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 8003DA00C2 for ; Thu, 3 Nov 2022 10:32:47 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 7BA0D427F0; Thu, 3 Nov 2022 10:32:47 +0100 (CET) Received: from mail-wm1-f45.google.com (mail-wm1-f45.google.com [209.85.128.45]) by mails.dpdk.org (Postfix) with ESMTP id 7C59840694 for ; Thu, 3 Nov 2022 10:32:45 +0100 (CET) Received: by mail-wm1-f45.google.com with SMTP id o30so700584wms.2 for ; Thu, 03 Nov 2022 02:32:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; 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=HDT6lTphkZsRaCOCjCqfam/5XbfRD1GhUKkwLgdxQGI=; b=Ve6T4l9D6wWa4E9bGKQ3Dzm4hAdpBqP1mD3Ne3nLAY076FF8k3vWvb/CjIMs9XUrEm Dfbv5oyYPPekkY/RRGUTG/GaSgxWn3kW5A4eNqAaHzJUFiHAaBoakpKsDg6zLHOqgGTI fRbBooGwTQPwMcsnkz73ZpGq+lTYwfE5XOYlZuUN95iH3F6FkoyY9FOEHeTJXhM/3cEQ uYDxLqYF0YesiUIKqKjol+0qmHYN+mvn1cYC4AdxRBb+5qjlTrgQxNHHXZWLa0tN7r0k 7CFTcADxqkUfDVSqpDBWgHSwDADJnvxVPLIZ8VDFbpl9qtiqPULoeLzMRQ7vJZO1qAmh ZIcg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=HDT6lTphkZsRaCOCjCqfam/5XbfRD1GhUKkwLgdxQGI=; b=v21i7HPP+RgqDrLguEqvanxcVzXRmO4beUaibpMOud+vGW0bIBYMmTKO60kkcQ06U9 Mp8lZmEUDJBG9ouWDhqnh6Ez/B/MZoA2O7GqOqTKpsCqzaSkDhohDthwGTl8POlA9J/9 fuzQ4zEnxxa3hPQQreUUswRpQ0cWeQgwo0vFgrNQCfwpirsT5LkMoIxHdpB5ZGW/OUeJ n5RNlAX5Z8JHFgK/2J7OjdbF7eJSYYPCMjXzUvM+9VpevnwSI15Cn1Uae+tvzSi2rLgr lP0ZYRRUMsJ5wco+aEGOZLuZvt1m3xWZZ9cpjUMZJwc6+UZIOg9ltexJVt54/8ndMAgA QfYg== X-Gm-Message-State: ACrzQf1eDcQy9HIpyAootVM/APpV94mYTM7lqv/SFKLiCe5TeFSSC7UX k25P60lnL2fhrSJD5g2qvUdHKco+j2gH9Agi X-Google-Smtp-Source: AMsMyM4b32+yTZQi7rP1FFwO3Fvl1m19vG8Pv+s3E/x5wzv9PHRnd0y3lAGm5a0TsyzKZfbMW4k9PA== X-Received: by 2002:a7b:c84c:0:b0:3cf:670e:6410 with SMTP id c12-20020a7bc84c000000b003cf670e6410mr17079002wml.21.1667467965197; Thu, 03 Nov 2022 02:32:45 -0700 (PDT) Received: from localhost ([137.220.119.58]) by smtp.gmail.com with ESMTPSA id e26-20020a05600c219a00b003a6a3595edasm662138wme.27.2022.11.03.02.32.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 03 Nov 2022 02:32:44 -0700 (PDT) From: luca.boccassi@gmail.com To: Huisong Li Cc: Dongdong Liu , dpdk stable Subject: patch 'net/hns3: fix IPv4 and IPv6 RSS' has been queued to stable release 20.11.7 Date: Thu, 3 Nov 2022 09:27:43 +0000 Message-Id: <20221103092758.1099402-85-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221103092758.1099402-1-luca.boccassi@gmail.com> References: <20221103092758.1099402-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.7 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 11/05/22. 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/kevintraynor/dpdk-stable This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable/commit/1e72007cd442562186a992d10ffd1fe2e73e8271 Thanks. Luca Boccassi --- >From 1e72007cd442562186a992d10ffd1fe2e73e8271 Mon Sep 17 00:00:00 2001 From: Huisong Li Date: Fri, 30 Sep 2022 15:22:14 +0800 Subject: [PATCH] net/hns3: fix IPv4 and IPv6 RSS [ upstream commit c56a1956b98d6c4eb2e1ebc486348feafd16143d ] Currently, hns3 driver use 'ipv4-other' and 'ipv6-other' as the flag of IP packets to judge if enable RSS tuple field. But user may use 'RTE_ETH_RSS_IPV4' or 'RTE_ETH_RSS_IPV6' as the flag. So this patch adds the processing of these macros. Fixes: 806f1d5ab0e3 ("net/hns3: set RSS hash type input configuration") Signed-off-by: Huisong Li Signed-off-by: Dongdong Liu --- drivers/net/hns3/hns3_rss.c | 14 ++++++++++++++ drivers/net/hns3/hns3_rss.h | 2 ++ 2 files changed, 16 insertions(+) diff --git a/drivers/net/hns3/hns3_rss.c b/drivers/net/hns3/hns3_rss.c index 8da680050f..d3fb342cc2 100644 --- a/drivers/net/hns3/hns3_rss.c +++ b/drivers/net/hns3/hns3_rss.c @@ -102,6 +102,10 @@ static const struct { BIT_ULL(HNS3_RSS_FIELD_IPV4_SCTP_EN_SCTP_S) }, { ETH_RSS_NONFRAG_IPV4_SCTP | ETH_RSS_L4_DST_ONLY, BIT_ULL(HNS3_RSS_FIELD_IPV4_SCTP_EN_SCTP_D) }, + { ETH_RSS_IPV4 | ETH_RSS_L3_SRC_ONLY, + BIT_ULL(HNS3_RSS_FIELD_IPV4_EN_NONFRAG_IP_S) }, + { ETH_RSS_IPV4 | ETH_RSS_L3_DST_ONLY, + BIT_ULL(HNS3_RSS_FIELD_IPV4_EN_NONFRAG_IP_D) }, { ETH_RSS_NONFRAG_IPV4_OTHER | ETH_RSS_L3_SRC_ONLY, BIT_ULL(HNS3_RSS_FIELD_IPV4_EN_NONFRAG_IP_S) }, { ETH_RSS_NONFRAG_IPV4_OTHER | ETH_RSS_L3_DST_ONLY, @@ -134,6 +138,10 @@ static const struct { BIT_ULL(HNS3_RSS_FILED_IPV6_SCTP_EN_SCTP_S) }, { ETH_RSS_NONFRAG_IPV6_SCTP | ETH_RSS_L4_DST_ONLY, BIT_ULL(HNS3_RSS_FILED_IPV6_SCTP_EN_SCTP_D) }, + { ETH_RSS_IPV6 | ETH_RSS_L3_SRC_ONLY, + BIT_ULL(HNS3_RSS_FIELD_IPV6_NONFRAG_IP_S) }, + { ETH_RSS_IPV6 | ETH_RSS_L3_DST_ONLY, + BIT_ULL(HNS3_RSS_FIELD_IPV6_NONFRAG_IP_D) }, { ETH_RSS_NONFRAG_IPV6_OTHER | ETH_RSS_L3_SRC_ONLY, BIT_ULL(HNS3_RSS_FIELD_IPV6_NONFRAG_IP_S) }, { ETH_RSS_NONFRAG_IPV6_OTHER | ETH_RSS_L3_DST_ONLY, @@ -159,6 +167,9 @@ static const struct { BIT_ULL(HNS3_RSS_FIELD_IPV4_SCTP_EN_SCTP_S) | BIT_ULL(HNS3_RSS_FIELD_IPV4_SCTP_EN_SCTP_D) | BIT_ULL(HNS3_RSS_FIELD_IPV4_SCTP_EN_SCTP_VER) }, + { ETH_RSS_IPV4, + BIT_ULL(HNS3_RSS_FIELD_IPV4_EN_NONFRAG_IP_S) | + BIT_ULL(HNS3_RSS_FIELD_IPV4_EN_NONFRAG_IP_D) }, { ETH_RSS_NONFRAG_IPV4_OTHER, BIT_ULL(HNS3_RSS_FIELD_IPV4_EN_NONFRAG_IP_S) | BIT_ULL(HNS3_RSS_FIELD_IPV4_EN_NONFRAG_IP_D) }, @@ -177,6 +188,9 @@ static const struct { BIT_ULL(HNS3_RSS_FILED_IPV6_SCTP_EN_SCTP_D) | BIT_ULL(HNS3_RSS_FILED_IPV6_SCTP_EN_SCTP_S) | BIT_ULL(HNS3_RSS_FIELD_IPV6_SCTP_EN_SCTP_VER) }, + { ETH_RSS_IPV6, + BIT_ULL(HNS3_RSS_FIELD_IPV6_NONFRAG_IP_S) | + BIT_ULL(HNS3_RSS_FIELD_IPV6_NONFRAG_IP_D) }, { ETH_RSS_NONFRAG_IPV6_OTHER, BIT_ULL(HNS3_RSS_FIELD_IPV6_NONFRAG_IP_S) | BIT_ULL(HNS3_RSS_FIELD_IPV6_NONFRAG_IP_D) } diff --git a/drivers/net/hns3/hns3_rss.h b/drivers/net/hns3/hns3_rss.h index 82c19b6b00..751e3475ed 100644 --- a/drivers/net/hns3/hns3_rss.h +++ b/drivers/net/hns3/hns3_rss.h @@ -9,11 +9,13 @@ #include #define HNS3_ETH_RSS_SUPPORT ( \ + ETH_RSS_IPV4 | \ ETH_RSS_FRAG_IPV4 | \ ETH_RSS_NONFRAG_IPV4_TCP | \ ETH_RSS_NONFRAG_IPV4_UDP | \ ETH_RSS_NONFRAG_IPV4_SCTP | \ ETH_RSS_NONFRAG_IPV4_OTHER | \ + ETH_RSS_IPV6 | \ ETH_RSS_FRAG_IPV6 | \ ETH_RSS_NONFRAG_IPV6_TCP | \ ETH_RSS_NONFRAG_IPV6_UDP | \ -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-11-03 09:27:30.583602198 +0000 +++ 0085-net-hns3-fix-IPv4-and-IPv6-RSS.patch 2022-11-03 09:27:25.545425770 +0000 @@ -1 +1 @@ -From c56a1956b98d6c4eb2e1ebc486348feafd16143d Mon Sep 17 00:00:00 2001 +From 1e72007cd442562186a992d10ffd1fe2e73e8271 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit c56a1956b98d6c4eb2e1ebc486348feafd16143d ] + @@ -12 +13,0 @@ -Cc: stable@dpdk.org @@ -22 +23 @@ -index fc912ed2e8..e7e114727f 100644 +index 8da680050f..d3fb342cc2 100644 @@ -27 +28 @@ - { RTE_ETH_RSS_NONFRAG_IPV4_SCTP | RTE_ETH_RSS_L4_DST_ONLY, + { ETH_RSS_NONFRAG_IPV4_SCTP | ETH_RSS_L4_DST_ONLY, @@ -29 +30 @@ -+ { RTE_ETH_RSS_IPV4 | RTE_ETH_RSS_L3_SRC_ONLY, ++ { ETH_RSS_IPV4 | ETH_RSS_L3_SRC_ONLY, @@ -31 +32 @@ -+ { RTE_ETH_RSS_IPV4 | RTE_ETH_RSS_L3_DST_ONLY, ++ { ETH_RSS_IPV4 | ETH_RSS_L3_DST_ONLY, @@ -33 +34 @@ - { RTE_ETH_RSS_NONFRAG_IPV4_OTHER | RTE_ETH_RSS_L3_SRC_ONLY, + { ETH_RSS_NONFRAG_IPV4_OTHER | ETH_RSS_L3_SRC_ONLY, @@ -35 +36 @@ - { RTE_ETH_RSS_NONFRAG_IPV4_OTHER | RTE_ETH_RSS_L3_DST_ONLY, + { ETH_RSS_NONFRAG_IPV4_OTHER | ETH_RSS_L3_DST_ONLY, @@ -38 +39 @@ - { RTE_ETH_RSS_NONFRAG_IPV6_SCTP | RTE_ETH_RSS_L4_DST_ONLY, + { ETH_RSS_NONFRAG_IPV6_SCTP | ETH_RSS_L4_DST_ONLY, @@ -40 +41 @@ -+ { RTE_ETH_RSS_IPV6 | RTE_ETH_RSS_L3_SRC_ONLY, ++ { ETH_RSS_IPV6 | ETH_RSS_L3_SRC_ONLY, @@ -42 +43 @@ -+ { RTE_ETH_RSS_IPV6 | RTE_ETH_RSS_L3_DST_ONLY, ++ { ETH_RSS_IPV6 | ETH_RSS_L3_DST_ONLY, @@ -44 +45 @@ - { RTE_ETH_RSS_NONFRAG_IPV6_OTHER | RTE_ETH_RSS_L3_SRC_ONLY, + { ETH_RSS_NONFRAG_IPV6_OTHER | ETH_RSS_L3_SRC_ONLY, @@ -46 +47 @@ - { RTE_ETH_RSS_NONFRAG_IPV6_OTHER | RTE_ETH_RSS_L3_DST_ONLY, + { ETH_RSS_NONFRAG_IPV6_OTHER | ETH_RSS_L3_DST_ONLY, @@ -51 +52 @@ -+ { RTE_ETH_RSS_IPV4, ++ { ETH_RSS_IPV4, @@ -54 +55 @@ - { RTE_ETH_RSS_NONFRAG_IPV4_OTHER, + { ETH_RSS_NONFRAG_IPV4_OTHER, @@ -61 +62 @@ -+ { RTE_ETH_RSS_IPV6, ++ { ETH_RSS_IPV6, @@ -64 +65 @@ - { RTE_ETH_RSS_NONFRAG_IPV6_OTHER, + { ETH_RSS_NONFRAG_IPV6_OTHER, @@ -68 +69 @@ -index 55aafedcba..8e8b056f4e 100644 +index 82c19b6b00..751e3475ed 100644 @@ -75,10 +76,10 @@ -+ RTE_ETH_RSS_IPV4 | \ - RTE_ETH_RSS_FRAG_IPV4 | \ - RTE_ETH_RSS_NONFRAG_IPV4_TCP | \ - RTE_ETH_RSS_NONFRAG_IPV4_UDP | \ - RTE_ETH_RSS_NONFRAG_IPV4_SCTP | \ - RTE_ETH_RSS_NONFRAG_IPV4_OTHER | \ -+ RTE_ETH_RSS_IPV6 | \ - RTE_ETH_RSS_FRAG_IPV6 | \ - RTE_ETH_RSS_NONFRAG_IPV6_TCP | \ - RTE_ETH_RSS_NONFRAG_IPV6_UDP | \ ++ ETH_RSS_IPV4 | \ + ETH_RSS_FRAG_IPV4 | \ + ETH_RSS_NONFRAG_IPV4_TCP | \ + ETH_RSS_NONFRAG_IPV4_UDP | \ + ETH_RSS_NONFRAG_IPV4_SCTP | \ + ETH_RSS_NONFRAG_IPV4_OTHER | \ ++ ETH_RSS_IPV6 | \ + ETH_RSS_FRAG_IPV6 | \ + ETH_RSS_NONFRAG_IPV6_TCP | \ + ETH_RSS_NONFRAG_IPV6_UDP | \