From patchwork Tue Dec 7 16:51:40 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Flavio Leitner X-Patchwork-Id: 1564776 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=sysclose.org header.i=@sysclose.org header.a=rsa-sha256 header.s=201903 header.b=fbfTPsVD; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=openvswitch.org (client-ip=140.211.166.137; helo=smtp4.osuosl.org; envelope-from=ovs-dev-bounces@openvswitch.org; receiver=) Received: from smtp4.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (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 bilbo.ozlabs.org (Postfix) with ESMTPS id 4J7mYg6FnQz9s1l for ; Wed, 8 Dec 2021 03:52:23 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id 3E02841C84; Tue, 7 Dec 2021 16:52:21 +0000 (UTC) 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 cWw_BtEY7_Vf; Tue, 7 Dec 2021 16:52:20 +0000 (UTC) Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [IPv6:2605:bc80:3010:104::8cd3:938]) by smtp4.osuosl.org (Postfix) with ESMTPS id 1C625403C6; Tue, 7 Dec 2021 16:52:19 +0000 (UTC) Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id D9866C002F; Tue, 7 Dec 2021 16:52:18 +0000 (UTC) X-Original-To: dev@openvswitch.org Delivered-To: ovs-dev@lists.linuxfoundation.org Received: from smtp3.osuosl.org (smtp3.osuosl.org [IPv6:2605:bc80:3010::136]) by lists.linuxfoundation.org (Postfix) with ESMTP id 8B6B7C002F for ; Tue, 7 Dec 2021 16:52:17 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id 6A9A1600CA for ; Tue, 7 Dec 2021 16:52:17 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Authentication-Results: smtp3.osuosl.org (amavisd-new); dkim=pass (2048-bit key) header.d=sysclose.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 IbGtJOTEKGhg for ; Tue, 7 Dec 2021 16:52:16 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.8.0 Received: from sysclose.org (smtp.sysclose.org [69.164.214.230]) by smtp3.osuosl.org (Postfix) with ESMTPS id A294260EAE for ; Tue, 7 Dec 2021 16:52:16 +0000 (UTC) Received: from localhost (unknown [131.100.62.140]) by sysclose.org (Postfix) with ESMTPSA id D54C32AA9; Tue, 7 Dec 2021 16:52:46 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 sysclose.org D54C32AA9 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sysclose.org; s=201903; t=1638895967; bh=jAO5SYX2wau+0DGjniIS2q1oRXSioHnsfD7FzMI2Bp4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=fbfTPsVDNmmlsM42hjwkhHCNsDSoNiQUUcLEW7EDt6WcyAL0T4sjOYXCvC6ohJDv7 ISkGxDRrDoZ0SY3Vd0y85YQ/2s/cg3vc+mV7/C8aEcl1ff4I4Hi3OMnKJpcyLsyWuJ 5WmVN7BsgbXPoLrMeyaVXw+BeIpb16RTSlIRRbk/VRuBcx7pxO8IPVFbIGsxO5o3RW A3eUX6mdFd2Mu2g8c/w1528otqgenWqF3v9ldvG6/O1nUvF84ZuVsJ9Z/HtoFRV4EO T1jP0G5wqp5JJPfwAraFZLfLz8GX0MKrFpY3VNDDKq1zH+bBCA0WvFbvlOUuCEhBjd H9w7tKWoYG+BQ== From: Flavio Leitner To: dev@openvswitch.org Date: Tue, 7 Dec 2021 13:51:40 -0300 Message-Id: <20211207165156.705727-2-fbl@sysclose.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20211207165156.705727-1-fbl@sysclose.org> References: <20211207165156.705727-1-fbl@sysclose.org> MIME-Version: 1.0 Cc: Flavio Leitner Subject: [ovs-dev] [[PATCH RFC] 01/17] Rename checksum to csum in hwol functions. 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" It seems csum is more common and shorter. Signed-off-by: Flavio Leitner --- lib/conntrack.c | 12 ++++++------ lib/dp-packet.h | 10 +++++----- lib/ipf.c | 4 ++-- lib/netdev-native-tnl.c | 4 ++-- 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/lib/conntrack.c b/lib/conntrack.c index 33a1a9295..e84ec4aee 100644 --- a/lib/conntrack.c +++ b/lib/conntrack.c @@ -2089,12 +2089,12 @@ conn_key_extract(struct conntrack *ct, struct dp_packet *pkt, ovs_be16 dl_type, ctx->key.dl_type = dl_type; if (ctx->key.dl_type == htons(ETH_TYPE_IP)) { - bool hwol_bad_l3_csum = dp_packet_ip_checksum_bad(pkt); + bool hwol_bad_l3_csum = dp_packet_ip_csum_bad(pkt); if (hwol_bad_l3_csum) { ok = false; COVERAGE_INC(conntrack_l3csum_err); } else { - bool hwol_good_l3_csum = dp_packet_ip_checksum_valid(pkt) + bool hwol_good_l3_csum = dp_packet_ip_csum_valid(pkt) || dp_packet_hwol_is_ipv4(pkt); /* Validate the checksum only when hwol is not supported. */ ok = extract_l3_ipv4(&ctx->key, l3, dp_packet_l3_size(pkt), NULL, @@ -2107,10 +2107,10 @@ conn_key_extract(struct conntrack *ct, struct dp_packet *pkt, ovs_be16 dl_type, } if (ok) { - bool hwol_bad_l4_csum = dp_packet_l4_checksum_bad(pkt); + bool hwol_bad_l4_csum = dp_packet_l4_csum_bad(pkt); if (!hwol_bad_l4_csum) { - bool hwol_good_l4_csum = dp_packet_l4_checksum_valid(pkt) - || dp_packet_hwol_tx_l4_checksum(pkt); + bool hwol_good_l4_csum = dp_packet_l4_csum_valid(pkt) + || dp_packet_hwol_tx_l4_csum(pkt); /* Validate the checksum only when hwol is not supported. */ if (extract_l4(&ctx->key, l4, dp_packet_l4_size(pkt), &ctx->icmp_related, l3, !hwol_good_l4_csum, @@ -3424,7 +3424,7 @@ handle_ftp_ctl(struct conntrack *ct, const struct conn_lookup_ctx *ctx, } th->tcp_csum = 0; - if (!dp_packet_hwol_tx_l4_checksum(pkt)) { + if (!dp_packet_hwol_tx_l4_csum(pkt)) { if (ctx->key.dl_type == htons(ETH_TYPE_IPV6)) { th->tcp_csum = packet_csum_upperlayer6(nh6, th, ctx->key.nw_proto, dp_packet_l4_size(pkt)); diff --git a/lib/dp-packet.h b/lib/dp-packet.h index 3dc582fbf..ee8451496 100644 --- a/lib/dp-packet.h +++ b/lib/dp-packet.h @@ -965,7 +965,7 @@ dp_packet_hwol_l4_mask(const struct dp_packet *b) /* Return true if the packet 'b' requested L4 checksum offload. */ static inline bool -dp_packet_hwol_tx_l4_checksum(const struct dp_packet *b) +dp_packet_hwol_tx_l4_csum(const struct dp_packet *b) { return !!dp_packet_hwol_l4_mask(b); } @@ -1056,28 +1056,28 @@ dp_packet_hwol_set_tcp_seg(struct dp_packet *b) } static inline bool -dp_packet_ip_checksum_valid(const struct dp_packet *p) +dp_packet_ip_csum_valid(const struct dp_packet *p) { return (*dp_packet_ol_flags_ptr(p) & DP_PACKET_OL_RX_IP_CKSUM_MASK) == DP_PACKET_OL_RX_IP_CKSUM_GOOD; } static inline bool -dp_packet_ip_checksum_bad(const struct dp_packet *p) +dp_packet_ip_csum_bad(const struct dp_packet *p) { return (*dp_packet_ol_flags_ptr(p) & DP_PACKET_OL_RX_IP_CKSUM_MASK) == DP_PACKET_OL_RX_IP_CKSUM_BAD; } static inline bool -dp_packet_l4_checksum_valid(const struct dp_packet *p) +dp_packet_l4_csum_valid(const struct dp_packet *p) { return (*dp_packet_ol_flags_ptr(p) & DP_PACKET_OL_RX_L4_CKSUM_MASK) == DP_PACKET_OL_RX_L4_CKSUM_GOOD; } static inline bool -dp_packet_l4_checksum_bad(const struct dp_packet *p) +dp_packet_l4_csum_bad(const struct dp_packet *p) { return (*dp_packet_ol_flags_ptr(p) & DP_PACKET_OL_RX_L4_CKSUM_MASK) == DP_PACKET_OL_RX_L4_CKSUM_BAD; diff --git a/lib/ipf.c b/lib/ipf.c index 507db2aea..013c4cfba 100644 --- a/lib/ipf.c +++ b/lib/ipf.c @@ -574,7 +574,7 @@ ipf_list_state_transition(struct ipf *ipf, struct ipf_list *ipf_list, static bool ipf_is_valid_v4_frag(struct ipf *ipf, struct dp_packet *pkt) { - if (OVS_UNLIKELY(dp_packet_ip_checksum_bad(pkt))) { + if (OVS_UNLIKELY(dp_packet_ip_csum_bad(pkt))) { COVERAGE_INC(ipf_l3csum_err); goto invalid_pkt; } @@ -608,7 +608,7 @@ ipf_is_valid_v4_frag(struct ipf *ipf, struct dp_packet *pkt) goto invalid_pkt; } - if (OVS_UNLIKELY(!dp_packet_ip_checksum_valid(pkt) + if (OVS_UNLIKELY(!dp_packet_ip_csum_valid(pkt) && !dp_packet_hwol_is_ipv4(pkt) && csum(l3, ip_hdr_len) != 0)) { COVERAGE_INC(ipf_l3csum_err); diff --git a/lib/netdev-native-tnl.c b/lib/netdev-native-tnl.c index b89dfdd52..2de424105 100644 --- a/lib/netdev-native-tnl.c +++ b/lib/netdev-native-tnl.c @@ -88,7 +88,7 @@ netdev_tnl_ip_extract_tnl_md(struct dp_packet *packet, struct flow_tnl *tnl, ovs_be32 ip_src, ip_dst; - if (OVS_UNLIKELY(!dp_packet_ip_checksum_valid(packet))) { + if (OVS_UNLIKELY(!dp_packet_ip_csum_valid(packet))) { if (csum(ip, IP_IHL(ip->ip_ihl_ver) * 4)) { VLOG_WARN_RL(&err_rl, "ip packet has invalid checksum"); return NULL; @@ -190,7 +190,7 @@ udp_extract_tnl_md(struct dp_packet *packet, struct flow_tnl *tnl, } if (udp->udp_csum) { - if (OVS_UNLIKELY(!dp_packet_l4_checksum_valid(packet))) { + if (OVS_UNLIKELY(!dp_packet_l4_csum_valid(packet))) { uint32_t csum; if (netdev_tnl_is_header_ipv6(dp_packet_data(packet))) { csum = packet_csum_pseudoheader6(dp_packet_l3(packet));