From: Haiyue Wang <haiyue.wang@intel.com>
To: dev@dpdk.org
Cc: qiming.yang@intel.com, qi.z.zhang@intel.com,
Haiyue Wang <haiyue.wang@intel.com>,
Jingjing Wu <jingjing.wu@intel.com>,
Beilei Xing <beilei.xing@intel.com>
Subject: [dpdk-dev] [PATCH v1] net/iavf: fix unsupported VLAN offload requested
Date: Mon, 25 Jan 2021 12:30:54 +0800 [thread overview]
Message-ID: <20210125043054.4998-1-haiyue.wang@intel.com> (raw)
If the underlying PF doesn't support a specific ethertype or the ability
to toggle VLAN insertion and/or stripping, then the VF prevents sending
an invalid message to the PF.
Fixes: 1c301e8c3cff ("net/iavf: support new VLAN capabilities")
Signed-off-by: Haiyue Wang <haiyue.wang@intel.com>
---
drivers/net/iavf/iavf_vchnl.c | 36 ++++++++++++++++-------------------
1 file changed, 16 insertions(+), 20 deletions(-)
diff --git a/drivers/net/iavf/iavf_vchnl.c b/drivers/net/iavf/iavf_vchnl.c
index c82925eceb..9b8c4d113a 100644
--- a/drivers/net/iavf/iavf_vchnl.c
+++ b/drivers/net/iavf/iavf_vchnl.c
@@ -528,23 +528,21 @@ int
iavf_config_vlan_strip_v2(struct iavf_adapter *adapter, bool enable)
{
struct iavf_info *vf = IAVF_DEV_PRIVATE_TO_VF(adapter);
- struct virtchnl_vlan_supported_caps *supported_caps;
+ struct virtchnl_vlan_supported_caps *stripping_caps;
struct virtchnl_vlan_setting vlan_strip;
struct iavf_cmd_info args;
- uint32_t stripping_caps;
uint32_t *ethertype;
int ret;
- supported_caps = &vf->vlan_v2_caps.offloads.stripping_support;
- if (supported_caps->outer) {
- stripping_caps = supported_caps->outer;
+ stripping_caps = &vf->vlan_v2_caps.offloads.stripping_support;
+
+ if ((stripping_caps->outer & VIRTCHNL_VLAN_ETHERTYPE_8100) &&
+ (stripping_caps->outer & VIRTCHNL_VLAN_TOGGLE))
ethertype = &vlan_strip.outer_ethertype_setting;
- } else {
- stripping_caps = supported_caps->inner;
+ else if ((stripping_caps->inner & VIRTCHNL_VLAN_ETHERTYPE_8100) &&
+ (stripping_caps->inner & VIRTCHNL_VLAN_TOGGLE))
ethertype = &vlan_strip.inner_ethertype_setting;
- }
-
- if (!(stripping_caps & VIRTCHNL_VLAN_ETHERTYPE_8100))
+ else
return -ENOTSUP;
memset(&vlan_strip, 0, sizeof(vlan_strip));
@@ -570,23 +568,21 @@ int
iavf_config_vlan_insert_v2(struct iavf_adapter *adapter, bool enable)
{
struct iavf_info *vf = IAVF_DEV_PRIVATE_TO_VF(adapter);
- struct virtchnl_vlan_supported_caps *supported_caps;
+ struct virtchnl_vlan_supported_caps *insertion_caps;
struct virtchnl_vlan_setting vlan_insert;
struct iavf_cmd_info args;
- uint32_t insertion_caps;
uint32_t *ethertype;
int ret;
- supported_caps = &vf->vlan_v2_caps.offloads.insertion_support;
- if (supported_caps->outer) {
- insertion_caps = supported_caps->outer;
+ insertion_caps = &vf->vlan_v2_caps.offloads.insertion_support;
+
+ if ((insertion_caps->outer & VIRTCHNL_VLAN_ETHERTYPE_8100) &&
+ (insertion_caps->outer & VIRTCHNL_VLAN_TOGGLE))
ethertype = &vlan_insert.outer_ethertype_setting;
- } else {
- insertion_caps = supported_caps->inner;
+ else if ((insertion_caps->inner & VIRTCHNL_VLAN_ETHERTYPE_8100) &&
+ (insertion_caps->inner & VIRTCHNL_VLAN_TOGGLE))
ethertype = &vlan_insert.inner_ethertype_setting;
- }
-
- if (!(insertion_caps & VIRTCHNL_VLAN_ETHERTYPE_8100))
+ else
return -ENOTSUP;
memset(&vlan_insert, 0, sizeof(vlan_insert));
--
2.30.0
next reply other threads:[~2021-01-25 4:47 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-25 4:30 Haiyue Wang [this message]
2021-01-26 3:24 ` Zhang, Qi Z
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210125043054.4998-1-haiyue.wang@intel.com \
--to=haiyue.wang@intel.com \
--cc=beilei.xing@intel.com \
--cc=dev@dpdk.org \
--cc=jingjing.wu@intel.com \
--cc=qi.z.zhang@intel.com \
--cc=qiming.yang@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).