From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 6A50AA0093 for ; Thu, 28 May 2020 18:25:36 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 5555B1DC18; Thu, 28 May 2020 18:25:36 +0200 (CEST) Received: from us-smtp-delivery-1.mimecast.com (us-smtp-2.mimecast.com [207.211.31.81]) by dpdk.org (Postfix) with ESMTP id 57B891D996 for ; Thu, 28 May 2020 18:25:32 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1590683131; 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=Zx3nhb6WYRyo6D3Ni4dtrNUSZ3fxcrfCFAxJ4YA5P3g=; b=HKar5TssTqgtXT4Kz4aBQFz/0jKAMWYnqpJsXcm5X+SQjpOqsHCoTlAqSGxy+RbftDd0wM ProS3HIwnCOyOycUVGrjPK4HO48UMOwA+MVjTSbAKf8KiK9pALXMWzHAzNEbddjsF0qsPy tfvKvS1I4pENEhDhXK7wQYHgp7NaRuk= 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-59-iugl9o1qNA6K3_LPKRjb6Q-1; Thu, 28 May 2020 12:25:28 -0400 X-MC-Unique: iugl9o1qNA6K3_LPKRjb6Q-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 BCEB48018AC; Thu, 28 May 2020 16:25:27 +0000 (UTC) Received: from rh.redhat.com (unknown [10.33.36.235]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0EE7360C05; Thu, 28 May 2020 16:25:26 +0000 (UTC) From: Kevin Traynor To: Stephen Hemminger Cc: dpdk stable Date: Thu, 28 May 2020 17:22:41 +0100 Message-Id: <20200528162322.7863-54-ktraynor@redhat.com> In-Reply-To: <20200528162322.7863-1-ktraynor@redhat.com> References: <20200528162322.7863-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/netvsc: propagate descriptor limits from VF' has been queued to LTS release 18.11.9 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Sender: "stable" Hi, FYI, your patch has been queued to LTS release 18.11.9 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 06/03/20. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Queued patches are on a temporary branch at: https://github.com/kevintraynor/dpdk-stable-queue This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable-queue/commit/b3f55241fbbe62c6a6b5c76a5725d4e6ce627f07 Thanks. Kevin. --- >From b3f55241fbbe62c6a6b5c76a5725d4e6ce627f07 Mon Sep 17 00:00:00 2001 From: Stephen Hemminger Date: Tue, 31 Mar 2020 10:13:57 -0700 Subject: [PATCH] net/netvsc: propagate descriptor limits from VF [ upstream commit 4bc7dc1110ac9284b07150a13436e2b0ca5a62d0 ] If application cares about descriptor limits, the netvsc device values should reflect those of the VF as well. Fixes: dc7680e8597c ("net/netvsc: support integrated VF") Signed-off-by: Stephen Hemminger --- drivers/net/netvsc/hn_vf.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/drivers/net/netvsc/hn_vf.c b/drivers/net/netvsc/hn_vf.c index 50f92a00ae..86485235ae 100644 --- a/drivers/net/netvsc/hn_vf.c +++ b/drivers/net/netvsc/hn_vf.c @@ -171,4 +171,15 @@ hn_nvs_handle_vfassoc(struct rte_eth_dev *dev, } +static void +hn_vf_merge_desc_lim(struct rte_eth_desc_lim *lim, + const struct rte_eth_desc_lim *vf_lim) +{ + lim->nb_max = RTE_MIN(vf_lim->nb_max, lim->nb_max); + lim->nb_min = RTE_MAX(vf_lim->nb_min, lim->nb_min); + lim->nb_align = RTE_MAX(vf_lim->nb_align, lim->nb_align); + lim->nb_seg_max = RTE_MIN(vf_lim->nb_seg_max, lim->nb_seg_max); + lim->nb_mtu_seg_max = RTE_MIN(vf_lim->nb_seg_max, lim->nb_seg_max); +} + /* * Merge the info from the VF and synthetic path. @@ -197,4 +208,5 @@ static void hn_vf_info_merge(struct rte_eth_dev *vf_dev, info->tx_offload_capa &= vf_info.tx_offload_capa; info->tx_queue_offload_capa &= vf_info.tx_queue_offload_capa; + hn_vf_merge_desc_lim(&info->tx_desc_lim, &vf_info.tx_desc_lim); info->min_rx_bufsize = RTE_MAX(vf_info.min_rx_bufsize, @@ -202,4 +214,5 @@ static void hn_vf_info_merge(struct rte_eth_dev *vf_dev, info->max_rx_pktlen = RTE_MAX(vf_info.max_rx_pktlen, info->max_rx_pktlen); + hn_vf_merge_desc_lim(&info->rx_desc_lim, &vf_info.rx_desc_lim); } -- 2.21.3 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-05-28 17:13:01.919447647 +0100 +++ 0054-net-netvsc-propagate-descriptor-limits-from-VF.patch 2020-05-28 17:12:59.126555835 +0100 @@ -1 +1 @@ -From 4bc7dc1110ac9284b07150a13436e2b0ca5a62d0 Mon Sep 17 00:00:00 2001 +From b3f55241fbbe62c6a6b5c76a5725d4e6ce627f07 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 4bc7dc1110ac9284b07150a13436e2b0ca5a62d0 ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org @@ -18 +19 @@ -index 7a3734cadf..1261b2e2ef 100644 +index 50f92a00ae..86485235ae 100644 @@ -21 +22 @@ -@@ -168,4 +168,15 @@ hn_nvs_handle_vfassoc(struct rte_eth_dev *dev, +@@ -171,4 +171,15 @@ hn_nvs_handle_vfassoc(struct rte_eth_dev *dev, @@ -37 +38 @@ -@@ -197,4 +208,5 @@ static int hn_vf_info_merge(struct rte_eth_dev *vf_dev, +@@ -197,4 +208,5 @@ static void hn_vf_info_merge(struct rte_eth_dev *vf_dev, @@ -43 +44 @@ -@@ -202,4 +214,5 @@ static int hn_vf_info_merge(struct rte_eth_dev *vf_dev, +@@ -202,4 +214,5 @@ static void hn_vf_info_merge(struct rte_eth_dev *vf_dev, @@ -46,0 +48 @@ + } @@ -48 +49,0 @@ - return 0;