From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 9E5FAA0032; Fri, 29 Oct 2021 11:42:56 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 64C18410E1; Fri, 29 Oct 2021 11:42:56 +0200 (CEST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mails.dpdk.org (Postfix) with ESMTP id 362EF410E0 for ; Fri, 29 Oct 2021 11:42:55 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1635500574; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=i/acI3/eeNxivBzrAS4cMG6o7Pnhb966srdR6JBDwYA=; b=jOtUDnMfkKG9g+Ab5Ewy2RjtjWSfEOK9cx24MMrIHEvAo5jdcEvTC+TjBjcqTMLzzgLTKo UEhHpAUwQ77mfbBl7sUS3LLp13cAeLXq0sJzaR/0CcvEbD2WqqbWFiLFZnQDgs1KbNF35/ /4MUzvePsqXakrYFjshZjiEDc4db6KM= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-62-ie7tQpgjONKaREPyWe2-Ug-1; Fri, 29 Oct 2021 05:42:51 -0400 X-MC-Unique: ie7tQpgjONKaREPyWe2-Ug-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 3364A80668A; Fri, 29 Oct 2021 09:42:50 +0000 (UTC) Received: from [10.39.208.19] (unknown [10.39.208.19]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 5A80860C13; Fri, 29 Oct 2021 09:42:48 +0000 (UTC) Message-ID: <6b1ce80a-25cd-4d6b-18a2-ccc3b51be7ad@redhat.com> Date: Fri, 29 Oct 2021 11:42:46 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.2.0 To: Andrew Rybchenko , Chenbo Xia , Ivan Dyukov Cc: dev@dpdk.org, Ivan Ilchenko , stable@dpdk.org References: <20211022131755.932304-1-andrew.rybchenko@oktetlabs.ru> From: Maxime Coquelin In-Reply-To: <20211022131755.932304-1-andrew.rybchenko@oktetlabs.ru> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=maxime.coquelin@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Language: en-US Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit Subject: Re: [dpdk-dev] [PATCH] net/virtio: fix link update in speed feature case X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" On 10/22/21 15:17, Andrew Rybchenko wrote: > From: Ivan Ilchenko > > Link update callback reports speed/duplex based on data > filled on device initialization. This is wrong in case of > VIRTIO_NET_F_SPEED_DUPLEX is negotiated since link could > be down at this time. Fix this function to actually > update the HW data in this case with respect to the fact > that specifying speed via devarg is a highest priority. > > Fixes: 1357b4b36246 ("net/virtio: support Virtio link speed feature") > Cc: stable@dpdk.org > > Signed-off-by: Ivan Ilchenko > Signed-off-by: Andrew Rybchenko > --- > drivers/net/virtio/virtio.h | 5 ++++ > drivers/net/virtio/virtio_ethdev.c | 47 +++++++++++++++++++++--------- > 2 files changed, 39 insertions(+), 13 deletions(-) > > diff --git a/drivers/net/virtio/virtio.h b/drivers/net/virtio/virtio.h > index e78b2e429e..4fd1427375 100644 > --- a/drivers/net/virtio/virtio.h > +++ b/drivers/net/virtio/virtio.h > @@ -178,6 +178,11 @@ struct virtio_hw { > uint16_t port_id; > uint8_t mac_addr[RTE_ETHER_ADDR_LEN]; > uint32_t speed; /* link speed in MB */ > + /* > + * Speed is specified via 'speed' devarg or > + * negotiated via VIRTIO_NET_F_SPEED_DUPLEX > + */ > + bool get_speed_via_feat; For better packing of this struct, it may be better to place it just before the speed field as it already has a 2 bytes hole above. > uint8_t duplex; > uint8_t intr_lsc; > uint16_t max_mtu; > diff --git a/drivers/net/virtio/virtio_ethdev.c b/drivers/net/virtio/virtio_ethdev.c > index 4001368bc4..3d80f664b3 100644 > --- a/drivers/net/virtio/virtio_ethdev.c > +++ b/drivers/net/virtio/virtio_ethdev.c > @@ -1777,6 +1777,32 @@ virtio_configure_intr(struct rte_eth_dev *dev) > > return 0; > } > + > +static void > +virtio_get_speed_duplex(struct rte_eth_dev *eth_dev, > + struct rte_eth_link *link) > +{ > + struct virtio_hw *hw = eth_dev->data->dev_private; > + struct virtio_net_config *config; > + struct virtio_net_config local_config; > + > + config = &local_config; > + virtio_read_dev_config(hw, > + offsetof(struct virtio_net_config, speed), > + &config->speed, sizeof(config->speed)); > + virtio_read_dev_config(hw, > + offsetof(struct virtio_net_config, duplex), > + &config->duplex, sizeof(config->duplex)); > + hw->speed = config->speed; > + hw->duplex = config->duplex; > + if (link != NULL) { > + link->link_duplex = hw->duplex; > + link->link_speed = hw->speed; > + } > + PMD_INIT_LOG(DEBUG, "link speed = %d, duplex = %d", > + hw->speed, hw->duplex); > +} > + > #define DUPLEX_UNKNOWN 0xff > /* reset device and renegotiate features if needed */ > static int > @@ -1830,19 +1856,10 @@ virtio_init_device(struct rte_eth_dev *eth_dev, uint64_t req_features) > hw->mac_addr[0], hw->mac_addr[1], hw->mac_addr[2], > hw->mac_addr[3], hw->mac_addr[4], hw->mac_addr[5]); > > - if (hw->speed == ETH_SPEED_NUM_UNKNOWN) { > - if (virtio_with_feature(hw, VIRTIO_NET_F_SPEED_DUPLEX)) { > - config = &local_config; > - virtio_read_dev_config(hw, > - offsetof(struct virtio_net_config, speed), > - &config->speed, sizeof(config->speed)); > - virtio_read_dev_config(hw, > - offsetof(struct virtio_net_config, duplex), > - &config->duplex, sizeof(config->duplex)); > - hw->speed = config->speed; > - hw->duplex = config->duplex; > - } > - } > + hw->get_speed_via_feat = hw->speed == ETH_SPEED_NUM_UNKNOWN && > + virtio_with_feature(hw, VIRTIO_NET_F_SPEED_DUPLEX); > + if (hw->get_speed_via_feat) > + virtio_get_speed_duplex(eth_dev, NULL); > if (hw->duplex == DUPLEX_UNKNOWN) > hw->duplex = ETH_LINK_FULL_DUPLEX; > PMD_INIT_LOG(DEBUG, "link speed = %d, duplex = %d", > @@ -2554,11 +2571,15 @@ virtio_dev_link_update(struct rte_eth_dev *dev, __rte_unused int wait_to_complet > dev->data->port_id); > } else { > link.link_status = ETH_LINK_UP; > + if (hw->get_speed_via_feat) > + virtio_get_speed_duplex(dev, &link); > PMD_INIT_LOG(DEBUG, "Port %d is up", > dev->data->port_id); > } > } else { > link.link_status = ETH_LINK_UP; > + if (hw->get_speed_via_feat) > + virtio_get_speed_duplex(dev, &link); > } > > return rte_eth_linkstatus_set(dev, &link); > If you agree with the change, I can do it while applying. Other than that: Reviewed-by: Maxime Coquelin Thanks, Maxime