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 8F5CF45DB9 for ; Wed, 27 Nov 2024 18:22:07 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 8B50D4069F; Wed, 27 Nov 2024 18:22:07 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mails.dpdk.org (Postfix) with ESMTP id 72138402E4 for ; Wed, 27 Nov 2024 18:22:05 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1732728125; 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=MnVv/ZumWAuB21lwcZ3jQGYYjM3WeBATrZToQdNbeNw=; b=AR4DVJZWhq7/inBIIwmKPTCiue1Y7ENEPFxo269FbQ2vPbkoJKCyyX2oo1M1OrMuKmIUTs yTdbzkhE5dA6Ucp8+HSAC7PTEx7+tNZGuq/1FiypM4hVi2YtotiuLo5FPfULn+FujA1E1Q lSwUJMFY4XFG8tqEsmONA1A7xwOLWog= Received: from mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-349-6xGhpk39NdCtHSWzfLSh3A-1; Wed, 27 Nov 2024 12:22:02 -0500 X-MC-Unique: 6xGhpk39NdCtHSWzfLSh3A-1 X-Mimecast-MFC-AGG-ID: 6xGhpk39NdCtHSWzfLSh3A Received: from mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 8A5F819560A6; Wed, 27 Nov 2024 17:22:01 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.192.52]) by mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 0E462300019E; Wed, 27 Nov 2024 17:21:59 +0000 (UTC) From: Kevin Traynor To: Chengwen Feng Cc: Jie Hai , dpdk stable Subject: patch 'net/hns3: restrict tunnel flow rule to one header' has been queued to stable release 21.11.9 Date: Wed, 27 Nov 2024 17:18:18 +0000 Message-ID: <20241127171916.690404-71-ktraynor@redhat.com> In-Reply-To: <20241127171916.690404-1-ktraynor@redhat.com> References: <20241127171916.690404-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.4 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: kAKCzR7JxeF_UMNujOOlWYRoFoRcm25LA-PoJcu0NSc_1732728121 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit content-type: text/plain; charset="US-ASCII"; x-default=true 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.9 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/02/24. 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/f5cfbef2f053f1cf33fa2fd0112724660c9efa0e Thanks. Kevin --- >From f5cfbef2f053f1cf33fa2fd0112724660c9efa0e Mon Sep 17 00:00:00 2001 From: Chengwen Feng Date: Fri, 18 Oct 2024 14:19:38 +0800 Subject: [PATCH] net/hns3: restrict tunnel flow rule to one header [ upstream commit 8887c207b9373a1875031c5346706f698322d66d ] The device's flow director supports a maximum of one tunnel header, if passed more than one tunnel header from rte-flow API, the driver should return error. Fixes: fcba820d9b9e ("net/hns3: support flow director") Signed-off-by: Chengwen Feng Signed-off-by: Jie Hai --- drivers/net/hns3/hns3_flow.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/drivers/net/hns3/hns3_flow.c b/drivers/net/hns3/hns3_flow.c index 74b08451e1..4d0d17f991 100644 --- a/drivers/net/hns3/hns3_flow.c +++ b/drivers/net/hns3/hns3_flow.c @@ -1136,4 +1136,9 @@ hns3_parse_tunnel(const struct rte_flow_item *item, struct hns3_fdir_rule *rule, "with mask"); + if (rule->key_conf.spec.tunnel_type != 0) + return rte_flow_error_set(error, EINVAL, + RTE_FLOW_ERROR_TYPE_ITEM, + item, "Too many tunnel headers!"); + switch (item->type) { case RTE_FLOW_ITEM_TYPE_VXLAN: -- 2.47.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-11-27 17:17:40.496179625 +0000 +++ 0071-net-hns3-restrict-tunnel-flow-rule-to-one-header.patch 2024-11-27 17:17:38.265269580 +0000 @@ -1 +1 @@ -From 8887c207b9373a1875031c5346706f698322d66d Mon Sep 17 00:00:00 2001 +From f5cfbef2f053f1cf33fa2fd0112724660c9efa0e Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 8887c207b9373a1875031c5346706f698322d66d ] + @@ -11 +12,0 @@ -Cc: stable@dpdk.org @@ -20 +21 @@ -index bf1eee506d..5586708a5d 100644 +index 74b08451e1..4d0d17f991 100644 @@ -23 +24 @@ -@@ -1222,4 +1222,9 @@ hns3_parse_tunnel(const struct rte_flow_item *item, struct hns3_fdir_rule *rule, +@@ -1136,4 +1136,9 @@ hns3_parse_tunnel(const struct rte_flow_item *item, struct hns3_fdir_rule *rule,