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 4BEACA0350 for ; Mon, 21 Feb 2022 16:42:38 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 40F5A41145; Mon, 21 Feb 2022 16:42:38 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mails.dpdk.org (Postfix) with ESMTP id 155BA410F7 for ; Mon, 21 Feb 2022 16:42:36 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1645458156; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=jSVVhhZaMGsFCodLqqZfS8GpxMkkZlOP6fznLJTAAE8=; b=FK9c/ckThlG0s3/r1Yb9jgWdXG07vMMpGU7zuVS7sBdXza/MHaFfWFHpoDSUMSQ24hYZfs FwkDmsIp5M9Hd9E+Nycerf+hyJ4R4BVXx3Q5rFc8/UhGqsj8WEclJW7URin3t78YIrJoDn 557RhLmMYaca9cNwR9gtpH3saNVHITA= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-356-_R9AezTgNAiL3dmT-8u_Eg-1; Mon, 21 Feb 2022 10:42:33 -0500 X-MC-Unique: _R9AezTgNAiL3dmT-8u_Eg-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 5FEDA1853026; Mon, 21 Feb 2022 15:42:32 +0000 (UTC) Received: from rh.Home (unknown [10.39.195.12]) by smtp.corp.redhat.com (Postfix) with ESMTP id 52A1D7E131; Mon, 21 Feb 2022 15:42:31 +0000 (UTC) From: Kevin Traynor To: Junfeng Guo Cc: Qi Zhang , dpdk stable Subject: patch 'net/ice: fix pattern check in flow director' has been queued to stable release 21.11.1 Date: Mon, 21 Feb 2022 15:35:58 +0000 Message-Id: <20220221153625.152324-169-ktraynor@redhat.com> In-Reply-To: <20220221153625.152324-1-ktraynor@redhat.com> References: <20220221153625.152324-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=ktraynor@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" 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 21.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/26/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/607d564355fe58b63e8d285a47f4e68866f1a792 Thanks. Kevin --- >From 607d564355fe58b63e8d285a47f4e68866f1a792 Mon Sep 17 00:00:00 2001 From: Junfeng Guo Date: Tue, 8 Feb 2022 15:09:25 +0800 Subject: [PATCH] net/ice: fix pattern check in flow director [ upstream commit 01b8739f476dbccc18d66f60bff3df91804ef634 ] Mask for IPv4/UDP/TCP/SCTP addr/port are not supported in current code. Thus we need to check each pattern mask. Only zero-mask and full-mask are allowed to pass the pattern parse, otherwise will return failure. Fixes: a631c98a96a2 ("net/ice: fix pattern check for flow director parser") Signed-off-by: Junfeng Guo Acked-by: Qi Zhang --- drivers/net/ice/ice_fdir_filter.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/drivers/net/ice/ice_fdir_filter.c b/drivers/net/ice/ice_fdir_filter.c index 287032a6a7..ff1cee1195 100644 --- a/drivers/net/ice/ice_fdir_filter.c +++ b/drivers/net/ice/ice_fdir_filter.c @@ -2039,8 +2039,8 @@ ice_fdir_parse_pattern(__rte_unused struct ice_adapter *ad, /* Mask for IPv4 src/dst addrs not supported */ - if (!ipv4_mask->hdr.src_addr && + if (ipv4_mask->hdr.src_addr && ipv4_mask->hdr.src_addr != UINT32_MAX) return -rte_errno; - if (!ipv4_mask->hdr.dst_addr && + if (ipv4_mask->hdr.dst_addr && ipv4_mask->hdr.dst_addr != UINT32_MAX) return -rte_errno; @@ -2188,8 +2188,8 @@ ice_fdir_parse_pattern(__rte_unused struct ice_adapter *ad, /* Mask for TCP src/dst ports not supported */ - if (!tcp_mask->hdr.src_port && + if (tcp_mask->hdr.src_port && tcp_mask->hdr.src_port != UINT16_MAX) return -rte_errno; - if (!tcp_mask->hdr.dst_port && + if (tcp_mask->hdr.dst_port && tcp_mask->hdr.dst_port != UINT16_MAX) return -rte_errno; @@ -2235,8 +2235,8 @@ ice_fdir_parse_pattern(__rte_unused struct ice_adapter *ad, /* Mask for UDP src/dst ports not supported */ - if (!udp_mask->hdr.src_port && + if (udp_mask->hdr.src_port && udp_mask->hdr.src_port != UINT16_MAX) return -rte_errno; - if (!udp_mask->hdr.dst_port && + if (udp_mask->hdr.dst_port && udp_mask->hdr.dst_port != UINT16_MAX) return -rte_errno; @@ -2280,8 +2280,8 @@ ice_fdir_parse_pattern(__rte_unused struct ice_adapter *ad, /* Mask for SCTP src/dst ports not supported */ - if (!sctp_mask->hdr.src_port && + if (sctp_mask->hdr.src_port && sctp_mask->hdr.src_port != UINT16_MAX) return -rte_errno; - if (!sctp_mask->hdr.dst_port && + if (sctp_mask->hdr.dst_port && sctp_mask->hdr.dst_port != UINT16_MAX) return -rte_errno; -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-02-21 15:22:48.209955542 +0000 +++ 0169-net-ice-fix-pattern-check-in-flow-director.patch 2022-02-21 15:22:44.331704667 +0000 @@ -1 +1 @@ -From 01b8739f476dbccc18d66f60bff3df91804ef634 Mon Sep 17 00:00:00 2001 +From 607d564355fe58b63e8d285a47f4e68866f1a792 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 01b8739f476dbccc18d66f60bff3df91804ef634 ] + @@ -12 +13,0 @@ -Cc: stable@dpdk.org @@ -21 +22 @@ -index b8728fb1be..7954c6d8ea 100644 +index 287032a6a7..ff1cee1195 100644 @@ -24 +25 @@ -@@ -2037,8 +2037,8 @@ ice_fdir_parse_pattern(__rte_unused struct ice_adapter *ad, +@@ -2039,8 +2039,8 @@ ice_fdir_parse_pattern(__rte_unused struct ice_adapter *ad, @@ -35 +36 @@ -@@ -2186,8 +2186,8 @@ ice_fdir_parse_pattern(__rte_unused struct ice_adapter *ad, +@@ -2188,8 +2188,8 @@ ice_fdir_parse_pattern(__rte_unused struct ice_adapter *ad, @@ -46 +47 @@ -@@ -2233,8 +2233,8 @@ ice_fdir_parse_pattern(__rte_unused struct ice_adapter *ad, +@@ -2235,8 +2235,8 @@ ice_fdir_parse_pattern(__rte_unused struct ice_adapter *ad, @@ -57 +58 @@ -@@ -2278,8 +2278,8 @@ ice_fdir_parse_pattern(__rte_unused struct ice_adapter *ad, +@@ -2280,8 +2280,8 @@ ice_fdir_parse_pattern(__rte_unused struct ice_adapter *ad,