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 127AB42CBC for ; Thu, 15 Jun 2023 03:35:32 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 0CE4F42D52; Thu, 15 Jun 2023 03:35:32 +0200 (CEST) Received: from mail-wm1-f54.google.com (mail-wm1-f54.google.com [209.85.128.54]) by mails.dpdk.org (Postfix) with ESMTP id 5C08642D51 for ; Thu, 15 Jun 2023 03:35:30 +0200 (CEST) Received: by mail-wm1-f54.google.com with SMTP id 5b1f17b1804b1-3f8c9cb3144so11588575e9.0 for ; Wed, 14 Jun 2023 18:35:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1686792930; x=1689384930; 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=tsbKDmFXqLvxfrZdcpMkpTb/EKXVgRtr6KKO2bVlEoo=; b=B1WV8BvrBXWPKfzm1GByXt6tYhjyrc8dvIuiLQj+fHvF3sJJhzs3I+QhENxXAIiOG+ yAeOHbSfIXncv1AqhPwiqD7tVVFaKDrTqpBNEKWKcQwyit9lgi9j89gvgh3axmyLOUeV k9304I5psLW3ZYwsVSmRm6shT1MQDYKSODGc1Ea7OhbSrX2teI8gDtDeBOZOTxJgzKgH eg1QhioRspkq4kjn33MEFBi+Qoni5lRhcToLuM5blwcnuIpNiBhnMqf2Vlf+SjDDFORQ iv+cnKKgUkMjo1L8nDbCz4Z2B7lQtNNB3R+Ir1S+I+IT9IJPVpOUjjOOG+izO7HoFvHU vtKA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686792930; x=1689384930; 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=tsbKDmFXqLvxfrZdcpMkpTb/EKXVgRtr6KKO2bVlEoo=; b=jj7s+bPVkxwC0OK1IiNF9zKxSbHYrUlyrc8WbwHc8UMDaxgzNQtXOfs+KNKfP4BEx6 8gjs7ZgTDuTARXfz5WDDyNMStJY4aS0mzfI8m1GIHVo1BtaItezES/bTEXBL/H0l2bsF LOAj07koeD0MKNCzZ+85Y9bBaVofjqkppligGt7z1xtt7mkMF8gK/C32IwDiaAHSOtWm ssizCnCQ1k5gXkdA5Gi1LAUqWVes8Hnaxpek1KBfavJJVTCOsqlz4qknEVZKyF5CTvvz KCsQUk2ea0QZ5KAaDJxpwosGOtJilBboUmjvlAi8SMNzUQFluUaaNY+Pbmzna11eX+ZF z4+Q== X-Gm-Message-State: AC+VfDwtYiNdYnv0W0VCNuEhNMaewuBPiI3vBKrN1lh6unyBmM9x2Qdj 3P+RvXMjrcsloBwRacDVifuFCKCHy4XAyfTz X-Google-Smtp-Source: ACHHUZ4R8YWw1k/NX+py3Je+vKpNcJkHZ3uHIAyK9g/C3uK6ZaQNFORJrT+aKlU3PJ1fCY2kEy8g/Q== X-Received: by 2002:a7b:cd89:0:b0:3f7:f884:7be3 with SMTP id y9-20020a7bcd89000000b003f7f8847be3mr11765580wmj.4.1686792929799; Wed, 14 Jun 2023 18:35:29 -0700 (PDT) Received: from localhost ([2a01:4b00:d307:1000:f1d3:eb5e:11f4:a7d9]) by smtp.gmail.com with ESMTPSA id e17-20020a05600c219100b003f18b942338sm18941953wme.3.2023.06.14.18.35.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 14 Jun 2023 18:35:29 -0700 (PDT) From: luca.boccassi@gmail.com To: Rongwei Liu Cc: Viacheslav Ovsiienko , dpdk stable Subject: patch 'net/mlx5: fix duplicated tag index matching in SWS' has been queued to stable release 20.11.9 Date: Thu, 15 Jun 2023 02:32:43 +0100 Message-Id: <20230615013258.1439718-48-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230615013258.1439718-1-luca.boccassi@gmail.com> References: <20230615013258.1439718-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 20.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 06/17/23. 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/c85dbe8ee375bff9222786fa12376daa5b39bd58 Thanks. Luca Boccassi --- >From c85dbe8ee375bff9222786fa12376daa5b39bd58 Mon Sep 17 00:00:00 2001 From: Rongwei Liu Date: Tue, 16 May 2023 08:43:29 +0300 Subject: [PATCH] net/mlx5: fix duplicated tag index matching in SWS [ upstream commit d5a7699c10651cb1cea2b18f94099e984c466b75 ] Duplicated matching tag index is not allowed in SWS because they are using the same matching field in the underlayer layout. For example: "tag index is 0 data spec 0x12 mask 0xff / tag index is 0 data spec 0x1234 mask 0xffff" is paradoxical matching condition and "tag index is 0 data spec 0x12 mask 0xff / tag index is 0 data spec 0x3400 mask 0xff00" should be "tag index is 0 data spec 0x3412 mask 0xffff" Add checking logic against it. Fixes: e554b672aa05 ("net/mlx5: support flow tag") Signed-off-by: Rongwei Liu Acked-by: Viacheslav Ovsiienko --- drivers/net/mlx5/mlx5_flow_dv.c | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c index c60aabf075..c413da53d7 100644 --- a/drivers/net/mlx5/mlx5_flow_dv.c +++ b/drivers/net/mlx5/mlx5_flow_dv.c @@ -1499,6 +1499,8 @@ flow_dv_validate_item_meta(struct rte_eth_dev *dev __rte_unused, * Pointer to the rte_eth_dev structure. * @param[in] item * Item specification. + * @param[in] tag_bitmap + * Tag index bitmap. * @param[in] attr * Attributes of flow that includes this item. * @param[out] error @@ -1510,6 +1512,7 @@ flow_dv_validate_item_meta(struct rte_eth_dev *dev __rte_unused, static int flow_dv_validate_item_tag(struct rte_eth_dev *dev, const struct rte_flow_item *item, + uint32_t *tag_bitmap, const struct rte_flow_attr *attr __rte_unused, struct rte_flow_error *error) { @@ -1553,6 +1556,12 @@ flow_dv_validate_item_tag(struct rte_eth_dev *dev, if (ret < 0) return ret; MLX5_ASSERT(ret != REG_NON); + if (*tag_bitmap & (1 << ret)) + return rte_flow_error_set(error, EINVAL, + RTE_FLOW_ERROR_TYPE_ITEM_SPEC, + item->spec, + "Duplicated tag index"); + *tag_bitmap |= 1 << ret; return 0; } @@ -5313,7 +5322,8 @@ flow_dv_validate(struct rte_eth_dev *dev, const struct rte_flow_attr *attr, .std_tbl_fix = true, }; const struct rte_eth_hairpin_conf *conf; - uint32_t tag_id = 0; + uint32_t tag_id = 0, tag_bitmap = 0; + const struct mlx5_rte_flow_item_tag *mlx5_tag; if (items == NULL) return -1; @@ -5584,7 +5594,7 @@ flow_dv_validate(struct rte_eth_dev *dev, const struct rte_flow_attr *attr, last_item = MLX5_FLOW_LAYER_ICMP6; break; case RTE_FLOW_ITEM_TYPE_TAG: - ret = flow_dv_validate_item_tag(dev, items, + ret = flow_dv_validate_item_tag(dev, items, &tag_bitmap, attr, error); if (ret < 0) return ret; @@ -5594,6 +5604,13 @@ flow_dv_validate(struct rte_eth_dev *dev, const struct rte_flow_attr *attr, last_item = MLX5_FLOW_ITEM_TX_QUEUE; break; case MLX5_RTE_FLOW_ITEM_TYPE_TAG: + mlx5_tag = (const struct mlx5_rte_flow_item_tag *)items->spec; + if (tag_bitmap & (1 << mlx5_tag->id)) + return rte_flow_error_set(error, EINVAL, + RTE_FLOW_ERROR_TYPE_ITEM_SPEC, + items->spec, + "Duplicated tag index"); + tag_bitmap |= 1 << mlx5_tag->id; break; case RTE_FLOW_ITEM_TYPE_GTP: ret = flow_dv_validate_item_gtp(dev, items, item_flags, -- 2.39.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-06-15 01:56:37.135371195 +0100 +++ 0048-net-mlx5-fix-duplicated-tag-index-matching-in-SWS.patch 2023-06-15 01:56:34.687543926 +0100 @@ -1 +1 @@ -From d5a7699c10651cb1cea2b18f94099e984c466b75 Mon Sep 17 00:00:00 2001 +From c85dbe8ee375bff9222786fa12376daa5b39bd58 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit d5a7699c10651cb1cea2b18f94099e984c466b75 ] + @@ -18 +19,0 @@ -Cc: stable@dpdk.org @@ -27 +28 @@ -index 9ef9f13cbb..27e8b3a5a9 100644 +index c60aabf075..c413da53d7 100644 @@ -30 +31 @@ -@@ -2295,6 +2295,8 @@ flow_dv_validate_item_meta(struct rte_eth_dev *dev __rte_unused, +@@ -1499,6 +1499,8 @@ flow_dv_validate_item_meta(struct rte_eth_dev *dev __rte_unused, @@ -39 +40 @@ -@@ -2306,6 +2308,7 @@ flow_dv_validate_item_meta(struct rte_eth_dev *dev __rte_unused, +@@ -1510,6 +1512,7 @@ flow_dv_validate_item_meta(struct rte_eth_dev *dev __rte_unused, @@ -47 +48 @@ -@@ -2349,6 +2352,12 @@ flow_dv_validate_item_tag(struct rte_eth_dev *dev, +@@ -1553,6 +1556,12 @@ flow_dv_validate_item_tag(struct rte_eth_dev *dev, @@ -60,4 +61,4 @@ -@@ -7280,9 +7289,10 @@ flow_dv_validate(struct rte_eth_dev *dev, const struct rte_flow_attr *attr, - bool def_policy = false; - bool shared_count = false; - uint16_t udp_dport = 0; +@@ -5313,7 +5322,8 @@ flow_dv_validate(struct rte_eth_dev *dev, const struct rte_flow_attr *attr, + .std_tbl_fix = true, + }; + const struct rte_eth_hairpin_conf *conf; @@ -66,2 +66,0 @@ - const struct rte_flow_action_age *non_shared_age = NULL; - const struct rte_flow_action_count *count = NULL; @@ -69,2 +67,0 @@ - struct mlx5_priv *act_priv = NULL; - int aso_after_sample = 0; @@ -72 +69,3 @@ -@@ -7611,7 +7621,7 @@ flow_dv_validate(struct rte_eth_dev *dev, const struct rte_flow_attr *attr, + if (items == NULL) + return -1; +@@ -5584,7 +5594,7 @@ flow_dv_validate(struct rte_eth_dev *dev, const struct rte_flow_attr *attr, @@ -81,2 +80,2 @@ -@@ -7621,6 +7631,13 @@ flow_dv_validate(struct rte_eth_dev *dev, const struct rte_flow_attr *attr, - last_item = MLX5_FLOW_ITEM_SQ; +@@ -5594,6 +5604,13 @@ flow_dv_validate(struct rte_eth_dev *dev, const struct rte_flow_attr *attr, + last_item = MLX5_FLOW_ITEM_TX_QUEUE;