From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id E0FBFA00C5; Wed, 3 Aug 2022 13:32:31 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 7879D42BC2; Wed, 3 Aug 2022 13:31:38 +0200 (CEST) Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by mails.dpdk.org (Postfix) with ESMTP id 59FA540A7E for ; Wed, 3 Aug 2022 13:31:35 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1659526295; x=1691062295; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=WWv2nt2i1EeahD+FSueuKuDn+ldi/9eCgse7akJ8QeI=; b=ni2uwEa33DxlFE5KmEomx25Z38Hy7KDVAROp893+TD8ctjv+d4SpgYNs UK5U2sorQ6iAdMoWzQPs2/5Ke/VwzUM4Gc8Mlp7DAXzMJ4XtjWwpVCi3e liCEjCOsZSz6ltwf4X8WLQQdUo+eYdOkyymkF8vWTaMehFV0Ct03YqpiU G52IchOf/zF8vrIDy8Zv3el3syc2j5SCBIYme09sC/dTlOn9gHwr4fplg mmgmY1Nh55y7uQDMteOYTjMkafxo3vfD1SEwy62CQzlVud4j14kYuXEi3 JGCkbdaK3Hqp/RcFoIg8kmWjbdAVdCM4uMxxISbRg66SL9FooP9hn9KsP A==; X-IronPort-AV: E=McAfee;i="6400,9594,10427"; a="375948531" X-IronPort-AV: E=Sophos;i="5.93,214,1654585200"; d="scan'208";a="375948531" Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 03 Aug 2022 04:31:35 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.93,214,1654585200"; d="scan'208";a="692211100" Received: from dpdk-jf-ntb-v2.sh.intel.com ([10.67.118.246]) by FMSMGA003.fm.intel.com with ESMTP; 03 Aug 2022 04:31:33 -0700 From: Junfeng Guo To: qi.z.zhang@intel.com, jingjing.wu@intel.com, beilei.xing@intel.com Cc: dev@dpdk.org, junfeng.guo@intel.com Subject: [PATCH 09/13] net/idpf: add support for RSS Date: Wed, 3 Aug 2022 19:31:00 +0800 Message-Id: <20220803113104.1184059-10-junfeng.guo@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220803113104.1184059-1-junfeng.guo@intel.com> References: <20220803113104.1184059-1-junfeng.guo@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 Add RSS support. Signed-off-by: Beilei Xing Signed-off-by: Junfeng Guo --- drivers/net/idpf/idpf_ethdev.c | 108 +++++++++++++++++++++++++++++++++ drivers/net/idpf/idpf_ethdev.h | 18 ++++++ drivers/net/idpf/idpf_vchnl.c | 93 ++++++++++++++++++++++++++++ 3 files changed, 219 insertions(+) diff --git a/drivers/net/idpf/idpf_ethdev.c b/drivers/net/idpf/idpf_ethdev.c index 55ec24872e..0b03ec860a 100644 --- a/drivers/net/idpf/idpf_ethdev.c +++ b/drivers/net/idpf/idpf_ethdev.c @@ -85,6 +85,7 @@ idpf_dev_info_get(__rte_unused struct rte_eth_dev *dev, struct rte_eth_dev_info dev_info->max_mtu = dev_info->max_rx_pktlen - IDPF_ETH_OVERHEAD; dev_info->min_mtu = RTE_ETHER_MIN_MTU; + dev_info->flow_type_rss_offloads = IDPF_RSS_OFFLOAD_ALL; dev_info->max_mac_addrs = IDPF_NUM_MACADDR_MAX; dev_info->dev_capa = RTE_ETH_DEV_CAPA_RUNTIME_RX_QUEUE_SETUP | RTE_ETH_DEV_CAPA_RUNTIME_TX_QUEUE_SETUP; @@ -293,6 +294,91 @@ idpf_init_vport(struct rte_eth_dev *dev) return 0; } +static int +idpf_config_rss(struct idpf_vport *vport) +{ + int ret; + + ret = idpf_set_rss_key(vport); + if (ret) { + PMD_INIT_LOG(ERR, "Failed to configure RSS key"); + return ret; + } + + ret = idpf_set_rss_lut(vport); + if (ret) { + PMD_INIT_LOG(ERR, "Failed to configure RSS lut"); + return ret; + } + + ret = idpf_set_rss_hash(vport); + if (ret) { + PMD_INIT_LOG(ERR, "Failed to configure RSS hash"); + return ret; + } + + return ret; +} + +static int +idpf_init_rss(struct idpf_vport *vport) +{ + struct rte_eth_rss_conf *rss_conf; + uint16_t i, nb_q, lut_size; + int ret = 0; + + rss_conf = &vport->dev_data->dev_conf.rx_adv_conf.rss_conf; + nb_q = vport->num_rx_q; + + vport->rss_key = (uint8_t *)rte_zmalloc("rss_key", + vport->rss_key_size, 0); + if (!vport->rss_key) { + PMD_INIT_LOG(ERR, "Failed to allocate RSS key"); + ret = -ENOMEM; + goto err_key; + } + + lut_size = vport->rss_lut_size; + vport->rss_lut = (uint32_t *)rte_zmalloc("rss_lut", + sizeof(uint32_t) * lut_size, 0); + if (!vport->rss_lut) { + PMD_INIT_LOG(ERR, "Failed to allocate RSS lut"); + ret = -ENOMEM; + goto err_lut; + } + + if (!rss_conf->rss_key) { + for (i = 0; i < vport->rss_key_size; i++) + vport->rss_key[i] = (uint8_t)rte_rand(); + } else { + rte_memcpy(vport->rss_key, rss_conf->rss_key, + RTE_MIN(rss_conf->rss_key_len, + vport->rss_key_size)); + } + + for (i = 0; i < lut_size; i++) + vport->rss_lut[i] = i % nb_q; + + vport->rss_hf = IECM_DEFAULT_RSS_HASH_EXPANDED; + + ret = idpf_config_rss(vport); + if (ret) { + PMD_INIT_LOG(ERR, "Failed to configure RSS"); + goto err_cfg; + } + + return ret; + +err_cfg: + rte_free(vport->rss_lut); + vport->rss_lut = NULL; +err_lut: + rte_free(vport->rss_key); + vport->rss_key = NULL; +err_key: + return ret; +} + static int idpf_dev_configure(struct rte_eth_dev *dev) { @@ -300,6 +386,10 @@ idpf_dev_configure(struct rte_eth_dev *dev) (struct idpf_vport *)dev->data->dev_private; int ret = 0; + if (dev->data->dev_conf.rxmode.mq_mode & RTE_ETH_MQ_RX_RSS_FLAG) + dev->data->dev_conf.rxmode.offloads |= + RTE_ETH_RX_OFFLOAD_RSS_HASH; + ret = idpf_init_vport_req_info(dev); if (ret) { PMD_INIT_LOG(ERR, "Failed to init vport req_info."); @@ -321,6 +411,14 @@ idpf_dev_configure(struct rte_eth_dev *dev) rte_ether_addr_copy((struct rte_ether_addr *)vport->default_mac_addr, &dev->data->mac_addrs[0]); + if (adapter->caps->rss_caps) { + ret = idpf_init_rss(vport); + if (ret) { + PMD_INIT_LOG(ERR, "Failed to init rss"); + return ret; + } + } + return ret; } @@ -422,6 +520,16 @@ idpf_dev_close(struct rte_eth_dev *dev) idpf_dev_stop(dev); idpf_destroy_vport(vport); + if (vport->rss_lut) { + rte_free(vport->rss_lut); + vport->rss_lut = NULL; + } + + if (vport->rss_key) { + rte_free(vport->rss_key); + vport->rss_key = NULL; + } + return 0; } diff --git a/drivers/net/idpf/idpf_ethdev.h b/drivers/net/idpf/idpf_ethdev.h index 130bb7ad2d..22096c4185 100644 --- a/drivers/net/idpf/idpf_ethdev.h +++ b/drivers/net/idpf/idpf_ethdev.h @@ -47,6 +47,20 @@ #define IDPF_ETH_OVERHEAD \ (RTE_ETHER_HDR_LEN + RTE_ETHER_CRC_LEN + IDPF_VLAN_TAG_SIZE * 2) +#define IDPF_RSS_OFFLOAD_ALL ( \ + RTE_ETH_RSS_IPV4 | \ + RTE_ETH_RSS_FRAG_IPV4 | \ + RTE_ETH_RSS_NONFRAG_IPV4_TCP | \ + RTE_ETH_RSS_NONFRAG_IPV4_UDP | \ + RTE_ETH_RSS_NONFRAG_IPV4_SCTP | \ + RTE_ETH_RSS_NONFRAG_IPV4_OTHER | \ + RTE_ETH_RSS_IPV6 | \ + RTE_ETH_RSS_FRAG_IPV6 | \ + RTE_ETH_RSS_NONFRAG_IPV6_TCP | \ + RTE_ETH_RSS_NONFRAG_IPV6_UDP | \ + RTE_ETH_RSS_NONFRAG_IPV6_SCTP | \ + RTE_ETH_RSS_NONFRAG_IPV6_OTHER) + #ifndef ETH_ADDR_LEN #define ETH_ADDR_LEN 6 #endif @@ -202,6 +216,9 @@ int idpf_check_api_version(struct idpf_adapter *adapter); int idpf_get_caps(struct idpf_adapter *adapter); int idpf_create_vport(__rte_unused struct rte_eth_dev *dev); int idpf_destroy_vport(struct idpf_vport *vport); +int idpf_set_rss_key(struct idpf_vport *vport); +int idpf_set_rss_lut(struct idpf_vport *vport); +int idpf_set_rss_hash(struct idpf_vport *vport); int idpf_config_rxqs(struct idpf_vport *vport); int idpf_config_rxq(struct idpf_vport *vport, uint16_t rxq_id); int idpf_config_txqs(struct idpf_vport *vport); @@ -212,3 +229,4 @@ int idpf_ena_dis_queues(struct idpf_vport *vport, bool enable); int idpf_ena_dis_vport(struct idpf_vport *vport, bool enable); #endif /* _IDPF_ETHDEV_H_ */ + diff --git a/drivers/net/idpf/idpf_vchnl.c b/drivers/net/idpf/idpf_vchnl.c index d78903d983..07b220016f 100644 --- a/drivers/net/idpf/idpf_vchnl.c +++ b/drivers/net/idpf/idpf_vchnl.c @@ -451,6 +451,99 @@ idpf_destroy_vport(struct idpf_vport *vport) return err; } +int +idpf_set_rss_key(struct idpf_vport *vport) +{ + struct virtchnl2_rss_key *rss_key; + struct idpf_cmd_info args; + int len, err; + + len = sizeof(*rss_key) + sizeof(rss_key->key[0]) * + (vport->rss_key_size - 1); + rss_key = rte_zmalloc("rss_key", len, 0); + if (!rss_key) + return -ENOMEM; + + rss_key->vport_id = vport->vport_id; + rss_key->key_len = vport->rss_key_size; + rte_memcpy(rss_key->key, vport->rss_key, + sizeof(rss_key->key[0]) * vport->rss_key_size); + + memset(&args, 0, sizeof(args)); + args.ops = VIRTCHNL2_OP_SET_RSS_KEY; + args.in_args = (uint8_t *)rss_key; + args.in_args_size = len; + args.out_buffer = adapter->mbx_resp; + args.out_size = IDPF_DFLT_MBX_BUF_SIZE; + + err = idpf_execute_vc_cmd(adapter, &args); + if (err) { + PMD_DRV_LOG(ERR, "Failed to execute command of VIRTCHNL2_OP_SET_RSS_KEY"); + return err; + } + + rte_free(rss_key); + return err; +} + +int +idpf_set_rss_lut(struct idpf_vport *vport) +{ + struct virtchnl2_rss_lut *rss_lut; + struct idpf_cmd_info args; + int len, err; + + len = sizeof(*rss_lut) + sizeof(rss_lut->lut[0]) * + (vport->rss_lut_size - 1); + rss_lut = rte_zmalloc("rss_lut", len, 0); + if (!rss_lut) + return -ENOMEM; + + rss_lut->vport_id = vport->vport_id; + rss_lut->lut_entries = vport->rss_lut_size; + rte_memcpy(rss_lut->lut, vport->rss_lut, + sizeof(rss_lut->lut[0]) * vport->rss_lut_size); + + memset(&args, 0, sizeof(args)); + args.ops = VIRTCHNL2_OP_SET_RSS_LUT; + args.in_args = (uint8_t *)rss_lut; + args.in_args_size = len; + args.out_buffer = adapter->mbx_resp; + args.out_size = IDPF_DFLT_MBX_BUF_SIZE; + + err = idpf_execute_vc_cmd(adapter, &args); + if (err) + PMD_DRV_LOG(ERR, "Failed to execute command of VIRTCHNL2_OP_SET_RSS_LUT"); + + rte_free(rss_lut); + return err; +} + +int +idpf_set_rss_hash(struct idpf_vport *vport) +{ + struct virtchnl2_rss_hash rss_hash; + struct idpf_cmd_info args; + int err; + + memset(&rss_hash, 0, sizeof(rss_hash)); + rss_hash.ptype_groups = vport->rss_hf; + rss_hash.vport_id = vport->vport_id; + + memset(&args, 0, sizeof(args)); + args.ops = VIRTCHNL2_OP_SET_RSS_HASH; + args.in_args = (uint8_t *)&rss_hash; + args.in_args_size = sizeof(rss_hash); + args.out_buffer = adapter->mbx_resp; + args.out_size = IDPF_DFLT_MBX_BUF_SIZE; + + err = idpf_execute_vc_cmd(adapter, &args); + if (err) + PMD_DRV_LOG(ERR, "Failed to execute command of OP_SET_RSS_HASH"); + + return err; +} + #define IDPF_RX_BUF_STRIDE 64 int idpf_config_rxqs(struct idpf_vport *vport) -- 2.25.1