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 B6D2BA0562 for ; Tue, 31 Mar 2020 19:14:18 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id A2AD31C06D; Tue, 31 Mar 2020 19:14:18 +0200 (CEST) Received: from mail-pj1-f68.google.com (mail-pj1-f68.google.com [209.85.216.68]) by dpdk.org (Postfix) with ESMTP id 7F4031C06D for ; Tue, 31 Mar 2020 19:14:16 +0200 (CEST) Received: by mail-pj1-f68.google.com with SMTP id np9so1339281pjb.4 for ; Tue, 31 Mar 2020 10:14:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=hzVAm9u+dULJ7B3oegwe+jNbuEADxU2ov+7HVG8Vajk=; b=U3ZZ3QAStCfHwZ4hSKa5/giNZ/+Idu3vRCckM+j/8fMDoGpUqzW4K+viX0FTT032Im 8adFS7staE7ivT2pzgWICZOkuVXiK55s/xYODOPUGEeOjB/VTTPHvEjn55pB4hDEfKJr goLPOyUxb2lze3h0Cgtk9R0SP1xX5PmEAoCgkIFNW6jcJMXrOGdzz9mbjL1QkDCkFVU0 JE1cIYMgBjU7KR4jEj7pVfC1BtZ9YwBrJ8Y/3zWI5/7mMJKxld/K4pQCWZPwiKUBs0sQ 0QlddD7tYNNHfz8ohy/Rp8wo+xQ+b25uFg3A/HwNSj+sh4M8Gq2S+ePI10TDlsBQw02l L34A== 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=hzVAm9u+dULJ7B3oegwe+jNbuEADxU2ov+7HVG8Vajk=; b=b4cDr/451Nq9CgvFHKOlqUhKheKPD5vJKKf6O6oQdNIB81YfguBt9NdfTj7YrGN8h+ 89UN4O4QNS6d1+xi4z22ntfMhc5M1oe3ZE2AifXWoVUTepSrEF/7KoR4h2cTrBITYxYi krN4wafAHzu8YBLR7fFHK906apQpfI+0JNlN7oINZ6FUPu+97bqVVdciFnMjAgEWsaXf moBVM8Re+hCfxhyufhJ+GuqOTvNjq0x/o/N0kMTW1eeiQiRx6qBtV7gWFUjRll0EJDej jvGEjhzwvzvDEzlUpyWFoXZF8LkET0uI1zwD4XoTutPT4pcsKTv8UdKGArFYMiQPlv+b vkJQ== X-Gm-Message-State: ANhLgQ02wBdH5bx+CfV4Lifzrf9XAKoBZoFuCFSZKcBqd92OpqvCZU9u 17v8cD0tlBlygioQfz8/fxXL6+1pv0kIKA== X-Google-Smtp-Source: ADFU+vvAqef61+DBerL1oh1flnX37SB0zGb0CMjEbNvrrrplm0S3QgzLmkUAyDckVP1RiF137ro8Aw== X-Received: by 2002:a17:902:562:: with SMTP id 89mr17977918plf.249.1585674855828; Tue, 31 Mar 2020 10:14:15 -0700 (PDT) Received: from hermes.lan (204-195-22-127.wavecable.com. [204.195.22.127]) by smtp.gmail.com with ESMTPSA id i124sm12869764pfg.14.2020.03.31.10.14.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 31 Mar 2020 10:14:14 -0700 (PDT) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger , stable@dpdk.org Date: Tue, 31 Mar 2020 10:13:57 -0700 Message-Id: <20200331171404.23596-2-stephen@networkplumber.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200331171404.23596-1-stephen@networkplumber.org> References: <20200316235612.29854-1-stephen@networkplumber.org> <20200331171404.23596-1-stephen@networkplumber.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] [PATCH v4 1/8] net/netvsc: propagate descriptor limits from VF to netvsc 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" 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 --- 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 7a3734cadfa4..1261b2e2ef85 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