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 10E01A0524; Fri, 19 Feb 2021 18:41:32 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id A45C9160949; Fri, 19 Feb 2021 18:41:31 +0100 (CET) Received: from mail-lj1-f180.google.com (mail-lj1-f180.google.com [209.85.208.180]) by mails.dpdk.org (Postfix) with ESMTP id 27F9A160941 for ; Fri, 19 Feb 2021 18:41:30 +0100 (CET) Received: by mail-lj1-f180.google.com with SMTP id e17so24160883ljl.8 for ; Fri, 19 Feb 2021 09:41:30 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20150623.gappssmtp.com; s=20150623; h=mime-version:references:in-reply-to:from:date:message-id:subject:to; bh=dWzixzegF8QbPjabRwYA3DQNtzsKGzAr7XMgFD7dtYg=; b=mjusf2yjLD+VjnE+9tghQiRrFQ4FdT5Du9KhJtoCiYRHmfrsiO7BZQqiq2X9NbKfMb r4MwWYBqCas2rJ25CZSY8JwyWAJI15oGWcttfsDdsayKhh/0fx7/Wq7CRwCrVd3OFrO5 ChrE2TzbZMJwoPIgPx10ab53KKutyvces7janlNASDurLUOrfJ59bcU5QDlIpon5m6cF ixOe6clhNCAnC3xuD4bZVlGsAbZBuuGVDp6Dz4GuxtX3XtQd0KYKtSTObeSjqE6g3Tj9 iZvQxXlgCxJ97j3jcB42ThMA+VkdV/o6extY6pPZcrdP4cZSlJcpWWrcRAhmR1/JUiaJ rOcw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to; bh=dWzixzegF8QbPjabRwYA3DQNtzsKGzAr7XMgFD7dtYg=; b=OWMQmZP4Fs2jeYEWYyyHv3sutGA8ZKReRjUTNyRKRSKoWTumL2/STvgCQZfEn0nNdd oDc45hrKKxq+88cpzwn3A8KIfAUMtTi3XDHKjn8bu+pE+mFWtyKniY+BYjFUZJ3RheNr 1xhHywdKCvu4cH/APdmrFNmnJNEHEN3wCc82XD2wBUDTp5SnCJyeGLnw+epoUkg6xQIb vZUweS3+8Caz58+sgD6J/IjMJReSpFFqRXM3UmyFU9mW2fR6huUoXQzs53CMVEbaexFN nhCRDpBG+D+oEs4TJzue380hYiDJ2HBH9YGlvWnMF+EH2gTFETuaduDF3Zr08s2L/uUR kLNg== X-Gm-Message-State: AOAM531T0foFu9iJnBs/QvfwDLModygUXMtqkO7ZpYCVUSu3qsvEXB0p I4VHMg5Vz/f+deQ0ULQ0ytK3DxfGGDandOEHbEjJRqOnIfs= X-Google-Smtp-Source: ABdhPJyu6A9JOC41h9tNS6MQERzp6xsXIQGj8bNHHzcXW/yrdb5LsD3g+jVYLlKZ5f/0nfAHnUZv/crZe60WGTzMoWo= X-Received: by 2002:a2e:8759:: with SMTP id q25mr3229497ljj.30.1613756489349; Fri, 19 Feb 2021 09:41:29 -0800 (PST) MIME-Version: 1.0 References: <20201123221918.20825-1-stephen@networkplumber.org> <20201123221918.20825-3-stephen@networkplumber.org> In-Reply-To: <20201123221918.20825-3-stephen@networkplumber.org> From: Stephen Hemminger Date: Fri, 19 Feb 2021 09:41:18 -0800 Message-ID: To: dev Content-Type: text/plain; charset="UTF-8" X-Content-Filtered-By: Mailman/MimeDel 2.1.29 Subject: Re: [dpdk-dev] [PATCH 2/2] net/netvsc: fix ethdev get_supported_ptypes 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" I have been without power and offline all week. Will try and get back next week On Mon, Nov 23, 2020, 2:19 PM Stephen Hemminger wrote: > 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; > -- > 2.27.0 > >