From patchwork Mon Jan 17 06:31:50 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wenjun Wu X-Patchwork-Id: 105900 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 8862CA034F; Mon, 17 Jan 2022 07:51:56 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 11D71410F7; Mon, 17 Jan 2022 07:51:56 +0100 (CET) Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by mails.dpdk.org (Postfix) with ESMTP id 332244067B; Mon, 17 Jan 2022 07:51:53 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1642402313; x=1673938313; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=jsRnq/LeKGkuGUJ1iInjgMjrjLHJ+M0Bgyn0ipMkAMs=; b=drIxnUbGPLEdymgaGPcXdNSSEEebmvRcDNWGa/cMWq9oWfbmLdsfdvZB 9rpEoTi7uZB/vj+Qw2Z6OA6NgrOsNr+3nIFi/lKW17gTroG+dN7rSZud/ 2BITLayt1FVi1qyvD/gLJ+xfaHDVPnAxS7pgTrDigIx4/TPqmqGifop/y Vvpbndgy5reKEh86LKXV1Podtg/0gDsznYu4xf49INQm2cs2YD3YoaknC xHdfw9aGbBPwJf/4ZWLvtBKVB7H1b/Atf+p9rR3kMr0Pv7XnPQ94R1aHh x+pHoqHp1/SfJUGLwdsAqJdzPykpbRuoxBnThVmVU6vl/eUTMQ/WVRfZ8 Q==; X-IronPort-AV: E=McAfee;i="6200,9189,10229"; a="307904362" X-IronPort-AV: E=Sophos;i="5.88,294,1635231600"; d="scan'208";a="307904362" Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by orsmga105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 16 Jan 2022 22:51:52 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.88,294,1635231600"; d="scan'208";a="614958260" Received: from wuwenjun.sh.intel.com (HELO npg-wuwenjun-dpdk-01.sh.intel.com) ([10.67.110.188]) by FMSMGA003.fm.intel.com with ESMTP; 16 Jan 2022 22:51:50 -0800 From: Wenjun Wu To: dev@dpdk.org, qi.z.zhang@intel.com, jingjing.wu@intel.com, beilei.xing@intel.com, stable@dpdk.org Cc: Wenjun Wu Subject: [PATCH 20.11] net/iavf: fix default RSS configuration Date: Mon, 17 Jan 2022 14:31:50 +0800 Message-Id: <20220117063150.259609-1-wenjun1.wu@intel.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 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 All the RSS rules should be cleared before creating default RSS rules for VF, otherwise duplicated rules will cause error. Fixes: 5ea614254332("net/iavf: fix VF reset for RSS") Cc: stable@dpdk.org Signed-off-by: Wenjun Wu --- This is a DPDK 20.11 only patch, since the deployment has been implemented after code refactoring in DPDK 21.02. --- drivers/net/iavf/iavf.h | 2 ++ drivers/net/iavf/iavf_ethdev.c | 26 ++++++++++++++++++++++++++ drivers/net/iavf/iavf_hash.c | 8 +------- drivers/net/iavf/iavf_vchnl.c | 23 +++++++++++++++++++++++ 4 files changed, 52 insertions(+), 7 deletions(-) diff --git a/drivers/net/iavf/iavf.h b/drivers/net/iavf/iavf.h index e06b35a283..301789be98 100644 --- a/drivers/net/iavf/iavf.h +++ b/drivers/net/iavf/iavf.h @@ -322,6 +322,8 @@ int iavf_fdir_check(struct iavf_adapter *adapter, struct iavf_fdir_conf *filter); int iavf_add_del_rss_cfg(struct iavf_adapter *adapter, struct virtchnl_rss_cfg *rss_cfg, bool add); +int iavf_set_hena(struct iavf_adapter *adapter, uint64_t hena); +int iavf_hash_default_set(struct iavf_adapter *ad, bool add); int iavf_add_del_mc_addr_list(struct iavf_adapter *adapter, struct rte_ether_addr *mc_addrs, uint32_t mc_addrs_num, bool add); diff --git a/drivers/net/iavf/iavf_ethdev.c b/drivers/net/iavf/iavf_ethdev.c index 168e4fef02..374cc720bf 100644 --- a/drivers/net/iavf/iavf_ethdev.c +++ b/drivers/net/iavf/iavf_ethdev.c @@ -295,6 +295,12 @@ iavf_init_rss(struct iavf_adapter *adapter) if (ret) return ret; + ret = iavf_hash_default_set(adapter, true); + if (ret) { + PMD_DRV_LOG(ERR, "fail to set default RSS"); + return ret; + } + return 0; } @@ -1954,6 +1960,24 @@ iavf_dev_filter_ctrl(struct rte_eth_dev *dev, return ret; } +static void +iavf_default_rss_disable(struct iavf_adapter *adapter) +{ + struct iavf_info *vf = IAVF_DEV_PRIVATE_TO_VF(adapter); + int ret = 0; + + if (vf->vf_res->vf_cap_flags & VIRTCHNL_VF_OFFLOAD_RSS_PF) { + /* Set hena = 0 to ask PF to cleanup all existing RSS. */ + ret = iavf_set_hena(adapter, 0); + if (ret) + /* It is a workaround, temporarily allow error to be + * returned due to possible lack of PF handling for + * hena = 0. + */ + PMD_INIT_LOG(WARNING, "fail to disable default RSS," + "lack PF support"); + } +} static int iavf_dev_init(struct rte_eth_dev *eth_dev) @@ -2041,6 +2065,8 @@ iavf_dev_init(struct rte_eth_dev *eth_dev) return ret; } + iavf_default_rss_disable(adapter); + return 0; } diff --git a/drivers/net/iavf/iavf_hash.c b/drivers/net/iavf/iavf_hash.c index eb7fd3f66f..53a5ef6cd1 100644 --- a/drivers/net/iavf/iavf_hash.c +++ b/drivers/net/iavf/iavf_hash.c @@ -458,7 +458,7 @@ static struct iavf_flow_parser iavf_hash_parser = { .stage = IAVF_FLOW_STAGE_RSS, }; -static int +int iavf_hash_default_set(struct iavf_adapter *ad, bool add) { struct virtchnl_rss_cfg *rss_cfg; @@ -510,12 +510,6 @@ iavf_hash_init(struct iavf_adapter *ad) return ret; } - ret = iavf_hash_default_set(ad, true); - if (ret) { - PMD_DRV_LOG(ERR, "fail to set default RSS"); - iavf_unregister_parser(parser, ad); - } - return ret; } diff --git a/drivers/net/iavf/iavf_vchnl.c b/drivers/net/iavf/iavf_vchnl.c index 1460330572..08bba56e18 100644 --- a/drivers/net/iavf/iavf_vchnl.c +++ b/drivers/net/iavf/iavf_vchnl.c @@ -1490,3 +1490,26 @@ iavf_get_max_rss_queue_region(struct iavf_adapter *adapter) return 0; } + +int +iavf_set_hena(struct iavf_adapter *adapter, uint64_t hena) +{ + struct iavf_info *vf = IAVF_DEV_PRIVATE_TO_VF(adapter); + struct virtchnl_rss_hena vrh; + struct iavf_cmd_info args; + int err; + + vrh.hena = hena; + args.ops = VIRTCHNL_OP_SET_RSS_HENA; + args.in_args = (u8 *)&vrh; + args.in_args_size = sizeof(vrh); + args.out_buffer = vf->aq_resp; + args.out_size = IAVF_AQ_BUF_SZ; + + err = iavf_execute_vf_cmd(adapter, &args); + if (err) + PMD_DRV_LOG(ERR, + "Failed to execute command of OP_SET_RSS_HENA"); + + return err; +}