From patchwork Wed Oct 11 06:36:31 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jiawei Wang X-Patchwork-Id: 132495 X-Patchwork-Delegate: rasland@nvidia.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 178C84235C; Wed, 11 Oct 2023 08:37:07 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 74B6F402DA; Wed, 11 Oct 2023 08:37:06 +0200 (CEST) Received: from NAM11-CO1-obe.outbound.protection.outlook.com (mail-co1nam11on2053.outbound.protection.outlook.com [40.107.220.53]) by mails.dpdk.org (Postfix) with ESMTP id 9F271400EF; Wed, 11 Oct 2023 08:37:04 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=F+BBmuTQqPzzoWzG4AIpxGiC+7Ox9LOWGptUpJm7XPskYHZ38GlZHmtyMk7t+6zJUmyRKgK/SCOixkOPDxgYGBEJRk3EzdeXLUnKIYPUZjAJQIwY2jIAVzTWB8bcC3nzk0V9jnYCJ2Hcf3YxODExdJWmk99EIFobrM+6GqbhQVjspdZ8W0wpF9jtTDcn4dbj4+Suws8yP67jDQuN7UhDrAgo/ZytmMypdEWvjb26C7G4nMcw7YjaT7Vi83BEKZtQhRF3QE4ZmwZH3sU8eQ30QkOwBKQJPf0ncoNgIj8aX1iBVRMa7Rclig94Y0GJEq3oL+P1V0Oi9DrlFDxaDz47ew== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=NQh/bcMFNNZ2FW0ILdw06JGuFX9jWQlqn8ddRXuqp2o=; b=ji+jjrOlOpGJ0zotS3E+0bcBOzW2k76FT7kxBuEqOZ+dYRJ/P189gQkdKzfkVK7RU8EIzplKaNpy041maKbGp9zgzqo/YsoblMdk93oTig1VuUatI3cKbelNiuj2q5w/vTfT6NsEXpmJApeaz+qDAmPCGZiUDM5zVJbK9rB19OzKb5+ilcF7Kus3Nmrg+fi1OoJ9VoAgXIWgExgFe6MvciQq2E0PaoBy6Icr8g2PKt76KV+btvcoIHQrC144Qsh5KQSwd2B19U3Nisl2VL6JiIo5eBP+5fPf/jDeMSc8bfysJjEvMysq4nAAY+BckrhHgeX8rutoITq1wXvAVDQF9A== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.161) smtp.rcpttodomain=dpdk.org smtp.mailfrom=nvidia.com; dmarc=pass (p=reject sp=reject pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=NQh/bcMFNNZ2FW0ILdw06JGuFX9jWQlqn8ddRXuqp2o=; b=quEDD7SjmBYtyRJv2k65ieAM3jzCGUPYoeGd/sW2sIcOsAZxdZXRC6//W3XV3UHh1CZEgtlCNiQQiOz+of8SA2RxrE+qsAZwf7/Qrv2Z2lPCewJ7/prsoik71nsMwqiYCURVHoe4EF3UBOuFTwWobVKjcJjWyOwWS20h6dNJGqlVE26s9qH4GiSbwzPc1tIljRIUXsyxDPr0vkVKmGmyjPhEncdFQYACLjNxdMHxJbVzrDyGLKxXPoWG1E2h8AaDDRWL6RKjp1i1/UlhfQUJj1o84bp81pUxAsLYhO+pcCt/vaCq6Zeb/dAyFSRRue6DazKczz5wPe8t5OcAZqrrow== Received: from CH0PR03CA0049.namprd03.prod.outlook.com (2603:10b6:610:b3::24) by SJ2PR12MB8805.namprd12.prod.outlook.com (2603:10b6:a03:4d0::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6863.38; Wed, 11 Oct 2023 06:37:01 +0000 Received: from DS2PEPF0000343B.namprd02.prod.outlook.com (2603:10b6:610:b3:cafe::b0) by CH0PR03CA0049.outlook.office365.com (2603:10b6:610:b3::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6863.43 via Frontend Transport; Wed, 11 Oct 2023 06:37:00 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.161) smtp.mailfrom=nvidia.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.117.161 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.161; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.161) by DS2PEPF0000343B.mail.protection.outlook.com (10.167.18.38) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6838.22 via Frontend Transport; Wed, 11 Oct 2023 06:37:00 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com (10.129.200.67) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.41; Tue, 10 Oct 2023 23:36:47 -0700 Received: from nvidia.com (10.126.231.35) by rnnvmail201.nvidia.com (10.129.68.8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.41; Tue, 10 Oct 2023 23:36:45 -0700 From: Jiawei Wang To: , CC: , , Subject: [PATCH] net/mlx5: fix wrong decap action checking in sample flow Date: Wed, 11 Oct 2023 09:36:31 +0300 Message-ID: <20231011063631.39568-1-jiaweiw@nvidia.com> X-Mailer: git-send-email 2.18.1 MIME-Version: 1.0 X-Originating-IP: [10.126.231.35] X-ClientProxiedBy: rnnvmail202.nvidia.com (10.129.68.7) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DS2PEPF0000343B:EE_|SJ2PR12MB8805:EE_ X-MS-Office365-Filtering-Correlation-Id: 1c3b69e0-bec1-4f81-1bbb-08dbca247973 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: lxyORScoXHKTWmPx+FRYmJtikUsiwLLEwx7J2uO5FGV5i2ot+rAe9uM1uDyR0uh/7adMgHJW+oEWvMHOXH8s4zHbIq0842d0QBOwHtvD0PsiyI/hRyULA31XuXceK4Yfre8LgoE2bIQb+xsA/e5+gCnfKrK1jOQBI1OYpZdxWFOU0FWmu+a2ZIWoKFI0m8njFuBq1btpo9ceqIYylI9Ipr5WWjhIKUJdwQNCXI6PggTBrEmJ26QY5zIoUK1kdP1DFe51VZtUYswIx031dJAhK+Wm6fzKAxG1l8yUEsS/OTEdvMqE2iBDTgatqcSlzu4D7T5VApuAbDyoVBMAkWwpupiCmkP3594QI66j5IuHgWEFQ7HHm7rqm5xxSGovDyNpN3HIT/OmP6s+ybxsOMheLA5mIXwq1PK9jry1OPZ1v4gvkEdTOX8U+C4nFypYggdrSw6ngDJJJy+86iA+/uUpzK9bKq74xbMpLh+f0WDUtL/oswSnmo4h6Ze5PoJyjfa3622yXKn8CGZM8wDQYc0WHKhiZFclZR7fQ6BCyPLq1h6wboa6C95RKJ3zOiuFW4SzH7awY4a1nGGVZE9bKEMYmAnup0fsGVZTLoiDy9yGqWx9AfMACJdbI6nAmMKc2TtaI7Z/ffTjiERRI1cF0aA1ypg7ynY9ZbO7eM3StN81+S+2RWQqiPLoLYIozrOkX1/4Wn3n8tkZHh2F5BMFgk6Ml+pMHPLpPj5QFxKGi5c9Yr8= X-Forefront-Antispam-Report: CIP:216.228.117.161; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc6edge2.nvidia.com; CAT:NONE; SFS:(13230031)(4636009)(346002)(396003)(136003)(376002)(39860400002)(84040400005)(230922051799003)(1800799009)(64100799003)(451199024)(186009)(82310400011)(36840700001)(40470700004)(46966006)(26005)(6286002)(6636002)(16526019)(70586007)(70206006)(54906003)(316002)(83380400001)(55016003)(40460700003)(110136005)(2616005)(1076003)(40480700001)(336012)(426003)(47076005)(5660300002)(478600001)(86362001)(7696005)(6666004)(450100002)(8936002)(8676002)(4326008)(82740400003)(36860700001)(356005)(7636003)(2906002)(36756003)(41300700001); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Oct 2023 06:37:00.6714 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 1c3b69e0-bec1-4f81-1bbb-08dbca247973 X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.117.161]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: DS2PEPF0000343B.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SJ2PR12MB8805 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org This patch uses the temp variable to check the current action type, to avoid overlap the sample action following the decap. Fixes: 7356aec64c48 ("net/mlx5: fix mirror flow split with L3 encapsulation") Cc: stable@dpdk.org Signed-off-by: Jiawei Wang Acked-by: Suanming Mou --- drivers/net/mlx5/mlx5_flow.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/drivers/net/mlx5/mlx5_flow.c b/drivers/net/mlx5/mlx5_flow.c index 8ad85e6027..772f6afb66 100644 --- a/drivers/net/mlx5/mlx5_flow.c +++ b/drivers/net/mlx5/mlx5_flow.c @@ -6159,6 +6159,7 @@ flow_check_match_action(const struct rte_flow_action actions[], { const struct rte_flow_action_sample *sample; const struct rte_flow_action_raw_decap *decap; + const struct rte_flow_action *action_cur = NULL; int actions_n = 0; uint32_t ratio = 0; int sub_type = 0; @@ -6219,12 +6220,12 @@ flow_check_match_action(const struct rte_flow_action actions[], break; case RTE_FLOW_ACTION_TYPE_RAW_DECAP: decap = actions->conf; - while ((++actions)->type == RTE_FLOW_ACTION_TYPE_VOID) + action_cur = actions; + while ((++action_cur)->type == RTE_FLOW_ACTION_TYPE_VOID) ; - actions_n++; - if (actions->type == RTE_FLOW_ACTION_TYPE_RAW_ENCAP) { + if (action_cur->type == RTE_FLOW_ACTION_TYPE_RAW_ENCAP) { const struct rte_flow_action_raw_encap *encap = - actions->conf; + action_cur->conf; if (decap->size <= MLX5_ENCAPSULATION_DECISION_SIZE && encap->size >