From nobody Sun Dec 14 21:36:26 2025 Received: from mail-pl1-f170.google.com (mail-pl1-f170.google.com [209.85.214.170]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 14AF0233D85 for ; Fri, 7 Feb 2025 06:11:31 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.170 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738908693; cv=none; b=PS4VF9LC7+IzT75tt1IZItICPwVXvZTesMrq/9OLv5IT2+TJ98gYwDaz9p+bwNXaUVaYFhcAlIVQCxqwGR8Gk7E/rXCIucwa1EJQVR2Gi1LWsyfOhJy0PaOJa9oVLzDnJ0zy0sJnE3cOBa+PelJrusV1PWHmzzHRIfqelx/cfWA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738908693; c=relaxed/simple; bh=14P4miNDa9H6HIf6vY14ANPJygZ9JM6cwyTT54tjwx0=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=obYcIzzArhlyFeIbEeSSZx/qoihcCqymPM6yuBHSRDbVDXTE9n9vx3RRxVIAxxzXiUolot4HdzfL1zQsxDhGS2VuKOL+h0BvqL8UzjVdaR3wWAB9ImZj0fXJ2wXuJcTu9jhsfn+9SxwHcceir3NfRMzwyniyHdbhYkqHozAyUqE= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=daynix.com; spf=pass smtp.mailfrom=daynix.com; dkim=pass (2048-bit key) header.d=daynix-com.20230601.gappssmtp.com header.i=@daynix-com.20230601.gappssmtp.com header.b=ws4kaxpv; arc=none smtp.client-ip=209.85.214.170 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=daynix.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=daynix.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=daynix-com.20230601.gappssmtp.com header.i=@daynix-com.20230601.gappssmtp.com header.b="ws4kaxpv" Received: by mail-pl1-f170.google.com with SMTP id d9443c01a7336-21f2f09865bso31429355ad.0 for ; Thu, 06 Feb 2025 22:11:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=daynix-com.20230601.gappssmtp.com; s=20230601; t=1738908691; x=1739513491; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=ryfdrY9lKc9aI6OIx44cHyHYp5a4chMvNjG7SkF+UUY=; b=ws4kaxpv6WNRak4Ix9gljrD/OWm3v1I977bmuP0JZasA08UmhY0Iwu0tQI47Ob2bP+ bh+pKmIKUev6s4eJyNTxADDh0wwsXe3Vu59ASOkJAycDLFsEqdg3XBy76pwQQFHRAiv6 XAXFa092g/n5rGp++D9grQfRomo2YCoWIqCOw6nqP8dqOyo9z/YR6GnqG7BYWNK8uU8E Fy0wvV6d6iHPUB4bTbQYRVTJ8N4E8kYS9k+GabmG2TmlwDdcWFR+Z0qvGjq1rjBYSCRc pHJE5g/xbW7zg8lm2fqMZcAevBVeF7tZy+VTBdiIVwt8anXwfAVtxR4xXAHjACRGTKkj CQPw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1738908691; x=1739513491; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=ryfdrY9lKc9aI6OIx44cHyHYp5a4chMvNjG7SkF+UUY=; b=V/7PAL8QAPbKvpYFMoqWukIsG3u62TN8QLAnGZoy+AqiRpLP18HK7Vw05T1M13p9Xs rAAtNAiWbWi1oB8ZWtG+lXvz+alhh6w+nwXal9U2jh7pRGZhVsPMMKd+xWoY6RW0xkh5 MMM9hoN7/uE5niVuZZ8MaAXr9cOT3I3CAXO3KjLA3iOUNRDJAcFJlhJUL9LR609Um4c2 qYAaEfBLWOh95igyNRhDDnn/RPu4s/+ROqaj5Cf5y7uBs+ScayiCj94z44jUVXeiC8ja 6WBaOyKq/W/hptkqq12JMbTdQ+k5w/Oqf25TD6uAqR1cqjKMoRbHwzUSJS8kW3QxgguP wiQA== X-Forwarded-Encrypted: i=1; AJvYcCXUTzRHeIlVllJzdUTx2yT3gyPI/1ViqDKI4gInikCZ7zq72T08M4GO5bSV/3S4iyJEjugQ6VAk3gZSP4M=@vger.kernel.org X-Gm-Message-State: AOJu0YzDsLK1tFUW+s5rRxptBjYJozBb/ahbuvael0BnNcS5y+ypBBo1 BAjYdXfxa+jN761CCfNo0BA9YT82EN5+Njkzs0aCCvk/WAPnQGWcAbsgmRKWpIg= X-Gm-Gg: ASbGnct1VjwmHn4CXCDa/84huGvAYR5vW7E+y6NRk0heXjH9jOaiHPfg4Lq34UGE9ad 0nLqKwZb3zlZBI590z7KaVocicAFk0N0G9J3zo212tQXzwNdQa6HDIQlJ87ihJ50xQCNk+UyVsM jqlorP0byqwDywBMSQbvu+ZuUvFRWcVLck7qD9LiddV/3WsecJGv1bG1TRWTzVQQgd3R9H9ZTof xjgi1o78j4OX5SMt/k1o1OddbtpRW1zEXBq5ffBMeO0KtIs38DS72Z+dH7C64V1k0j7HesTDkX3 nn7oiF1BNc9CQfhFCt4= X-Google-Smtp-Source: AGHT+IEEJYrdib72m4Zd54o8C2PQElqhgx3VdUfzIWfw+vKrrFWoYYZWeaayg47XMVtdM3/Pr5uX8Q== X-Received: by 2002:a05:6a21:3a4a:b0:1ea:f941:8d8e with SMTP id adf61e73a8af0-1ee0539ced6mr2495946637.16.1738908691404; Thu, 06 Feb 2025 22:11:31 -0800 (PST) Received: from localhost ([157.82.205.237]) by smtp.gmail.com with UTF8SMTPSA id d2e1a72fcca58-73048bf1504sm2332362b3a.108.2025.02.06.22.11.25 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 06 Feb 2025 22:11:30 -0800 (PST) From: Akihiko Odaki Date: Fri, 07 Feb 2025 15:10:54 +0900 Subject: [PATCH net-next v6 4/7] tun: Decouple vnet handling Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20250207-tun-v6-4-fb49cf8b103e@daynix.com> References: <20250207-tun-v6-0-fb49cf8b103e@daynix.com> In-Reply-To: <20250207-tun-v6-0-fb49cf8b103e@daynix.com> To: Jonathan Corbet , Willem de Bruijn , Jason Wang , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , "Michael S. Tsirkin" , Xuan Zhuo , Shuah Khan , 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 , Andrew Melnychenko , Stephen Hemminger , gur.stavi@huawei.com, devel@daynix.com, Akihiko Odaki Cc: Willem de Bruijn X-Mailer: b4 0.14.2 Decouple the vnet handling code so that we can reuse it for tap. Signed-off-by: Akihiko Odaki Reviewed-by: Willem de Bruijn --- drivers/net/tun.c | 237 ++++++++++++++++++++++++++++++++------------------= ---- 1 file changed, 139 insertions(+), 98 deletions(-) diff --git a/drivers/net/tun.c b/drivers/net/tun.c index 28a1af1de9d704ed5cc51aac3d99bc095cb28ba5..a52c5d00e75c28bb1574f07f59b= e9f96702a6f0a 100644 --- a/drivers/net/tun.c +++ b/drivers/net/tun.c @@ -352,6 +352,127 @@ static inline __virtio16 cpu_to_tun16(unsigned int fl= ags, u16 val) return __cpu_to_virtio16(tun_is_little_endian(flags), val); } =20 +static long tun_vnet_ioctl(int *vnet_hdr_sz, unsigned int *flags, + unsigned int cmd, int __user *sp) +{ + int s; + + switch (cmd) { + case TUNGETVNETHDRSZ: + s =3D *vnet_hdr_sz; + if (put_user(s, sp)) + return -EFAULT; + return 0; + + case TUNSETVNETHDRSZ: + if (get_user(s, sp)) + return -EFAULT; + if (s < (int)sizeof(struct virtio_net_hdr)) + return -EINVAL; + + *vnet_hdr_sz =3D s; + return 0; + + case TUNGETVNETLE: + s =3D !!(*flags & TUN_VNET_LE); + if (put_user(s, sp)) + return -EFAULT; + return 0; + + case TUNSETVNETLE: + if (get_user(s, sp)) + return -EFAULT; + if (s) + *flags |=3D TUN_VNET_LE; + else + *flags &=3D ~TUN_VNET_LE; + return 0; + + case TUNGETVNETBE: + return tun_get_vnet_be(*flags, sp); + + case TUNSETVNETBE: + return tun_set_vnet_be(flags, sp); + + default: + return -EINVAL; + } +} + +static int tun_vnet_hdr_get(int sz, unsigned int flags, struct iov_iter *f= rom, + struct virtio_net_hdr *hdr) +{ + u16 hdr_len; + + if (iov_iter_count(from) < sz) + return -EINVAL; + + if (!copy_from_iter_full(hdr, sizeof(*hdr), from)) + return -EFAULT; + + hdr_len =3D tun16_to_cpu(flags, hdr->hdr_len); + + if (hdr->flags & VIRTIO_NET_HDR_F_NEEDS_CSUM) { + hdr_len =3D max(tun16_to_cpu(flags, hdr->csum_start) + tun16_to_cpu(flag= s, hdr->csum_offset) + 2, hdr_len); + hdr->hdr_len =3D cpu_to_tun16(flags, hdr_len); + } + + if (hdr_len > iov_iter_count(from)) + return -EINVAL; + + iov_iter_advance(from, sz - sizeof(*hdr)); + + return hdr_len; +} + +static int tun_vnet_hdr_put(int sz, struct iov_iter *iter, + const struct virtio_net_hdr *hdr) +{ + if (unlikely(iov_iter_count(iter) < sz)) + return -EINVAL; + + if (unlikely(copy_to_iter(hdr, sizeof(*hdr), iter) !=3D sizeof(*hdr))) + return -EFAULT; + + iov_iter_advance(iter, sz - sizeof(*hdr)); + + return 0; +} + +static int tun_vnet_hdr_to_skb(unsigned int flags, struct sk_buff *skb, + const struct virtio_net_hdr *hdr) +{ + return virtio_net_hdr_to_skb(skb, hdr, tun_is_little_endian(flags)); +} + +static int tun_vnet_hdr_from_skb(unsigned int flags, + const struct net_device *dev, + const struct sk_buff *skb, + struct virtio_net_hdr *hdr) +{ + int vlan_hlen =3D skb_vlan_tag_present(skb) ? VLAN_HLEN : 0; + + if (virtio_net_hdr_from_skb(skb, hdr, + tun_is_little_endian(flags), true, + vlan_hlen)) { + struct skb_shared_info *sinfo =3D skb_shinfo(skb); + + if (net_ratelimit()) { + netdev_err(dev, "unexpected GSO type: 0x%x, gso_size %d, hdr_len %d\n", + sinfo->gso_type, tun16_to_cpu(flags, hdr->gso_size), + tun16_to_cpu(flags, hdr->hdr_len)); + print_hex_dump(KERN_ERR, "tun: ", + DUMP_PREFIX_NONE, + 16, 1, skb->head, + min(tun16_to_cpu(flags, hdr->hdr_len), 64), true); + } + WARN_ON_ONCE(1); + return -EINVAL; + } + + return 0; +} + static inline u32 tun_hashfn(u32 rxhash) { return rxhash & TUN_MASK_FLOW_ENTRIES; @@ -1765,25 +1886,12 @@ static ssize_t tun_get_user(struct tun_struct *tun,= struct tun_file *tfile, =20 if (tun->flags & IFF_VNET_HDR) { int vnet_hdr_sz =3D READ_ONCE(tun->vnet_hdr_sz); - int flags =3D tun->flags; - - if (len < vnet_hdr_sz) - return -EINVAL; - len -=3D vnet_hdr_sz; - - if (!copy_from_iter_full(&gso, sizeof(gso), from)) - return -EFAULT; - - hdr_len =3D tun16_to_cpu(flags, gso.hdr_len); =20 - if (gso.flags & VIRTIO_NET_HDR_F_NEEDS_CSUM) { - hdr_len =3D max(tun16_to_cpu(flags, gso.csum_start) + tun16_to_cpu(flag= s, gso.csum_offset) + 2, hdr_len); - gso.hdr_len =3D cpu_to_tun16(flags, hdr_len); - } + hdr_len =3D tun_vnet_hdr_get(vnet_hdr_sz, tun->flags, from, &gso); + if (hdr_len < 0) + return hdr_len; =20 - if (hdr_len > len) - return -EINVAL; - iov_iter_advance(from, vnet_hdr_sz - sizeof(gso)); + len -=3D vnet_hdr_sz; } =20 if ((tun->flags & TUN_TYPE_MASK) =3D=3D IFF_TAP) { @@ -1857,7 +1965,7 @@ static ssize_t tun_get_user(struct tun_struct *tun, s= truct tun_file *tfile, } } =20 - if (virtio_net_hdr_to_skb(skb, &gso, tun_is_little_endian(tun->flags))) { + if (tun_vnet_hdr_to_skb(tun->flags, skb, &gso)) { atomic_long_inc(&tun->rx_frame_errors); err =3D -EINVAL; goto free_skb; @@ -2052,18 +2160,15 @@ static ssize_t tun_put_user_xdp(struct tun_struct *= tun, { int vnet_hdr_sz =3D 0; size_t size =3D xdp_frame->len; - size_t ret; + ssize_t ret; =20 if (tun->flags & IFF_VNET_HDR) { struct virtio_net_hdr gso =3D { 0 }; =20 vnet_hdr_sz =3D READ_ONCE(tun->vnet_hdr_sz); - if (unlikely(iov_iter_count(iter) < vnet_hdr_sz)) - return -EINVAL; - if (unlikely(copy_to_iter(&gso, sizeof(gso), iter) !=3D - sizeof(gso))) - return -EFAULT; - iov_iter_advance(iter, vnet_hdr_sz - sizeof(gso)); + ret =3D tun_vnet_hdr_put(vnet_hdr_sz, iter, &gso); + if (ret) + return ret; } =20 ret =3D copy_to_iter(xdp_frame->data, size, iter) + vnet_hdr_sz; @@ -2086,6 +2191,7 @@ static ssize_t tun_put_user(struct tun_struct *tun, int vlan_offset =3D 0; int vlan_hlen =3D 0; int vnet_hdr_sz =3D 0; + int ret; =20 if (skb_vlan_tag_present(skb)) vlan_hlen =3D VLAN_HLEN; @@ -2111,33 +2217,14 @@ static ssize_t tun_put_user(struct tun_struct *tun, =20 if (vnet_hdr_sz) { struct virtio_net_hdr gso; - int flags =3D tun->flags; - - if (iov_iter_count(iter) < vnet_hdr_sz) - return -EINVAL; - - if (virtio_net_hdr_from_skb(skb, &gso, - tun_is_little_endian(flags), true, - vlan_hlen)) { - struct skb_shared_info *sinfo =3D skb_shinfo(skb); - - if (net_ratelimit()) { - netdev_err(tun->dev, "unexpected GSO type: 0x%x, gso_size %d, hdr_len = %d\n", - sinfo->gso_type, tun16_to_cpu(flags, gso.gso_size), - tun16_to_cpu(flags, gso.hdr_len)); - print_hex_dump(KERN_ERR, "tun: ", - DUMP_PREFIX_NONE, - 16, 1, skb->head, - min((int)tun16_to_cpu(flags, gso.hdr_len), 64), true); - } - WARN_ON_ONCE(1); - return -EINVAL; - } =20 - if (copy_to_iter(&gso, sizeof(gso), iter) !=3D sizeof(gso)) - return -EFAULT; + ret =3D tun_vnet_hdr_from_skb(tun->flags, tun->dev, skb, &gso); + if (ret) + return ret; =20 - iov_iter_advance(iter, vnet_hdr_sz - sizeof(gso)); + ret =3D tun_vnet_hdr_put(vnet_hdr_sz, iter, &gso); + if (ret) + return ret; } =20 if (vlan_hlen) { @@ -2497,7 +2584,7 @@ static int tun_xdp_one(struct tun_struct *tun, skb_reserve(skb, xdp->data - xdp->data_hard_start); skb_put(skb, xdp->data_end - xdp->data); =20 - if (virtio_net_hdr_to_skb(skb, gso, tun_is_little_endian(tun->flags))) { + if (tun_vnet_hdr_to_skb(tun->flags, skb, gso)) { atomic_long_inc(&tun->rx_frame_errors); kfree_skb(skb); ret =3D -EINVAL; @@ -3081,8 +3168,6 @@ static long __tun_chr_ioctl(struct file *file, unsign= ed int cmd, kgid_t group; int ifindex; int sndbuf; - int vnet_hdr_sz; - int le; int ret; bool do_notify =3D false; =20 @@ -3289,50 +3374,6 @@ static long __tun_chr_ioctl(struct file *file, unsig= ned int cmd, tun_set_sndbuf(tun); break; =20 - case TUNGETVNETHDRSZ: - vnet_hdr_sz =3D tun->vnet_hdr_sz; - if (copy_to_user(argp, &vnet_hdr_sz, sizeof(vnet_hdr_sz))) - ret =3D -EFAULT; - break; - - case TUNSETVNETHDRSZ: - if (copy_from_user(&vnet_hdr_sz, argp, sizeof(vnet_hdr_sz))) { - ret =3D -EFAULT; - break; - } - if (vnet_hdr_sz < (int)sizeof(struct virtio_net_hdr)) { - ret =3D -EINVAL; - break; - } - - tun->vnet_hdr_sz =3D vnet_hdr_sz; - break; - - case TUNGETVNETLE: - le =3D !!(tun->flags & TUN_VNET_LE); - if (put_user(le, (int __user *)argp)) - ret =3D -EFAULT; - break; - - case TUNSETVNETLE: - if (get_user(le, (int __user *)argp)) { - ret =3D -EFAULT; - break; - } - if (le) - tun->flags |=3D TUN_VNET_LE; - else - tun->flags &=3D ~TUN_VNET_LE; - break; - - case TUNGETVNETBE: - ret =3D tun_get_vnet_be(tun->flags, argp); - break; - - case TUNSETVNETBE: - ret =3D tun_set_vnet_be(&tun->flags, argp); - break; - case TUNATTACHFILTER: /* Can be set only for TAPs */ ret =3D -EINVAL; @@ -3388,7 +3429,7 @@ static long __tun_chr_ioctl(struct file *file, unsign= ed int cmd, break; =20 default: - ret =3D -EINVAL; + ret =3D tun_vnet_ioctl(&tun->vnet_hdr_sz, &tun->flags, cmd, argp); break; } =20 --=20 2.48.1