From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <stable-bounces@dpdk.org>
Received: from dpdk.org (dpdk.org [92.243.14.124])
by inbox.dpdk.org (Postfix) with ESMTP id 9BDF3A0093
for <public@inbox.dpdk.org>; Tue, 19 May 2020 15:08:07 +0200 (CEST)
Received: from [92.243.14.124] (localhost [127.0.0.1])
by dpdk.org (Postfix) with ESMTP id 9393D1D67B;
Tue, 19 May 2020 15:08:07 +0200 (CEST)
Received: from mail-wr1-f66.google.com (mail-wr1-f66.google.com
[209.85.221.66]) by dpdk.org (Postfix) with ESMTP id 2E60D1D603
for <stable@dpdk.org>; Tue, 19 May 2020 15:08:06 +0200 (CEST)
Received: by mail-wr1-f66.google.com with SMTP id s8so15831855wrt.9
for <stable@dpdk.org>; Tue, 19 May 2020 06:08:06 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025;
h=from:to:cc:subject:date:message-id:in-reply-to:references
:mime-version:content-transfer-encoding;
bh=3W02fb6Pc9V6WnMrcy4AwZutVN2UJADgrrVoMGebJkU=;
b=s9O/r0LMxJMXziJeLh+dwtZJUL518wRLKzNSM58fG3VBAux0qsVIzgy0iHG/h8lIM0
s3bbsFij/aTZ4f+oxDQtb6sK/yK0DnaGy4UBVeXvk1JyY30r7aQgoQ642/Fs+DgzdxtD
jCJYS4uRuIXz6Koc/R50Ue1/Io20cxBgRTeaehiCHzM0PAyeaddL0k/KY5Pih0f6tdIO
2Dnag9JHRwX6vkJhq7s7++IiWXq7nvAt8TKNOK6oSzH98V6TyVSQZFNAzUMfFAGxhnGY
03giDrIsQbcUETDY2QCAkD8lBFAPDtZHL8gn98qPHy3G0GjK9CW9D6ahlrtRibBnSwXD
9Svg==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20161025;
h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to
:references:mime-version:content-transfer-encoding;
bh=3W02fb6Pc9V6WnMrcy4AwZutVN2UJADgrrVoMGebJkU=;
b=k/PaO6gn6NAs7cm83b42N5HVizFyrcuNB6P8AXIzaD4HHRfUlX7/euFWq6eZNot6CO
D+tOQN4W1m89AqubJAhyVC1x6WHKo3cl4aM9YsZrWc90EfPpd/CjPcjppm5A8BE7E+op
8BluMeak7vgzuCciWlwMohIPShjNSNY0Zy0XiZBtbQrljg5UI5GRTGG6xiMjGQdHgnMl
9lRGAGyKE0sQt+uiPgBMdfQICmG8fkpKXEGBv/YFiJ4F9/RsB/HI7y7rX6RmmHDbb60V
31ypvOFVG3lrwWjdTsNOwoP9ybsKTj/oZXL4t3Z1q0sBkSampWVsC78BPTNTytDgqXUq
bM6Q==
X-Gm-Message-State: AOAM5320PA4gzZEq/DY3g+J7X653EYXBWBAYvw3PWqpA4ErgNgkg2/Fh
QehmXz3UDYwu+23ndSYA5cA=
X-Google-Smtp-Source: ABdhPJxgTRzd/8/YzhxVpRhaLAe6UmPM97H5wAVwP5y6+Fl3CYlnOpIeh21v4gPRSbKErWTDeMD/sw==
X-Received: by 2002:adf:e783:: with SMTP id n3mr25373991wrm.157.1589893685899;
Tue, 19 May 2020 06:08:05 -0700 (PDT)
Received: from localhost ([88.98.246.218])
by smtp.gmail.com with ESMTPSA id l19sm3999869wmj.14.2020.05.19.06.08.05
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Tue, 19 May 2020 06:08:05 -0700 (PDT)
From: luca.boccassi@gmail.com
To: Stephen Hemminger <stephen@networkplumber.org>
Cc: dpdk stable <stable@dpdk.org>
Date: Tue, 19 May 2020 14:02:57 +0100
Message-Id: <20200519130549.112823-42-luca.boccassi@gmail.com>
X-Mailer: git-send-email 2.20.1
In-Reply-To: <20200519130549.112823-1-luca.boccassi@gmail.com>
References: <20200519125804.104349-1-luca.boccassi@gmail.com>
<20200519130549.112823-1-luca.boccassi@gmail.com>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Subject: [dpdk-stable] patch 'net/netvsc: propagate descriptor limits from
VF' has been queued to stable release 19.11.3
X-BeenThere: stable@dpdk.org
X-Mailman-Version: 2.1.15
Precedence: list
List-Id: patches for DPDK stable branches <stable.dpdk.org>
List-Unsubscribe: <https://mails.dpdk.org/options/stable>,
<mailto:stable-request@dpdk.org?subject=unsubscribe>
List-Archive: <http://mails.dpdk.org/archives/stable/>
List-Post: <mailto:stable@dpdk.org>
List-Help: <mailto:stable-request@dpdk.org?subject=help>
List-Subscribe: <https://mails.dpdk.org/listinfo/stable>,
<mailto:stable-request@dpdk.org?subject=subscribe>
Errors-To: stable-bounces@dpdk.org
Sender: "stable" <stable-bounces@dpdk.org>
Hi,
FYI, your patch has been queued to stable release 19.11.3
Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 05/21/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.
Thanks.
Luca Boccassi
---
>From cc1f0062537705bf1f619f989ff5fb4fae9a77fe Mon Sep 17 00:00:00 2001
From: Stephen Hemminger <stephen@networkplumber.org>
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 <stephen@networkplumber.org>
---
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 7a3734cadf..1261b2e2ef 100644
--- a/drivers/net/netvsc/hn_vf.c
+++ b/drivers/net/netvsc/hn_vf.c
@@ -167,6 +167,17 @@ hn_nvs_handle_vfassoc(struct rte_eth_dev *dev,
hn_vf_remove(hv);
}
+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.
* use the default config of the VF
@@ -196,11 +207,13 @@ static int hn_vf_info_merge(struct rte_eth_dev *vf_dev,
info->max_tx_queues);
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,
info->min_rx_bufsize);
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);
return 0;
}
--
2.20.1
---
Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- - 2020-05-19 14:04:46.269222883 +0100
+++ 0042-net-netvsc-propagate-descriptor-limits-from-VF.patch 2020-05-19 14:04:44.180647720 +0100
@@ -1,13 +1,14 @@
-From 4bc7dc1110ac9284b07150a13436e2b0ca5a62d0 Mon Sep 17 00:00:00 2001
+From cc1f0062537705bf1f619f989ff5fb4fae9a77fe Mon Sep 17 00:00:00 2001
From: Stephen Hemminger <stephen@networkplumber.org>
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")
-Cc: stable@dpdk.org
Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
---