From patchwork Thu Jul 1 05:54:56 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jack Min X-Patchwork-Id: 95091 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 2E042A0A0C; Thu, 1 Jul 2021 07:55:22 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 9E75540141; Thu, 1 Jul 2021 07:55:21 +0200 (CEST) Received: from NAM04-DM6-obe.outbound.protection.outlook.com (mail-dm6nam08on2063.outbound.protection.outlook.com [40.107.102.63]) by mails.dpdk.org (Postfix) with ESMTP id 2A69840040; Thu, 1 Jul 2021 07:55:20 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=S4dFV/gQAFETUG72OBC0xwjArB9hxgK8y3BabJg9xZpku/tqiNeZ5QVjhBE2pXe2YAQ4c4o01VZ/Ro7zO/I053gKQeVb92ZVeWqgviS0aQvfkeUOR8Xy/StvQPHue2LeQ8Fuc6Ua4osaVxhUh/8T1z2ip8KISD3AQ8zePDgiVAIzqos8UKDo15hh95qvRIhqZy0bU/2EQPvWI7dsjGMl3lioAb0vBBR9oW8UcqYRNwn7i5UlAng0IwjOpqvcmT8nxo0/y7DUOIVfOBKzZVlJeJQH5yiduo9nsOtpZKEANqkDw7o2m41o4wZa/LZk6Yovk9sFQsEQjeRVpYAx9dfD7A== 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-SenderADCheck; bh=LTMVfo4xSNtObKL31CL7NkqEU+DxJqTqNHwjucCpOYY=; b=CKLyTye3xS2cwHOYW+gTp4rUw2Bp9g09uqVk5gOzCJXBfxJOgDe086MWcaU2sXrNekFByyysJxn0qi1Eawjx4AUDL33suhE4E7NgRz7afO93OUH3WzxNxYbukAKx0mjErDeglClgkG+O0pQsNhNASxWEleGPty8hMZsAe4dtoyJu0p63j9ov6ForFg0a482FsB+pJPFHaefFEnrZqB6sKP3l/m3KuW05j+3MsbJSnJFjJ391/9mxc5aTWqF9fmt1GqEg5vo9JFjBAgIHj+c6ONlHHNN5lB81xp/gyvcr9n0e9bvXVyzqUGhxXe75NEL0xzx9wd8VQ57o4tG4pnYVzQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.112.34) smtp.rcpttodomain=dpdk.org smtp.mailfrom=nvidia.com; dmarc=pass (p=none sp=none 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=LTMVfo4xSNtObKL31CL7NkqEU+DxJqTqNHwjucCpOYY=; b=UGX6taKKnCtpkL9k0vVoQap2L1ntBiITvz+m+Um2K8M6L4+kp7NM2bIvQMPMWIK+Ziw5E0sjOZ7ZcLkLVOdMfnlpMaPxIrRwNtOA1jbckLuHHoY2codDkDAvevmkjPwliy8NE47WcGOoyuD8bDR2VD5fhpCrB+rFx0QKXmJQ6tlEZeX6qE8x4TyZPpHKSzfgi6a1ykgGp9crlaGWyrvlG1U0WSkTwQ8gjQNFuAYyaxUj48b8Anbbqww4sx5/DdPF4Qfir+o9IcKKF1WNL6V/GdgqZqxTYYalmIeIYIZubOJiccspfBV2nAmUTFGsHZNLgCgiRb1G0JwfgAk8DOHQwg== Received: from CO2PR06CA0066.namprd06.prod.outlook.com (2603:10b6:104:3::24) by MW2PR12MB2459.namprd12.prod.outlook.com (2603:10b6:907:c::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4264.23; Thu, 1 Jul 2021 05:55:16 +0000 Received: from CO1NAM11FT022.eop-nam11.prod.protection.outlook.com (2603:10b6:104:3:cafe::de) by CO2PR06CA0066.outlook.office365.com (2603:10b6:104:3::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4287.22 via Frontend Transport; Thu, 1 Jul 2021 05:55:16 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.112.34) smtp.mailfrom=nvidia.com; dpdk.org; dkim=none (message not signed) header.d=none;dpdk.org; dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.112.34 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.112.34; helo=mail.nvidia.com; Received: from mail.nvidia.com (216.228.112.34) by CO1NAM11FT022.mail.protection.outlook.com (10.13.175.199) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.4287.22 via Frontend Transport; Thu, 1 Jul 2021 05:55:15 +0000 Received: from nvidia.com (172.20.187.6) by HQMAIL107.nvidia.com (172.20.187.13) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Thu, 1 Jul 2021 05:55:13 +0000 From: Xiaoyu Min To: Matan Azrad , Shahaf Shuler , Viacheslav Ovsiienko , Xiaoyu Min CC: , Date: Thu, 1 Jul 2021 13:54:56 +0800 Message-ID: <5cebc85325fbe3d9bcac626dd2838b8052c1c7bf.1625117923.git.jackmin@nvidia.com> X-Mailer: git-send-email 2.32.0 MIME-Version: 1.0 X-Originating-IP: [172.20.187.6] X-ClientProxiedBy: HQMAIL111.nvidia.com (172.20.187.18) To HQMAIL107.nvidia.com (172.20.187.13) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: de2795da-add1-469f-aa92-08d93c54ccd4 X-MS-TrafficTypeDiagnostic: MW2PR12MB2459: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:2803; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: R/5iNz3Zz2V2f0HNuoFnmVn0rQT/bfvrzaoMS2G8rcTUxCPyrSX0dbbhRCsYhiwqW9UWHCb105oeEzvQZTFuNPxGQt6bJknH5tjFsrIX90J9sfgyuU3+Tl1vOx5v4kY6B6wx+IzQbd5BKnH7kvKN2uyeFlDrk6vWGly/2h2ahy5n3vkK3VUupeJrLA3xNe0RvsXmG5W4WxTVTlr1Bbz9AR3PBdn4SWVTe/MeLjwT5/3wCbZQXWOZgOyBrLa8dEgQXfrow0KJN/foqU37Cyq31vhRrn6dFbOkGssP2axqFRbTruWEF3ozAwVlQdFZ5kXtmP7yd/ZEBgwiXuwy+dHexWu4FiziGrjvIakYVEjksFcBwYbntNbtt5GFrn8pPwwRydqMXby5aXZ7TNiZ0cwycagrhR3koPIPqshY4e8ohwmCpYTjZxblq3pqMKXxJsAsf733zCHNZlq6HJyUDeHIV0TgAqVu44VtT0GyZMKOxZYxPgOxxfVRCx7t0MeOBDh0vgO6tMl8Vb0g7IY3Dhl7bBVQUkyW1ujX92YY0NLx2uoJR4oUChzpIDXk8R6R2CLNgZsDhLeac0BmqCHM2VW5ihXkXzXYExoia/nQDoF6y5dN5bvejIb8aps6kM0ynN+fFCK1x/XaoGQkTs9AJICsDfVjGxjty0r9jhjRp2bzLtM1N3mQ3sqFnhOat8dzKlZ64W7VRDD8Wu0uPHCeIH50Zg== X-Forefront-Antispam-Report: CIP:216.228.112.34; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:schybrid03.nvidia.com; CAT:NONE; SFS:(4636009)(376002)(396003)(136003)(346002)(39860400002)(46966006)(36840700001)(316002)(8676002)(7636003)(478600001)(356005)(2906002)(55016002)(83380400001)(26005)(6666004)(336012)(82740400003)(70206006)(70586007)(450100002)(82310400003)(110136005)(7696005)(47076005)(36860700001)(6286002)(8936002)(2616005)(186003)(54906003)(5660300002)(16526019)(4326008)(36756003)(86362001)(426003); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Jul 2021 05:55:15.9425 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: de2795da-add1-469f-aa92-08d93c54ccd4 X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.112.34]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: CO1NAM11FT022.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW2PR12MB2459 Subject: [dpdk-dev] [PATCH] net/mlx5: fix match MPLS over GRE with key 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 Sender: "dev" Currently PMD needs previous layer information in order to set corresponding match field for MPLSoGRE or MPLSoUDP. GRE_KEY item is missing as supported previous layer when translate item MPLS, which causes flow[1] cannot match MPLS over GRE traffic. According to RFC4023, MPLS over GRE tunnel with optional key field needs to be supported too. By adding missing GRE_KEY as supported previous layer fix problem. [1]: flow create 0 ingress pattern eth / ipv6 / gre k_bit is 1 / gre_key / mpls label is 966138 / end actions queue index 1 / mark id 0xa / end Fixes: a7a0365565a4 ("net/mlx5: match GRE key and present bits") Cc: stable@dpdk.org Signed-off-by: Xiaoyu Min Acked-by: Matan Azrad --- drivers/net/mlx5/mlx5_flow_dv.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c index a04a3c2bb8..feeeaf6a1d 100644 --- a/drivers/net/mlx5/mlx5_flow_dv.c +++ b/drivers/net/mlx5/mlx5_flow_dv.c @@ -9027,6 +9027,8 @@ flow_dv_translate_item_mpls(void *matcher, void *key, MLX5_UDP_PORT_MPLS); break; case MLX5_FLOW_LAYER_GRE: + /* Fall-through. */ + case MLX5_FLOW_LAYER_GRE_KEY: MLX5_SET(fte_match_set_misc, misc_m, gre_protocol, 0xffff); MLX5_SET(fte_match_set_misc, misc_v, gre_protocol, RTE_ETHER_TYPE_MPLS);