From patchwork Tue Dec 7 16:51:46 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Flavio Leitner X-Patchwork-Id: 1564781 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=qiZY6YZU; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=openvswitch.org (client-ip=140.211.166.133; helo=smtp2.osuosl.org; envelope-from=ovs-dev-bounces@openvswitch.org; receiver=) Received: from smtp2.osuosl.org (smtp2.osuosl.org [140.211.166.133]) (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 4J7mZg2pD6z9s1l for ; Wed, 8 Dec 2021 03:53:15 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id 37DBB40997; Tue, 7 Dec 2021 16:53:13 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp2.osuosl.org ([127.0.0.1]) by localhost (smtp2.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id iqQoIWlt1NOF; Tue, 7 Dec 2021 16:53:11 +0000 (UTC) Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [IPv6:2605:bc80:3010:104::8cd3:938]) by smtp2.osuosl.org (Postfix) with ESMTPS id F1E6940932; Tue, 7 Dec 2021 16:53:08 +0000 (UTC) Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id C4C5BC002F; Tue, 7 Dec 2021 16:53:08 +0000 (UTC) X-Original-To: dev@openvswitch.org Delivered-To: ovs-dev@lists.linuxfoundation.org Received: from smtp1.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by lists.linuxfoundation.org (Postfix) with ESMTP id 18FDBC002F for ; Tue, 7 Dec 2021 16:53:07 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id 8528183F05 for ; Tue, 7 Dec 2021 16:52:40 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Authentication-Results: smtp1.osuosl.org (amavisd-new); dkim=pass (2048-bit key) header.d=sysclose.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 vCiFfbckIfhx for ; Tue, 7 Dec 2021 16:52:39 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.8.0 Received: from sysclose.org (smtp.sysclose.org [69.164.214.230]) by smtp1.osuosl.org (Postfix) with ESMTPS id C6C7583E9B for ; Tue, 7 Dec 2021 16:52:39 +0000 (UTC) Received: from localhost (unknown [131.100.62.140]) by sysclose.org (Postfix) with ESMTPSA id EAC6C2C17; Tue, 7 Dec 2021 16:53:09 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 sysclose.org EAC6C2C17 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sysclose.org; s=201903; t=1638895990; bh=utKxlvPgJ+63RYmisKP8Snl/uAdAES5jnwOfzvrLMKo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=qiZY6YZUOgXO2QAjSUSVnybLZTVx8890eugXDs4873EbQZmx0SqcuztjuapIXGna3 wIDB72C7D5Y0/Uf6p14GcuVkYZ2+Bnm84yJxihVV0ndpMN3UN0uKrJAVOnUnSe/o+W OcMCTgNcBI9/m7bEffh/+oEbYAuf1+nbWVBDRt+NNgkLRf4EjzuswJcVRD/7KhYhRB cAoRY3Gaw4W6fykW9u7EQ5kTPIZ3TFPXr1SwuzwBSg2y4nuxhF5+NfReNEQA7GvNP3 8B2Nu5pq2Ii3FN3TYn+Ul/+HrNuIugVqFz1SjzMKNXpXk63sgqwqnYlaKEiHOT6VAB IXqKR0iH59QuA== From: Flavio Leitner To: dev@openvswitch.org Date: Tue, 7 Dec 2021 13:51:46 -0300 Message-Id: <20211207165156.705727-8-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] 07/17] dp-packet: Rename dp_packet_ol_tcp_seg 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" Rename to dp_packet_ol_tcp_seg, because that is less redundant and allows other protocols. Signed-off-by: Flavio Leitner --- lib/dp-packet.h | 2 +- lib/netdev-linux.c | 2 +- lib/netdev.c | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/dp-packet.h b/lib/dp-packet.h index 8b06e457b..614ebbb4d 100644 --- a/lib/dp-packet.h +++ b/lib/dp-packet.h @@ -972,7 +972,7 @@ dp_packet_ol_tx_l4_csum(const struct dp_packet *p) /* Returns 'true' if packet 'p' is marked for TCP segmentation offloading. */ static inline bool -dp_packet_ol_is_tso(const struct dp_packet *p) +dp_packet_ol_tcp_seg(const struct dp_packet *p) { return !!(*dp_packet_ol_flags_ptr(p) & DP_PACKET_OL_TX_TCP_SEG); } diff --git a/lib/netdev-linux.c b/lib/netdev-linux.c index 35e3e1e79..5d0af5a40 100644 --- a/lib/netdev-linux.c +++ b/lib/netdev-linux.c @@ -6665,7 +6665,7 @@ netdev_linux_prepend_vnet_hdr(struct dp_packet *b, int mtu) { struct virtio_net_hdr *vnet = dp_packet_push_zeros(b, sizeof *vnet); - if (dp_packet_ol_is_tso(b)) { + if (dp_packet_ol_tcp_seg(b)) { uint16_t hdr_len = ((char *)dp_packet_l4(b) - (char *)dp_packet_eth(b)) + TCP_HEADER_LEN; diff --git a/lib/netdev.c b/lib/netdev.c index d087929e5..fb535ed7c 100644 --- a/lib/netdev.c +++ b/lib/netdev.c @@ -794,7 +794,7 @@ netdev_send_prepare_packet(const uint64_t netdev_flags, { uint64_t l4_mask; - if (dp_packet_ol_is_tso(packet) + if (dp_packet_ol_tcp_seg(packet) && !(netdev_flags & NETDEV_OFFLOAD_TX_TCP_TSO)) { /* Fall back to GSO in software. */ VLOG_ERR_BUF(errormsg, "No TSO support"); @@ -960,7 +960,7 @@ netdev_push_header(const struct netdev *netdev, size_t i, size = dp_packet_batch_size(batch); DP_PACKET_BATCH_REFILL_FOR_EACH (i, size, packet, batch) { - if (OVS_UNLIKELY(dp_packet_ol_is_tso(packet) + if (OVS_UNLIKELY(dp_packet_ol_tcp_seg(packet) || dp_packet_ol_l4_mask(packet))) { COVERAGE_INC(netdev_push_header_drops); dp_packet_delete(packet);