From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by dpdk.org (Postfix) with ESMTP id 822821B4B7 for ; Thu, 29 Nov 2018 14:21:52 +0100 (CET) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id EA0E9C07C58E; Thu, 29 Nov 2018 13:21:51 +0000 (UTC) Received: from ktraynor.remote.csb (ovpn-117-230.ams2.redhat.com [10.36.117.230]) by smtp.corp.redhat.com (Postfix) with ESMTP id E4D341001F50; Thu, 29 Nov 2018 13:21:50 +0000 (UTC) From: Kevin Traynor To: Rahul Lakkireddy Cc: dpdk stable Date: Thu, 29 Nov 2018 13:20:10 +0000 Message-Id: <20181129132128.7609-10-ktraynor@redhat.com> In-Reply-To: <20181129132128.7609-1-ktraynor@redhat.com> References: <20181129132128.7609-1-ktraynor@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.32]); Thu, 29 Nov 2018 13:21:51 +0000 (UTC) Subject: [dpdk-stable] patch 'net/cxgbe: fix wrong ingress port value set in filter spec' has been queued to stable release 18.08.1 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 29 Nov 2018 13:21:52 -0000 Hi, FYI, your patch has been queued to stable release 18.08.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 12/08/18. 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. If the code is different (ie: not only metadata diffs), due for example to a change in context or macro names, please double check it. Thanks. Kevin Traynor --- >>From 617071df24ec403d46196f35b3bd988041327981 Mon Sep 17 00:00:00 2001 From: Rahul Lakkireddy Date: Fri, 9 Nov 2018 13:26:27 +0530 Subject: [PATCH] net/cxgbe: fix wrong ingress port value set in filter spec [ upstream commit 34ca5e3eb7ac8d6ba81de2fa6b55565ab599511b ] Set the "value" in the filter spec and not the "mask". Also, remove duplicate comparison for hardware supported match items already done earlier. Fixes: af44a577988b ("net/cxgbe: support to offload flows to HASH region") Signed-off-by: Rahul Lakkireddy --- drivers/net/cxgbe/cxgbe_filter.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/drivers/net/cxgbe/cxgbe_filter.c b/drivers/net/cxgbe/cxgbe_filter.c index 7f0d38001..059ee0e41 100644 --- a/drivers/net/cxgbe/cxgbe_filter.c +++ b/drivers/net/cxgbe/cxgbe_filter.c @@ -246,6 +246,6 @@ static u64 hash_filter_ntuple(const struct filter_entry *f) u16 tcp_proto = IPPROTO_TCP; /* TCP Protocol Number */ - if (tp->port_shift >= 0) - ntuple |= (u64)f->fs.mask.iport << tp->port_shift; + if (tp->port_shift >= 0 && f->fs.mask.iport) + ntuple |= (u64)f->fs.val.iport << tp->port_shift; if (tp->protocol_shift >= 0) { @@ -259,7 +259,4 @@ static u64 hash_filter_ntuple(const struct filter_entry *f) ntuple |= (u64)(f->fs.val.ethtype) << tp->ethertype_shift; - if (ntuple != tp->hash_filter_mask) - return 0; - return ntuple; } -- 2.19.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2018-11-29 13:11:35.277033442 +0000 +++ 0009-net-cxgbe-fix-wrong-ingress-port-value-set-in-filter.patch 2018-11-29 13:11:34.000000000 +0000 @@ -1,14 +1,15 @@ -From 34ca5e3eb7ac8d6ba81de2fa6b55565ab599511b Mon Sep 17 00:00:00 2001 +From 617071df24ec403d46196f35b3bd988041327981 Mon Sep 17 00:00:00 2001 From: Rahul Lakkireddy Date: Fri, 9 Nov 2018 13:26:27 +0530 Subject: [PATCH] net/cxgbe: fix wrong ingress port value set in filter spec +[ upstream commit 34ca5e3eb7ac8d6ba81de2fa6b55565ab599511b ] + Set the "value" in the filter spec and not the "mask". Also, remove duplicate comparison for hardware supported match items already done earlier. Fixes: af44a577988b ("net/cxgbe: support to offload flows to HASH region") -Cc: stable@dpdk.org Signed-off-by: Rahul Lakkireddy --- @@ -16,10 +17,10 @@ 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/drivers/net/cxgbe/cxgbe_filter.c b/drivers/net/cxgbe/cxgbe_filter.c -index ef1102be3..3a7912e48 100644 +index 7f0d38001..059ee0e41 100644 --- a/drivers/net/cxgbe/cxgbe_filter.c +++ b/drivers/net/cxgbe/cxgbe_filter.c -@@ -264,6 +264,6 @@ static u64 hash_filter_ntuple(const struct filter_entry *f) +@@ -246,6 +246,6 @@ static u64 hash_filter_ntuple(const struct filter_entry *f) u16 tcp_proto = IPPROTO_TCP; /* TCP Protocol Number */ - if (tp->port_shift >= 0) @@ -28,8 +29,8 @@ + ntuple |= (u64)f->fs.val.iport << tp->port_shift; if (tp->protocol_shift >= 0) { -@@ -279,7 +279,4 @@ static u64 hash_filter_ntuple(const struct filter_entry *f) - ntuple |= (u64)(f->fs.val.macidx) << tp->macmatch_shift; +@@ -259,7 +259,4 @@ static u64 hash_filter_ntuple(const struct filter_entry *f) + ntuple |= (u64)(f->fs.val.ethtype) << tp->ethertype_shift; - if (ntuple != tp->hash_filter_mask) - return 0;