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 080B4A04DD; Wed, 21 Oct 2020 12:06:41 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 53165A967; Wed, 21 Oct 2020 12:06:39 +0200 (CEST) Received: from huawei.com (szxga05-in.huawei.com [45.249.212.191]) by dpdk.org (Postfix) with ESMTP id 98562A573 for ; Wed, 21 Oct 2020 12:06:38 +0200 (CEST) Received: from DGGEMS411-HUB.china.huawei.com (unknown [172.30.72.58]) by Forcepoint Email with ESMTP id 15235E4825B0EA152674; Wed, 21 Oct 2020 18:06:36 +0800 (CST) Received: from localhost.localdomain (10.69.192.56) by DGGEMS411-HUB.china.huawei.com (10.3.19.211) with Microsoft SMTP Server id 14.3.487.0; Wed, 21 Oct 2020 18:06:29 +0800 From: Lijun Ou To: , , , CC: , Date: Wed, 21 Oct 2020 18:07:10 +0800 Message-ID: <1603274830-25490-1-git-send-email-oulijun@huawei.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1602765018-29810-1-git-send-email-oulijun@huawei.com> References: <1602765018-29810-1-git-send-email-oulijun@huawei.com> MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [10.69.192.56] X-CFilter-Loop: Reflected Subject: [dpdk-dev] [PATCH] app/testpmd: set default RSS key as null 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: Ophir Munk When creating an RSS rule without specifying a key (see [1]) it is expected that the device will use the default key. A NULL key is used to indicate to a PMD it should use its default key, however testpmd assigns a non-NULL dummy key (see [2]) instead. This does not enable testing any PMD behavior when the RSS key is not specified. This commit fixes this limitation by setting key to NULL. Also, it fixes the Scenario [3] that enable default RSS action by setting key=NULL and key_len!=0. [1] RSS rule example without specifying a key: flow create 0 ingress / end actions rss queues 0 1 end / end [2] Testpmd default key assignment: .key= "testpmd's default RSS hash key, " "override it for better balancing" [3] flow create 0 actions rss queues 0 1 end key_len 40 / end fixes refer to the link: https://patches.dpdk.org/patch/80898/ Signed-off-by: Ophir Munk Signed-off-by: Ferruh Yigit Signed-off-by: Lijun Ou --- app/test-pmd/cmdline_flow.c | 19 ++----------------- lib/librte_ethdev/rte_flow.c | 2 +- 2 files changed, 3 insertions(+), 18 deletions(-) diff --git a/app/test-pmd/cmdline_flow.c b/app/test-pmd/cmdline_flow.c index cd35d5b..3d1dd05 100644 --- a/app/test-pmd/cmdline_flow.c +++ b/app/test-pmd/cmdline_flow.c @@ -4850,30 +4850,15 @@ parse_vc_action_rss(struct context *ctx, const struct token *token, .func = RTE_ETH_HASH_FUNCTION_DEFAULT, .level = 0, .types = rss_hf, - .key_len = sizeof(action_rss_data->key), + .key_len = 0, .queue_num = RTE_MIN(nb_rxq, ACTION_RSS_QUEUE_NUM), - .key = action_rss_data->key, + .key = NULL, .queue = action_rss_data->queue, }, - .key = "testpmd's default RSS hash key, " - "override it for better balancing", .queue = { 0 }, }; for (i = 0; i < action_rss_data->conf.queue_num; ++i) action_rss_data->queue[i] = i; - if (!port_id_is_invalid(ctx->port, DISABLED_WARN) && - ctx->port != (portid_t)RTE_PORT_ALL) { - struct rte_eth_dev_info info; - int ret2; - - ret2 = rte_eth_dev_info_get(ctx->port, &info); - if (ret2 != 0) - return ret2; - - action_rss_data->conf.key_len = - RTE_MIN(sizeof(action_rss_data->key), - info.hash_key_size); - } action->conf = &action_rss_data->conf; return ret; } diff --git a/lib/librte_ethdev/rte_flow.c b/lib/librte_ethdev/rte_flow.c index d3e5cbc..a06f64c 100644 --- a/lib/librte_ethdev/rte_flow.c +++ b/lib/librte_ethdev/rte_flow.c @@ -577,7 +577,7 @@ rte_flow_conv_action_conf(void *buf, const size_t size, }), size > sizeof(*dst.rss) ? sizeof(*dst.rss) : size); off = sizeof(*dst.rss); - if (src.rss->key_len) { + if (src.rss->key_len && src.rss->key) { off = RTE_ALIGN_CEIL(off, sizeof(*dst.rss->key)); tmp = sizeof(*src.rss->key) * src.rss->key_len; if (size >= off + tmp) -- 2.7.4