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 0FEEAA0524 for ; Fri, 5 Feb 2021 12:30:30 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 097D340682; Fri, 5 Feb 2021 12:30:30 +0100 (CET) Received: from mail-wm1-f42.google.com (mail-wm1-f42.google.com [209.85.128.42]) by mails.dpdk.org (Postfix) with ESMTP id 4522040682 for ; Fri, 5 Feb 2021 12:30:29 +0100 (CET) Received: by mail-wm1-f42.google.com with SMTP id j21so2930613wmj.0 for ; Fri, 05 Feb 2021 03:30:29 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=WdeIUcJn9u1BC19r4MlkML5E7vSXFRIfIJhjzBOl9Q4=; b=FoRq+SSTZFGbO/ptjd9p/y0MMLQqCmZmeFpBI072mJ0BzveaB19nf2z8GBWKPVq4o0 6PKmas6an9mqWcdGSI700th7df3K8YKxwA+aLBkXf9rpKNDFfAZMEQxKGFiLkj1K1CAm fRz+ZZ3l9b8GTInqMPxYD07lsdHtLKVNTllto0xWAE0+2Zlwtr8D4jpIHUoa9LRhGKlE OM3lqyL9N1Yn+iy7qnYxpR9hKY5mMHk1XxaH8ek1nHkU9YzfRSx6Q0OjR2rAVgShuNKY xc4jhJj8Se89zvIzdM4VQnJrYRG3Ohot4Vp71F8wHcXKuFuDh13wbm1Q2OrFek5W9Cs1 +Ldw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=WdeIUcJn9u1BC19r4MlkML5E7vSXFRIfIJhjzBOl9Q4=; b=VaA6CUPZkH4M9mgaYLiPlN+FBgaP6tMyZ8f/AcdDheLyxJFMlDo/ZnwEK9IFrESkc5 ABePMnFcLVFD+ADE0iCGoHpO9KamzR3zhXGo6ZRGyhMiKyGhCCxVHgc6b7GJ5TsSi83X K2wdEY+cYwdGgHUudBEGWBqqvnAlxna7cBwfTS/BezrkKZXHa5q1vhBKUzT6YcDEDgP4 cbW4hwBP7lOxHt6jbRGbDVUXbM2nCH69XlxG04wQM/51JwvV+nfSabgWhrKa/2NKkeUc QFBtmY4XtHQfS2ZMhq+ObbJASlZkCB76O4wYyB7UdzYBPkYDpTA2U1k8y0xdsTE/Q0e4 F2Sg== X-Gm-Message-State: AOAM532gmDO8lUNAtViz8hxde1wcRnUbGdLfTR6Qr28EBxFm1rpNHbrs e84g1L9/1zuoPVZXtq5tLAXqFjXZ9Rfxl7op X-Google-Smtp-Source: ABdhPJxygQskbPPjUS4MNMbu8xttDDQQgQImNqgeOxVIZwZoKLEDyEXyqt/SO7tgSxpCXfkC76SyzA== X-Received: by 2002:a1c:dc83:: with SMTP id t125mr3197952wmg.154.1612524629049; Fri, 05 Feb 2021 03:30:29 -0800 (PST) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id m22sm13136276wrh.66.2021.02.05.03.30.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 Feb 2021 03:30:28 -0800 (PST) From: luca.boccassi@gmail.com To: Murphy Yang Cc: Jeff Guo , dpdk stable Date: Fri, 5 Feb 2021 11:16:27 +0000 Message-Id: <20210205111920.1272063-101-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210205111920.1272063-1-luca.boccassi@gmail.com> References: <20210205111920.1272063-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/iavf: fix conflicting RSS combination rules' has been queued to stable release 20.11.1 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 Sender: "stable" Hi, FYI, your patch has been queued to stable release 20.11.1 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 02/07/21. 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/a6f9886c7a9d6d8bd1004e7cee93152d3677844a Thanks. Luca Boccassi --- >From a6f9886c7a9d6d8bd1004e7cee93152d3677844a Mon Sep 17 00:00:00 2001 From: Murphy Yang Date: Thu, 7 Jan 2021 09:17:10 +0000 Subject: [PATCH] net/iavf: fix conflicting RSS combination rules [ upstream commit 653b88893b75cc5d1cd5edcc8eb7813e8dfbb21d ] Currently, when use 'flow' command to create a rule with following invalid RSS type combination, it can be created successfully. Invalid RSS combinations list: - ETH_RSS_IPV4 | ETH_RSS_NONFRAG_IPV4_TCP - ETH_RSS_IPV6 | ETH_RSS_NONFRAG_IPV6_TCP This patch adds these combinations in 'invalid_rss_comb' array to do valid check, if the combination check failed, the rule will be created unsuccessful. Fixes: 91f27b2e39ab ("net/iavf: refactor RSS") Signed-off-by: Murphy Yang Acked-by: Jeff Guo --- drivers/net/iavf/iavf_hash.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/net/iavf/iavf_hash.c b/drivers/net/iavf/iavf_hash.c index c4c73e6644..27cafdf2b4 100644 --- a/drivers/net/iavf/iavf_hash.c +++ b/drivers/net/iavf/iavf_hash.c @@ -806,7 +806,9 @@ static void iavf_refine_proto_hdrs(struct virtchnl_proto_hdrs *proto_hdrs, static uint64_t invalid_rss_comb[] = { ETH_RSS_IPV4 | ETH_RSS_NONFRAG_IPV4_UDP, + ETH_RSS_IPV4 | ETH_RSS_NONFRAG_IPV4_TCP, ETH_RSS_IPV6 | ETH_RSS_NONFRAG_IPV6_UDP, + ETH_RSS_IPV6 | ETH_RSS_NONFRAG_IPV6_TCP, RTE_ETH_RSS_L3_PRE32 | RTE_ETH_RSS_L3_PRE40 | RTE_ETH_RSS_L3_PRE48 | RTE_ETH_RSS_L3_PRE56 | RTE_ETH_RSS_L3_PRE96 -- 2.29.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-02-05 11:18:33.785562771 +0000 +++ 0101-net-iavf-fix-conflicting-RSS-combination-rules.patch 2021-02-05 11:18:28.954693930 +0000 @@ -1 +1 @@ -From 653b88893b75cc5d1cd5edcc8eb7813e8dfbb21d Mon Sep 17 00:00:00 2001 +From a6f9886c7a9d6d8bd1004e7cee93152d3677844a Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 653b88893b75cc5d1cd5edcc8eb7813e8dfbb21d ] + @@ -18 +19,0 @@ -Cc: stable@dpdk.org @@ -27 +28 @@ -index 7620876b58..ebaac58254 100644 +index c4c73e6644..27cafdf2b4 100644 @@ -30 +31 @@ -@@ -863,7 +863,9 @@ static void iavf_refine_proto_hdrs(struct virtchnl_proto_hdrs *proto_hdrs, +@@ -806,7 +806,9 @@ static void iavf_refine_proto_hdrs(struct virtchnl_proto_hdrs *proto_hdrs,