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 E1E70A034E for ; Mon, 21 Feb 2022 16:38:01 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id DC9FE4013F; Mon, 21 Feb 2022 16:38:01 +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 537934013F for ; Mon, 21 Feb 2022 16:38:00 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1645457879; 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=034IKs9CrBn+82sO33rgBVK9B7fD/zEzeKarL0M4hOw=; b=UUJA1L0YMkCwjZvXLL1lK+91JZkJHFNmyvVdWF7dM4Xg/VYo+gic/dewmYH39ei9anJFFI iI+sEiDP9oYvp81iJCLOhC1hccqIR1CHVC//5NnAW2kB3b3KTbQEq3HXZ5b2nwxHb/7YAH 89SOOgLzC0o9siJxHCy0K0zl7I3ShOY= 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-266-d_A_LHSEN6S3W92tst55mg-1; Mon, 21 Feb 2022 10:37:56 -0500 X-MC-Unique: d_A_LHSEN6S3W92tst55mg-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 AA5F41091DA0; Mon, 21 Feb 2022 15:37:55 +0000 (UTC) Received: from rh.Home (unknown [10.39.195.12]) by smtp.corp.redhat.com (Postfix) with ESMTP id A00EE7E2C5; Mon, 21 Feb 2022 15:37:54 +0000 (UTC) From: Kevin Traynor To: Junfeng Guo Cc: Qi Zhang , dpdk stable Subject: patch 'net/ice: fix pattern check for flow director parser' has been queued to stable release 21.11.1 Date: Mon, 21 Feb 2022 15:33:44 +0000 Message-Id: <20220221153625.152324-35-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/a9ff22fc593d0d27d1286dae7c260e71976a8774 Thanks. Kevin --- >From a9ff22fc593d0d27d1286dae7c260e71976a8774 Mon Sep 17 00:00:00 2001 From: Junfeng Guo Date: Wed, 22 Dec 2021 16:11:38 +0800 Subject: [PATCH] net/ice: fix pattern check for flow director parser [ upstream commit a631c98a96a20358d5cad00c605ebd71f8feeed8 ] FDIR rules with masks are not supported in current code. Thus add pattern check for IPv4/UDP/TCP/SCTP addr/port to terminate the FDIR programming stage. Fixes: 1b71ed2cdd5d ("net/ice: refactor flow pattern parser") Signed-off-by: Junfeng Guo Acked-by: Qi Zhang --- drivers/net/ice/ice_fdir_filter.c | 32 +++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/drivers/net/ice/ice_fdir_filter.c b/drivers/net/ice/ice_fdir_filter.c index 13a2ac42df..287032a6a7 100644 --- a/drivers/net/ice/ice_fdir_filter.c +++ b/drivers/net/ice/ice_fdir_filter.c @@ -2038,4 +2038,12 @@ ice_fdir_parse_pattern(__rte_unused struct ice_adapter *ad, } + /* Mask for IPv4 src/dst addrs not supported */ + if (!ipv4_mask->hdr.src_addr && + ipv4_mask->hdr.src_addr != UINT32_MAX) + return -rte_errno; + if (!ipv4_mask->hdr.dst_addr && + ipv4_mask->hdr.dst_addr != UINT32_MAX) + return -rte_errno; + if (ipv4_mask->hdr.dst_addr == UINT32_MAX) *input_set |= ICE_INSET_IPV4_DST; @@ -2179,4 +2187,12 @@ ice_fdir_parse_pattern(__rte_unused struct ice_adapter *ad, } + /* Mask for TCP src/dst ports not supported */ + if (!tcp_mask->hdr.src_port && + tcp_mask->hdr.src_port != UINT16_MAX) + return -rte_errno; + if (!tcp_mask->hdr.dst_port && + tcp_mask->hdr.dst_port != UINT16_MAX) + return -rte_errno; + if (tcp_mask->hdr.src_port == UINT16_MAX) *input_set |= ICE_INSET_TCP_SRC_PORT; @@ -2218,4 +2234,12 @@ ice_fdir_parse_pattern(__rte_unused struct ice_adapter *ad, } + /* Mask for UDP src/dst ports not supported */ + if (!udp_mask->hdr.src_port && + udp_mask->hdr.src_port != UINT16_MAX) + return -rte_errno; + if (!udp_mask->hdr.dst_port && + udp_mask->hdr.dst_port != UINT16_MAX) + return -rte_errno; + if (udp_mask->hdr.src_port == UINT16_MAX) *input_set |= ICE_INSET_UDP_SRC_PORT; @@ -2255,4 +2279,12 @@ ice_fdir_parse_pattern(__rte_unused struct ice_adapter *ad, } + /* Mask for SCTP src/dst ports not supported */ + if (!sctp_mask->hdr.src_port && + sctp_mask->hdr.src_port != UINT16_MAX) + return -rte_errno; + if (!sctp_mask->hdr.dst_port && + sctp_mask->hdr.dst_port != UINT16_MAX) + return -rte_errno; + if (sctp_mask->hdr.src_port == UINT16_MAX) *input_set |= ICE_INSET_SCTP_SRC_PORT; -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-02-21 15:22:45.419297522 +0000 +++ 0035-net-ice-fix-pattern-check-for-flow-director-parser.patch 2022-02-21 15:22:44.078704096 +0000 @@ -1 +1 @@ -From a631c98a96a20358d5cad00c605ebd71f8feeed8 Mon Sep 17 00:00:00 2001 +From a9ff22fc593d0d27d1286dae7c260e71976a8774 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit a631c98a96a20358d5cad00c605ebd71f8feeed8 ] + @@ -11 +12,0 @@ -Cc: stable@dpdk.org