From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id CB385A0093; Tue, 19 May 2020 04:18:06 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 96F481D54F; Tue, 19 May 2020 04:18:05 +0200 (CEST) Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by dpdk.org (Postfix) with ESMTP id 7F00C1D16F for ; Tue, 19 May 2020 04:18:04 +0200 (CEST) IronPort-SDR: 58RHF5Vk0fSO6ePiiHWgZ7wteoEzynZ3qfoKD827oL17mxJqMxgFv21aE2n4qpLnYUW6brxlLC ROlIQL/62emQ== X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga006.jf.intel.com ([10.7.209.51]) by fmsmga102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 18 May 2020 19:18:03 -0700 IronPort-SDR: 4GAxolOIpkKUiRqLb31Xl2aDY9jm4p0VZ5sTpdpJFgrimujjZZbPKdSxkYNN6jS25B5KrifDtf D7FARLPBuX2g== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.73,408,1583222400"; d="scan'208";a="267728629" Received: from npg-dpdk-cvl-jeffguo-01.sh.intel.com ([10.67.111.128]) by orsmga006.jf.intel.com with ESMTP; 18 May 2020 19:18:01 -0700 From: Jeff Guo To: beilei.xing@intel.com, xiaolong.ye@intel.com, qi.z.zhang@intel.com, jingjing.wu@intel.com Cc: dev@dpdk.org, jia.guo@intel.com, Zhiwei He Date: Tue, 19 May 2020 10:17:30 -0400 Message-Id: <20200519141730.70116-1-jia.guo@intel.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-dev] [dpdk-dev v2] net/iavf: fix VF reset issue for hash 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" Since there are some default rss configure in kernel PF/VF but not DPDK IAVF, if these configurations be modified by VF and then VF reset, this default rss configurations can not be reset to default by IAVF. So need to add default rss set in IAVF hash initial process. Signed-off-by: Jeff Guo Fixes: 7be10c3004be ("net/iavf: add RSS configuration for VF") Acked-by: Qi Zhang Tested-by: Zhiwei He --- v2->v1: add hash engine unregister process --- drivers/net/iavf/iavf_hash.c | 53 +++++++++++++++++++++++++++++++++++- 1 file changed, 52 insertions(+), 1 deletion(-) diff --git a/drivers/net/iavf/iavf_hash.c b/drivers/net/iavf/iavf_hash.c index 975c84556..56ab170d8 100644 --- a/drivers/net/iavf/iavf_hash.c +++ b/drivers/net/iavf/iavf_hash.c @@ -857,6 +857,17 @@ struct iavf_hash_match_type iavf_hash_type_list[] = { &hdrs_hint_ipv6_sctp}, }; +struct virtchnl_proto_hdrs *iavf_hash_default_hdrs[] = { + &hdrs_hint_ipv4, + &hdrs_hint_ipv4_udp, + &hdrs_hint_ipv4_tcp, + &hdrs_hint_ipv4_sctp, + &hdrs_hint_ipv6, + &hdrs_hint_ipv6_udp, + &hdrs_hint_ipv6_tcp, + &hdrs_hint_ipv6_sctp, +}; + static struct iavf_flow_engine iavf_hash_engine = { .init = iavf_hash_init, .create = iavf_hash_create, @@ -875,6 +886,33 @@ static struct iavf_flow_parser iavf_hash_parser = { .stage = IAVF_FLOW_STAGE_RSS, }; +static int +iavf_hash_default_set(struct iavf_adapter *ad) +{ + struct virtchnl_rss_cfg *rss_cfg; + uint16_t i; + int ret; + + rss_cfg = rte_zmalloc("iavf rss rule", + sizeof(struct virtchnl_rss_cfg), 0); + if (!rss_cfg) + return -ENOMEM; + + for (i = 0; i < RTE_DIM(iavf_hash_default_hdrs); i++) { + rss_cfg->proto_hdrs = *iavf_hash_default_hdrs[i]; + rss_cfg->rss_algorithm = VIRTCHNL_RSS_ALG_TOEPLITZ_ASYMMETRIC; + + ret = iavf_add_del_rss_cfg(ad, rss_cfg, true); + if (ret) { + PMD_DRV_LOG(ERR, "fail to add RSS configure"); + rte_free(rss_cfg); + return ret; + } + } + + return ret; +} + RTE_INIT(iavf_hash_engine_init) { struct iavf_flow_engine *engine = &iavf_hash_engine; @@ -887,6 +925,7 @@ iavf_hash_init(struct iavf_adapter *ad) { struct iavf_info *vf = IAVF_DEV_PRIVATE_TO_VF(ad); struct iavf_flow_parser *parser; + int ret; if (!vf->vf_res) return -EINVAL; @@ -896,7 +935,19 @@ iavf_hash_init(struct iavf_adapter *ad) parser = &iavf_hash_parser; - return iavf_register_parser(parser, ad); + ret = iavf_register_parser(parser, ad); + if (ret) { + PMD_DRV_LOG(ERR, "fail to register hash parser"); + return ret; + } + + ret = iavf_hash_default_set(ad); + if (ret) { + PMD_DRV_LOG(ERR, "fail to set default RSS"); + iavf_unregister_parser(parser, ad); + } + + return ret; } static int -- 2.20.1