From patchwork Sun Jul 4 09:40:03 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: miter X-Patchwork-Id: 1500410 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=openvswitch.org (client-ip=140.211.166.138; helo=smtp1.osuosl.org; envelope-from=ovs-dev-bounces@openvswitch.org; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=outlook.com header.i=@outlook.com header.a=rsa-sha256 header.s=selector1 header.b=mkt/4zQc; dkim-atps=neutral Received: from smtp1.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4GHkM23Dd0z9sX1 for ; Sun, 4 Jul 2021 19:40:14 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id BCD3D83B84; Sun, 4 Jul 2021 09:40:12 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp1.osuosl.org ([127.0.0.1]) by localhost (smtp1.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 16Ny1oJcHNdS; Sun, 4 Jul 2021 09:40:11 +0000 (UTC) Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [140.211.9.56]) by smtp1.osuosl.org (Postfix) with ESMTPS id DBC6683B66; Sun, 4 Jul 2021 09:40:10 +0000 (UTC) Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id A7F1DC001A; Sun, 4 Jul 2021 09:40:10 +0000 (UTC) X-Original-To: dev@openvswitch.org Delivered-To: ovs-dev@lists.linuxfoundation.org Received: from smtp1.osuosl.org (smtp1.osuosl.org [IPv6:2605:bc80:3010::138]) by lists.linuxfoundation.org (Postfix) with ESMTP id 3FFD7C000E for ; Sun, 4 Jul 2021 09:40:09 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id 1154483B7D for ; Sun, 4 Jul 2021 09:40:09 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp1.osuosl.org ([127.0.0.1]) by localhost (smtp1.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id wgrpX0gCEzEw for ; Sun, 4 Jul 2021 09:40:08 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.8.0 Received: from AUS01-SY4-obe.outbound.protection.outlook.com (mail-sy4aus01olkn2186.outbound.protection.outlook.com [40.92.62.186]) by smtp1.osuosl.org (Postfix) with ESMTPS id E87B983B66 for ; Sun, 4 Jul 2021 09:40:07 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=IJyryLpFRPINLSTr/GfJPCKZ1BhQVs8cjW2KkfRq0LfY1LxTZDbhESQjKzXH3duncEHSORDrarvrBmVIiCtE39RyNXVwYrG7ZctbPCDjakThbULbvcDZKeZgZojdWG6tDd+WHd2jbAURTRuPovVBfRGngw/1tlBGu1S+mSsaT+fdzGRXoXqEwd40J9bOtmduf2HeFnAeP0HAUkKiDnYe2yzKybiNjNQe48FWy1yjERVea/ZFSBzJsdFgXeU+QNPXGfh0zYBNK4WUgndYO8RX0qqdn/CJ/08Ayn31fF/4/XThPcmdYpOrKbtYXbBlnEORkYc8xkk9qvgHVtDeZigdYw== 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=s59sxup6sKwQpqdcSxUxUt4KKd+12S9Co+/TY6v/nWE=; b=gM04iwBEBevX/7cdaSo5cB8Ny8W//z7KXa3j0igZl5fe/EkvnqUf1vrzUy+qieLVtSzKpeHMg2GXG4cSWWSmUgOmsHGoiZ2CbDA3ASDGYxo1OzZKDLRrehBwThDNb7LFD+QQsRqpHYf+PXHorkqXootLe2p04SkDp0KtE2Ui321rfyoegzuCvJCm3TCD/lM1tFMHRl1Cg4CtNvp25slzIxnOSzzledbDU3AGjbAhcBy8Lk4782RSKjfmEq4w8yE8wo1xPOuOSvATih1tgLGZxTRxjka3ZSSag+PVL20FeGwrZ4/eJyQHY5absjd9+GuVHjKqMEIUgTFQWwqbm9mo9w== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=s59sxup6sKwQpqdcSxUxUt4KKd+12S9Co+/TY6v/nWE=; b=mkt/4zQcWkJZGJYNnHoB6XzilLbnEcN13Ip/WxFyxZfJwWmeoEC6JvjkxpCDn7BcZrYQLvS6vWNvxbhS5roFKiCsmnSjvyN/T9jf31QaZIIVwZoM5yCpBmzmBFhkJdN/IyAdTHytdQ8zXEt7bWUjVkVLO9l3FCBi9thxwc/e0J55C1oApzbVNNmJ2leZxF1nCgt8O70d66CfCjImz7kXvlyZMtQf7Nd6mMzh69N5e1d598AnZLdjHMJhlNnYSXNmMIMdqjC3yaK76BkAaoYgnZmdSGu7NbSt7BfVQtuwthnuYYqtb4iWhWmOGaFnT8CpjY4a919hxPTfqyCBs6iUxQ== Received: from MEYP282MB3302.AUSP282.PROD.OUTLOOK.COM (2603:10c6:220:15b::24) by MEYP282MB2861.AUSP282.PROD.OUTLOOK.COM (2603:10c6:220:156::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4287.24; Sun, 4 Jul 2021 09:40:03 +0000 Received: from MEYP282MB3302.AUSP282.PROD.OUTLOOK.COM ([fe80::dd71:a32a:32de:975]) by MEYP282MB3302.AUSP282.PROD.OUTLOOK.COM ([fe80::dd71:a32a:32de:975%6]) with mapi id 15.20.4287.033; Sun, 4 Jul 2021 09:40:03 +0000 From: lin huang To: "dev@openvswitch.org" , "u9012063@gmail.com" Thread-Topic: [PATCH] netdev-native-tnl : Fix netdev-native-tnl.c/.h coding style. Thread-Index: AQHXcLhzT6hMQsPVjEeMkCkVkYIpTQ== Date: Sun, 4 Jul 2021 09:40:03 +0000 Message-ID: Accept-Language: zh-CN, en-US Content-Language: zh-CN X-MS-Has-Attach: X-MS-TNEF-Correlator: x-tmn: [27bficGL4EQ5Ral7W2w1tmiFSjVGdSaM] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: e949cf52-1715-4aea-2009-08d93ecfb353 x-ms-traffictypediagnostic: MEYP282MB2861: x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: Y8LtSd3+k40g//HcbyzoBpRNAiYc5rFtRiKMsaUtG6VhlxqRz+0eI77eubJrKbyZOSarsI+lhQbdNSHZrMZS0ipvmG6qsdkA/sSEGn0COTP0n7QaxYYPTJLvHPoCJh0mSmBBM1RHJjBHczRjWfz6D891Bv9ul19MxgcQ3KnXSC+vBrwxFy6m0QFBDOKGNfTB1zvw6M5p6vz1uhphZZFveB30LDlADSA6uGBIGZG7dlSWox37RhPCQ+70QwK5ASFJF6bo/9CnI+CLqNRcMuNk0Vm+tfqceRFinqXzdggKZ2I4WgGM/EQNqCFzAhlQNKHpqgiRHCt5925OUlK8RwQXQ2rJicS9ROjeyXo+LWmvpr6IRAd4V/hOvlCr45e/Xxk8gg/POW+t3NDDXTgJpXCspXMGUUrfDaKqLoGBR+dNESVPyF/Jh2r9IfH/CUMy6pDi x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: zYtu7sTZhweodKH4iZN5LI5PawgZG3R62tsOKsBduiE66RbAFbLtvz+PE4NNtHcbFj7V8gc4ZcDfVlNOf9cO4p2ntu0ZItgnUUOdSxQgNHkJI/Bq3QVeufEGKSCZFzYu6VT6jq5u9ZIf9i9Pa7AEnQ== x-ms-exchange-transport-forked: True MIME-Version: 1.0 X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: MEYP282MB3302.AUSP282.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-CrossTenant-Network-Message-Id: e949cf52-1715-4aea-2009-08d93ecfb353 X-MS-Exchange-CrossTenant-originalarrivaltime: 04 Jul 2021 09:40:03.6043 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-rms-persistedconsumerorg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: MEYP282MB2861 Subject: [ovs-dev] [PATCH] netdev-native-tnl : Fix netdev-native-tnl.c/.h coding style. 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: , Errors-To: ovs-dev-bounces@openvswitch.org Sender: "dev" Fix indentation and whitespace. Signed-off-by: linhuang --- lib/netdev-native-tnl.c | 40 ++++++++++++++++++++++++---------------- lib/netdev-native-tnl.h | 5 +++-- 2 files changed, 27 insertions(+), 18 deletions(-) diff --git a/lib/netdev-native-tnl.c b/lib/netdev-native-tnl.c index b89dfdd52..f499e05ac 100644 --- a/lib/netdev-native-tnl.c +++ b/lib/netdev-native-tnl.c @@ -62,7 +62,7 @@ uint16_t tnl_udp_port_max = 61000; void * netdev_tnl_ip_extract_tnl_md(struct dp_packet *packet, struct flow_tnl *tnl, - unsigned int *hlen) + unsigned int *hlen) { void *nh; struct ip_header *ip; @@ -96,7 +96,8 @@ netdev_tnl_ip_extract_tnl_md(struct dp_packet *packet, struct flow_tnl *tnl, } if (ntohs(ip->ip_tot_len) > l3_size) { - VLOG_WARN_RL(&err_rl, "ip packet is truncated (IP length %d, actual %d)", + VLOG_WARN_RL(&err_rl, + "ip packet is truncated (IP length %d, actual %d)", ntohs(ip->ip_tot_len), l3_size); return NULL; } @@ -147,7 +148,7 @@ netdev_tnl_ip_extract_tnl_md(struct dp_packet *packet, struct flow_tnl *tnl, * Return pointer to the L4 header added to 'packet'. */ void * netdev_tnl_push_ip_header(struct dp_packet *packet, - const void *header, int size, int *ip_tot_size) + const void *header, int size, int *ip_tot_size) { struct eth_header *eth; struct ip_header *ip; @@ -245,7 +246,8 @@ netdev_tnl_push_udp_header(const struct netdev *netdev OVS_UNUSED, struct udp_header *udp; int ip_tot_size; - udp = netdev_tnl_push_ip_header(packet, data->header, data->header_len, &ip_tot_size); + udp = netdev_tnl_push_ip_header(packet, data->header, data->header_len, + &ip_tot_size); /* set udp src port */ udp->udp_src = netdev_tnl_get_src_port(packet); @@ -294,8 +296,8 @@ netdev_tnl_ip_build_header(struct ovs_action_push_tnl *data, put_16aligned_be32(&ip->ip_src, ip_src); put_16aligned_be32(&ip->ip_dst, params->flow->tunnel.ip_dst); - ip->ip_frag_off = (params->flow->tunnel.flags & FLOW_TNL_F_DONT_FRAGMENT) ? - htons(IP_DF) : 0; + ip->ip_frag_off = (params->flow->tunnel.flags + & FLOW_TNL_F_DONT_FRAGMENT) ? htons(IP_DF) : 0; /* Checksum has already been zeroed by eth_build_header. */ ip->ip_csum = csum(ip, sizeof *ip); @@ -312,7 +314,8 @@ netdev_tnl_ip_build_header(struct ovs_action_push_tnl *data, ip6->ip6_hlim = params->flow->tunnel.ip_ttl; ip6->ip6_nxt = next_proto; memcpy(&ip6->ip6_src, params->s_ip, sizeof(ovs_be32[4])); - memcpy(&ip6->ip6_dst, ¶ms->flow->tunnel.ipv6_dst, sizeof(ovs_be32[4])); + memcpy(&ip6->ip6_dst, ¶ms->flow->tunnel.ipv6_dst, + sizeof(ovs_be32[4])); data->header_len += IPV6_HEADER_LEN; return ip6 + 1; @@ -385,8 +388,8 @@ parse_gre_header(struct dp_packet *packet, ovs_be16 pkt_csum; pkt_csum = csum(greh, dp_packet_size(packet) - - ((const unsigned char *)greh - - (const unsigned char *)dp_packet_eth(packet))); + ((const unsigned char *)greh - + (const unsigned char *)dp_packet_eth(packet))); if (pkt_csum) { return -EINVAL; } @@ -456,7 +459,8 @@ netdev_gre_push_header(const struct netdev *netdev, struct gre_base_hdr *greh; int ip_tot_size; - greh = netdev_tnl_push_ip_header(packet, data->header, data->header_len, &ip_tot_size); + greh = netdev_tnl_push_ip_header(packet, data->header, data->header_len, + &ip_tot_size); if (greh->flags & htons(GRE_CSUM)) { ovs_be16 *csum_opt = (ovs_be16 *) (greh + 1); @@ -669,8 +673,8 @@ netdev_erspan_build_header(const struct netdev *netdev, set_sid(ersh, sid); uint32_t erspan_idx = (tnl_cfg->erspan_idx_flow - ? params->flow->tunnel.erspan_idx - : tnl_cfg->erspan_idx); + ? params->flow->tunnel.erspan_idx + : tnl_cfg->erspan_idx); put_16aligned_be32(ALIGNED_CAST(ovs_16aligned_be32 *, ersh + 1), htonl(erspan_idx)); @@ -982,7 +986,8 @@ netdev_geneve_pop_header(struct dp_packet *packet) pkt_metadata_init_tnl(md); if (GENEVE_BASE_HLEN > dp_packet_l4_size(packet)) { - VLOG_WARN_RL(&err_rl, "geneve packet too small: min header=%u packet size=%"PRIuSIZE"\n", + VLOG_WARN_RL(&err_rl, "geneve packet too small: " + "min header=%u packet size=%"PRIuSIZE"\n", (unsigned int)GENEVE_BASE_HLEN, dp_packet_l4_size(packet)); goto err; } @@ -995,7 +1000,8 @@ netdev_geneve_pop_header(struct dp_packet *packet) opts_len = gnh->opt_len * 4; hlen = ulen + GENEVE_BASE_HLEN + opts_len; if (hlen > dp_packet_size(packet)) { - VLOG_WARN_RL(&err_rl, "geneve packet too small: header len=%u packet size=%u\n", + VLOG_WARN_RL(&err_rl, "geneve packet too small: " + "header len=%u packet size=%u\n", hlen, dp_packet_size(packet)); goto err; } @@ -1045,7 +1051,8 @@ netdev_geneve_build_header(const struct netdev *netdev, gnh = udp_build_header(tnl_cfg, data, params); - put_16aligned_be32(&gnh->vni, htonl(ntohll(params->flow->tunnel.tun_id) << 8)); + put_16aligned_be32(&gnh->vni, + htonl(ntohll(params->flow->tunnel.tun_id) << 8)); ovs_mutex_unlock(&dev->mutex); @@ -1072,7 +1079,8 @@ netdev_tnl_egress_port_range(struct unixctl_conn *conn, int argc, if (argc < 3) { struct ds ds = DS_EMPTY_INITIALIZER; - ds_put_format(&ds, "Tunnel UDP source port range: %"PRIu16"-%"PRIu16"\n", + ds_put_format(&ds, "Tunnel UDP source port range: " + "%"PRIu16"-%"PRIu16"\n", tnl_udp_port_min, tnl_udp_port_max); unixctl_command_reply(conn, ds_cstr(&ds)); diff --git a/lib/netdev-native-tnl.h b/lib/netdev-native-tnl.h index 22ae2ce53..f84542a2b 100644 --- a/lib/netdev-native-tnl.h +++ b/lib/netdev-native-tnl.h @@ -120,8 +120,9 @@ netdev_tnl_get_src_port(struct dp_packet *packet) hash = dp_packet_get_rss_hash(packet); - return htons((((uint64_t) hash * (tnl_udp_port_max - tnl_udp_port_min)) >> 32) + - tnl_udp_port_min); + return htons((((uint64_t) hash * + (tnl_udp_port_max - tnl_udp_port_min)) >> 32) + + tnl_udp_port_min); } void *