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 A617541EA5 for ; Wed, 15 Mar 2023 23:48:07 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id A061540A7A; Wed, 15 Mar 2023 23:48:07 +0100 (CET) Received: from mail-wr1-f44.google.com (mail-wr1-f44.google.com [209.85.221.44]) by mails.dpdk.org (Postfix) with ESMTP id A9CFF410FB for ; Wed, 15 Mar 2023 23:48:05 +0100 (CET) Received: by mail-wr1-f44.google.com with SMTP id t15so18688611wrz.7 for ; Wed, 15 Mar 2023 15:48:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1678920485; 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=tosp5o3AO0QGDURjgt4oM5sSX6qidQQ/G6j/enQBZc4=; b=YejOqx4pdJk62Rer2IUT1a8rn72x9ckFcXOLuLxep7QmZ6Kfd8TP0yjA+8TSCWVH/U iSn1N5JygmZHkVeGrHK8581miXl8WvHsJWUWgMkBb6AU6XOVijX4NslPKBh4cUF7gpP9 tHvq2+YC6VErYIULgxonnBtGGKugEFuqTc5r77VuvRvNERjPYRW9Y9+QqRhG9WJyFp47 Z6lrcdUYQ8VKQd1CDr8feriOsHQCbN2z/5SlNnnu14+Hjdy0Tu4X5pH4Aa8ZBEXjUQOW QeE0c2FONTPosIgAUhlmal68i6ar93eJ5vOpAY22nXC4IcCzrUSZ80s2yKRv+txjrTKe DV1w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678920485; 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=tosp5o3AO0QGDURjgt4oM5sSX6qidQQ/G6j/enQBZc4=; b=NZeZYUs2MDBAz/Z9LGLu3FiwruRT6LYMNSo9+oRH+fNMvdyLpgT+xYM0+BTlG/q82H jiN6eFNiE0wqasoECpOSJeKp1a1y1/mbwkl6V97tVP1M/NEfCy0e0if9QgBUYWB6IZwq R1I6ZLyqmQ9ob1Pirt47goBhonOumFZNBDKoR3sqcXo2WzEkwuA3LlhUTGxx1JPw9TVG ooK7slEGWoZ44/rqe8cjfcgNQeuyaoxNp0vGMMKEDNJtUvR/XZ1t+cV7kfSgXZEPGVaH sF7n4fq176s10a+oUdkt9gaIGhYYaI77d4ZmzJILgXFSmud5HpLR/ped0K/mc1D61rFE c+1Q== X-Gm-Message-State: AO0yUKUQzOh/tLnLx2GcP1Mq3sgnyQVS2ntt4R/31OdAtp+v8JL1mdWT VwmBXAAe3DP/RVW3QHpFkOfSj0+MqptMGw== X-Google-Smtp-Source: AK7set+rcMZX24ge10SoB472RLtb/XaL0Be0K656JN/O2W5P5+/vYe+womWkQ9S7hXAeHPMnppFnbQ== X-Received: by 2002:a05:6000:11c7:b0:2cf:e3d0:1b63 with SMTP id i7-20020a05600011c700b002cfe3d01b63mr3773002wrx.35.1678920485335; Wed, 15 Mar 2023 15:48:05 -0700 (PDT) Received: from localhost ([2a01:4b00:d307:1000:f1d3:eb5e:11f4:a7d9]) by smtp.gmail.com with ESMTPSA id m8-20020a7bcb88000000b003dc47d458cdsm3151316wmi.15.2023.03.15.15.48.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Mar 2023 15:48:05 -0700 (PDT) From: luca.boccassi@gmail.com To: Huisong Li Cc: Dongdong Liu , dpdk stable Subject: patch 'net/hns3: separate setting redirection table' has been queued to stable release 20.11.8 Date: Wed, 15 Mar 2023 22:46:22 +0000 Message-Id: <20230315224631.1025649-31-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230315224631.1025649-1-luca.boccassi@gmail.com> References: <20230223093715.3926893-71-luca.boccassi@gmail.com> <20230315224631.1025649-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 20.11.8 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/17/23. 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/ff26a8777d14a2f99aa30f9f2b5ed961e9e0244a Thanks. Luca Boccassi --- >From ff26a8777d14a2f99aa30f9f2b5ed961e9e0244a Mon Sep 17 00:00:00 2001 From: Huisong Li Date: Fri, 10 Mar 2023 17:35:10 +0800 Subject: [PATCH] net/hns3: separate setting redirection table [ upstream commit a421cb93462932717f23c5d8342381726e547ba6 ] The settings of redirection table comes from the ethdev ops (like, dev_configure and rss_hash_update) and rte_flow API. For the ethdev ops, driver has to save it to rss_info::rss_indirection_tbl in hns3_hw structure so as to it can be restored when reset is triggered. While rte_flow API no need to use this field to save, they has a global RSS flow list to maintain all rules which can be used to restore the table during the reset phase. Signed-off-by: Huisong Li Signed-off-by: Dongdong Liu --- drivers/net/hns3/hns3_flow.c | 2 -- drivers/net/hns3/hns3_rss.c | 21 +++++++++++++-------- 2 files changed, 13 insertions(+), 10 deletions(-) diff --git a/drivers/net/hns3/hns3_flow.c b/drivers/net/hns3/hns3_flow.c index cddf4e540c..3aaebd3515 100644 --- a/drivers/net/hns3/hns3_flow.c +++ b/drivers/net/hns3/hns3_flow.c @@ -1487,8 +1487,6 @@ hns3_update_indir_table(struct hns3_hw *hw, uint32_t i; /* Fill in redirection table */ - memcpy(indir_tbl, hw->rss_info.rss_indirection_tbl, - sizeof(hw->rss_info.rss_indirection_tbl)); for (i = 0, j = 0; i < hw->rss_ind_tbl_size; i++, j++) { j %= num; if (conf->queue[j] >= hw->alloc_rss_size) { diff --git a/drivers/net/hns3/hns3_rss.c b/drivers/net/hns3/hns3_rss.c index a67795b6ad..7f4655333b 100644 --- a/drivers/net/hns3/hns3_rss.c +++ b/drivers/net/hns3/hns3_rss.c @@ -473,10 +473,6 @@ hns3_set_rss_indir_table(struct hns3_hw *hw, uint16_t *indir, uint16_t size) } } - /* Update redirection table of hw */ - memcpy(hw->rss_info.rss_indirection_tbl, indir, - sizeof(uint16_t) * size); - return 0; } @@ -542,8 +538,11 @@ hns3_rss_reset_indir_table(struct hns3_hw *hw) } ret = hns3_set_rss_indir_table(hw, lut, hw->rss_ind_tbl_size); - if (ret) - hns3_err(hw, "RSS uninit indir table failed: %d", ret); + if (ret != 0) + hns3_err(hw, "RSS uninit indir table failed, ret = %d.", ret); + else + memcpy(hw->rss_info.rss_indirection_tbl, lut, + sizeof(uint16_t) * hw->rss_ind_tbl_size); rte_free(lut); return ret; @@ -855,12 +854,12 @@ hns3_dev_rss_reta_update(struct rte_eth_dev *dev, idx = i / RTE_RETA_GROUP_SIZE; shift = i % RTE_RETA_GROUP_SIZE; if (reta_conf[idx].reta[shift] >= hw->alloc_rss_size) { - rte_spinlock_unlock(&hw->lock); hns3_err(hw, "queue id(%u) set to redirection table " "exceeds queue number(%u) allocated to a TC", reta_conf[idx].reta[shift], hw->alloc_rss_size); - return -EINVAL; + ret = -EINVAL; + goto out; } if (reta_conf[idx].mask & (1ULL << shift)) @@ -869,7 +868,13 @@ hns3_dev_rss_reta_update(struct rte_eth_dev *dev, ret = hns3_set_rss_indir_table(hw, indirection_tbl, hw->rss_ind_tbl_size); + if (ret != 0) + goto out; + memcpy(rss_cfg->rss_indirection_tbl, indirection_tbl, + sizeof(uint16_t) * hw->rss_ind_tbl_size); + +out: rte_spinlock_unlock(&hw->lock); return ret; } -- 2.39.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-03-15 22:44:51.407893211 +0000 +++ 0031-net-hns3-separate-setting-redirection-table.patch 2023-03-15 22:44:49.643851519 +0000 @@ -1 +1 @@ -From a421cb93462932717f23c5d8342381726e547ba6 Mon Sep 17 00:00:00 2001 +From ff26a8777d14a2f99aa30f9f2b5ed961e9e0244a Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit a421cb93462932717f23c5d8342381726e547ba6 ] + @@ -14,2 +15,0 @@ -Cc: stable@dpdk.org - @@ -24 +24 @@ -index 2faeb9ca52..d5db09a263 100644 +index cddf4e540c..3aaebd3515 100644 @@ -27 +27 @@ -@@ -1519,8 +1519,6 @@ hns3_update_indir_table(struct hns3_hw *hw, +@@ -1487,8 +1487,6 @@ hns3_update_indir_table(struct hns3_hw *hw, @@ -37 +37 @@ -index 401e3adfdf..751033d98f 100644 +index a67795b6ad..7f4655333b 100644 @@ -66,2 +66,2 @@ - idx = i / RTE_ETH_RETA_GROUP_SIZE; - shift = i % RTE_ETH_RETA_GROUP_SIZE; + idx = i / RTE_RETA_GROUP_SIZE; + shift = i % RTE_RETA_GROUP_SIZE;