From patchwork Mon May 15 08:23:52 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Roi Dayan X-Patchwork-Id: 1781159 X-Patchwork-Delegate: horms@verge.net.au Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=openvswitch.org (client-ip=2605:bc80:3010::137; helo=smtp4.osuosl.org; envelope-from=ovs-dev-bounces@openvswitch.org; receiver=) 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=Wf9IXJlt; dkim-atps=neutral Received: from smtp4.osuosl.org (smtp4.osuosl.org [IPv6:2605:bc80:3010::137]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4QKXV65vNJz20KF for ; Mon, 15 May 2023 18:24:46 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id A84594200D; Mon, 15 May 2023 08:24:44 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org A84594200D Authentication-Results: smtp4.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=Wf9IXJlt 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 7up6IbRg-LZF; Mon, 15 May 2023 08:24:43 +0000 (UTC) Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [140.211.9.56]) by smtp4.osuosl.org (Postfix) with ESMTPS id 94FE441FDB; Mon, 15 May 2023 08:24:41 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org 94FE441FDB Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id 5BA0AC0037; Mon, 15 May 2023 08:24:41 +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 168A8C0037 for ; Mon, 15 May 2023 08:24:40 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id D045A41E99 for ; Mon, 15 May 2023 08:24:33 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org D045A41E99 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 4xvdr7DIeZ9d for ; Mon, 15 May 2023 08:24:31 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.8.0 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org 6166841E86 Received: from NAM04-BN8-obe.outbound.protection.outlook.com (mail-bn8nam04on20630.outbound.protection.outlook.com [IPv6:2a01:111:f400:7e8d::630]) by smtp4.osuosl.org (Postfix) with ESMTPS id 6166841E86 for ; Mon, 15 May 2023 08:24:31 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=P8vAnFdmqIJfLKcil0LtjAZvMcn53hVdSbpFao1fdt0eQTeTMx1WTbo97Fib9EQzXXFnzLoQMTXrNTn2QZNnavY4Ui9pjv24WfJHQd3/irynpn0GsGf/S8YkdlfPsLiIgklTh9+I/1ymFhBrv4eF1I5E2wa8ZqaxGmQ8UaI7M0tGzQNUYyd3a1z1hQJv4u3dZGxb1swi2P1WziHbO7uswAXzt2qG32m8qnPHru2Zupykv3a1FOjR9DHpcDvgF1818ShWeEDKFzy58Hoe3cvhLV1ncUAOXx/2Z1K/TPfWMaqhBl6AZukxVKiQUefuPW2cmTprF7l/Zs6XHE6ED/zS6g== 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=MC6UFiLMP7GxjJPbn7B0uu0BSdbhIiXgFumfyZOgyFM=; b=A5MeT9j1rdb4p7PXL2/Rl5XAIwTbSAEEjAv3pTT0bHeDJtcBS8C8eH8LY++dO0+s31nWzj/RiYGPjPQRwR3gxfsmkdVX2kPMPYmGQ/i+1dg5MB/E8DFC1RgyGoj6CTiRqrD9OXTIrVeDPeWG2UT/5pME5EP+WZozCvi0GRplu2TZofcl3MUmpI0Ozimx1VhNrdqwbhHTJt2swAsZBDEcdI+EZvb3o932t88+XBrv9E1vfaK2Co2aWn4CHV0Mfip/8rtKK4enUAOiZL8QXYvZZIpQtKKZS9ot1Kq3EVApDqT/v3jP7DGgjgQD8otwQ5s3binKDA1wgMJvv9d7gbyYBg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.118.233) 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 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=MC6UFiLMP7GxjJPbn7B0uu0BSdbhIiXgFumfyZOgyFM=; b=Wf9IXJltjGKIQF/MpooqDFXxgSGkZMo87sGyR2IHLcyRyVaU/aEi8GSxq4jhlad7eWObVoXsGRQtoA2sDDFWKtakmAzf3d5CCHlUqhJ8JJc8bxqr2JhTft8CnKbYWToStvtaBe3xffqxv0GqIYTm8cf/81nhZ4W2NRhNVioGHtcy+0moeai4Am6BacaPbAO+hHeh8G7f4NO7QtRiKXT/906EolptOHgk3+ow5XPSO/slVjqGhNdQFpCYYsGZ3jOeJVQUTXrz49+6pjtLxQ4zMzAE7zR+riIS4Nq+EKCbGn8B2zvbydyHDNFZXvdaa7ZJSUg/Vww8+7WqKt19cYaLog== Received: from BN6PR17CA0055.namprd17.prod.outlook.com (2603:10b6:405:75::44) by BL3PR12MB6449.namprd12.prod.outlook.com (2603:10b6:208:3b8::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6387.30; Mon, 15 May 2023 08:24:27 +0000 Received: from BN8NAM11FT004.eop-nam11.prod.protection.outlook.com (2603:10b6:405:75:cafe::20) by BN6PR17CA0055.outlook.office365.com (2603:10b6:405:75::44) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6387.30 via Frontend Transport; Mon, 15 May 2023 08:24:27 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.118.233) 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.118.233 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.118.233; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.118.233) by BN8NAM11FT004.mail.protection.outlook.com (10.13.176.164) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6411.14 via Frontend Transport; Mon, 15 May 2023 08:24:25 +0000 Received: from drhqmail203.nvidia.com (10.126.190.182) by mail.nvidia.com (10.127.129.6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.5; Mon, 15 May 2023 01:24:13 -0700 Received: from drhqmail201.nvidia.com (10.126.190.180) by drhqmail203.nvidia.com (10.126.190.182) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.37; Mon, 15 May 2023 01:24:12 -0700 Received: from dev-r-vrt-138.mtr.labs.mlnx (10.127.8.10) by mail.nvidia.com (10.126.190.180) with Microsoft SMTP Server id 15.2.986.37 via Frontend Transport; Mon, 15 May 2023 01:24:10 -0700 To: Date: Mon, 15 May 2023 11:23:52 +0300 Message-ID: <20230515082356.3471136-4-roid@nvidia.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230515082356.3471136-1-roid@nvidia.com> References: <20230515082356.3471136-1-roid@nvidia.com> MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BN8NAM11FT004:EE_|BL3PR12MB6449:EE_ X-MS-Office365-Filtering-Correlation-Id: bebbb2ff-9170-479b-07e3-08db551dcb4d X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: E4KjAwRHk2yDqV53vV8dncWMo4Ob6Ntf8mi6Dg3jRXbnNnpVawPkaLl22uDpaGDi6ijUsCxzELdoq0KdRyjQuR9iWhVnUiDqlmHWFtWD8nr5BVF6x8nWk+/vXRT8T01r7MpUlp0ucRKZidS6ULDevebuCm6YRuD2jv+xSI+DJ35jJnUqIMpV7Ayz/psQBevL2HkNYu6ZoEdQu0x5e4SE9BlzjKGHp41S26g8RMMhbqWFBd6UsnRd4SuXcJdHDXDUP1WzNIZAPPrOwORscCj1LMW2w6OkpO4JqcCnUuEiHyEilLmhK0OfiZns7GM+n6a47XFcvyk2kclREF66077rjmfWKe8UQ6awCFtaxJZjnFzrRXLofQqKkSejGm9/Mc58xx6IdPTaw1zdHbiC2J1w00uAGxaBrqjjjq8iKLOm+r4Q/BFbfY5rVJexJLgUaLZjYmuavEkpq8DaC7Ks5JKxzRZe3weuTQ+C/yj68zIIp10ebhwKSfz5S3jfEyJbJxq3OcJIi4khH0XtOhVVp8cP9BWPIZhBFcD66UO9o39dL1D9l+gWoYeIqZpf9bha8B1yotDDS5YCZ5UGeeS9IASkPDZFjzXRJY1cmW9J/EM0KO3yPtQC1BcTTyWFElyglAee1ER0RS2WzkFVoh2aLwHNJFeNvLHGcWO3h1yWkuA46Mn4Zy2jpa3qfrbSunvI3m6uJdStlD22jFnFaFSVT75KF6ag6rm9fj9jiWcyN0p4Co4= X-Forefront-Antispam-Report: CIP:216.228.118.233; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc7edge2.nvidia.com; CAT:NONE; SFS:(13230028)(4636009)(376002)(136003)(396003)(346002)(39860400002)(451199021)(36840700001)(40470700004)(46966006)(47076005)(336012)(36860700001)(83380400001)(426003)(70206006)(70586007)(2616005)(1076003)(26005)(107886003)(478600001)(40480700001)(54906003)(6666004)(186003)(5660300002)(86362001)(8676002)(40460700003)(8936002)(36756003)(2906002)(4326008)(6916009)(316002)(41300700001)(82740400003)(7636003)(356005)(82310400005); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 May 2023 08:24:25.4261 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: bebbb2ff-9170-479b-07e3-08db551dcb4d X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.118.233]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: BN8NAM11FT004.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BL3PR12MB6449 Cc: Simon Horman , Gavi Teitz , Ilya Maximets , Gavin Li Subject: [ovs-dev] [PATCH v3 3/7] odp-util: Extract vxlan gbp option encoding to a function 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: Roi Dayan via dev From: Roi Dayan Reply-To: Roi Dayan Errors-To: ovs-dev-bounces@openvswitch.org Sender: "dev" From: Gavin Li Extract vxlan gbp option encoding to odp_encode_gbp_raw to be used in following commits. Signed-off-by: Gavin Li Reviewed-by: Roi Dayan Reviewed-by: Simon Horman --- lib/odp-util.c | 2 +- lib/odp-util.h | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/lib/odp-util.c b/lib/odp-util.c index f62dc86c5f9e..bf34c61fec58 100644 --- a/lib/odp-util.c +++ b/lib/odp-util.c @@ -3281,7 +3281,7 @@ tun_key_to_attr(struct ofpbuf *a, const struct flow_tnl *tun_key, vxlan_opts_ofs = nl_msg_start_nested(a, OVS_TUNNEL_KEY_ATTR_VXLAN_OPTS); nl_msg_put_u32(a, OVS_VXLAN_EXT_GBP, - (tun_key->gbp_flags << 16) | ntohs(tun_key->gbp_id)); + odp_encode_gbp_raw(tun_key->gbp_flags, tun_key->gbp_id)); nl_msg_end_nested(a, vxlan_opts_ofs); } diff --git a/lib/odp-util.h b/lib/odp-util.h index cf762bdc3547..163efe7a87b5 100644 --- a/lib/odp-util.h +++ b/lib/odp-util.h @@ -382,6 +382,11 @@ static inline void odp_decode_gbp_raw(uint32_t gbp_raw, *flags = (gbp_raw >> 16) & 0xFF; } +static inline uint32_t odp_encode_gbp_raw(uint8_t flags, ovs_be16 id) +{ + return (flags << 16) | ntohs(id); +} + struct attr_len_tbl { int len; const struct attr_len_tbl *next;