From nobody Wed Nov 27 06:49:17 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1700299242; cv=none; d=zohomail.com; s=zohoarc; b=RVp6ENjjNzM72MeDcEoCR4H33J0elePguTTundUkXtTF9HjKhR7LJI2Vn7FLscRDN8TMxUtTMRDgNCHny/VfymQLJDM82rFdbjqra5cVnODe9YiGX6oHDuK/XLwjsf8D1MTQkUSgmP9EInaZGFnK2Kn5xEtYFCGCehMTgFRhToI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1700299242; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:Message-Id:Reply-To:To; bh=SA+gp7Q4DsFINtAgCtzcNmDa0U0Sm402hHQG0dlxYmY=; b=iZVCdjEIlEXX40IOf6cbE27yDgaVDcxtHmmv/+TC/CVHSvmSeEn6D3Mhnm1iLZTz3tQT3of8kgJfh+pC0/Bxf9X87RdU3WNttXfRPoWotF7qWP8yA8Doc5RMVKqbc0cuq+DQQEU9ctVbhsfSgFcE8mklu6BlUiFUUelAtGrIr0U= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1700299242072197.13748110021663; Sat, 18 Nov 2023 01:20:42 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r4HTs-0002U0-Gn; Sat, 18 Nov 2023 04:19:12 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1r4HTq-0002Tm-Lz for qemu-devel@nongnu.org; Sat, 18 Nov 2023 04:19:10 -0500 Received: from mail-pg1-x52a.google.com ([2607:f8b0:4864:20::52a]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1r4HTo-00055v-MH for qemu-devel@nongnu.org; Sat, 18 Nov 2023 04:19:10 -0500 Received: by mail-pg1-x52a.google.com with SMTP id 41be03b00d2f7-5bd33abbb90so1945941a12.2 for ; Sat, 18 Nov 2023 01:19:08 -0800 (PST) Received: from localhost ([157.82.205.15]) by smtp.gmail.com with UTF8SMTPSA id ji6-20020a170903324600b001c9d6923e7dsm2631409plb.222.2023.11.18.01.19.04 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sat, 18 Nov 2023 01:19:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=daynix-com.20230601.gappssmtp.com; s=20230601; t=1700299147; x=1700903947; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=SA+gp7Q4DsFINtAgCtzcNmDa0U0Sm402hHQG0dlxYmY=; b=zC0rodCv0Bwl00ZhFGN931Wtzzx/yNB/Uai1G14XCB6xGxkKHfA9sfZ/+GhJVOOiuW RURRU9CCSdqYtaMKve+Ea7nxOn79H3+bETPl8wv0RSaKtj9M7Iu/FGYn/6KH3E+LlXLJ kIxkJviIMsCxfiWo5WNx29ZKSe9sceH/qlezxbqTK6+rTn7wCEbz/P/QW2F9Bpk31AJ5 aI4kUTvBYQefzTkVKSvMXvAxeccUZ/4YPyVCenL3cWmTXz/tscWYQ0BFCLJ0hT5Th0MR uhZeTu7kNDxGmc5KGZUCFRZ+GjMbOCXwPf41EbWhjZYHeHE2zqBJ/x22jfnibbI99eSN RJtw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1700299147; x=1700903947; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=SA+gp7Q4DsFINtAgCtzcNmDa0U0Sm402hHQG0dlxYmY=; b=QCJqbPFeZsgY6NwT5V79b7Crlm21TuvKkxj6f86+1VxZn2vSUyZeZfqM+iUlV9aDkx wNFIrP8eo5oV/s+lnkkoSkQamDCaK0lWykeWu5Shb5QGnLmfsbzls/D5YEktaHY4ZdjM Jv6Y22/ibAtqKv2wj0UJIkqCRGJpRfgji3Je2kj0+sXhwycAOlRZPlbk1+4+PWZz2GLs itAWotY9OSvBuR7N0kwElqvo5ZZ/zo2DC8ZCM88Aq9eHio+eSBthXHAnBa8ElzA9WwPa OILhYnjzVawzJtGOKcHWLIwW7sXadUySP/ft2s7v4kWdUgyhJt6qD+Z6mqgLa1DGcqP4 X9EQ== X-Gm-Message-State: AOJu0YxqJLBIZN81fgIjv35O2Z6s8kc0U09cDjlDR4ojQ2ydOqALIftv Kgy8MCttoZHOEnEMHkf529D1jM1jOzmA4T60840= X-Google-Smtp-Source: AGHT+IFVwKtaUDKs9H8SawdsPGnNjg6rYzkLXoEf7lgXQHNSd1eW341yAWl2aYmxRWIZHh82uYLc2w== X-Received: by 2002:a05:6a20:9382:b0:189:7c2:508d with SMTP id x2-20020a056a20938200b0018907c2508dmr1758851pzh.12.1700299146962; Sat, 18 Nov 2023 01:19:06 -0800 (PST) From: Akihiko Odaki To: Cc: qemu-devel@nongnu.org, Yuri Benditovich , Andrew Melnychenko , "Michael S . Tsirkin" , Jason Wang , "Zhang, Chen" , Akihiko Odaki , Dmitry Fleytman , Sriram Yagnaraman , Luigi Rizzo , Giuseppe Lettieri , Vincenzo Maffione Subject: [PATCH v7 02/19] tap: Remove qemu_using_vnet_hdr() Date: Sat, 18 Nov 2023 18:18:16 +0900 Message-ID: <20231118091837.5758-3-akihiko.odaki@daynix.com> X-Mailer: git-send-email 2.42.1 In-Reply-To: <20231118091837.5758-1-akihiko.odaki@daynix.com> References: <20231118091837.5758-1-akihiko.odaki@daynix.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: none client-ip=2607:f8b0:4864:20::52a; envelope-from=akihiko.odaki@daynix.com; helo=mail-pg1-x52a.google.com X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_NONE=0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @daynix-com.20230601.gappssmtp.com) X-ZM-MESSAGEID: 1700299242340100001 Content-Type: text/plain; charset="utf-8" Since qemu_set_vnet_hdr_len() is always called when qemu_using_vnet_hdr() is called, we can merge them and save some code. For consistency, express that the virtio-net header is not in use by returning 0 with qemu_get_vnet_hdr_len() instead of having a dedicated function, qemu_get_using_vnet_hdr(). Signed-off-by: Akihiko Odaki --- include/net/net.h | 7 ------- hw/net/e1000e.c | 1 - hw/net/igb.c | 1 - hw/net/net_tx_pkt.c | 4 ++-- hw/net/virtio-net.c | 3 --- hw/net/vmxnet3.c | 2 -- net/dump.c | 4 +--- net/net.c | 24 +----------------------- net/netmap.c | 5 ----- net/tap.c | 28 +--------------------------- 10 files changed, 5 insertions(+), 74 deletions(-) diff --git a/include/net/net.h b/include/net/net.h index ffbd2c8d56..374a827190 100644 --- a/include/net/net.h +++ b/include/net/net.h @@ -57,8 +57,6 @@ typedef bool (HasUfo)(NetClientState *); typedef bool (HasUso)(NetClientState *); typedef bool (HasVnetHdr)(NetClientState *); typedef bool (HasVnetHdrLen)(NetClientState *, int); -typedef bool (GetUsingVnetHdr)(NetClientState *); -typedef void (UsingVnetHdr)(NetClientState *, bool); typedef void (SetOffload)(NetClientState *, int, int, int, int, int, int, = int); typedef int (GetVnetHdrLen)(NetClientState *); typedef void (SetVnetHdrLen)(NetClientState *, int); @@ -88,10 +86,7 @@ typedef struct NetClientInfo { HasUso *has_uso; HasVnetHdr *has_vnet_hdr; HasVnetHdrLen *has_vnet_hdr_len; - GetUsingVnetHdr *get_using_vnet_hdr; - UsingVnetHdr *using_vnet_hdr; SetOffload *set_offload; - GetVnetHdrLen *get_vnet_hdr_len; SetVnetHdrLen *set_vnet_hdr_len; SetVnetLE *set_vnet_le; SetVnetBE *set_vnet_be; @@ -194,8 +189,6 @@ bool qemu_has_ufo(NetClientState *nc); bool qemu_has_uso(NetClientState *nc); bool qemu_has_vnet_hdr(NetClientState *nc); bool qemu_has_vnet_hdr_len(NetClientState *nc, int len); -bool qemu_get_using_vnet_hdr(NetClientState *nc); -void qemu_using_vnet_hdr(NetClientState *nc, bool enable); void qemu_set_offload(NetClientState *nc, int csum, int tso4, int tso6, int ecn, int ufo, int uso4, int uso6); int qemu_get_vnet_hdr_len(NetClientState *nc); diff --git a/hw/net/e1000e.c b/hw/net/e1000e.c index e41a6c1038..4edb58858e 100644 --- a/hw/net/e1000e.c +++ b/hw/net/e1000e.c @@ -352,7 +352,6 @@ e1000e_init_net_peer(E1000EState *s, PCIDevice *pci_dev= , uint8_t *macaddr) for (i =3D 0; i < s->conf.peers.queues; i++) { nc =3D qemu_get_subqueue(s->nic, i); qemu_set_vnet_hdr_len(nc->peer, sizeof(struct virtio_net_hdr)); - qemu_using_vnet_hdr(nc->peer, true); } } =20 diff --git a/hw/net/igb.c b/hw/net/igb.c index 8b713843d9..cfdb148051 100644 --- a/hw/net/igb.c +++ b/hw/net/igb.c @@ -339,7 +339,6 @@ igb_init_net_peer(IGBState *s, PCIDevice *pci_dev, uint= 8_t *macaddr) for (i =3D 0; i < s->conf.peers.queues; i++) { nc =3D qemu_get_subqueue(s->nic, i); qemu_set_vnet_hdr_len(nc->peer, sizeof(struct virtio_net_hdr)); - qemu_using_vnet_hdr(nc->peer, true); } } =20 diff --git a/hw/net/net_tx_pkt.c b/hw/net/net_tx_pkt.c index 2e5f58b3c9..668871f8d8 100644 --- a/hw/net/net_tx_pkt.c +++ b/hw/net/net_tx_pkt.c @@ -578,7 +578,7 @@ static void net_tx_pkt_sendv( { NetClientState *nc =3D opaque; =20 - if (qemu_get_using_vnet_hdr(nc->peer)) { + if (qemu_get_vnet_hdr_len(nc->peer)) { qemu_sendv_packet(nc, virt_iov, virt_iov_cnt); } else { qemu_sendv_packet(nc, iov, iov_cnt); @@ -808,7 +808,7 @@ static bool net_tx_pkt_do_sw_fragmentation(struct NetTx= Pkt *pkt, =20 bool net_tx_pkt_send(struct NetTxPkt *pkt, NetClientState *nc) { - bool offload =3D qemu_get_using_vnet_hdr(nc->peer); + bool offload =3D !!qemu_get_vnet_hdr_len(nc->peer); return net_tx_pkt_send_custom(pkt, offload, net_tx_pkt_sendv, nc); } =20 diff --git a/hw/net/virtio-net.c b/hw/net/virtio-net.c index 80c56f0cfc..e12176acb1 100644 --- a/hw/net/virtio-net.c +++ b/hw/net/virtio-net.c @@ -3728,9 +3728,6 @@ static void virtio_net_device_realize(DeviceState *de= v, Error **errp) =20 peer_test_vnet_hdr(n); if (peer_has_vnet_hdr(n)) { - for (i =3D 0; i < n->max_queue_pairs; i++) { - qemu_using_vnet_hdr(qemu_get_subqueue(n->nic, i)->peer, true); - } n->host_hdr_len =3D sizeof(struct virtio_net_hdr); } else { n->host_hdr_len =3D 0; diff --git a/hw/net/vmxnet3.c b/hw/net/vmxnet3.c index 6fb4102d03..81ab8ada55 100644 --- a/hw/net/vmxnet3.c +++ b/hw/net/vmxnet3.c @@ -2091,8 +2091,6 @@ static void vmxnet3_net_init(VMXNET3State *s) if (s->peer_has_vhdr) { qemu_set_vnet_hdr_len(qemu_get_queue(s->nic)->peer, sizeof(struct virtio_net_hdr)); - - qemu_using_vnet_hdr(qemu_get_queue(s->nic)->peer, 1); } =20 qemu_format_nic_info_str(qemu_get_queue(s->nic), s->conf.macaddr.a); diff --git a/net/dump.c b/net/dump.c index 16073f2458..956e34a123 100644 --- a/net/dump.c +++ b/net/dump.c @@ -154,10 +154,8 @@ static ssize_t filter_dump_receive_iov(NetFilterState = *nf, NetClientState *sndr, int iovcnt, NetPacketSent *sent_cb) { NetFilterDumpState *nfds =3D FILTER_DUMP(nf); - int offset =3D qemu_get_using_vnet_hdr(nf->netdev) ? - qemu_get_vnet_hdr_len(nf->netdev) : 0; =20 - dump_receive_iov(&nfds->ds, iov, iovcnt, offset); + dump_receive_iov(&nfds->ds, iov, iovcnt, qemu_get_vnet_hdr_len(nf->net= dev)); return 0; } =20 diff --git a/net/net.c b/net/net.c index cb88651db2..f603030dd6 100644 --- a/net/net.c +++ b/net/net.c @@ -524,24 +524,6 @@ bool qemu_has_vnet_hdr_len(NetClientState *nc, int len) return nc->info->has_vnet_hdr_len(nc, len); } =20 -bool qemu_get_using_vnet_hdr(NetClientState *nc) -{ - if (!nc || !nc->info->get_using_vnet_hdr) { - return false; - } - - return nc->info->get_using_vnet_hdr(nc); -} - -void qemu_using_vnet_hdr(NetClientState *nc, bool enable) -{ - if (!nc || !nc->info->using_vnet_hdr) { - return; - } - - nc->info->using_vnet_hdr(nc, enable); -} - void qemu_set_offload(NetClientState *nc, int csum, int tso4, int tso6, int ecn, int ufo, int uso4, int uso6) { @@ -554,11 +536,7 @@ void qemu_set_offload(NetClientState *nc, int csum, in= t tso4, int tso6, =20 int qemu_get_vnet_hdr_len(NetClientState *nc) { - if (!nc || !nc->info->get_vnet_hdr_len) { - return 0; - } - - return nc->info->get_vnet_hdr_len(nc); + return nc->vnet_hdr_len; } =20 void qemu_set_vnet_hdr_len(NetClientState *nc, int len) diff --git a/net/netmap.c b/net/netmap.c index 241b27c8e9..297510e190 100644 --- a/net/netmap.c +++ b/net/netmap.c @@ -351,10 +351,6 @@ static bool netmap_has_vnet_hdr(NetClientState *nc) return netmap_has_vnet_hdr_len(nc, sizeof(struct virtio_net_hdr)); } =20 -static void netmap_using_vnet_hdr(NetClientState *nc, bool enable) -{ -} - static void netmap_set_vnet_hdr_len(NetClientState *nc, int len) { NetmapState *s =3D DO_UPCAST(NetmapState, nc, nc); @@ -393,7 +389,6 @@ static NetClientInfo net_netmap_info =3D { .has_ufo =3D netmap_has_vnet_hdr, .has_vnet_hdr =3D netmap_has_vnet_hdr, .has_vnet_hdr_len =3D netmap_has_vnet_hdr_len, - .using_vnet_hdr =3D netmap_using_vnet_hdr, .set_offload =3D netmap_set_offload, .set_vnet_hdr_len =3D netmap_set_vnet_hdr_len, }; diff --git a/net/tap.c b/net/tap.c index a1f4d9d49f..ea2dadc943 100644 --- a/net/tap.c +++ b/net/tap.c @@ -262,13 +262,6 @@ static bool tap_has_vnet_hdr_len(NetClientState *nc, i= nt len) return tap_has_vnet_hdr(nc); } =20 -static int tap_get_vnet_hdr_len(NetClientState *nc) -{ - TAPState *s =3D DO_UPCAST(TAPState, nc, nc); - - return s->host_vnet_hdr_len; -} - static void tap_set_vnet_hdr_len(NetClientState *nc, int len) { TAPState *s =3D DO_UPCAST(TAPState, nc, nc); @@ -280,23 +273,7 @@ static void tap_set_vnet_hdr_len(NetClientState *nc, i= nt len) =20 tap_fd_set_vnet_hdr_len(s->fd, len); s->host_vnet_hdr_len =3D len; -} - -static bool tap_get_using_vnet_hdr(NetClientState *nc) -{ - TAPState *s =3D DO_UPCAST(TAPState, nc, nc); - - return s->using_vnet_hdr; -} - -static void tap_using_vnet_hdr(NetClientState *nc, bool using_vnet_hdr) -{ - TAPState *s =3D DO_UPCAST(TAPState, nc, nc); - - assert(nc->info->type =3D=3D NET_CLIENT_DRIVER_TAP); - assert(!!s->host_vnet_hdr_len =3D=3D using_vnet_hdr); - - s->using_vnet_hdr =3D using_vnet_hdr; + s->using_vnet_hdr =3D true; } =20 static int tap_set_vnet_le(NetClientState *nc, bool is_le) @@ -394,10 +371,7 @@ static NetClientInfo net_tap_info =3D { .has_uso =3D tap_has_uso, .has_vnet_hdr =3D tap_has_vnet_hdr, .has_vnet_hdr_len =3D tap_has_vnet_hdr_len, - .get_using_vnet_hdr =3D tap_get_using_vnet_hdr, - .using_vnet_hdr =3D tap_using_vnet_hdr, .set_offload =3D tap_set_offload, - .get_vnet_hdr_len =3D tap_get_vnet_hdr_len, .set_vnet_hdr_len =3D tap_set_vnet_hdr_len, .set_vnet_le =3D tap_set_vnet_le, .set_vnet_be =3D tap_set_vnet_be, --=20 2.42.1