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 CD0D343C60 for ; Thu, 7 Mar 2024 02:37:30 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id C048C42F21; Thu, 7 Mar 2024 02:37:30 +0100 (CET) Received: from mail-wm1-f43.google.com (mail-wm1-f43.google.com [209.85.128.43]) by mails.dpdk.org (Postfix) with ESMTP id 3BFE742EE3 for ; Thu, 7 Mar 2024 02:37:28 +0100 (CET) Received: by mail-wm1-f43.google.com with SMTP id 5b1f17b1804b1-412ea23a750so2355305e9.0 for ; Wed, 06 Mar 2024 17:37:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1709775448; x=1710380248; darn=dpdk.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=iuOEPwSZqZd30j1twygiFjGygYOy0MIoAMOh5/HTJEE=; b=kbgVmd8Eco1KWfz+5NdRsAJ7AjjOJO4iptvyCefMosavBx/NO0N/NPgvCcLWjmPYDs twQimhQxMovEdhPyj9+IabkpZXdqCbm7eApFoTeDNdcw1v1wDWwSV4/r1SuItDuRhWQC WqEtCaiNwVNbRG3ZLYA96GStujcYRic1P2PSp/JQkBySJvd8RFW93Mds8H0Zsa+QfK4W QK/M4V+laPYLuO51Ldxldp5VjCQMvZjoXatBiKBFHqJseK9SXOon0JI8K4XqJpBNArDa v8IU97JqlViAIQN4pejYupOSlwisLK5vxjKo2tCFJHoaq93Ks35tU1L02aPVzbV5DRqW v6RA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709775448; x=1710380248; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=iuOEPwSZqZd30j1twygiFjGygYOy0MIoAMOh5/HTJEE=; b=enGgIieDQHXuTleUpq40fyirpeHNzclJSV8XK7eoFCsUDzhWmP1UysTd4UntfzlGkp MbZHJ2JcbWjFrcKH0/9Vwf7B7FrGdzwCVC60OZDDvdu1ssNOx9TboripHG47CpxmsjO4 Eao1f+iJaRMIEkKYtLAmLuzZrODORaCsKYp7T9LOdReeOH8ZKdDGgSOB1sXpDYWc/Uiz tJ7Op6tcVnixfYIHYxXQ8f3KWbbFoZBUnGHchk5kocTYrotdXz/s3LeBEygUrcAVvfKh huzX+O3cxI/Px70MmnBRBjEu+IcecL98YKoBIgNB9tXP06/DPl+1d5S4IsxtxgmqS5KZ 7fmQ== X-Forwarded-Encrypted: i=1; AJvYcCXf9H3tTyyLy/1r2Gs4H7y554YsBSpeMpiiQxXisy52sPbOE639J48eiLIuSvlWAivdQSnn+8GkIYJp0KmyZMQ= X-Gm-Message-State: AOJu0YwCeCHIIwN5ZIkdDwUsnsDZpGxVcYIoZ4lxOOI+A8eOazeCsnDn dyV0Pt79lr2i/cDkC/z5JxqKZEJNd5StAxUgcLWMCf4HPYQ+siFgcMsgLrFlzfk= X-Google-Smtp-Source: AGHT+IF0N2j428zqLPa0QjgvKO7fRZc2XIl8fYh3ot4N3KtxQY5Ab8U84MYXONLhw2drD4yzzFem1A== X-Received: by 2002:a05:600c:4f41:b0:412:c379:606 with SMTP id m1-20020a05600c4f4100b00412c3790606mr51472wmq.2.1709775447713; Wed, 06 Mar 2024 17:37:27 -0800 (PST) Received: from localhost ([2a01:4b00:d036:ae00:7aef:1aaa:3dff:d546]) by smtp.gmail.com with ESMTPSA id t7-20020a05600c450700b00413103af563sm281349wmo.0.2024.03.06.17.37.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 06 Mar 2024 17:37:27 -0800 (PST) From: luca.boccassi@gmail.com To: Kiran Kumar K Cc: Satheesh Paul , dpdk stable Subject: patch 'net/cnxk: fix flow RSS configuration' has been queued to stable release 22.11.5 Date: Thu, 7 Mar 2024 01:31:48 +0000 Message-Id: <20240307013159.1735343-91-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240307013159.1735343-1-luca.boccassi@gmail.com> References: <20240307013159.1735343-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 Hi, FYI, your patch has been queued to stable release 22.11.5 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 03/09/24. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Queued patches are on a temporary branch at: https://github.com/bluca/dpdk-stable This queued commit can be viewed at: https://github.com/bluca/dpdk-stable/commit/d7cb16965b578ea628f1e3ea550500a3181c54f3 Thanks. Luca Boccassi --- >From d7cb16965b578ea628f1e3ea550500a3181c54f3 Mon Sep 17 00:00:00 2001 From: Kiran Kumar K Date: Fri, 15 Dec 2023 12:15:43 +0530 Subject: [PATCH] net/cnxk: fix flow RSS configuration [ upstream commit 752ce2f3e5bf7bd8add8dc9629f3b824886c641e ] While creating a RSS rule, if no RSS types are specified, use RSS types from dev config. Fixes: bc778a17fa46 ("net/cnxk: support flow RSS") Signed-off-by: Kiran Kumar K Reviewed-by: Satheesh Paul --- drivers/net/cnxk/cnxk_flow.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/drivers/net/cnxk/cnxk_flow.c b/drivers/net/cnxk/cnxk_flow.c index 422c5d74df..ee0c4e5550 100644 --- a/drivers/net/cnxk/cnxk_flow.c +++ b/drivers/net/cnxk/cnxk_flow.c @@ -98,15 +98,19 @@ npc_rss_action_validate(struct rte_eth_dev *eth_dev, } static void -npc_rss_flowkey_get(struct cnxk_eth_dev *eth_dev, - const struct roc_npc_action *rss_action, - uint32_t *flowkey_cfg) +npc_rss_flowkey_get(struct cnxk_eth_dev *eth_dev, const struct roc_npc_action *rss_action, + uint32_t *flowkey_cfg, uint64_t default_rss_types) { const struct roc_npc_action_rss *rss; + uint64_t rss_types; rss = (const struct roc_npc_action_rss *)rss_action->conf; + rss_types = rss->types; + /* If no RSS types are specified, use default one */ + if (rss_types == 0) + rss_types = default_rss_types; - *flowkey_cfg = cnxk_rss_ethdev_to_nix(eth_dev, rss->types, rss->level); + *flowkey_cfg = cnxk_rss_ethdev_to_nix(eth_dev, rss_types, rss->level); } static int @@ -206,7 +210,8 @@ cnxk_map_actions(struct rte_eth_dev *eth_dev, const struct rte_flow_attr *attr, goto err_exit; in_actions[i].type = ROC_NPC_ACTION_TYPE_RSS; in_actions[i].conf = actions->conf; - npc_rss_flowkey_get(dev, &in_actions[i], flowkey_cfg); + npc_rss_flowkey_get(dev, &in_actions[i], flowkey_cfg, + eth_dev->data->dev_conf.rx_adv_conf.rss_conf.rss_hf); break; case RTE_FLOW_ACTION_TYPE_SECURITY: -- 2.39.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-03-07 01:05:42.454676680 +0000 +++ 0091-net-cnxk-fix-flow-RSS-configuration.patch 2024-03-07 01:05:34.994944177 +0000 @@ -1 +1 @@ -From 752ce2f3e5bf7bd8add8dc9629f3b824886c641e Mon Sep 17 00:00:00 2001 +From d7cb16965b578ea628f1e3ea550500a3181c54f3 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 752ce2f3e5bf7bd8add8dc9629f3b824886c641e ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org @@ -19 +20 @@ -index 11670d37e0..a92b61c332 100644 +index 422c5d74df..ee0c4e5550 100644 @@ -22 +23 @@ -@@ -103,15 +103,19 @@ npc_rss_action_validate(struct rte_eth_dev *eth_dev, const struct rte_flow_attr +@@ -98,15 +98,19 @@ npc_rss_action_validate(struct rte_eth_dev *eth_dev, @@ -46 +47 @@ -@@ -293,7 +297,8 @@ cnxk_map_actions(struct rte_eth_dev *eth_dev, const struct rte_flow_attr *attr, +@@ -206,7 +210,8 @@ cnxk_map_actions(struct rte_eth_dev *eth_dev, const struct rte_flow_attr *attr,