From patchwork Fri Dec 8 07:40:33 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Xing, Beilei" X-Patchwork-Id: 32011 X-Patchwork-Delegate: helin.zhang@intel.com Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 80F2C7CFD; Fri, 8 Dec 2017 08:40:01 +0100 (CET) Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by dpdk.org (Postfix) with ESMTP id CD8AC237; Fri, 8 Dec 2017 08:39:59 +0100 (CET) Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga101.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 07 Dec 2017 23:39:59 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos; i="5.45,376,1508828400"; d="scan'208"; a="1253057944" Received: from unknown (HELO dpdk9.sh.intel.com) ([10.67.118.52]) by fmsmga002.fm.intel.com with ESMTP; 07 Dec 2017 23:39:58 -0800 From: Beilei Xing To: jingjing.wu@intel.com Cc: dev@dpdk.org, stable@dpdk.org Date: Fri, 8 Dec 2017 15:40:33 +0800 Message-Id: <1512718833-129154-1-git-send-email-beilei.xing@intel.com> X-Mailer: git-send-email 2.5.5 In-Reply-To: <1512441646-17502-1-git-send-email-beilei.xing@intel.com> References: <1512441646-17502-1-git-send-email-beilei.xing@intel.com> Subject: [dpdk-dev] [PATCH v2] net/i40e: fix VF Tx error issue 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 using kernel PF + DPDK VF, if setting VLAN strip on or off in VF side after setting PVID for VF with ethtool in PF side, it will cause VF Tx error. The root cause is that Rx VLAN offload is not permitted after setting PVID for VF in kernel PF side. This patch fixes the issue by check VLAN offload capability when setting VLAN offload. Fixes: 5f0b95d5 ("net/i40e: support VLAN stripping for VF") Cc: stable@dpdk.org Signed-off-by: Beilei Xing Acked-by: Jingjing Wu --- v2 changes: - Fix typo in commit log. drivers/net/i40e/i40e_ethdev_vf.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/drivers/net/i40e/i40e_ethdev_vf.c b/drivers/net/i40e/i40e_ethdev_vf.c index 91b5bb0..4927b14 100644 --- a/drivers/net/i40e/i40e_ethdev_vf.c +++ b/drivers/net/i40e/i40e_ethdev_vf.c @@ -1585,13 +1585,19 @@ static int i40evf_init_vlan(struct rte_eth_dev *dev) { /* Apply vlan offload setting */ - return i40evf_vlan_offload_set(dev, ETH_VLAN_STRIP_MASK); + i40evf_vlan_offload_set(dev, ETH_VLAN_STRIP_MASK); + + return 0; } static int i40evf_vlan_offload_set(struct rte_eth_dev *dev, int mask) { struct rte_eth_conf *dev_conf = &dev->data->dev_conf; + struct i40e_vf *vf = I40EVF_DEV_PRIVATE_TO_VF(dev->data->dev_private); + + if (!(vf->vf_res->vf_offload_flags & VIRTCHNL_VF_OFFLOAD_VLAN)) + return -ENOTSUP; /* Vlan stripping setting */ if (mask & ETH_VLAN_STRIP_MASK) {