From patchwork Tue Apr 25 12:41:18 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Roi Dayan X-Patchwork-Id: 1773397 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=WihFrQtW; 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 4Q5M8j4bqgz23td for ; Tue, 25 Apr 2023 22:42:29 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id D280D417A3; Tue, 25 Apr 2023 12:42:27 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org D280D417A3 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=WihFrQtW 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 FV41c0PoJW1D; Tue, 25 Apr 2023 12:42:27 +0000 (UTC) Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [140.211.9.56]) by smtp4.osuosl.org (Postfix) with ESMTPS id E749941805; Tue, 25 Apr 2023 12:42:25 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org E749941805 Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id 8D897C0036; Tue, 25 Apr 2023 12:42:25 +0000 (UTC) X-Original-To: dev@openvswitch.org Delivered-To: ovs-dev@lists.linuxfoundation.org Received: from smtp4.osuosl.org (smtp4.osuosl.org [IPv6:2605:bc80:3010::137]) by lists.linuxfoundation.org (Postfix) with ESMTP id 0E7D5C002A for ; Tue, 25 Apr 2023 12:42:24 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id C7815417DE for ; Tue, 25 Apr 2023 12:42:23 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org C7815417DE 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 iwjvALFgtv9F for ; Tue, 25 Apr 2023 12:42:23 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.8.0 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org B738E408B3 Received: from NAM02-DM3-obe.outbound.protection.outlook.com (mail-dm3nam02on20625.outbound.protection.outlook.com [IPv6:2a01:111:f400:7e83::625]) by smtp4.osuosl.org (Postfix) with ESMTPS id B738E408B3 for ; Tue, 25 Apr 2023 12:42:22 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=iaiMwmG0nl7NjXJ/Cs8ee7Gst/NF4TX7ZyFJ6hy+XqAl6ntlfYYxbPp9KSLTpBUPjEX/B4Qc4YD01o1zcnEZDC2MDxJQzlMrv30GVqPB6OCAbEp6483xc6TGbddWLAJeKDGwRm2vj3ohaehPWOqeOEZy69WR/cBhN1++u9zKffPVPA7qNKZzCCBJWG0dQosiM8eTKssXteu+eEsslvdoATS82gdPRjz13bToGZU9KvtsznP5J7Ne2Mu5JuyllPWlDyGd2khnrYC5Qdmcak8b3BGIdXSQH2yfmojQ5QwglS+sof7vLsvvh+LpfOO5AdDfQFEfiX7b/aCmqEYBOcn99Q== 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=AO9kJYGmZeBIBNc15XzS3rtgMMsXfZQAIx3AIR59Th8=; b=l5C1p1nNz3h+PkFOIKCUQwXvNj4gHZWsk9VHOIyJfsv3ytgTPUCrCIRZsPs0qceo+SJ4B7TPFvfOK5Yx+FkwOuOsWE1DL1OjlC1sBNyocVV1bdE+AUUd0Zf2Zme+ZqGlohBRJTuxE8aQEBsK26dUNwbj4l49s7Snz/bywG+JEke+2TD1OPZh6q0CvCDs6tiMEM8hAATte1Bi8xfePslqdvXbzqomQxFK0zM91xR203xtMceG5NuSX61KZHEHpQjZtCkblXNh69D1HXETNCvVNQjTdwh1dAuzHN2dipASlow5t3gK20G/Sqoglj5GKtWfr9JOPIWsBmBfSjNmcnlcwA== 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 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=AO9kJYGmZeBIBNc15XzS3rtgMMsXfZQAIx3AIR59Th8=; b=WihFrQtWUKhW5g90MCH5whdtz8b0I6EEi+hSOgAcge/SgD06UYitI9b3GgT9bTclDe3F8XuXY6p/xhTzoTY1PWt0W+USxOtsw4kP86tVOGKsI5AJfXrTPWH1N24ZYjIYidS66e6CpdLPDI56O20szUCjHKKa/+cVLgfiLUpM0NrDDBr247f37jN+YEU/rVlkDsz4ulIh1o5VfRn23T3zktcwLek5nNOMQBFx7O1n53id8G8Rj72OJDbNzQKvFYdBfQtuZ4QW5VhnbsbA1PSsuCsuojDLleNIhif9WwoHJ6e8PCbgYqbPeYQ+hBCHCK5aKjM88krmi9UXOm/Qxd98yg== Received: from MW4PR03CA0235.namprd03.prod.outlook.com (2603:10b6:303:b9::30) by PH0PR12MB7960.namprd12.prod.outlook.com (2603:10b6:510:287::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6298.45; Tue, 25 Apr 2023 12:42:18 +0000 Received: from CO1NAM11FT114.eop-nam11.prod.protection.outlook.com (2603:10b6:303:b9:cafe::17) by MW4PR03CA0235.outlook.office365.com (2603:10b6:303:b9::30) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6319.34 via Frontend Transport; Tue, 25 Apr 2023 12:42:18 +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 CO1NAM11FT114.mail.protection.outlook.com (10.13.174.103) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6340.20 via Frontend Transport; Tue, 25 Apr 2023 12:42:17 +0000 Received: from rnnvmail204.nvidia.com (10.129.68.6) 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.5; Tue, 25 Apr 2023 05:42:07 -0700 Received: from rnnvmail205.nvidia.com (10.129.68.10) by rnnvmail204.nvidia.com (10.129.68.6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.37; Tue, 25 Apr 2023 05:42:06 -0700 Received: from dev-r-vrt-138.mtr.labs.mlnx (10.127.8.10) by mail.nvidia.com (10.129.68.10) with Microsoft SMTP Server id 15.2.986.37 via Frontend Transport; Tue, 25 Apr 2023 05:42:04 -0700 To: Date: Tue, 25 Apr 2023 15:41:18 +0300 Message-ID: <20230425124122.2443376-4-roid@nvidia.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230425124122.2443376-1-roid@nvidia.com> References: <20230425124122.2443376-1-roid@nvidia.com> MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CO1NAM11FT114:EE_|PH0PR12MB7960:EE_ X-MS-Office365-Filtering-Correlation-Id: 044cf435-775d-4484-30b0-08db458a814d X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: gLjVpwLt08HWB0U/3lP2yW9+g+yhODRPsEOxZZbFLAz533KfwQTVyPwZCYg/lAuXJnDIHnbHZVTpKUA8dUZzF7155CFeeiUBEegTSuswnYEsOBVPc5rWvymXooKV8h1/9LY1FUM1hoEY0cH8X8NnnqWJ8UWUmmQlmJYTYptb069i1L40MoCfMq0QvlnRIR/fNfBw2dIy7ctYub4UgyQX7MPUukSyDfDoEYT+KFJ1wJnf8fhKnEQ2vIA+KdvWiOyoZuBxUao6mdYcAvNbL5SX3oAcF7ROZGe1rb3q+k/zcUerUN+C/eaqdRQGe11pWCl7VnAAJSLw1CQgPmnl9X1Ga2Qdiv4FiHb+PhuUfEG1Cpi5AlK6Ra9du3XeQzx66GPJp92pmmTUiCXs59dUlpzOIrgU21S1kpWsdZiIE47Xqb0+6dn7AwWCnQUgqUKz4HJoR/tCJbRe9IbBlw5IQf4c6XMEbPtXF2myyA0oEXvTICF08JsVD8YYzBTVdXLKINmv4d1NpVnzYbtpieZi1e989vmCft8opooOT694gf8RCz2TmAEdWZdwZ3SevNazPPub8d2SQs3Z9GQXL9fp3c2LDHiwMtyhY3ZSFEi1ZF2qNmyrnwbGaU9mv+7of8pZW5h3I2A6hk24834nuFD2HelVmr9B4XGonnlnmW06c9IscXc5hrSLN1FRg5hHbBaktv4I2VmtpmZmO9wJkc7Kdq1MqIXE+GdXtqLuyFBPOXEkGZ4= 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:(13230028)(4636009)(136003)(376002)(39860400002)(396003)(346002)(451199021)(46966006)(36840700001)(40470700004)(478600001)(4326008)(6666004)(8676002)(8936002)(34020700004)(40480700001)(316002)(41300700001)(82740400003)(70586007)(70206006)(6916009)(54906003)(7636003)(356005)(40460700003)(36756003)(1076003)(2906002)(36860700001)(107886003)(86362001)(26005)(336012)(426003)(83380400001)(82310400005)(47076005)(2616005)(5660300002)(186003); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Apr 2023 12:42:17.9086 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 044cf435-775d-4484-30b0-08db458a814d 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: CO1NAM11FT114.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH0PR12MB7960 Cc: Simon Horman , Gavi Teitz , Ilya Maximets , Gavin Li Subject: [ovs-dev] [PATCH v2 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;