From patchwork Mon Nov 23 22:19:17 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 84479 X-Patchwork-Delegate: ferruh.yigit@amd.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id C8659A04B1; Mon, 23 Nov 2020 23:20:01 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 2480DC914; Mon, 23 Nov 2020 23:19:44 +0100 (CET) Received: from mail-pl1-f176.google.com (mail-pl1-f176.google.com [209.85.214.176]) by dpdk.org (Postfix) with ESMTP id D2868C908 for ; Mon, 23 Nov 2020 23:19:39 +0100 (CET) Received: by mail-pl1-f176.google.com with SMTP id b23so1868995pls.11 for ; Mon, 23 Nov 2020 14:19:39 -0800 (PST) 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=mDdgN7eMol33Roq7nDDojQbfi0s37yVCvpHJJt8Lu5w=; b=LyRuDY0XtEi3k10zT+5JOGlBM641+HgpXAwBweRbaHCt1fgJK9y+Aw9Ae2Ee8S4Bgy Zpp0HRFgQN4bU+KqnM0vn9dFU2uF5bUnAQqn3JyJ36hIutA2wrCfK/WLjk533143bnDp cDN/p91v4jisz7Sbbs8jk0COlrOcUb+mkMjJK/40fM3H+GDcIb+feH9oUVWh8LKHCM+S 9NyWVguAxGdgd7b//7smjDg+wlA49fIKmN3E3mI3+lOuMDw1FraJQaA2pjQff9NGCNhT dlR0cfCyOKq/20H0nwE7A0QS3DOVgoYqUrNUFPO0tiVasnDffdtJh0VE0AGtzATThK9k /8zA== 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=mDdgN7eMol33Roq7nDDojQbfi0s37yVCvpHJJt8Lu5w=; b=g4D8CTo3OfA0TnCx1vwGitXSYPNFN9MvN2TvrLBY5YFMxz5rD2H4ESHfRBKnRfkiTR tyCukePOQ6u9gCrwnG8do4Bnw3jSQvoAclaX85HPOP2rRflJvHFixsVhqS8orMNcx8Aa BE9AblkX0AJv+5fCGC4etWYqclVLfhltfQ/ogJKRyYPFFgj6ybdLgmKS8G9XYc/0V+Zl CAqbH3U6vvM0JyuChCvE/382XdqsbhCdyaFDLimJR6wnCxygGqMXMs9weQfTXNJkf2f8 stdaEdtZleY3nbFWeH0haV4JRoIx2SW8MfkksKTI1YyQg3NOmPVetCJP1DzkCq+On2yN Nx4Q== X-Gm-Message-State: AOAM532YoKvxNrl6vObB80gtkId5Na0doGtFSTtOANEow8AujH/cgaiL 9vIuReg9gszIhzXUfq/IVrojhRiyCBqnwM+6 X-Google-Smtp-Source: ABdhPJxrw0J50vwlakT377cubAvllLJfVkEXs6HqihCqSXq26SVRCZuMhj2X8zGQiJKLxWdx/mHfvg== X-Received: by 2002:a17:902:8b89:b029:d6:df6e:54df with SMTP id ay9-20020a1709028b89b02900d6df6e54dfmr1324590plb.0.1606169977530; Mon, 23 Nov 2020 14:19:37 -0800 (PST) Received: from hermes.corp.microsoft.com (204-195-22-127.wavecable.com. [204.195.22.127]) by smtp.gmail.com with ESMTPSA id h7sm12950414pgi.90.2020.11.23.14.19.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 23 Nov 2020 14:19:36 -0800 (PST) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger Date: Mon, 23 Nov 2020 14:19:17 -0800 Message-Id: <20201123221918.20825-2-stephen@networkplumber.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20201123221918.20825-1-stephen@networkplumber.org> References: <20201123221918.20825-1-stephen@networkplumber.org> MIME-Version: 1.0 Subject: [dpdk-dev] [PATCH 1/2] net/netvsc: remove unused code X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 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" This code is not called anywhere. Signed-off-by: Stephen Hemminger --- drivers/net/netvsc/hn_rndis.c | 31 ------------------------------- drivers/net/netvsc/hn_rndis.h | 1 - 2 files changed, 32 deletions(-) diff --git a/drivers/net/netvsc/hn_rndis.c b/drivers/net/netvsc/hn_rndis.c index 1ce260c89b95..beb716f3c96c 100644 --- a/drivers/net/netvsc/hn_rndis.c +++ b/drivers/net/netvsc/hn_rndis.c @@ -946,37 +946,6 @@ int hn_rndis_get_offload(struct hn_data *hv, return 0; } -uint32_t -hn_rndis_get_ptypes(struct hn_data *hv) -{ - struct ndis_offload hwcaps; - uint32_t ptypes; - int error; - - memset(&hwcaps, 0, sizeof(hwcaps)); - - error = hn_rndis_query_hwcaps(hv, &hwcaps); - if (error) { - PMD_DRV_LOG(ERR, "hwcaps query failed: %d", error); - return RTE_PTYPE_L2_ETHER; - } - - ptypes = RTE_PTYPE_L2_ETHER; - - if (hwcaps.ndis_csum.ndis_ip4_rxcsum & NDIS_RXCSUM_CAP_IP4) - ptypes |= RTE_PTYPE_L3_IPV4; - - if ((hwcaps.ndis_csum.ndis_ip4_rxcsum & NDIS_RXCSUM_CAP_TCP4) || - (hwcaps.ndis_csum.ndis_ip6_rxcsum & NDIS_RXCSUM_CAP_TCP6)) - ptypes |= RTE_PTYPE_L4_TCP; - - if ((hwcaps.ndis_csum.ndis_ip4_rxcsum & NDIS_RXCSUM_CAP_UDP4) || - (hwcaps.ndis_csum.ndis_ip6_rxcsum & NDIS_RXCSUM_CAP_UDP6)) - ptypes |= RTE_PTYPE_L4_UDP; - - return ptypes; -} - int hn_rndis_set_rxfilter(struct hn_data *hv, uint32_t filter) { diff --git a/drivers/net/netvsc/hn_rndis.h b/drivers/net/netvsc/hn_rndis.h index 9a8251fc2fb4..11b89042dd4b 100644 --- a/drivers/net/netvsc/hn_rndis.h +++ b/drivers/net/netvsc/hn_rndis.h @@ -25,7 +25,6 @@ int hn_rndis_query_rsscaps(struct hn_data *hv, int hn_rndis_query_rss(struct hn_data *hv, struct rte_eth_rss_conf *rss_conf); int hn_rndis_conf_rss(struct hn_data *hv, uint32_t flags); -uint32_t hn_rndis_get_ptypes(struct hn_data *hv); #ifdef RTE_LIBRTE_NETVSC_DEBUG_DUMP void hn_rndis_dump(const void *buf); From patchwork Mon Nov 23 22:19:18 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 84480 X-Patchwork-Delegate: ferruh.yigit@amd.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 234FDA04B1; Mon, 23 Nov 2020 23:20:22 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 15DDAC92C; Mon, 23 Nov 2020 23:19:46 +0100 (CET) Received: from mail-pg1-f196.google.com (mail-pg1-f196.google.com [209.85.215.196]) by dpdk.org (Postfix) with ESMTP id 2CA8EC906 for ; Mon, 23 Nov 2020 23:19:41 +0100 (CET) Received: by mail-pg1-f196.google.com with SMTP id v21so15595719pgi.2 for ; Mon, 23 Nov 2020 14:19:41 -0800 (PST) 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=OIgNDlflmIConLZzILl+qRFhC9bxq64g5x+maOQHTT8=; b=MtDrTVChtfAJ+uW/wMBiDlq+qfYL3FvN16XHgrzf77P4/DyDZ2raplmDPUtL/MQCJD FDMh4kl24VjEF1s92Hn6VogPXbmPymmoru9QK4tmjhyEI0i9PGz1woMP7DBpJ3kQ4Ocr wZnxcw9z8tkz8WDOj+qZfFuZrmGpptGcwKbWtcZvRE/4LZtUvpxyafr8yczHRXu0cd4k Vwqa1iFd3NmJzbBSVFfK4Jz7oeKeJ231RPzKcDf8f5f3a276YLX93CNMP0JbUydLxNhr IX7PUYB7cmjkKAh38+Cbrb5AepM6zfnBQmMYrkJqIhzIb+6GPhr/G+5ZTQXFp9FbdC1X ud2A== 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=OIgNDlflmIConLZzILl+qRFhC9bxq64g5x+maOQHTT8=; b=ElCgiVA8BFnP4GegWBdVIKm8T7RUPXk5ap4iOoJaU6fFH0heIyiO5GHksQt61i1IIV SZunFPzAAuj8qbKg4clT834asDHKl1odFknytMX6LNnR7Faj+eJBoRgRjzzldKFiIqoV 5OJiiNdAlS92lbJ44DnSDrqg4WFitmDyZHA3VWrfwYJT+YmLSl/solfsU3IU4YB+5Kx9 97Nt2cSCv3nOesfHdxrus3L38hM27SbFi4uoIOcf4coasP8b9kFR6VAlYBbhDWxNPVW1 vciT6s1QOraM80KLSLPLA66uHefrnpbcQZEsIhdVQQGTU6s3bb1xIAjcLqkD/TsjN4/b 9Gkg== X-Gm-Message-State: AOAM530n8po+TCdFri/kGZyeFZuTT0X8jTTx7c0Fd/bnWmqL8r2IvYI+ jRt8FQeLkn8V7lAc0V6eKGkS9jIJ/CGNPt/H X-Google-Smtp-Source: ABdhPJz73tsjHR6qop2LxAhzlaCNC33wZImJK6DWQiePdzpuqp9cK6qKGqsgrb0sI1mp9W4NNcD6bA== X-Received: by 2002:a17:90a:940e:: with SMTP id r14mr1211234pjo.47.1606169978920; Mon, 23 Nov 2020 14:19:38 -0800 (PST) Received: from hermes.corp.microsoft.com (204-195-22-127.wavecable.com. [204.195.22.127]) by smtp.gmail.com with ESMTPSA id h7sm12950414pgi.90.2020.11.23.14.19.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 23 Nov 2020 14:19:37 -0800 (PST) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger Date: Mon, 23 Nov 2020 14:19:18 -0800 Message-Id: <20201123221918.20825-3-stephen@networkplumber.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20201123221918.20825-1-stephen@networkplumber.org> References: <20201123221918.20825-1-stephen@networkplumber.org> MIME-Version: 1.0 Subject: [dpdk-dev] [PATCH 2/2] net/netvsc: fix ethdev get_supported_ptypes X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 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" When doing rte_eth_dev_get_supported_ptypes on netvsc device the values reported are incorrect if VF is not present. If no VF is present the device uses rte_net_get_ptype() which can return a wide range of values. Use the same table as TAP device in that case. Signed-off-by: Stephen Hemminger --- drivers/net/netvsc/hn_ethdev.c | 48 +++++++++++++++++++++++++++++++++- drivers/net/netvsc/hn_var.h | 1 - drivers/net/netvsc/hn_vf.c | 15 ----------- 3 files changed, 47 insertions(+), 17 deletions(-) diff --git a/drivers/net/netvsc/hn_ethdev.c b/drivers/net/netvsc/hn_ethdev.c index 49f954305dd8..9ce0134bd41b 100644 --- a/drivers/net/netvsc/hn_ethdev.c +++ b/drivers/net/netvsc/hn_ethdev.c @@ -438,6 +438,52 @@ static int hn_rss_hash_conf_get(struct rte_eth_dev *dev, return 0; } +static const uint32_t* +hn_dev_supported_ptypes(struct rte_eth_dev *dev) +{ + struct hn_data *hv = dev->data->dev_private; + struct rte_eth_dev *vf_dev; + const uint32_t *ptypes = NULL; + + /* List of possible ptypes comes from rte_net_get_ptype. */ + static const uint32_t net_ptypes[] = { + RTE_PTYPE_INNER_L2_ETHER, + RTE_PTYPE_INNER_L2_ETHER_VLAN, + RTE_PTYPE_INNER_L2_ETHER_QINQ, + RTE_PTYPE_INNER_L3_IPV4, + RTE_PTYPE_INNER_L3_IPV4_EXT, + RTE_PTYPE_INNER_L3_IPV6, + RTE_PTYPE_INNER_L3_IPV6_EXT, + RTE_PTYPE_INNER_L4_FRAG, + RTE_PTYPE_INNER_L4_UDP, + RTE_PTYPE_INNER_L4_TCP, + RTE_PTYPE_INNER_L4_SCTP, + RTE_PTYPE_L2_ETHER, + RTE_PTYPE_L2_ETHER_VLAN, + RTE_PTYPE_L2_ETHER_QINQ, + RTE_PTYPE_L3_IPV4, + RTE_PTYPE_L3_IPV4_EXT, + RTE_PTYPE_L3_IPV6_EXT, + RTE_PTYPE_L3_IPV6, + RTE_PTYPE_L4_FRAG, + RTE_PTYPE_L4_UDP, + RTE_PTYPE_L4_TCP, + RTE_PTYPE_L4_SCTP, + }; + + rte_rwlock_read_lock(&hv->vf_lock); + vf_dev = hn_get_vf_dev(hv); + if (vf_dev) { + if (vf_dev->dev_ops->dev_supported_ptypes_get) + ptypes = (*vf_dev->dev_ops->dev_supported_ptypes_get)(vf_dev); + } else { + ptypes = net_ptypes; + } + rte_rwlock_read_unlock(&hv->vf_lock); + + return ptypes; +} + static int hn_dev_promiscuous_enable(struct rte_eth_dev *dev) { @@ -880,7 +926,7 @@ static const struct eth_dev_ops hn_eth_dev_ops = { .dev_infos_get = hn_dev_info_get, .txq_info_get = hn_dev_tx_queue_info, .rxq_info_get = hn_dev_rx_queue_info, - .dev_supported_ptypes_get = hn_vf_supported_ptypes, + .dev_supported_ptypes_get = hn_dev_supported_ptypes, .promiscuous_enable = hn_dev_promiscuous_enable, .promiscuous_disable = hn_dev_promiscuous_disable, .allmulticast_enable = hn_dev_allmulticast_enable, diff --git a/drivers/net/netvsc/hn_var.h b/drivers/net/netvsc/hn_var.h index bd874c6b4d70..7c84f58d430d 100644 --- a/drivers/net/netvsc/hn_var.h +++ b/drivers/net/netvsc/hn_var.h @@ -223,7 +223,6 @@ int hn_vf_info_get(struct hn_data *hv, int hn_vf_add(struct rte_eth_dev *dev, struct hn_data *hv); int hn_vf_configure(struct rte_eth_dev *dev, const struct rte_eth_conf *dev_conf); -const uint32_t *hn_vf_supported_ptypes(struct rte_eth_dev *dev); int hn_vf_start(struct rte_eth_dev *dev); void hn_vf_reset(struct rte_eth_dev *dev); int hn_vf_close(struct rte_eth_dev *dev); diff --git a/drivers/net/netvsc/hn_vf.c b/drivers/net/netvsc/hn_vf.c index d43ebaa69fbb..e18596e77061 100644 --- a/drivers/net/netvsc/hn_vf.c +++ b/drivers/net/netvsc/hn_vf.c @@ -244,21 +244,6 @@ int hn_vf_configure(struct rte_eth_dev *dev, return ret; } -const uint32_t *hn_vf_supported_ptypes(struct rte_eth_dev *dev) -{ - struct hn_data *hv = dev->data->dev_private; - struct rte_eth_dev *vf_dev; - const uint32_t *ptypes = NULL; - - rte_rwlock_read_lock(&hv->vf_lock); - vf_dev = hn_get_vf_dev(hv); - if (vf_dev && vf_dev->dev_ops->dev_supported_ptypes_get) - ptypes = (*vf_dev->dev_ops->dev_supported_ptypes_get)(vf_dev); - rte_rwlock_read_unlock(&hv->vf_lock); - - return ptypes; -} - int hn_vf_start(struct rte_eth_dev *dev) { struct hn_data *hv = dev->data->dev_private;