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 17C0743CAD for ; Thu, 14 Mar 2024 01:12:33 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 0E2B442E63; Thu, 14 Mar 2024 01:12:33 +0100 (CET) Received: from mail-lf1-f42.google.com (mail-lf1-f42.google.com [209.85.167.42]) by mails.dpdk.org (Postfix) with ESMTP id E27BE42E5D for ; Thu, 14 Mar 2024 01:12:30 +0100 (CET) Received: by mail-lf1-f42.google.com with SMTP id 2adb3069b0e04-51381021af1so569329e87.0 for ; Wed, 13 Mar 2024 17:12:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1710375150; x=1710979950; 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=IDfPZaxY/1HL0RfR8mE2GUmMP63WPy9aXHiIjDlD33g=; b=erV0bqquZmEJ2Lprg7mBhOhrqUCD4UsWKRoqCeQrKFF2O//1nvReAbmkNGGoIXMsdk +W5FNM+ahyMFPkmGr1svt/nw9rAPImoRGwhepZU7Tmhk7XZ6TXeAlzNLU48rzzEsc1UT txAL09xU0xBy4C9Lx+k3uFSfQDBbuBqYWNGngtMPlZiC+kkJMjVwS6ExUjb4JhZ2GVPq ZZUnf2vE2ENE3raVguKFpcMEBG+eeQNEFQqd11YfHDbmERibN2faWoC/QcEkxr/TZm54 f8bA9P4YDxV6lRw/y8kizXcmkoNshFcDnxWKBpIye+dttwBJfeVIjCOXKUmK/4JQDZgp 5f7g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1710375150; x=1710979950; 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=IDfPZaxY/1HL0RfR8mE2GUmMP63WPy9aXHiIjDlD33g=; b=LNcYXBw/McnOO9N6AhC+N3C+hlv/nyG2kyA0+9hf305GUnwStl/8WwseTfnK0vBEXT NjY63q/8uUAuJlCZ1oy1QtxRPF9Z5/Soo5pEP8OisD1g63sTNVF2AHMtE8E6H8kJQIQz cjumwEybx3u8Pkf4ylY/KCgMB6sWpg1eQysKd9ajc+cM2M+aR3qwLHMdexWxP6HHH7uL vt/0Q+iT0lAFnspPzRNzWiKbqd1+gb+6tDJL6aKO073qZh31xXTOijuGC9rWX8Nd88D0 mLVFeTaL/voabQsDyEn2eF8LuwleneuYKk7YfU9zHUef0Dj+qT1H5EIz2L4uSjQV64nj r2qw== X-Forwarded-Encrypted: i=1; AJvYcCXq71yoYxCAS0HuBP17Sg++Ku+hZ8AZNKdYLoSNzbGyPa8zysYjIJBp0JIBKZhVV1TpJwK+X9fxFaYVpq7j75k= X-Gm-Message-State: AOJu0YyReouBp/Si+z3oe/MPMQIsh+zRdzhcW7OaP/tW0dvHgrCu7O9O isJBX/PRF6XvCFbUIhf0cnsa5lGaPCANJmdhZ8st6C+ApMHLlLevtOMbO8/TI88= X-Google-Smtp-Source: AGHT+IHKSJDQ9sMqIBJu6ZjAQwqcoH4EtTmIrQ5Jh2BZr+r9rCeorHD5BHeCLfs8zgBiUunAFblSug== X-Received: by 2002:ac2:5983:0:b0:513:aefa:8474 with SMTP id w3-20020ac25983000000b00513aefa8474mr37993lfn.65.1710375150099; Wed, 13 Mar 2024 17:12:30 -0700 (PDT) Received: from localhost ([2a01:4b00:d036:ae00:7aef:1aaa:3dff:d546]) by smtp.gmail.com with ESMTPSA id r17-20020a05600c459100b00413429bfab0sm3787432wmo.16.2024.03.13.17.12.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 Mar 2024 17:12:29 -0700 (PDT) From: luca.boccassi@gmail.com To: Dariusz Sosnowski Cc: Ori Kam , dpdk stable Subject: patch 'net/mlx5: fix connection tracking action validation' has been queued to stable release 22.11.5 Date: Thu, 14 Mar 2024 00:09:42 +0000 Message-Id: <20240314000957.2810803-46-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/ff41fc17f18c2f43cf675427a920ddf727a651c8 Thanks. Luca Boccassi --- >From ff41fc17f18c2f43cf675427a920ddf727a651c8 Mon Sep 17 00:00:00 2001 From: Dariusz Sosnowski Date: Tue, 27 Feb 2024 15:52:22 +0200 Subject: [PATCH] net/mlx5: fix connection tracking action validation [ upstream commit bd2db022c1ad154cd996b7b858c9f04f5a458416 ] In mlx5 PMD, handles to indirect connection tracking flow actions are encoded as 32-bit unsigned integers, where port ID is stored in bits 28-25. Because of this, connection tracking flow actions cannot be created on ports with IDs higher than 15. This patch adds missing validation. Fixes: 463170a7c934 ("net/mlx5: support connection tracking with HWS") Signed-off-by: Dariusz Sosnowski Acked-by: Ori Kam --- drivers/net/mlx5/mlx5_flow_dv.c | 9 +++++++++ drivers/net/mlx5/mlx5_flow_hw.c | 7 +++++++ 2 files changed, 16 insertions(+) diff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c index 4ce6da50e8..7ed04bdb15 100644 --- a/drivers/net/mlx5/mlx5_flow_dv.c +++ b/drivers/net/mlx5/mlx5_flow_dv.c @@ -13143,6 +13143,13 @@ flow_dv_translate_create_conntrack(struct rte_eth_dev *dev, return rte_flow_error_set(error, ENOTSUP, RTE_FLOW_ERROR_TYPE_ACTION, NULL, "Connection is not supported"); + if (dev->data->port_id >= MLX5_INDIRECT_ACT_CT_MAX_PORT) { + rte_flow_error_set(error, EINVAL, + RTE_FLOW_ERROR_TYPE_UNSPECIFIED, NULL, + "CT supports port indexes up to " + RTE_STR(MLX5_ACTION_CTX_CT_MAX_PORT)); + return 0; + } idx = flow_dv_aso_ct_alloc(dev, error); if (!idx) return rte_flow_error_set(error, rte_errno, @@ -15812,6 +15819,8 @@ flow_dv_action_create(struct rte_eth_dev *dev, case RTE_FLOW_ACTION_TYPE_CONNTRACK: ret = flow_dv_translate_create_conntrack(dev, action->conf, err); + if (!ret) + break; idx = MLX5_INDIRECT_ACT_CT_GEN_IDX(PORT_ID(priv), ret); break; default: diff --git a/drivers/net/mlx5/mlx5_flow_hw.c b/drivers/net/mlx5/mlx5_flow_hw.c index 948c56099f..fe50d23987 100644 --- a/drivers/net/mlx5/mlx5_flow_hw.c +++ b/drivers/net/mlx5/mlx5_flow_hw.c @@ -7708,6 +7708,13 @@ flow_hw_conntrack_create(struct rte_eth_dev *dev, uint32_t queue, "CT is not enabled"); return 0; } + if (dev->data->port_id >= MLX5_INDIRECT_ACT_CT_MAX_PORT) { + rte_flow_error_set(error, EINVAL, + RTE_FLOW_ERROR_TYPE_UNSPECIFIED, NULL, + "CT supports port indexes up to " + RTE_STR(MLX5_ACTION_CTX_CT_MAX_PORT)); + return 0; + } ct = mlx5_ipool_zmalloc(pool->cts, &ct_idx); if (!ct) { rte_flow_error_set(error, rte_errno, -- 2.39.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-03-14 00:09:22.819810014 +0000 +++ 0046-net-mlx5-fix-connection-tracking-action-validation.patch 2024-03-14 00:09:20.681616571 +0000 @@ -1 +1 @@ -From bd2db022c1ad154cd996b7b858c9f04f5a458416 Mon Sep 17 00:00:00 2001 +From ff41fc17f18c2f43cf675427a920ddf727a651c8 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit bd2db022c1ad154cd996b7b858c9f04f5a458416 ] + @@ -13 +14,0 @@ -Cc: stable@dpdk.org @@ -23 +24 @@ -index 75a8a223ab..ddf19e9a51 100644 +index 4ce6da50e8..7ed04bdb15 100644 @@ -26 +27 @@ -@@ -13889,6 +13889,13 @@ flow_dv_translate_create_conntrack(struct rte_eth_dev *dev, +@@ -13143,6 +13143,13 @@ flow_dv_translate_create_conntrack(struct rte_eth_dev *dev, @@ -40 +41 @@ -@@ -16586,6 +16593,8 @@ flow_dv_action_create(struct rte_eth_dev *dev, +@@ -15812,6 +15819,8 @@ flow_dv_action_create(struct rte_eth_dev *dev, @@ -50 +51 @@ -index c8440262d8..43bde71c93 100644 +index 948c56099f..fe50d23987 100644 @@ -53 +54 @@ -@@ -10346,6 +10346,13 @@ flow_hw_conntrack_create(struct rte_eth_dev *dev, uint32_t queue, +@@ -7708,6 +7708,13 @@ flow_hw_conntrack_create(struct rte_eth_dev *dev, uint32_t queue,