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 3E18746D0B for ; Tue, 12 Aug 2025 14:42:09 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 178F440270; Tue, 12 Aug 2025 14:42:09 +0200 (CEST) Received: from mail-pf1-f182.google.com (mail-pf1-f182.google.com [209.85.210.182]) by mails.dpdk.org (Postfix) with ESMTP id DC83340270 for ; Tue, 12 Aug 2025 14:42:07 +0200 (CEST) Received: by mail-pf1-f182.google.com with SMTP id d2e1a72fcca58-76bed310fa1so4571183b3a.2 for ; Tue, 12 Aug 2025 05:42:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=uetpeshawar-edu-pk.20230601.gappssmtp.com; s=20230601; t=1755002527; x=1755607327; darn=dpdk.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=/32VpI40R9aC3UE3nsnUHTCkVozldm0aG1t5RnfzV1I=; b=vJPIcIi2znaBP/n/LSs7s6QaBIUvvDvyqFkS77KKjggN3WQgdGnDL7prtip2ANkJBr nGBc2JJoI6snZCQux8i5SBDwXKR1wHfsb8aJ7m8jZkrTJWCeeELezbnDTJor7Bf+GJvc cnvy+M+mtYq5ojQlAdmktzp7e90s5l6zafF+j62kCmyqkkz84Os+PHbpsMX69nUJHgAY gDcKpO0o87RViUNkGL/IOCJTXnBjyoJR2udtJRGPXv21jicVyssjRBrOeH8on8sU2EX7 Q7l69HK4UXv7BVafYJgLwyUZAzRGQ9Xr9CBykF9JZbajEv9x5y1ZAkOfnlpwn/A99dLq D1IA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1755002527; x=1755607327; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=/32VpI40R9aC3UE3nsnUHTCkVozldm0aG1t5RnfzV1I=; b=YjRFtAiB2EP9q9+TJglsySFT7F0GaSNEtnXUttDBSpTn0B3ooj7/E6UbCqJP/emr5i Q+ROEiWb7nG7bv8M+tLoccfaZyDylpNyiEr44vI7+hS84n/NvyKRvT1v4R+PqDd15eO8 ht4x2e36W9rkWikPNs2GsjC4EXRlDn49hLdUt7oB7LGcFu10EbJfH4yGeoOv3BRs01CH mT9EtmVmnUYuMrD59ewh3+3l8UJDAWQJAzn8CpUj/cQqaqw7bvKQ7HODLy8StbZnhe9w Ibop95njhGxh7FCTxrUfyLEPWhGo8rrGNZCNYBrLkyW78BGAeHAu0xQdAmuJQDfwonDn O22A== X-Forwarded-Encrypted: i=1; AJvYcCUiyVk5QxKaDLWlic7qT4FLI48WcpLhQeto3obol0aHpuT9op99lZOVCv17azhyFoWkOn1lybU=@dpdk.org X-Gm-Message-State: AOJu0Yw2N3QJTC3vUX0ioq23y0QnD+lYTrQOzUGs/FROdrw3GDKG47AP 7h6vT39Lyuly0BQ6F/7/pUC/LOM5gtWomBnjWAmicVUMFlXihWHqvcYq9Y3rBM/d7Uw= X-Gm-Gg: ASbGncu0zzml3C/HQFwULouK+wh9UqiEf2odvpqbpbaa/lQGArFpFRVveQU/RY35fAR RrBMGjUR1X3RnCxQG9DAI5sguj2v0nXRTCP97pnRv2GD/3f9f5oNQVXPOJnc9ph0vxxwDq7QmxV 2QDhrhv0H428pvjKQ360/o/sUlbikwWNLOzJOzFfnpxBNqRId6WeVHM/0D0KTgjev+XShOvA41Z 52WeCA4JEXeHIDrVVLhvagYNKkKKmj60ehq2Kmhy4i/6khzGhOQk2KyM7MH0qUln3D1K8X1G2TW DEPhS0gAkinCpHNqnib2cXGLafPT2iH3goVNORPTU2++Uvooud2p4dSGnWojlxBR4ma1n+21ExN wQcx50gH+kt3P3kEzYp3rnAT7Ncsbl8C5ytr9fC62Nkf4WmL0 X-Google-Smtp-Source: AGHT+IEpSdy/eQyX0lRVbNQyFbqrHzKl3khwl/AkaZsqtVkVo2qP5c9POMX32N4UUk3ixDKnWVl7rw== X-Received: by 2002:a05:6a00:1894:b0:76b:f1c0:224b with SMTP id d2e1a72fcca58-76c461f593fmr23059960b3a.23.1755002526841; Tue, 12 Aug 2025 05:42:06 -0700 (PDT) Received: from localhost.localdomain ([64.62.143.197]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-76bccfbcbf0sm29442892b3a.69.2025.08.12.05.42.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 Aug 2025 05:42:06 -0700 (PDT) From: Khadem Ullah <14pwcse1224@uetpeshawar.edu.pk> To: Dariusz Sosnowski , Viacheslav Ovsiienko , Bing Zhao , Ori Kam , Suanming Mou , Matan Azrad Cc: dev@dpdk.org, stable@dpdk.org, Khadem Ullah <14pwcse1224@uetpeshawar.edu.pk> Subject: [PATCH v2] net/mlx5: fix connection tracking state item validation Date: Tue, 12 Aug 2025 08:41:50 -0400 Message-ID: <20250812124150.2915138-1-14pwcse1224@uetpeshawar.edu.pk> X-Mailer: git-send-email 2.43.0 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 This patch validate a connection tracking state when matching 'conntrack is' in rte_flow rules. Since conntrack item flags is a bitmap, then any combination of RTE_FLOW_CONNTRACK_PKT_STATE_* flags is a valid value to match on. This patch validate the CT state item. Fixes: aca19061e4b9 ('net/mlx5: validate connection tracking item') Cc: stable@dpdk.org Signed-off-by: Khadem Ullah <14pwcse1224@uetpeshawar.edu.pk> --- drivers/net/mlx5/mlx5_flow_dv.c | 12 +++++++++++- drivers/net/mlx5/mlx5_flow_hw.c | 17 ++++++++++++++++- 2 files changed, 27 insertions(+), 2 deletions(-) diff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c index 7b9e5018b8..19475b931f 100644 --- a/drivers/net/mlx5/mlx5_flow_dv.c +++ b/drivers/net/mlx5/mlx5_flow_dv.c @@ -3271,7 +3271,7 @@ mlx5_flow_dv_validate_item_aso_ct(struct rte_eth_dev *dev, { const struct rte_flow_item_conntrack *spec = item->spec; const struct rte_flow_item_conntrack *mask = item->mask; - uint32_t flags; + uint32_t flags, flags_all; if (*item_flags & MLX5_FLOW_LAYER_ASO_CT) return rte_flow_error_set(error, EINVAL, @@ -3289,6 +3289,16 @@ mlx5_flow_dv_validate_item_aso_ct(struct rte_eth_dev *dev, RTE_FLOW_ERROR_TYPE_ITEM, NULL, "Conflict status bits"); + flags_all = (RTE_FLOW_CONNTRACK_PKT_STATE_VALID | + RTE_FLOW_CONNTRACK_PKT_STATE_CHANGED | + RTE_FLOW_CONNTRACK_PKT_STATE_INVALID | + RTE_FLOW_CONNTRACK_PKT_STATE_DISABLED | + RTE_FLOW_CONNTRACK_PKT_STATE_BAD); + if (spec->flags & ~flags_all) + return rte_flow_error_set(error, EINVAL, + RTE_FLOW_ERROR_TYPE_ITEM, + NULL, + "Invalid CT item matching \n"); } /* State change also needs to be considered. */ *item_flags |= MLX5_FLOW_LAYER_ASO_CT; diff --git a/drivers/net/mlx5/mlx5_flow_hw.c b/drivers/net/mlx5/mlx5_flow_hw.c index 6dc16f80d3..6dbbc44819 100644 --- a/drivers/net/mlx5/mlx5_flow_hw.c +++ b/drivers/net/mlx5/mlx5_flow_hw.c @@ -16957,7 +16957,6 @@ flow_hw_validate_rule_pattern(struct rte_eth_dev *dev, { const struct rte_flow_pattern_template *pt; const struct rte_flow_item *pt_item; - if (pattern_template_idx >= table->nb_item_templates) return rte_flow_error_set(error, EINVAL, RTE_FLOW_ERROR_TYPE_UNSPECIFIED, NULL, "Pattern template index out of range"); @@ -16996,7 +16995,9 @@ flow_hw_validate_rule_pattern(struct rte_eth_dev *dev, switch (items->type) { const struct rte_flow_item_ethdev *ethdev; const struct rte_flow_item_tx_queue *tx_queue; + const struct rte_flow_item_conntrack *spec; struct mlx5_txq_ctrl *txq; + uint32_t flags_all; case RTE_FLOW_ITEM_TYPE_REPRESENTED_PORT: ethdev = items->spec; @@ -17016,6 +17017,20 @@ flow_hw_validate_rule_pattern(struct rte_eth_dev *dev, RTE_FLOW_ERROR_TYPE_ITEM_SPEC, items, "Invalid Tx queue"); mlx5_txq_release(dev, tx_queue->tx_queue); + break; + case RTE_FLOW_ITEM_TYPE_CONNTRACK: + spec = items->spec; + flags_all = (RTE_FLOW_CONNTRACK_PKT_STATE_VALID | + RTE_FLOW_CONNTRACK_PKT_STATE_CHANGED | + RTE_FLOW_CONNTRACK_PKT_STATE_INVALID | + RTE_FLOW_CONNTRACK_PKT_STATE_DISABLED | + RTE_FLOW_CONNTRACK_PKT_STATE_BAD); + if (spec->flags & ~flags_all) + return rte_flow_error_set(error, EINVAL, + RTE_FLOW_ERROR_TYPE_ITEM, + NULL, + "Invalid CT item matching \n"); + break; default: break; } -- 2.43.0