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 AEFD645BB6 for ; Wed, 23 Oct 2024 23:21:38 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id AA05640261; Wed, 23 Oct 2024 23:21:38 +0200 (CEST) Received: from mail-wm1-f45.google.com (mail-wm1-f45.google.com [209.85.128.45]) by mails.dpdk.org (Postfix) with ESMTP id 4DAB740261 for ; Wed, 23 Oct 2024 23:21:37 +0200 (CEST) Received: by mail-wm1-f45.google.com with SMTP id 5b1f17b1804b1-4315abed18aso2066435e9.2 for ; Wed, 23 Oct 2024 14:21:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1729718497; x=1730323297; 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=gN52Y99BKfKQmZUPF3BOpptHM1WEBZrM6krgKvl92G4=; b=TcGjBgv2hGJh4D2QzFvzstcEzcTYXeV/OWyH3DWLWhmvPug5j8XKWzavZNJ+7q8hxo QqPqWfx6MeJ937snVAuCObKVJ0g6sJ77BfnQWhnkxXcAcmiQrPjUXr8NNPgW0sIhFnuq MX8fLyomNHmrf+NCxjE/Xn69E4XO4Mo4n9P1Nnh/i42DaRXR5P4WWQBXSBTxOtX7HseI /5geVSExqvgDJJ4SE9J6skR2h6cIHsNdao1+AatsMz5OleduvlqrYwgn1Eiw8WqqoB3P EgcznAnl3oOOQzZ56FfR+6pOFY0sQonSHcl9lOdZuIrM7g9O3J/7APHidqsRU9/sUPm0 YZgQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1729718497; x=1730323297; 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=gN52Y99BKfKQmZUPF3BOpptHM1WEBZrM6krgKvl92G4=; b=llvPnrAjwx+J0mV09IdiWTm83pH2qUBIBuw2VKIXs9GT4kIM/BxEX/PVdDiM6uK5FF /NTt/2g3xqWUF+DHORVS72rbLGyTUm/ZhwDzXJSrq2qnAHfYmwEf/8YAg6eFze92XjkK wsk1dVWPji8GlGl0wOzpwhHuce0b/gaU3FQPAbuMGaSCJozPM4vAhYv6tQ4cQ70XqhKT tC3ONIVNsSHydGAJS9fMOIoJkWXJyo4TOotqNH/RHDbj28wZrhxgCWBHodVEfgYC/2us BC7WigIwvcKiGeMOCcgvd42WUv/BpZ5k/9wNxxDT29IdbC6/iN0H50yW4fHKfPMCgISs mZow== X-Forwarded-Encrypted: i=1; AJvYcCWBBRtONPqc1pe41fyZq+N9m8uHOK6ceTSzga4wTRsFeGyGLWPVekdrKCVAU5EXp6opRvWLAXA=@dpdk.org X-Gm-Message-State: AOJu0YzdX0bP1DKMY2S549BW3P1XRRkcPq1hMZjNsecn/QS/1T8t14fY uOMR6WaQpKdZR38hmIrXOccC0yWozCHFQThCFI3Wttn1rfGgGThiuTokNY0h X-Google-Smtp-Source: AGHT+IG3247fPeJv3beOnwa36K9p+LN8gSILQjVHDIVouUUCL/OOAuoffbVsFVePbIxi0b0GaGZQKg== X-Received: by 2002:a05:600c:1d06:b0:430:563a:b20a with SMTP id 5b1f17b1804b1-431841fd955mr29688315e9.11.1729718496702; Wed, 23 Oct 2024 14:21:36 -0700 (PDT) Received: from localhost ([2a01:4b00:d036:ae00:21cd:def0:a01d:d2aa]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-43186bdb7b6sm26704515e9.11.2024.10.23.14.21.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 23 Oct 2024 14:21:36 -0700 (PDT) From: luca.boccassi@gmail.com To: Viacheslav Ovsiienko Cc: Dariusz Sosnowski , dpdk stable Subject: patch 'net/mlx5: fix next protocol validation after flex item' has been queued to stable release 22.11.7 Date: Wed, 23 Oct 2024 22:16:53 +0100 Message-ID: <20241023211704.1216956-73-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20241023211704.1216956-1-luca.boccassi@gmail.com> References: <20241023211704.1216956-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 10/25/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/9015591db9b6292558b5b839616a9e6ddd00b38e Thanks. Luca Boccassi --- >From 9015591db9b6292558b5b839616a9e6ddd00b38e Mon Sep 17 00:00:00 2001 From: Viacheslav Ovsiienko Date: Wed, 18 Sep 2024 16:46:21 +0300 Subject: [PATCH] net/mlx5: fix next protocol validation after flex item [ upstream commit 3847a3b192315491118eab9830e695eb2c9946e2 ] On the flow validation some items may check the preceding protocols. In case of flex item the next protocol is opaque (or can be multiple ones) we should set neutral value and allow successful validation, for example, for the combination of flex and following ESP items. Fixes: a23e9b6e3ee9 ("net/mlx5: handle flex item in flows") Signed-off-by: Viacheslav Ovsiienko Acked-by: Dariusz Sosnowski --- drivers/net/mlx5/mlx5_flow_dv.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c index 6521b5b230..8267bf9ffa 100644 --- a/drivers/net/mlx5/mlx5_flow_dv.c +++ b/drivers/net/mlx5/mlx5_flow_dv.c @@ -7503,6 +7503,8 @@ flow_dv_validate(struct rte_eth_dev *dev, const struct rte_flow_attr *attr, tunnel != 0, error); if (ret < 0) return ret; + /* Reset for next proto, it is unknown. */ + next_protocol = 0xff; break; case RTE_FLOW_ITEM_TYPE_METER_COLOR: ret = flow_dv_validate_item_meter_color(dev, items, -- 2.45.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-10-23 22:16:43.280505849 +0100 +++ 0073-net-mlx5-fix-next-protocol-validation-after-flex-ite.patch 2024-10-23 22:16:40.551944763 +0100 @@ -1 +1 @@ -From 3847a3b192315491118eab9830e695eb2c9946e2 Mon Sep 17 00:00:00 2001 +From 9015591db9b6292558b5b839616a9e6ddd00b38e Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 3847a3b192315491118eab9830e695eb2c9946e2 ] + @@ -12 +13,0 @@ -Cc: stable@dpdk.org @@ -21 +22 @@ -index e8ca2b3ed6..4451b114ae 100644 +index 6521b5b230..8267bf9ffa 100644 @@ -24 +25 @@ -@@ -8194,6 +8194,8 @@ flow_dv_validate(struct rte_eth_dev *dev, const struct rte_flow_attr *attr, +@@ -7503,6 +7503,8 @@ flow_dv_validate(struct rte_eth_dev *dev, const struct rte_flow_attr *attr,