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 3556743CAD for ; Thu, 14 Mar 2024 01:12:02 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 2AC8042E6A; Thu, 14 Mar 2024 01:12:02 +0100 (CET) Received: from mail-wr1-f44.google.com (mail-wr1-f44.google.com [209.85.221.44]) by mails.dpdk.org (Postfix) with ESMTP id 31C4742E67 for ; Thu, 14 Mar 2024 01:12:00 +0100 (CET) Received: by mail-wr1-f44.google.com with SMTP id ffacd0b85a97d-33e92b3b5c9so380877f8f.2 for ; Wed, 13 Mar 2024 17:12:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1710375120; x=1710979920; 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=EnKpuklvWatHJJcZoAAd5JnPBG9SgtZZAfGArh7SYA0=; b=HcrOykvF19hy60yHLiJp7gVWcqVpHk0icnhJvHvMfEFiwM0N78Iyf/Q8kl5HPnO6kB u6lF/8qjCROIK08bpHBUlutGil0SmAtMHm8xuRB5OjReDCLi1oyEEwj2Ezyai0K2DnBf 5dPZ9Z+4fq5HfNUaoDFCU/Sepn00PR7TxUZd/qYDZa3VLH5ATYgUUK1tj8gS3w+saLt1 nSXte+UIg0x7blk04Khhf/6AX0V5jU4PzHKIFcR6rJH5M7AdTJRCmB+Zm3tqci6r/l5r pd/FwBpDMZNdwNfpw3kl0VDb5O9Vdzh8zgMlUrI7+roxvjYJ/ROrD92zZqbDFcznDEdU otpA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1710375120; x=1710979920; 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=EnKpuklvWatHJJcZoAAd5JnPBG9SgtZZAfGArh7SYA0=; b=aWtu5DNYZbT6hyEEXsdHML86q2eL0KJ5vYiW3Mt7FyeYBTgH9qHgzogUEwINMdGhq9 hQ4WKUFn86vyhmLeMbtCNv7uw230D6lHjdEcfSFAR298hf4Mgktuxer5mCgrA92B43Jr HlnApHWPdvcDuGsgERErY15GBeC/kbInFGsZhcHTlqZExqCupHXPgjaiQ8HljnDGRQmY 6HOIyEdzyUQ90y7tgLq1y+kYXl6FZeiMw7hoSZGojzVwiymUd499sAxs4NwaH5y72Yin SaG4Y34LRgsSO1pf7iIpoxz1arou3V6B8jkixg9gTJldeUPKDmVsHavTr4COE7SP9ZDW eH9w== X-Forwarded-Encrypted: i=1; AJvYcCVIzyY2Q4r7vCangFHYbL6cizO9ZoNH4PApw5BzoqQT0kO66k/DyYRNEgM8sVDvdV0r/MAA7c14hNj02RAiAJ0= X-Gm-Message-State: AOJu0YzHSWDDoqdacWmyYuXtycetTgNIV+sABtLEB2cL1m5C9303I/Yh A6KSVclRvITx4Q6ObZv5KCuF0eIU97dr59IIfQi32/OKbfIl3uoO X-Google-Smtp-Source: AGHT+IG82Xb+WH62a9oAJo6h54Ty27Zmn26fhFKQ+wO4z9xW6zsaGT31gugf7wHJa+3z9gkwA+YLpQ== X-Received: by 2002:a05:6000:1081:b0:33e:89ad:efbd with SMTP id y1-20020a056000108100b0033e89adefbdmr88781wrw.53.1710375119862; Wed, 13 Mar 2024 17:11:59 -0700 (PDT) Received: from localhost ([2a01:4b00:d036:ae00:7aef:1aaa:3dff:d546]) by smtp.gmail.com with ESMTPSA id by2-20020a056000098200b0033ec6a1b37esm166548wrb.8.2024.03.13.17.11.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 Mar 2024 17:11:59 -0700 (PDT) From: luca.boccassi@gmail.com To: Erez Shitrit Cc: Matan Azrad , dpdk stable Subject: patch 'net/mlx5/hws: check not supported fields in VXLAN' has been queued to stable release 22.11.5 Date: Thu, 14 Mar 2024 00:09:34 +0000 Message-Id: <20240314000957.2810803-38-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240314000957.2810803-1-luca.boccassi@gmail.com> References: <20240307013159.1735343-102-luca.boccassi@gmail.com> <20240314000957.2810803-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.5 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 03/16/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/d458f6a235bde619a8a1c95b68ea8efaf2affda2 Thanks. Luca Boccassi --- >From d458f6a235bde619a8a1c95b68ea8efaf2affda2 Mon Sep 17 00:00:00 2001 From: Erez Shitrit Date: Sun, 18 Feb 2024 07:11:16 +0200 Subject: [PATCH] net/mlx5/hws: check not supported fields in VXLAN [ upstream commit 4506703cbe96185bf3593a222fb9f51f70de78af ] Don't allow the user to mask over rsvd1 / rsvd2 fields which are not supported. Fixes: 28e69588f417 ("net/mlx5/hws: fix tunnel protocol checks") Signed-off-by: Erez Shitrit Acked-by: Matan Azrad --- drivers/net/mlx5/hws/mlx5dr_definer.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/drivers/net/mlx5/hws/mlx5dr_definer.c b/drivers/net/mlx5/hws/mlx5dr_definer.c index af63cdd343..9637281a1e 100644 --- a/drivers/net/mlx5/hws/mlx5dr_definer.c +++ b/drivers/net/mlx5/hws/mlx5dr_definer.c @@ -1002,6 +1002,13 @@ mlx5dr_definer_conv_item_vxlan(struct mlx5dr_definer_conv_data *cd, struct mlx5dr_definer_fc *fc; bool inner = cd->tunnel; + if (m && (m->rsvd0[0] != 0 || m->rsvd0[1] != 0 || m->rsvd0[2] != 0 || + m->rsvd1 != 0)) { + DR_LOG(ERR, "reserved fields are not supported"); + rte_errno = ENOTSUP; + return rte_errno; + } + if (inner) { DR_LOG(ERR, "Inner VXLAN item not supported"); rte_errno = ENOTSUP; -- 2.39.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-03-14 00:09:22.440203726 +0000 +++ 0038-net-mlx5-hws-check-not-supported-fields-in-VXLAN.patch 2024-03-14 00:09:20.625615459 +0000 @@ -1 +1 @@ -From 4506703cbe96185bf3593a222fb9f51f70de78af Mon Sep 17 00:00:00 2001 +From d458f6a235bde619a8a1c95b68ea8efaf2affda2 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 4506703cbe96185bf3593a222fb9f51f70de78af ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org @@ -19 +20 @@ -index 79d98bbf78..8b8757ecac 100644 +index af63cdd343..9637281a1e 100644 @@ -22 +23 @@ -@@ -1414,6 +1414,13 @@ mlx5dr_definer_conv_item_vxlan(struct mlx5dr_definer_conv_data *cd, +@@ -1002,6 +1002,13 @@ mlx5dr_definer_conv_item_vxlan(struct mlx5dr_definer_conv_data *cd,