From patchwork Mon Jan 25 07:04:46 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Wang, Haiyue" X-Patchwork-Id: 87170 X-Patchwork-Delegate: qi.z.zhang@intel.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 4E0DCA052A; Mon, 25 Jan 2021 08:20:56 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id C20A9140D25; Mon, 25 Jan 2021 08:20:54 +0100 (CET) Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by mails.dpdk.org (Postfix) with ESMTP id 0C1F6140D23 for ; Mon, 25 Jan 2021 08:20:52 +0100 (CET) IronPort-SDR: GwYBKvq9mRjRwUTtvbmUQ29TjFqEja7ryqV2DhqMbihsukDgz2w2HTppLEw68yqyo+SYOL43OV zo6lS2qA2srQ== X-IronPort-AV: E=McAfee;i="6000,8403,9874"; a="243752759" X-IronPort-AV: E=Sophos;i="5.79,372,1602572400"; d="scan'208";a="243752759" Received: from orsmga008.jf.intel.com ([10.7.209.65]) by orsmga105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 24 Jan 2021 23:20:51 -0800 IronPort-SDR: Xdh7QeXo0NMJqlYttQxjs54G/njwJmqFgYNrlf9v/0WBXcuIAAL5STEl9gjDVUObW4yhnjcgCj mQGsyVBqrohg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.79,372,1602572400"; d="scan'208";a="387204932" Received: from npg-dpdk-haiyue-3.sh.intel.com ([10.67.118.189]) by orsmga008.jf.intel.com with ESMTP; 24 Jan 2021 23:20:49 -0800 From: Haiyue Wang To: dev@dpdk.org Cc: qiming.yang@intel.com, qi.z.zhang@intel.com, Haiyue Wang , Jingjing Wu , Beilei Xing Date: Mon, 25 Jan 2021 15:04:46 +0800 Message-Id: <20210125070446.53506-1-haiyue.wang@intel.com> X-Mailer: git-send-email 2.30.0 MIME-Version: 1.0 Subject: [dpdk-dev] [PATCH v1] net/iavf: support to config VLAN filter 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" Add the VLAN filtering enable/disable configuration according to the VF successfully negotiated that capability with PF. Signed-off-by: Haiyue Wang --- drivers/net/iavf/iavf.h | 1 + drivers/net/iavf/iavf_ethdev.c | 7 ++++++ drivers/net/iavf/iavf_vchnl.c | 40 ++++++++++++++++++++++++++++++++++ 3 files changed, 48 insertions(+) diff --git a/drivers/net/iavf/iavf.h b/drivers/net/iavf/iavf.h index c934d2e614..9d84e2604d 100644 --- a/drivers/net/iavf/iavf.h +++ b/drivers/net/iavf/iavf.h @@ -314,6 +314,7 @@ int iavf_configure_queues(struct iavf_adapter *adapter, int iavf_get_supported_rxdid(struct iavf_adapter *adapter); int iavf_config_vlan_strip_v2(struct iavf_adapter *adapter, bool enable); int iavf_config_vlan_insert_v2(struct iavf_adapter *adapter, bool enable); +int iavf_config_vlan_filter_v2(struct iavf_adapter *adapter, bool enable); int iavf_add_del_vlan_v2(struct iavf_adapter *adapter, uint16_t vlanid, bool add); int iavf_get_vlan_offload_caps_v2(struct iavf_adapter *adapter); diff --git a/drivers/net/iavf/iavf_ethdev.c b/drivers/net/iavf/iavf_ethdev.c index cf6ea0b15c..8e741031ec 100644 --- a/drivers/net/iavf/iavf_ethdev.c +++ b/drivers/net/iavf/iavf_ethdev.c @@ -1086,6 +1086,13 @@ iavf_dev_vlan_offload_set_v2(struct rte_eth_dev *dev, int mask) enable = !!(rxmode->offloads & DEV_RX_OFFLOAD_VLAN_FILTER); iavf_iterate_vlan_filters_v2(dev, enable); + + err = iavf_config_vlan_filter_v2(adapter, enable); + /* If not support, the filtering is already disabled by PF */ + if (err == -ENOTSUP && !enable) + err = 0; + if (err) + return -EIO; } if (mask & ETH_VLAN_STRIP_MASK) { diff --git a/drivers/net/iavf/iavf_vchnl.c b/drivers/net/iavf/iavf_vchnl.c index 9b8c4d113a..7af143a21b 100644 --- a/drivers/net/iavf/iavf_vchnl.c +++ b/drivers/net/iavf/iavf_vchnl.c @@ -604,6 +604,46 @@ iavf_config_vlan_insert_v2(struct iavf_adapter *adapter, bool enable) return ret; } +int +iavf_config_vlan_filter_v2(struct iavf_adapter *adapter, bool enable) +{ + struct iavf_info *vf = IAVF_DEV_PRIVATE_TO_VF(adapter); + struct virtchnl_vlan_supported_caps *filtering_caps; + struct virtchnl_vlan_setting vlan_filter; + struct iavf_cmd_info args; + uint32_t *ethertype; + int ret; + + filtering_caps = &vf->vlan_v2_caps.filtering.filtering_support; + + if ((filtering_caps->outer & VIRTCHNL_VLAN_ETHERTYPE_8100) && + (filtering_caps->outer & VIRTCHNL_VLAN_TOGGLE)) + ethertype = &vlan_filter.outer_ethertype_setting; + else if ((filtering_caps->inner & VIRTCHNL_VLAN_ETHERTYPE_8100) && + (filtering_caps->inner & VIRTCHNL_VLAN_TOGGLE)) + ethertype = &vlan_filter.inner_ethertype_setting; + else + return -ENOTSUP; + + memset(&vlan_filter, 0, sizeof(vlan_filter)); + vlan_filter.vport_id = vf->vsi_res->vsi_id; + *ethertype = VIRTCHNL_VLAN_ETHERTYPE_8100; + + args.ops = enable ? VIRTCHNL_OP_ENABLE_VLAN_FILTERING_V2 : + VIRTCHNL_OP_DISABLE_VLAN_FILTERING_V2; + args.in_args = (uint8_t *)&vlan_filter; + args.in_args_size = sizeof(vlan_filter); + args.out_buffer = vf->aq_resp; + args.out_size = IAVF_AQ_BUF_SZ; + ret = iavf_execute_vf_cmd(adapter, &args); + if (ret) + PMD_DRV_LOG(ERR, "fail to execute command %s", + enable ? "VIRTCHNL_OP_ENABLE_VLAN_FILTERING_V2" : + "VIRTCHNL_OP_DISABLE_VLAN_FILTERING_V2"); + + return ret; +} + int iavf_add_del_vlan_v2(struct iavf_adapter *adapter, uint16_t vlanid, bool add) {