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 8130B45DCB for ; Fri, 29 Nov 2024 11:43:54 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 7690C4014F; Fri, 29 Nov 2024 11:43:54 +0100 (CET) Received: from mx0b-0016f401.pphosted.com (mx0b-0016f401.pphosted.com [67.231.156.173]) by mails.dpdk.org (Postfix) with ESMTP id C2B6F4014F for ; Fri, 29 Nov 2024 11:43:19 +0100 (CET) Received: from pps.filterd (m0045851.ppops.net [127.0.0.1]) by mx0b-0016f401.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 4ATAFhq0003006 for ; Fri, 29 Nov 2024 02:43:19 -0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=marvell.com; h= cc:content-transfer-encoding:content-type:date:from:message-id :mime-version:subject:to; s=pfpt0220; bh=mul48G9qU7WBmp+d8dOjS2q pg5//PQZTpdpZVH+PTOU=; b=CDdCgWUH0v3mPKi8wpzz+nZWupR7/N2GWv7fxqh gnaV6EcbVKYppi5FmAr/gX+vz/MwhphaSQfCY7H1DPM8xSKkJwTVMtcAuQw5Hk8G j3eyyO8IEQeLQJHy5WAhy9Cc6o0vnMU/CoFsP6yiEPQNdFwaR9ptpkoH2Reqvbib AxkqSr8njfGy06ltqqWD1rqMegpfv0GO8fpMFbgZz5TrHCu2G34OOZuR1/3Xxn2J lcD2jund9CKBYnCSP3Oi0wmZgRcbGZRV6dYSiM7kbRUNFsOozUywbSH1mHi83qqv S0f11xcGRdpWNv2NCHzm9kmLjbu/bc6r4+JzyMuwJyBQn3Q== Received: from dc5-exch05.marvell.com ([199.233.59.128]) by mx0b-0016f401.pphosted.com (PPS) with ESMTPS id 4373jv0v5b-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Fri, 29 Nov 2024 02:43:18 -0800 (PST) Received: from DC5-EXCH05.marvell.com (10.69.176.209) by DC5-EXCH05.marvell.com (10.69.176.209) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.4; Fri, 29 Nov 2024 02:43:17 -0800 Received: from maili.marvell.com (10.69.176.80) by DC5-EXCH05.marvell.com (10.69.176.209) with Microsoft SMTP Server id 15.2.1544.4 via Frontend Transport; Fri, 29 Nov 2024 02:43:17 -0800 Received: from cavium-OptiPlex-3070-BM17.. (unknown [10.28.34.33]) by maili.marvell.com (Postfix) with ESMTP id 37A7A5C68E2; Fri, 29 Nov 2024 02:43:14 -0800 (PST) From: To: Nithin Dabilpuram , Kiran Kumar K , Sunil Kumar Kori , Satha Rao , Satheesh Paul CC: , Jerin Jacob Subject: [PATCH 21.11] common/cnxk: fix RSS key configuration Date: Fri, 29 Nov 2024 16:13:11 +0530 Message-ID: <20241129104311.3778258-1-psatheesh@marvell.com> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Proofpoint-ORIG-GUID: _l_j3GFlTr0EYQVltSWoS_dtz1yuD0H0 X-Proofpoint-GUID: _l_j3GFlTr0EYQVltSWoS_dtz1yuD0H0 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1039,Hydra:6.0.680,FMLib:17.12.60.29 definitions=2024-09-06_09,2024-09-06_01,2024-09-02_01 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org From: Kiran Kumar K [ upstream commit 56fa6f92e9e32cbc5c99af89da611a9f33bbe254 ] Limit the configuring RSS key with rte_flow operations as it is a global resource. Key can be update only with ethdev dev operations using rte_eth_dev_rss_hash_update(). Fixes: 51dc6a80f843 ("common/cnxk: support RSS action in NPC rule") Signed-off-by: Kiran Kumar K Signed-off-by: Satheesh Paul Reviewed-by: Jerin Jacob --- drivers/common/cnxk/roc_npc.c | 33 +++++++++++++++++++++++------- drivers/common/cnxk/roc_platform.h | 3 ++- 2 files changed, 28 insertions(+), 8 deletions(-) diff --git a/drivers/common/cnxk/roc_npc.c b/drivers/common/cnxk/roc_npc.c index 9422a42457..5183d3016e 100644 --- a/drivers/common/cnxk/roc_npc.c +++ b/drivers/common/cnxk/roc_npc.c @@ -716,9 +716,35 @@ npc_rss_action_configure(struct roc_npc *roc_npc, uint8_t key[ROC_NIX_RSS_KEY_LEN]; const uint8_t *key_ptr; uint8_t flowkey_algx; + uint32_t key_len; uint16_t *reta; int rc; + roc_nix_rss_key_get(roc_nix, key); + if (rss->key == NULL) { + key_ptr = key; + } else { + key_len = rss->key_len; + if (key_len > ROC_NIX_RSS_KEY_LEN) + key_len = ROC_NIX_RSS_KEY_LEN; + + for (i = 0; i < key_len; i++) { + if (key[i] != rss->key[i]) { + plt_err("RSS key config not supported"); + plt_err("New Key:"); + for (i = 0; i < key_len; i++) + plt_dump_no_nl("0x%.2x ", rss->key[i]); + plt_dump_no_nl("\n"); + plt_err("Configured Key:"); + for (i = 0; i < ROC_NIX_RSS_KEY_LEN; i++) + plt_dump_no_nl("0x%.2x ", key[i]); + plt_dump_no_nl("\n"); + return -ENOTSUP; + } + } + key_ptr = rss->key; + } + rc = npc_rss_free_grp_get(npc, &rss_grp_idx); /* RSS group :0 is not usable for flow rss action */ if (rc < 0 || rss_grp_idx == 0) @@ -733,13 +759,6 @@ npc_rss_action_configure(struct roc_npc *roc_npc, *rss_grp = rss_grp_idx; - if (rss->key == NULL) { - roc_nix_rss_key_default_fill(roc_nix, key); - key_ptr = key; - } else { - key_ptr = rss->key; - } - roc_nix_rss_key_set(roc_nix, key_ptr); /* If queue count passed in the rss action is less than diff --git a/drivers/common/cnxk/roc_platform.h b/drivers/common/cnxk/roc_platform.h index 61d4781209..c79c5fda4b 100644 --- a/drivers/common/cnxk/roc_platform.h +++ b/drivers/common/cnxk/roc_platform.h @@ -203,7 +203,8 @@ extern int cnxk_logtype_tm; #define plt_info(fmt, args...) RTE_LOG(INFO, PMD, fmt "\n", ##args) #define plt_warn(fmt, args...) RTE_LOG(WARNING, PMD, fmt "\n", ##args) #define plt_print(fmt, args...) RTE_LOG(INFO, PMD, fmt "\n", ##args) -#define plt_dump(fmt, ...) fprintf(stderr, fmt "\n", ##__VA_ARGS__) +#define plt_dump(fmt, ...) fprintf(stderr, fmt "\n", ##__VA_ARGS__) +#define plt_dump_no_nl(fmt, ...) fprintf(stderr, fmt, ##__VA_ARGS__) /** * Log debug message if given subsystem logging is enabled. -- 2.39.2