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 E4C0B45C9B for ; Tue, 12 Nov 2024 23:08:07 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id D77304021E; Tue, 12 Nov 2024 23:08:07 +0100 (CET) Received: from mail-wm1-f53.google.com (mail-wm1-f53.google.com [209.85.128.53]) by mails.dpdk.org (Postfix) with ESMTP id 4C9A54021E for ; Tue, 12 Nov 2024 23:08:06 +0100 (CET) Received: by mail-wm1-f53.google.com with SMTP id 5b1f17b1804b1-4315e9e9642so52204715e9.0 for ; Tue, 12 Nov 2024 14:08:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1731449286; x=1732054086; darn=dpdk.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=/C8gFvxO111FPxIlxJz/+6EwxC751I1GyCogH0BdDX0=; b=cf7iUFqtqCv5QOIw+SB26WBuLmS224J2oCKthyaj5jhgM3YZnimarIqf8Q9RUnlk6g 9HkSVW/bCL+++bTef4/QDmcGDy9IuvQvHpHJhc58PCVDSc68JBlKBkvZ7SDsqMkUd8NP xt/nyPH4G0jVEBk10+FHKDDQAO0g7kGMylO9L0Br0a6hMau/dtjNzDV32Szmzy/SYMFN 5zkz9dxMZ1WM/8WeAG1iTdCyVDb5WitFksV/MExQVtxfKx0nbGhAA5jkxSQeCMi5FBCp ZJ3Lxqs8iLibdPg2gRHYf97cYHDLKWnsBBGT6GcfQLGLfsGyKlP1g0xjp026vg7f35TT 5TCQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1731449286; x=1732054086; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=/C8gFvxO111FPxIlxJz/+6EwxC751I1GyCogH0BdDX0=; b=QkfdjFPOk1oDOmOg/etkQXUD02nB9dUksEpSkG01AFbCq3Yh4Xd81/+GHMqLpUamCI 10MfCtUo2+zL6j0pHF8DdeB9riyj3oXIvVqMLbKvOqKMazPL2bCiFRlTsRvS98t/jHm0 qbgzxxWtTcqProtVqfZMMLrwDeZsFctBUUaPSZYblPD80zmsK9xt0QvuE1wgMPBtXMVS 9sUMLF277TYspTlUGugc2SEp12ZHJn+Bl8vdvUw9wxiAfzh8eRewPHtorBsJowG6/EF7 RP2crETYG+hV6q7dmQGm2kXD/GsR9SWewtuSUXmVIujZXil9S7itvcc57Q7mud8fr2sE oGGQ== X-Forwarded-Encrypted: i=1; AJvYcCXU5pPHY+Lu4oDvlrCXyDV+jlBe1YwM1vPe+QifYd9pKYXjlFIAsSCwSgRFESoERC6CJPD2Q98=@dpdk.org X-Gm-Message-State: AOJu0Yz/dOk1bO78qNoqySiK1ILPTiR/xgJ01C7mVfkU5uL6gg9gycMp q0Nxg7kdlOPWIHYO3FJ4eFdiIgpJttY8o6Xc9KhnhXIWwhUqPHG1V/DWWw== X-Google-Smtp-Source: AGHT+IGZpTVzeGtwemJIcLcrs6sMdSZKnEvGf/uwGQT69UNmNseGuBdKvLQDW7RN7nI0NMt82AfTag== X-Received: by 2002:a05:600c:1d88:b0:431:5a27:839c with SMTP id 5b1f17b1804b1-432d4a98364mr6195405e9.5.1731449285589; Tue, 12 Nov 2024 14:08:05 -0800 (PST) Received: from localhost ([2a01:4b00:d036:ae00:e89d:e9a1:da72:2f9d]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-432d55515easm795835e9.36.2024.11.12.14.08.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 Nov 2024 14:08:04 -0800 (PST) From: luca.boccassi@gmail.com 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 22.11.7 Date: Tue, 12 Nov 2024 22:07:13 +0000 Message-ID: <20241112220754.666489-3-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20241112220754.666489-1-luca.boccassi@gmail.com> References: <20241023211704.1216956-79-luca.boccassi@gmail.com> <20241112220754.666489-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 22.11.7 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 11/14/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/bluca/dpdk-stable This queued commit can be viewed at: https://github.com/bluca/dpdk-stable/commit/b207e53f2788c4c09f23b0646b242b49f79d51aa Thanks. Luca Boccassi --- >From b207e53f2788c4c09f23b0646b242b49f79d51aa 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 da17fa6e69..ec2000064c 100644 --- a/drivers/net/hns3/hns3_flow.c +++ b/drivers/net/hns3/hns3_flow.c @@ -1182,6 +1182,11 @@ hns3_parse_tunnel(const struct rte_flow_item *item, struct hns3_fdir_rule *rule, "Tunnel packets must configure " "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: case RTE_FLOW_ITEM_TYPE_VXLAN_GPE: -- 2.45.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-11-12 22:06:58.796939457 +0000 +++ 0003-net-hns3-restrict-tunnel-flow-rule-to-one-header.patch 2024-11-12 22:06:58.627306574 +0000 @@ -1 +1 @@ -From 8887c207b9373a1875031c5346706f698322d66d Mon Sep 17 00:00:00 2001 +From b207e53f2788c4c09f23b0646b242b49f79d51aa 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 da17fa6e69..ec2000064c 100644 @@ -23 +24 @@ -@@ -1221,6 +1221,11 @@ hns3_parse_tunnel(const struct rte_flow_item *item, struct hns3_fdir_rule *rule, +@@ -1182,6 +1182,11 @@ hns3_parse_tunnel(const struct rte_flow_item *item, struct hns3_fdir_rule *rule,