From patchwork Tue Oct 31 15:14:17 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Salem Sol X-Patchwork-Id: 1857652 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=Nvidia.com header.i=@Nvidia.com header.a=rsa-sha256 header.s=selector2 header.b=Mx56D52Q; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=openvswitch.org (client-ip=140.211.166.136; helo=smtp3.osuosl.org; envelope-from=ovs-dev-bounces@openvswitch.org; receiver=patchwork.ozlabs.org) Received: from smtp3.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4SKYbJ3pzTz1yQ5 for ; Wed, 1 Nov 2023 02:14:52 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id 737AB6148D; Tue, 31 Oct 2023 15:14:50 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org 737AB6148D Authentication-Results: smtp3.osuosl.org; dkim=fail reason="signature verification failed" (2048-bit key, unprotected) header.d=Nvidia.com header.i=@Nvidia.com header.a=rsa-sha256 header.s=selector2 header.b=Mx56D52Q X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp3.osuosl.org ([127.0.0.1]) by localhost (smtp3.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id GCOy9lf1ol8T; Tue, 31 Oct 2023 15:14:49 +0000 (UTC) Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [IPv6:2605:bc80:3010:104::8cd3:938]) by smtp3.osuosl.org (Postfix) with ESMTPS id 9309D61471; Tue, 31 Oct 2023 15:14:48 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org 9309D61471 Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id 6A3A9C0039; Tue, 31 Oct 2023 15:14:48 +0000 (UTC) X-Original-To: dev@openvswitch.org Delivered-To: ovs-dev@lists.linuxfoundation.org Received: from smtp4.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by lists.linuxfoundation.org (Postfix) with ESMTP id B0D53C0032 for ; Tue, 31 Oct 2023 15:14:47 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id 7EA4E42D11 for ; Tue, 31 Oct 2023 15:14:47 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org 7EA4E42D11 Authentication-Results: smtp4.osuosl.org; dkim=pass (2048-bit key, unprotected) header.d=Nvidia.com header.i=@Nvidia.com header.a=rsa-sha256 header.s=selector2 header.b=Mx56D52Q X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Y6XPH27yGv5u for ; Tue, 31 Oct 2023 15:14:46 +0000 (UTC) Received: from NAM10-MW2-obe.outbound.protection.outlook.com (mail-mw2nam10on2060b.outbound.protection.outlook.com [IPv6:2a01:111:f400:7e89::60b]) by smtp4.osuosl.org (Postfix) with ESMTPS id 2E60842D05 for ; Tue, 31 Oct 2023 15:14:46 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org 2E60842D05 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=XVof4KWdHqQ8YpoIDIYNHfY1evHDzbxm7e6fPS0fnhRnGNqHI8ucmTNPIhDY+6a5Ip9HoH/EOZfk9xS7LuPHd0UgVJYIMgnkS2mnL0BXpJwj8rmgUZ+aJOtL+BF+bKudYXRhcBUFLGoi7KKEps0/ghR5fX+B/gbrKwppenj+rnzgVJFqGwEocvBpJp/fNv1NeHdUSUGKlKcbuQxx/jdMhZ6xB/pqoxu48sBxiCAQgns8EXF3sDd2x3QYVoW3DvUbJEhXPt8I/JTXY8zJfAkZSZIorQnzekOuG0Sj3UvEBabCcw6LJDNEZ3cg2N09MQfIkyZaFuoHq2SfPZ/iOpsAGg== 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=Y+zxrQxBzCyW7dJnQ06QgbL/zlgdksqOywkd3+hYKrc=; b=jVpQdUOCFbYxPDmMMqr78Tzi8y0tFaqMHFs3/5GXMBL3F56p7WsMxNTuLEQNbULUqs9W2dD99wbI4TB8B0BE/OtYu9zQ1DDO1/oYceN4DNKxtJqIy2i4fiFzMvEqKm/HISSqI4dC2L7T6J7P0WbzL7a3oXp02MxEc7YCGAc23UWSI633u+YmJP2t4FOVE5m0IAyv2hnZCcbPas0SmYK2dRn1YNgV+VwXmn5rdT2N0jnEl+YlqCIgWCxPHjtbQ90TM7RTqQM88XkZHrn3MgN04ax2cF5xNzfG5FyUkOBL8tReLJLTAvNi9Wuq1Z9tYX9mE46UJbMcIS2AIRuaGZHEqQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.160) smtp.rcpttodomain=openvswitch.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 (0) 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=Y+zxrQxBzCyW7dJnQ06QgbL/zlgdksqOywkd3+hYKrc=; b=Mx56D52Q7/TdljqX4+DCbcrhCkPthkrr6EZWQrCVu/LAKscI8NPydFfJo0cj9agzlcu57An46XQZxUSgtoZ2KhFIT08wlUgeQ8lEAH4eVaYs6JYTjrSTOEE//v75CPZ7NQQPiGDFEza34tAbGIGv7DZGZkEZjhewS7fDcxzO6MWl8HsnFohrmuIh78ClLEzaYY6ydbzDsPfGgXSuvwlgwV7q/YXxkRYmgIApKgvYmW6ZmMpWKrnGqStRWL3t7fyRdN3u9x0ep+c4udEO8QmPYObO3f98DCkDKChoRQIPH+IYxCp4+M4iSLg1Zeh/J0YExU23ko2/Br26xLlatt+pow== Received: from BL1PR13CA0143.namprd13.prod.outlook.com (2603:10b6:208:2bb::28) by SJ0PR12MB7034.namprd12.prod.outlook.com (2603:10b6:a03:449::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6933.29; Tue, 31 Oct 2023 15:14:43 +0000 Received: from BL02EPF0001A0FC.namprd03.prod.outlook.com (2603:10b6:208:2bb:cafe::12) by BL1PR13CA0143.outlook.office365.com (2603:10b6:208:2bb::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6954.15 via Frontend Transport; Tue, 31 Oct 2023 15:14:42 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.160) 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.160 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.160; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.160) by BL02EPF0001A0FC.mail.protection.outlook.com (10.167.242.103) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6954.19 via Frontend Transport; Tue, 31 Oct 2023 15:14:41 +0000 Received: from rnnvmail202.nvidia.com (10.129.68.7) by mail.nvidia.com (10.129.200.66) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.41; Tue, 31 Oct 2023 08:14:21 -0700 Received: from rnnvmail201.nvidia.com (10.129.68.8) by rnnvmail202.nvidia.com (10.129.68.7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.41; Tue, 31 Oct 2023 08:14:21 -0700 Received: from mtl123.mtl.labs.mlnx (10.127.8.10) by mail.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 via Frontend Transport; Tue, 31 Oct 2023 08:14:21 -0700 Received: from nvidia.com ([10.228.128.224]) by mtl123.mtl.labs.mlnx (8.14.4/8.14.4) with ESMTP id 39VFEJLt017407; Tue, 31 Oct 2023 17:14:19 +0200 To: Date: Tue, 31 Oct 2023 17:14:17 +0200 Message-ID: <20231031151417.124022-1-salems@nvidia.com> X-Mailer: git-send-email 2.21.0 MIME-Version: 1.0 X-NV-OnPremToCloud: ExternallySecured X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BL02EPF0001A0FC:EE_|SJ0PR12MB7034:EE_ X-MS-Office365-Filtering-Correlation-Id: e0d58985-a3ac-4978-7f12-08dbda241b69 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: ZMVXPQDS0xqQlVhEdNOu3CZBgcmluMyX/iXvIKCaUrqJ8SOodo1EWi2fHSeDmn5zLhQYH9Jrp7bF3iYSEkUxka5gtQorbSrukFnVbQKG2Cd0L3d+bGk9D6PkVtQBkW8+Cj9qB1BDX+uycPAT6cSEDSmlg6Nj5BWGy3WyJ+XTQAjLQ8AMppOfQvxl31iCGTQ6Jm7DFFfk5R5PP5IpvSbtq3xzk+tIQ8NeyCES3vds+WOx6C1P7ua8qHWF0azJGaaVBhGzZunSq5Zyu9QUjscReBPfaJw+0U1EaSrrndX4tsSwUM/ZqogzrRdfanGH9Q6LvOPqrhycod+j/BidJOKSZe9UXbWc8t7gWySXbWWNpFJagpEYIQY7TmTx4XJOBavSRNFXxUTsLg4d6GQzj+V99SxHoh4tawKT+YtHDD593p7n554q4REzUE1i9N41rRjTpMX4h+T3/4cxVyx79F0qz1mkSuQ4meRbs+/6Jp6HgclLp5tYkeaUH+Xi1QaKyBHyQphF3Yh8fHyE50N4Uzwci6FjCKSv6jpj9JtmLR5SknTEP0nrhg7HrMtv+0+x0uBgI2lsHuuzcVFokPo0RXiVRr3Fme4bhtc2YlG4L5BzQNe4WuyS9KloOowOHN2bShjjM6MrCOpkQx2x7GewJ8Zad1Pk0/3jT8NbzYyyXonTxlXpGdxnADIkpuLYn3vTGlcEuHi6y6Nh4UMp4jBIilsjDEI8fD4MSLr2MZJdJ+UD1gICNQU2e1ye79STTsSw7w0h X-Forefront-Antispam-Report: CIP:216.228.117.160; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc6edge1.nvidia.com; CAT:NONE; SFS:(13230031)(4636009)(136003)(396003)(39860400002)(346002)(376002)(230922051799003)(451199024)(64100799003)(82310400011)(186009)(1800799009)(46966006)(40470700004)(36840700001)(41300700001)(4326008)(8676002)(8936002)(2906002)(40480700001)(5660300002)(55016003)(70206006)(70586007)(316002)(6916009)(40460700003)(54906003)(86362001)(36860700001)(478600001)(26005)(336012)(1076003)(2616005)(7696005)(36756003)(107886003)(82740400003)(7636003)(83380400001)(47076005)(356005); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 31 Oct 2023 15:14:41.4758 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: e0d58985-a3ac-4978-7f12-08dbda241b69 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.160]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: BL02EPF0001A0FC.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SJ0PR12MB7034 Cc: Eli Britstein Subject: [ovs-dev] [PATCH v3 1/1] netdev-offload-dpdk: Fix GRE without a key match. X-BeenThere: ovs-dev@openvswitch.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Salem Sol via dev From: Salem Sol Reply-To: Salem Sol Errors-To: ovs-dev-bounces@openvswitch.org Sender: "dev" In case there is no match on GRE key, avoid adding the key match item. Fixes: 7617d0583c73 ("netdev-offload-dpdk: Add support for matching on gre fields.") Signed-off-by: Salem Sol Acked-by: Simon Horman --- lib/netdev-offload-dpdk.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/lib/netdev-offload-dpdk.c b/lib/netdev-offload-dpdk.c index 992627fa2..b2bb9013e 100644 --- a/lib/netdev-offload-dpdk.c +++ b/lib/netdev-offload-dpdk.c @@ -1336,16 +1336,19 @@ parse_gre_match(struct flow_patterns *patterns, greh_spec->k = !!(match->flow.tunnel.flags & FLOW_TNL_F_KEY); greh_mask->k = 1; - key_spec = xzalloc(sizeof *key_spec); - key_mask = xzalloc(sizeof *key_mask); + if (greh_spec->k) { + key_spec = xzalloc(sizeof *key_spec); + key_mask = xzalloc(sizeof *key_mask); - *key_spec = htonl(ntohll(match->flow.tunnel.tun_id)); - *key_mask = htonl(ntohll(match->wc.masks.tunnel.tun_id)); + *key_spec = htonl(ntohll(match->flow.tunnel.tun_id)); + *key_mask = htonl(ntohll(match->wc.masks.tunnel.tun_id)); + + add_flow_pattern(patterns, RTE_FLOW_ITEM_TYPE_GRE_KEY, key_spec, + key_mask, NULL); + } consumed_masks->tunnel.tun_id = 0; consumed_masks->tunnel.flags &= ~FLOW_TNL_F_KEY; - add_flow_pattern(patterns, RTE_FLOW_ITEM_TYPE_GRE_KEY, key_spec, - key_mask, NULL); } consumed_masks->tunnel.flags &= ~FLOW_TNL_F_DONT_FRAGMENT;