From patchwork Tue Dec 7 16:51:42 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Flavio Leitner X-Patchwork-Id: 1564778 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=PWNKMVqm; dkim-atps=neutral Authentication-Results: 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=) 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 RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4J7mYt6zrGz9s1l for ; Wed, 8 Dec 2021 03:52:34 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id B4F9041CAE; Tue, 7 Dec 2021 16:52:32 +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 ZVk4B4-iUrck; Tue, 7 Dec 2021 16:52:31 +0000 (UTC) Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [140.211.9.56]) by smtp4.osuosl.org (Postfix) with ESMTPS id C655341D4A; Tue, 7 Dec 2021 16:52:30 +0000 (UTC) Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id 9E2F4C002F; Tue, 7 Dec 2021 16:52:30 +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 3045DC0030 for ; Tue, 7 Dec 2021 16:52:29 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id 19FD660EBB for ; Tue, 7 Dec 2021 16:52:26 +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 7VyEw7XL4eNC for ; Tue, 7 Dec 2021 16:52:25 +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 3227560EB5 for ; Tue, 7 Dec 2021 16:52:25 +0000 (UTC) Received: from localhost (unknown [131.100.62.140]) by sysclose.org (Postfix) with ESMTPSA id 461432C17; Tue, 7 Dec 2021 16:52:55 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 sysclose.org 461432C17 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sysclose.org; s=201903; t=1638895975; bh=XJ0tzvmPt1w655nuU5q9s4TCsrPD/u4zpQkDkX68r2k=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=PWNKMVqmlsGew3I24SgHF5Mdj3zmqwYgHhnVM/OMDoAKQiJqc4pqVsK97p/T/zesC wytp5NOuIMXZzDwuyYKRJZoMxHrVffdyhFxM6fdzk1prCyK0VAvVoey/+IaSZhogD4 UimiXr+QlZGaZYSaUcwxGyN2gA0FpDgiqa1OMOPRtQITBR3H4zaH2xMK8hffIKOpAA sUIWveeix1v6K/PvmhrbwhiyNwOyxoUZMGa84Nr6YvtYTBe6djErSTSKUNeerwcuKi kx9iqRs4mpp5uQCEDwgtSJ2190e2DJpPjIUTPra5VR+khNkZksRkpun313579JMmdn FyV+2KpfRoT8g== From: Flavio Leitner To: dev@openvswitch.org Date: Tue, 7 Dec 2021 13:51:42 -0300 Message-Id: <20211207165156.705727-4-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] 03/17] Prefix netdev offload flags with NETDEV_OFFLOAD_. 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" Use the 'NETDEV_OFFLOAD_' prefix in the flags to indicate we are talking about hardware offloading capabilities. Signed-off-by: Flavio Leitner --- lib/netdev-dpdk.c | 20 ++++++++++---------- lib/netdev-linux.c | 10 +++++----- lib/netdev-provider.h | 10 +++++----- lib/netdev.c | 8 ++++---- 4 files changed, 24 insertions(+), 24 deletions(-) diff --git a/lib/netdev-dpdk.c b/lib/netdev-dpdk.c index 6fbf19ada..c4618eb22 100644 --- a/lib/netdev-dpdk.c +++ b/lib/netdev-dpdk.c @@ -5006,12 +5006,12 @@ netdev_dpdk_reconfigure(struct netdev *netdev) err = dpdk_eth_dev_init(dev); if (dev->hw_ol_features & NETDEV_TX_TSO_OFFLOAD) { - netdev->ol_flags |= NETDEV_TX_OFFLOAD_TCP_TSO; - netdev->ol_flags |= NETDEV_TX_OFFLOAD_TCP_CSUM; - netdev->ol_flags |= NETDEV_TX_OFFLOAD_UDP_CSUM; - netdev->ol_flags |= NETDEV_TX_OFFLOAD_IPV4_CSUM; + netdev->ol_flags |= NETDEV_OFFLOAD_TX_TCP_TSO; + netdev->ol_flags |= NETDEV_OFFLOAD_TX_TCP_CSUM; + netdev->ol_flags |= NETDEV_OFFLOAD_TX_UDP_CSUM; + netdev->ol_flags |= NETDEV_OFFLOAD_TX_IPV4_CSUM; if (dev->hw_ol_features & NETDEV_TX_SCTP_CHECKSUM_OFFLOAD) { - netdev->ol_flags |= NETDEV_TX_OFFLOAD_SCTP_CSUM; + netdev->ol_flags |= NETDEV_OFFLOAD_TX_SCTP_CSUM; } } @@ -5153,11 +5153,11 @@ netdev_dpdk_vhost_client_reconfigure(struct netdev *netdev) } if (userspace_tso_enabled()) { - netdev->ol_flags |= NETDEV_TX_OFFLOAD_TCP_TSO; - netdev->ol_flags |= NETDEV_TX_OFFLOAD_TCP_CSUM; - netdev->ol_flags |= NETDEV_TX_OFFLOAD_UDP_CSUM; - netdev->ol_flags |= NETDEV_TX_OFFLOAD_SCTP_CSUM; - netdev->ol_flags |= NETDEV_TX_OFFLOAD_IPV4_CSUM; + netdev->ol_flags |= NETDEV_OFFLOAD_TX_TCP_TSO; + netdev->ol_flags |= NETDEV_OFFLOAD_TX_TCP_CSUM; + netdev->ol_flags |= NETDEV_OFFLOAD_TX_UDP_CSUM; + netdev->ol_flags |= NETDEV_OFFLOAD_TX_SCTP_CSUM; + netdev->ol_flags |= NETDEV_OFFLOAD_TX_IPV4_CSUM; vhost_unsup_flags = 1ULL << VIRTIO_NET_F_HOST_ECN | 1ULL << VIRTIO_NET_F_HOST_UFO; } else { diff --git a/lib/netdev-linux.c b/lib/netdev-linux.c index e4b7c72f8..30d552170 100644 --- a/lib/netdev-linux.c +++ b/lib/netdev-linux.c @@ -928,11 +928,11 @@ netdev_linux_common_construct(struct netdev *netdev_) ovs_mutex_init(&netdev->mutex); if (userspace_tso_enabled()) { - netdev_->ol_flags |= NETDEV_TX_OFFLOAD_TCP_TSO; - netdev_->ol_flags |= NETDEV_TX_OFFLOAD_TCP_CSUM; - netdev_->ol_flags |= NETDEV_TX_OFFLOAD_UDP_CSUM; - netdev_->ol_flags |= NETDEV_TX_OFFLOAD_SCTP_CSUM; - netdev_->ol_flags |= NETDEV_TX_OFFLOAD_IPV4_CSUM; + netdev_->ol_flags |= NETDEV_OFFLOAD_TX_TCP_TSO; + netdev_->ol_flags |= NETDEV_OFFLOAD_TX_TCP_CSUM; + netdev_->ol_flags |= NETDEV_OFFLOAD_TX_UDP_CSUM; + netdev_->ol_flags |= NETDEV_OFFLOAD_TX_SCTP_CSUM; + netdev_->ol_flags |= NETDEV_OFFLOAD_TX_IPV4_CSUM; } return 0; diff --git a/lib/netdev-provider.h b/lib/netdev-provider.h index 08bf8b871..0a8538615 100644 --- a/lib/netdev-provider.h +++ b/lib/netdev-provider.h @@ -38,11 +38,11 @@ struct netdev_tnl_build_header_params; #define NETDEV_NUMA_UNSPEC OVS_NUMA_UNSPEC enum netdev_ol_flags { - NETDEV_TX_OFFLOAD_IPV4_CSUM = 1 << 0, - NETDEV_TX_OFFLOAD_TCP_CSUM = 1 << 1, - NETDEV_TX_OFFLOAD_UDP_CSUM = 1 << 2, - NETDEV_TX_OFFLOAD_SCTP_CSUM = 1 << 3, - NETDEV_TX_OFFLOAD_TCP_TSO = 1 << 4, + NETDEV_OFFLOAD_TX_IPV4_CSUM = 1 << 0, + NETDEV_OFFLOAD_TX_TCP_CSUM = 1 << 1, + NETDEV_OFFLOAD_TX_UDP_CSUM = 1 << 2, + NETDEV_OFFLOAD_TX_SCTP_CSUM = 1 << 3, + NETDEV_OFFLOAD_TX_TCP_TSO = 1 << 4, }; /* A network device (e.g. an Ethernet device). diff --git a/lib/netdev.c b/lib/netdev.c index e9b2bbe83..a06138aca 100644 --- a/lib/netdev.c +++ b/lib/netdev.c @@ -795,7 +795,7 @@ netdev_send_prepare_packet(const uint64_t netdev_flags, uint64_t l4_mask; if (dp_packet_hwol_is_tso(packet) - && !(netdev_flags & NETDEV_TX_OFFLOAD_TCP_TSO)) { + && !(netdev_flags & NETDEV_OFFLOAD_TX_TCP_TSO)) { /* Fall back to GSO in software. */ VLOG_ERR_BUF(errormsg, "No TSO support"); return false; @@ -804,19 +804,19 @@ netdev_send_prepare_packet(const uint64_t netdev_flags, l4_mask = dp_packet_hwol_l4_mask(packet); if (l4_mask) { if (dp_packet_hwol_l4_is_tcp(packet)) { - if (!(netdev_flags & NETDEV_TX_OFFLOAD_TCP_CSUM)) { + if (!(netdev_flags & NETDEV_OFFLOAD_TX_TCP_CSUM)) { /* Fall back to TCP csum in software. */ VLOG_ERR_BUF(errormsg, "No TCP checksum support"); return false; } } else if (dp_packet_hwol_l4_is_udp(packet)) { - if (!(netdev_flags & NETDEV_TX_OFFLOAD_UDP_CSUM)) { + if (!(netdev_flags & NETDEV_OFFLOAD_TX_UDP_CSUM)) { /* Fall back to UDP csum in software. */ VLOG_ERR_BUF(errormsg, "No UDP checksum support"); return false; } } else if (dp_packet_hwol_l4_is_sctp(packet)) { - if (!(netdev_flags & NETDEV_TX_OFFLOAD_SCTP_CSUM)) { + if (!(netdev_flags & NETDEV_OFFLOAD_TX_SCTP_CSUM)) { /* Fall back to SCTP csum in software. */ VLOG_ERR_BUF(errormsg, "No SCTP checksum support"); return false;