From patchwork Thu Jun 13 15:03:42 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 54783 X-Patchwork-Delegate: ferruh.yigit@amd.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 313451D669; Thu, 13 Jun 2019 17:03:51 +0200 (CEST) Received: from mail-pg1-f194.google.com (mail-pg1-f194.google.com [209.85.215.194]) by dpdk.org (Postfix) with ESMTP id AF1601D657 for ; Thu, 13 Jun 2019 17:03:48 +0200 (CEST) Received: by mail-pg1-f194.google.com with SMTP id 83so11114391pgg.8 for ; Thu, 13 Jun 2019 08:03:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=DC/JuaSMj4rHwSAhOlB37yPC1OoGmJRnG9eHBdxokkc=; b=XDKpuD2l03u86E3VgL774sRkAusoDMEnLPmx81osoHK95aCTgTLGbwdGAhzkQbFo6P BtV++KOFp95uIU5CssagxRITwncNnXasU4PvzmHTRmKFGMy29yrMoS6hHQujb/JeudED u1nq6XCzxNb4dxgqy8T4QKo8zyRvjlXeKkzW7Z5HY8QhQVDq26mTTiFIWyUThQAuUQsq uEVeyhTRJRNUOl/5hyW4S+Bo/IRGJfzxbKJPS4qwIuk7EHVbmdsRuAPQK8vjQICYaHPu IUgs8ILpjBhuNwJODAgm4O11uQiRDGFqjT+8xoWbTk0QE9Q9Y0Si8yvQd/oguktENToq Kw6g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=DC/JuaSMj4rHwSAhOlB37yPC1OoGmJRnG9eHBdxokkc=; b=Px+W8E62t7TH6GCKYxAXlAFWLGGPCcEXMy8CLfyj/98oW+RQlCNam6vVNMrhyPT3Sq Y/oIo8mIAGczMMGaR0wKdlHdTbKw5ARU+uAvnfQcPmO9qxWlC1m1xS1izdRGC0nfiBKt S29AWGVhVd2KdO3Bh04O1lnlrCmUios6qGVRqpeRZdBTo6uCtN+OcZteHinYOHhAGRXd EGuDMtXsZueX8zcFj7LQ5V4diibHo2RfxOM1bjgvDXDG5Qq7VvFz7qpQF9S2kL5k9nMo c6hXh4Vt4RG9ZmEFaAAARvsYzuMurwiduCcBb/jo4XUlRrzMK0ksSFoCFISr8Kai2yma GGig== X-Gm-Message-State: APjAAAUftvczJvj/fAkXZtrCVqgDngZXZKwa/3lQtN+z/OJfFOtNzzrV U55GwYIReXMqv9fair7r48+Cj7YXbtk= X-Google-Smtp-Source: APXvYqx3Gv7AYaae4KHC5PaUOFwwRmLbmUQeZeqKQFjxZTFNtgvtKEC5B3h+hDBOijbfUU0T0ELn7Q== X-Received: by 2002:a62:6:: with SMTP id 6mr29710485pfa.159.1560438227660; Thu, 13 Jun 2019 08:03:47 -0700 (PDT) Received: from hermes.lan (204-195-22-127.wavecable.com. [204.195.22.127]) by smtp.gmail.com with ESMTPSA id 23sm1840099pfn.176.2019.06.13.08.03.46 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Thu, 13 Jun 2019 08:03:46 -0700 (PDT) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger Date: Thu, 13 Jun 2019 08:03:42 -0700 Message-Id: <20190613150343.8229-2-stephen@networkplumber.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190613150343.8229-1-stephen@networkplumber.org> References: <20190613150343.8229-1-stephen@networkplumber.org> MIME-Version: 1.0 Subject: [dpdk-dev] [PATCH 1/2] net/netvsc: return correct RSS offload settings 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" From: Stephen Hemminger Use the result from querying host to show the RSS info. Fixes: 4e9c73e96e83 ("net/netvsc: add Hyper-V network device") Signed-off-by: Stephen Hemminger --- drivers/net/netvsc/hn_ethdev.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/netvsc/hn_ethdev.c b/drivers/net/netvsc/hn_ethdev.c index 9e7cf2df5472..b9a9e0372619 100644 --- a/drivers/net/netvsc/hn_ethdev.c +++ b/drivers/net/netvsc/hn_ethdev.c @@ -237,8 +237,8 @@ static void hn_dev_info_get(struct rte_eth_dev *dev, dev_info->max_mac_addrs = 1; dev_info->hash_key_size = NDIS_HASH_KEYSIZE_TOEPLITZ; - dev_info->flow_type_rss_offloads = - ETH_RSS_IPV4 | ETH_RSS_IPV6 | ETH_RSS_TCP | ETH_RSS_UDP; + dev_info->flow_type_rss_offloads = hv->rss_offloads; + dev_info->reta_size = ETH_RSS_RETA_SIZE_128; dev_info->max_rx_queues = hv->max_queues; dev_info->max_tx_queues = hv->max_queues; From patchwork Thu Jun 13 15:03:43 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 54784 X-Patchwork-Delegate: ferruh.yigit@amd.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 4FFBF1D66F; Thu, 13 Jun 2019 17:03:53 +0200 (CEST) Received: from mail-pl1-f194.google.com (mail-pl1-f194.google.com [209.85.214.194]) by dpdk.org (Postfix) with ESMTP id 5D5501D657 for ; Thu, 13 Jun 2019 17:03:50 +0200 (CEST) Received: by mail-pl1-f194.google.com with SMTP id d21so8268375plr.3 for ; Thu, 13 Jun 2019 08:03:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=TspGXSL7cNOklwIxtxIwQ1L068KaNoj8Ago2DvAHvtc=; b=AuKl5IY8TU9QGmZCH6QZ+ec5AP1FyCrjbsrJy7vLKFf4Ixs1j3cj51WsZiJmfyf/cF +LvMAEJuKA+nV9zbddj8vYGlOtnkyndmhQUEAJZw0z10Q/6yN8R064+DgY1f3IE6EYI4 DLwrgeGHyVun/kdfMKPmRVXO7BFQYldFFQyc5LMTQguG9kMH21UOwxBzijWD/x7Em5rY aB57gBiaWkl4F6fxXHEx39E7zSKNQWuctIEFIUDmm34orI5dQmzfzrz4Fhu3YwBzEdBU Zclfl27QyFzBmMhMj/cG1ZH2N0GY5PegrnTpo2LqG24D8QOv3z34LNc1EBREYPLtsST8 ZGeQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=TspGXSL7cNOklwIxtxIwQ1L068KaNoj8Ago2DvAHvtc=; b=KUUY3C3rdXEKu3FSXPlsBTLP1kZ1KvBYSl/uX2FGbQZvW/GG3Yf5s2DPfQEtQQAX6c 8DdFt6/XQNvs6E5nWxITVEme9XDgYcp3os0e266/3Q09kHmMisGh8r8uFoHx55Nkd9Nn YSyByvfXfJ4Tq901PHyq3J7Um3lmXp8rvLNf6s45bU/aaTp9S3Brm7BN67p7wIrun7aX ZcWAo2bYg6d7qosbovqBcWY/UCH6tA9MaYUwklped/pgo2UDDv3DZNlmXo0J9Dz0TaCi 5wD9xd6gjUe8f57/RD1LEq/4XgZb3o7B8LYEQW3JigBHBbezf/R9ux3jbnHxHUotmZTc qZqQ== X-Gm-Message-State: APjAAAUbOVlCr4XubmkrRpaVmd/5jreln4ZLjhEOgC38GdrBYL5Kr1td f6vZIMJ0jL1BgQ6xLpADg2NpdxcffK0= X-Google-Smtp-Source: APXvYqypviSqYmgH50+/dTS9TTbdhsff1gDmDSmVwUI+RxoHejdTEw/GdMUbHlk7w6lUkyzaLcTTeg== X-Received: by 2002:a17:902:7891:: with SMTP id q17mr32656681pll.236.1560438229046; Thu, 13 Jun 2019 08:03:49 -0700 (PDT) Received: from hermes.lan (204-195-22-127.wavecable.com. [204.195.22.127]) by smtp.gmail.com with ESMTPSA id 23sm1840099pfn.176.2019.06.13.08.03.47 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Thu, 13 Jun 2019 08:03:47 -0700 (PDT) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger Date: Thu, 13 Jun 2019 08:03:43 -0700 Message-Id: <20190613150343.8229-3-stephen@networkplumber.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190613150343.8229-1-stephen@networkplumber.org> References: <20190613150343.8229-1-stephen@networkplumber.org> MIME-Version: 1.0 Subject: [dpdk-dev] [PATCH 2/2] net/netvsc: support configuring RSS parameters 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" From: Stephen Hemminger Add RSS hash key and reta update and query functions. Signed-off-by: Stephen Hemminger --- drivers/net/netvsc/hn_ethdev.c | 183 +++++++++++++++++++++++++++++++-- drivers/net/netvsc/hn_rndis.c | 40 ++----- drivers/net/netvsc/hn_rndis.h | 5 +- drivers/net/netvsc/hn_var.h | 9 ++ drivers/net/netvsc/hn_vf.c | 34 ++++++ 5 files changed, 228 insertions(+), 43 deletions(-) diff --git a/drivers/net/netvsc/hn_ethdev.c b/drivers/net/netvsc/hn_ethdev.c index b9a9e0372619..17cc41e922f9 100644 --- a/drivers/net/netvsc/hn_ethdev.c +++ b/drivers/net/netvsc/hn_ethdev.c @@ -69,6 +69,18 @@ static const struct hn_xstats_name_off hn_stat_strings[] = { { "size_1519_max_packets", offsetof(struct hn_stats, size_bins[7]) }, }; +/* The default RSS key. + * This value is the same as MLX5 so that flows will be + * received on same path for both VF ans synthetic NIC. + */ +static const uint8_t rss_default_key[NDIS_HASH_KEYSIZE_TOEPLITZ] = { + 0x2c, 0xc6, 0x81, 0xd1, 0x5b, 0xdb, 0xf4, 0xf7, + 0xfc, 0xa2, 0x83, 0x19, 0xdb, 0x1a, 0x3e, 0x94, + 0x6b, 0x9e, 0x38, 0xd9, 0x2c, 0x9c, 0x03, 0xd1, + 0xad, 0x99, 0x44, 0xa7, 0xd9, 0x56, 0x3d, 0x59, + 0x06, 0x3c, 0x25, 0xf3, 0xfc, 0x1f, 0xdc, 0x2a, +}; + static struct rte_eth_dev * eth_dev_vmbus_allocate(struct rte_vmbus_device *dev, size_t private_data_size) { @@ -247,6 +259,155 @@ static void hn_dev_info_get(struct rte_eth_dev *dev, hn_vf_info_get(hv, dev_info); } +static int hn_rss_reta_update(struct rte_eth_dev *dev, + struct rte_eth_rss_reta_entry64 *reta_conf, + uint16_t reta_size) +{ + struct hn_data *hv = dev->data->dev_private; + unsigned int i; + int err; + + PMD_INIT_FUNC_TRACE(); + + if (reta_size != NDIS_HASH_INDCNT) { + PMD_DRV_LOG(ERR, "Hash lookup table size does not match NDIS"); + return -EINVAL; + } + + for (i = 0; i < NDIS_HASH_INDCNT; i++) { + uint16_t idx = i / RTE_RETA_GROUP_SIZE; + uint16_t shift = i % RTE_RETA_GROUP_SIZE; + uint64_t mask = (uint64_t)1 << shift; + + if (reta_conf[idx].mask & mask) + hv->rss_ind[i] = reta_conf[idx].reta[shift]; + } + + err = hn_rndis_conf_rss(hv, 0); + if (err) { + PMD_DRV_LOG(NOTICE, + "reta reconfig failed"); + return err; + } + + return hn_vf_reta_hash_update(dev, reta_conf, reta_size); +} + +static int hn_rss_reta_query(struct rte_eth_dev *dev, + struct rte_eth_rss_reta_entry64 *reta_conf, + uint16_t reta_size) +{ + struct hn_data *hv = dev->data->dev_private; + unsigned int i; + + PMD_INIT_FUNC_TRACE(); + + if (reta_size != NDIS_HASH_INDCNT) { + PMD_DRV_LOG(ERR, "Hash lookup table size does not match NDIS"); + return -EINVAL; + } + + for (i = 0; i < NDIS_HASH_INDCNT; i++) { + uint16_t idx = i / RTE_RETA_GROUP_SIZE; + uint16_t shift = i % RTE_RETA_GROUP_SIZE; + uint64_t mask = (uint64_t)1 << shift; + + if (reta_conf[idx].mask & mask) + reta_conf[idx].reta[shift] = hv->rss_ind[i]; + } + return 0; +} + +static void hn_rss_hash_init(struct hn_data *hv, + const struct rte_eth_rss_conf *rss_conf) +{ + /* Convert from DPDK RSS hash flags to NDIS hash flags */ + hv->rss_hash = NDIS_HASH_FUNCTION_TOEPLITZ; + + if (rss_conf->rss_hf & ETH_RSS_IPV4) + hv->rss_hash |= NDIS_HASH_IPV4; + if (rss_conf->rss_hf & ETH_RSS_NONFRAG_IPV4_TCP) + hv->rss_hash |= NDIS_HASH_TCP_IPV4; + if (rss_conf->rss_hf & ETH_RSS_IPV6) + hv->rss_hash |= NDIS_HASH_IPV6; + if (rss_conf->rss_hf & ETH_RSS_IPV6_EX) + hv->rss_hash |= NDIS_HASH_IPV6_EX; + if (rss_conf->rss_hf & ETH_RSS_NONFRAG_IPV6_TCP) + hv->rss_hash |= NDIS_HASH_TCP_IPV6; + if (rss_conf->rss_hf & ETH_RSS_IPV6_TCP_EX) + hv->rss_hash |= NDIS_HASH_TCP_IPV6_EX; + + memcpy(hv->rss_key, rss_conf->rss_key ? : rss_default_key, + NDIS_HASH_KEYSIZE_TOEPLITZ); +} + +static int hn_rss_hash_update(struct rte_eth_dev *dev, + struct rte_eth_rss_conf *rss_conf) +{ + struct hn_data *hv = dev->data->dev_private; + int err; + + PMD_INIT_FUNC_TRACE(); + + err = hn_rndis_conf_rss(hv, NDIS_RSS_FLAG_DISABLE); + if (err) { + PMD_DRV_LOG(NOTICE, + "rss disable failed"); + return err; + } + + hn_rss_hash_init(hv, rss_conf); + + err = hn_rndis_conf_rss(hv, 0); + if (err) { + PMD_DRV_LOG(NOTICE, + "rss reconfig failed (RSS disabled)"); + return err; + } + + + return hn_vf_rss_hash_update(dev, rss_conf); +} + +static int hn_rss_hash_conf_get(struct rte_eth_dev *dev, + struct rte_eth_rss_conf *rss_conf) +{ + struct hn_data *hv = dev->data->dev_private; + + PMD_INIT_FUNC_TRACE(); + + if (hv->ndis_ver < NDIS_VERSION_6_20) { + PMD_DRV_LOG(DEBUG, "RSS not supported on this host"); + return -EOPNOTSUPP; + } + + rss_conf->rss_key_len = NDIS_HASH_KEYSIZE_TOEPLITZ; + if (rss_conf->rss_key) + memcpy(rss_conf->rss_key, hv->rss_key, + NDIS_HASH_KEYSIZE_TOEPLITZ); + + rss_conf->rss_hf = 0; + if (hv->rss_hash & NDIS_HASH_IPV4) + rss_conf->rss_hf |= ETH_RSS_IPV4; + + if (hv->rss_hash & NDIS_HASH_TCP_IPV4) + rss_conf->rss_hf |= ETH_RSS_NONFRAG_IPV4_TCP; + + if (hv->rss_hash & NDIS_HASH_IPV6) + rss_conf->rss_hf |= ETH_RSS_IPV6; + + if (hv->rss_hash & NDIS_HASH_IPV6_EX) + rss_conf->rss_hf |= ETH_RSS_IPV6_EX; + + if (hv->rss_hash & NDIS_HASH_TCP_IPV6) + rss_conf->rss_hf |= ETH_RSS_NONFRAG_IPV6_TCP; + + if (hv->rss_hash & NDIS_HASH_TCP_IPV6_EX) + rss_conf->rss_hf |= ETH_RSS_IPV6_TCP_EX; + + return 0; +} + static void hn_dev_promiscuous_enable(struct rte_eth_dev *dev) { @@ -353,15 +514,13 @@ static int hn_subchan_configure(struct hn_data *hv, static int hn_dev_configure(struct rte_eth_dev *dev) { - const struct rte_eth_conf *dev_conf = &dev->data->dev_conf; + struct rte_eth_conf *dev_conf = &dev->data->dev_conf; + struct rte_eth_rss_conf *rss_conf = &dev_conf->rx_adv_conf.rss_conf; const struct rte_eth_rxmode *rxmode = &dev_conf->rxmode; const struct rte_eth_txmode *txmode = &dev_conf->txmode; - - const struct rte_eth_rss_conf *rss_conf = - &dev_conf->rx_adv_conf.rss_conf; struct hn_data *hv = dev->data->dev_private; uint64_t unsupported; - int err, subchan; + int i, err, subchan; PMD_INIT_FUNC_TRACE(); @@ -393,6 +552,12 @@ static int hn_dev_configure(struct rte_eth_dev *dev) hv->num_queues = RTE_MAX(dev->data->nb_rx_queues, dev->data->nb_tx_queues); + + for (i = 0; i < NDIS_HASH_INDCNT; i++) + hv->rss_ind[i] = i % hv->num_queues; + + hn_rss_hash_init(hv, rss_conf); + subchan = hv->num_queues - 1; if (subchan > 0) { err = hn_subchan_configure(hv, subchan); @@ -402,10 +567,10 @@ static int hn_dev_configure(struct rte_eth_dev *dev) return err; } - err = hn_rndis_conf_rss(hv, rss_conf); + err = hn_rndis_conf_rss(hv, 0); if (err) { PMD_DRV_LOG(NOTICE, - "rss configuration failed"); + "initial RSS config failed"); return err; } } @@ -655,6 +820,10 @@ static const struct eth_dev_ops hn_eth_dev_ops = { .allmulticast_enable = hn_dev_allmulticast_enable, .allmulticast_disable = hn_dev_allmulticast_disable, .set_mc_addr_list = hn_dev_mc_addr_list, + .reta_update = hn_rss_reta_update, + .reta_query = hn_rss_reta_query, + .rss_hash_update = hn_rss_hash_update, + .rss_hash_conf_get = hn_rss_hash_conf_get, .tx_queue_setup = hn_dev_tx_queue_setup, .tx_queue_release = hn_dev_tx_queue_release, .tx_done_cleanup = hn_dev_tx_done_cleanup, diff --git a/drivers/net/netvsc/hn_rndis.c b/drivers/net/netvsc/hn_rndis.c index 4a1d49ffcb1b..a67bc7a79074 100644 --- a/drivers/net/netvsc/hn_rndis.c +++ b/drivers/net/netvsc/hn_rndis.c @@ -961,62 +961,34 @@ hn_rndis_set_rxfilter(struct hn_data *hv, uint32_t filter) return error; } -/* The default RSS key. - * This value is the same as MLX5 so that flows will be - * received on same path for both VF ans synthetic NIC. - */ -static const uint8_t rss_default_key[NDIS_HASH_KEYSIZE_TOEPLITZ] = { - 0x2c, 0xc6, 0x81, 0xd1, 0x5b, 0xdb, 0xf4, 0xf7, - 0xfc, 0xa2, 0x83, 0x19, 0xdb, 0x1a, 0x3e, 0x94, - 0x6b, 0x9e, 0x38, 0xd9, 0x2c, 0x9c, 0x03, 0xd1, - 0xad, 0x99, 0x44, 0xa7, 0xd9, 0x56, 0x3d, 0x59, - 0x06, 0x3c, 0x25, 0xf3, 0xfc, 0x1f, 0xdc, 0x2a, -}; - -int hn_rndis_conf_rss(struct hn_data *hv, - const struct rte_eth_rss_conf *rss_conf) +int hn_rndis_conf_rss(struct hn_data *hv, uint32_t flags) { struct ndis_rssprm_toeplitz rssp; struct ndis_rss_params *prm = &rssp.rss_params; - const uint8_t *rss_key = rss_conf->rss_key ? : rss_default_key; - uint32_t rss_hash; unsigned int i; int error; - PMD_INIT_FUNC_TRACE(); - memset(&rssp, 0, sizeof(rssp)); prm->ndis_hdr.ndis_type = NDIS_OBJTYPE_RSS_PARAMS; prm->ndis_hdr.ndis_rev = NDIS_RSS_PARAMS_REV_2; prm->ndis_hdr.ndis_size = sizeof(*prm); - prm->ndis_flags = 0; - - rss_hash = NDIS_HASH_FUNCTION_TOEPLITZ; - if (rss_conf->rss_hf & ETH_RSS_IPV4) - rss_hash |= NDIS_HASH_IPV4; - if (rss_conf->rss_hf & ETH_RSS_NONFRAG_IPV4_TCP) - rss_hash |= NDIS_HASH_TCP_IPV4; - if (rss_conf->rss_hf & ETH_RSS_IPV6) - rss_hash |= NDIS_HASH_IPV6; - if (rss_conf->rss_hf & ETH_RSS_NONFRAG_IPV6_TCP) - rss_hash |= NDIS_HASH_TCP_IPV6; - - prm->ndis_hash = rss_hash; + prm->ndis_flags = flags; + prm->ndis_hash = hv->rss_hash; prm->ndis_indsize = sizeof(rssp.rss_ind[0]) * NDIS_HASH_INDCNT; prm->ndis_indoffset = offsetof(struct ndis_rssprm_toeplitz, rss_ind[0]); prm->ndis_keysize = NDIS_HASH_KEYSIZE_TOEPLITZ; prm->ndis_keyoffset = offsetof(struct ndis_rssprm_toeplitz, rss_key[0]); for (i = 0; i < NDIS_HASH_INDCNT; i++) - rssp.rss_ind[i] = i % hv->num_queues; + rssp.rss_ind[i] = hv->rss_ind[i]; /* Set hask key values */ - memcpy(&rssp.rss_key, rss_key, NDIS_HASH_KEYSIZE_TOEPLITZ); + memcpy(&rssp.rss_key, hv->rss_key, NDIS_HASH_KEYSIZE_TOEPLITZ); error = hn_rndis_set(hv, OID_GEN_RECEIVE_SCALE_PARAMETERS, &rssp, sizeof(rssp)); - if (error) { + if (error != 0) { PMD_DRV_LOG(ERR, "RSS config num queues=%u failed: %d", hv->num_queues, error); diff --git a/drivers/net/netvsc/hn_rndis.h b/drivers/net/netvsc/hn_rndis.h index 319b497a7a70..9a8251fc2fb4 100644 --- a/drivers/net/netvsc/hn_rndis.h +++ b/drivers/net/netvsc/hn_rndis.h @@ -22,8 +22,9 @@ int hn_rndis_conf_offload(struct hn_data *hv, uint64_t rx_offloads); int hn_rndis_query_rsscaps(struct hn_data *hv, unsigned int *rxr_cnt0); -int hn_rndis_conf_rss(struct hn_data *hv, - const struct rte_eth_rss_conf *rss_conf); +int hn_rndis_query_rss(struct hn_data *hv, + struct rte_eth_rss_conf *rss_conf); +int hn_rndis_conf_rss(struct hn_data *hv, uint32_t flags); uint32_t hn_rndis_get_ptypes(struct hn_data *hv); #ifdef RTE_LIBRTE_NETVSC_DEBUG_DUMP diff --git a/drivers/net/netvsc/hn_var.h b/drivers/net/netvsc/hn_var.h index bf94d90a7635..1756615a39b2 100644 --- a/drivers/net/netvsc/hn_var.h +++ b/drivers/net/netvsc/hn_var.h @@ -131,6 +131,10 @@ struct hn_data { rte_atomic32_t rndis_req_id; uint8_t rndis_resp[256]; + uint32_t rss_hash; + uint8_t rss_key[40]; + uint16_t rss_ind[128]; + struct rte_ether_addr mac_addr; struct rte_eth_dev_owner owner; @@ -239,3 +243,8 @@ int hn_vf_xstats_get(struct rte_eth_dev *dev, struct rte_eth_xstat *xstats, unsigned int n); void hn_vf_xstats_reset(struct rte_eth_dev *dev); +int hn_vf_rss_hash_update(struct rte_eth_dev *dev, + struct rte_eth_rss_conf *rss_conf); +int hn_vf_reta_hash_update(struct rte_eth_dev *dev, + struct rte_eth_rss_reta_entry64 *reta_conf, + uint16_t reta_size); diff --git a/drivers/net/netvsc/hn_vf.c b/drivers/net/netvsc/hn_vf.c index 27ac87e7e975..764cf844c3b7 100644 --- a/drivers/net/netvsc/hn_vf.c +++ b/drivers/net/netvsc/hn_vf.c @@ -553,3 +553,37 @@ void hn_vf_xstats_reset(struct rte_eth_dev *dev) vf_dev->dev_ops->xstats_reset(vf_dev); rte_spinlock_unlock(&hv->vf_lock); } + +int hn_vf_rss_hash_update(struct rte_eth_dev *dev, + struct rte_eth_rss_conf *rss_conf) +{ + struct hn_data *hv = dev->data->dev_private; + struct rte_eth_dev *vf_dev; + int ret = 0; + + rte_spinlock_lock(&hv->vf_lock); + vf_dev = hn_get_vf_dev(hv); + if (vf_dev && vf_dev->dev_ops->rss_hash_update) + ret = vf_dev->dev_ops->rss_hash_update(vf_dev, rss_conf); + rte_spinlock_unlock(&hv->vf_lock); + + return ret; +} + +int hn_vf_reta_hash_update(struct rte_eth_dev *dev, + struct rte_eth_rss_reta_entry64 *reta_conf, + uint16_t reta_size) +{ + struct hn_data *hv = dev->data->dev_private; + struct rte_eth_dev *vf_dev; + int ret = 0; + + rte_spinlock_lock(&hv->vf_lock); + vf_dev = hn_get_vf_dev(hv); + if (vf_dev && vf_dev->dev_ops->reta_update) + ret = vf_dev->dev_ops->reta_update(vf_dev, + reta_conf, reta_size); + rte_spinlock_unlock(&hv->vf_lock); + + return ret; +}