From: Willem de Bruijn <willemdebruijn.kernel@gmail.com>
To: Akihiko Odaki <akihiko.odaki@daynix.com>,
Jonathan Corbet <corbet@lwn.net>,
Willem de Bruijn <willemdebruijn.kernel@gmail.com>,
Jason Wang <jasowang@redhat.com>,
"David S. Miller" <davem@davemloft.net>,
Eric Dumazet <edumazet@google.com>,
Jakub Kicinski <kuba@kernel.org>,
Paolo Abeni <pabeni@redhat.com>,
"Michael S. Tsirkin" <mst@redhat.com>,
Xuan Zhuo <xuanzhuo@linux.alibaba.com>,
Shuah Khan <shuah@kernel.org>,
linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org,
netdev@vger.kernel.org, kvm@vger.kernel.org,
virtualization@lists.linux-foundation.org,
linux-kselftest@vger.kernel.org,
Yuri Benditovich <yuri.benditovich@daynix.com>,
Andrew Melnychenko <andrew@daynix.com>,
Stephen Hemminger <stephen@networkplumber.org>,
gur.stavi@huawei.com, devel@daynix.com,
Akihiko Odaki <akihiko.odaki@daynix.com>
Subject: Re: [PATCH net-next v5 6/7] tap: Keep hdr_len in tap_get_user()
Date: Wed, 05 Feb 2025 16:21:52 -0500 [thread overview]
Message-ID: <67a3d6706c01a_170d3929436@willemb.c.googlers.com.notmuch> (raw)
In-Reply-To: <20250205-tun-v5-6-15d0b32e87fa@daynix.com>
Akihiko Odaki wrote:
> hdr_len is repeatedly used so keep it in a local variable.
>
> Signed-off-by: Akihiko Odaki <akihiko.odaki@daynix.com>
> @@ -682,11 +683,8 @@ static ssize_t tap_get_user(struct tap_queue *q, void *msg_control,
> if (msg_control && sock_flag(&q->sk, SOCK_ZEROCOPY)) {
> struct iov_iter i;
>
> - copylen = vnet_hdr.hdr_len ?
> - tap16_to_cpu(q, vnet_hdr.hdr_len) : GOODCOPY_LEN;
> - if (copylen > good_linear)
> - copylen = good_linear;
> - else if (copylen < ETH_HLEN)
> + copylen = min(hdr_len ? hdr_len : GOODCOPY_LEN, good_linear);
> + if (copylen < ETH_HLEN)
> copylen = ETH_HLEN;
I forgot earlier: this can also use single line statement
copylen = max(copylen, ETH_HLEN);
And perhaps easiest to follow is
copylen = hdr_len ?: GOODCOPY_LEN;
copylen = min(copylen, good_linear);
copylen = max(copylen, ETH_HLEN);
> linear = copylen;
> i = *from;
> @@ -697,11 +695,9 @@ static ssize_t tap_get_user(struct tap_queue *q, void *msg_control,
>
> if (!zerocopy) {
> copylen = len;
> - linear = tap16_to_cpu(q, vnet_hdr.hdr_len);
> - if (linear > good_linear)
> - linear = good_linear;
> - else if (linear < ETH_HLEN)
> - linear = ETH_HLEN;
> + linear = min(hdr_len, good_linear);
> + if (copylen < ETH_HLEN)
> + copylen = ETH_HLEN;
Same
next prev parent reply other threads:[~2025-02-05 21:21 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-02-05 6:22 [PATCH net-next v5 0/7] tun: Unify vnet implementation Akihiko Odaki
2025-02-05 6:22 ` [PATCH net-next v5 1/7] tun: Refactor CONFIG_TUN_VNET_CROSS_LE Akihiko Odaki
2025-02-05 21:06 ` Willem de Bruijn
2025-02-06 6:53 ` Akihiko Odaki
2025-02-05 6:22 ` [PATCH net-next v5 2/7] tun: Keep hdr_len in tun_get_user() Akihiko Odaki
2025-02-05 6:22 ` [PATCH net-next v5 3/7] tun: Decouple vnet from tun_struct Akihiko Odaki
2025-02-05 6:22 ` [PATCH net-next v5 4/7] tun: Decouple vnet handling Akihiko Odaki
2025-02-05 6:22 ` [PATCH net-next v5 5/7] tun: Extract the vnet handling code Akihiko Odaki
2025-02-05 21:12 ` Willem de Bruijn
2025-02-06 6:58 ` Akihiko Odaki
2025-02-05 6:22 ` [PATCH net-next v5 6/7] tap: Keep hdr_len in tap_get_user() Akihiko Odaki
2025-02-05 21:12 ` Willem de Bruijn
2025-02-05 21:21 ` Willem de Bruijn [this message]
2025-02-06 7:04 ` Akihiko Odaki
2025-02-06 16:09 ` Willem de Bruijn
2025-02-05 6:22 ` [PATCH net-next v5 7/7] tap: Use tun's vnet-related code Akihiko Odaki
2025-02-05 21:14 ` Willem de Bruijn
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=67a3d6706c01a_170d3929436@willemb.c.googlers.com.notmuch \
--to=willemdebruijn.kernel@gmail.com \
--cc=akihiko.odaki@daynix.com \
--cc=andrew@daynix.com \
--cc=corbet@lwn.net \
--cc=davem@davemloft.net \
--cc=devel@daynix.com \
--cc=edumazet@google.com \
--cc=gur.stavi@huawei.com \
--cc=jasowang@redhat.com \
--cc=kuba@kernel.org \
--cc=kvm@vger.kernel.org \
--cc=linux-doc@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-kselftest@vger.kernel.org \
--cc=mst@redhat.com \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
--cc=shuah@kernel.org \
--cc=stephen@networkplumber.org \
--cc=virtualization@lists.linux-foundation.org \
--cc=xuanzhuo@linux.alibaba.com \
--cc=yuri.benditovich@daynix.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®