From nobody Sun Dec 14 21:37:47 2025 Received: from mail-pj1-f45.google.com (mail-pj1-f45.google.com [209.85.216.45]) (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 A1F2F228377 for ; Wed, 5 Feb 2025 06:22:39 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.45 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738736561; cv=none; b=pygnbOIzQQC76zyY0eSWiFikJ6rr5uwVnxB0RE8VaK2M0etF4f/WV6OCu2PX2Cz5pbFzAmjRA/h/b5zJep9Y3A2qZ6sQMPJJkr1blH7xczFcs4vD6ROg/KN0rRjOZrZVFwZjv0lM3Jr+OPxXN2wyue5XA9D9uvGaKopFsWZ3RDY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738736561; c=relaxed/simple; bh=k8AT/7ba0LLNdr42q8vL3zcMMHDDU7sY3oym4vZIyT0=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=kyxwjLhNFm2czTjeuHcYmJmkygQncWW9U4c61BjJqBPokYRK56nDU85Ln111LItTh4pY5e0Lo7NxuZAy2s7nqaVkO91X/jHKMnphjT4XC99QGJAhh25v8VfX0qa3/xs8AfcgyLBrvKq4tru4AQqd2vVHHrjNmKnOw+3uZdjDEXs= 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=QH5FA/9x; arc=none smtp.client-ip=209.85.216.45 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="QH5FA/9x" Received: by mail-pj1-f45.google.com with SMTP id 98e67ed59e1d1-2f43d17b0e3so10882536a91.0 for ; Tue, 04 Feb 2025 22:22:39 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=daynix-com.20230601.gappssmtp.com; s=20230601; t=1738736559; x=1739341359; 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=beCLR6fS0dAzFFFSsVjnikGsGyHpeeQQjgoShxHI8aw=; b=QH5FA/9xqt072asZe5B9//N3mO6mhAz+QH/YNmvtldGolQMWlwGYejVvjtBamDcLp4 S6ABuX9ImmCgHuvcGRlduNyYiPZ5Ydnv6kd6W5Xq2yUVlIAWtvQq4XMXWF2cYZKvo3Eh uQkU7w1C8VpdJCvld8Kou4rkgUbYgYJyzSFpeAY/X27K75fn9vbOUNeoAUzsny0D10r+ WRZlVSmQDZy/9RoLIlECHt55nk1Oec1qM4I5MNXLkY53o6IqSX4rCU/evEQaT3gYolQ4 SiiiPIVmcVpAqx99LvEIWfjK5BM+ZbyGdNS5WxbeS2mtKWsc7Kqone2ve8NCNXQzmyMz QR2g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1738736559; x=1739341359; 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=beCLR6fS0dAzFFFSsVjnikGsGyHpeeQQjgoShxHI8aw=; b=YpNfaSHFOaE/pcY1Kr4kPh5w8VIs9TSHItX3NT6ZKw/mmUDHq0TkLN1P9x7tnkNzux 4Y8iBF/cGcjqi3n/r6xX32JAMAYa0R735CSW7CUYYqXJc1bsSthd0Oeim3AXD20U3b01 x42Rnfq6wCwTUfhLGTv9RYtyDapRRIPYn4qNlE0kmFe8URDMJsejc6V+GZ18DduRDJ7i Bnp+FlsGvGypTsPk1WYoWX/WaHHFooKK7GHT/pbQ6dtNlqjB4H/G9OKZhRaF0/3T/vXv 0LCj4egbyWYTBOtHfWiP5s83+rkwngdR1l1P0ehvdhE3yeBW04GIhOFZ/pvm1WHQVVv5 dykg== X-Forwarded-Encrypted: i=1; AJvYcCVbei41G8GgVdvlmtjAGLO3FG5m1vhpoJfFhAeo7XiMMkIonRndjE1oxr9XAUkyBkqaqzpLYTmDlkN5D6o=@vger.kernel.org X-Gm-Message-State: AOJu0YxmOsVCp+7yu/MYmbtIsmb72MYBMbpfnTuHdE0WDY2EWrlJ3Z5A KhYrs1tLmm+pYE3r/xezuFH0pvKTUhmGr7RKqqAxqz8/AbKYUKjeTk8IEctZjBs= X-Gm-Gg: ASbGncsp1ZBXzE1sHMcyb41MdO6sug5ZVrcoRTgsMqZSxpQ3L1o8oMGZoRjo2oMXO9Q cPngr24QZQaOwSavsSIiF6zzCQmgtRluAqVVBWGUIbM+myC0sr5Y+qdsEGBwunjWfmqt2+q+73Z 7J55yMHiUKwjs6P/u2L2mkvsFnKp76Z8eQVvyKu11k9zh2ibZ8BFxdgrz1NkwGKdiXjNcstrw09 f8HMy23kYIqg9xaKMHV/frbAIDQ2kaaFfSFWI6YfKDzNg+stInYJZ2adchJw+SNJKGqdJhKJMTG arV0oqjfhE8ZUVNigzA= X-Google-Smtp-Source: AGHT+IEkltYiingUuvZ5OPE7k95CCEI+ZGRFDs15kcTYl15oURn0Qzmrf04BT6IAVXnOElwIy1y3oQ== X-Received: by 2002:a17:90b:3c52:b0:2ee:74a1:fba2 with SMTP id 98e67ed59e1d1-2f9e079b0efmr2575681a91.20.1738736559002; Tue, 04 Feb 2025 22:22:39 -0800 (PST) Received: from localhost ([157.82.207.107]) by smtp.gmail.com with UTF8SMTPSA id d9443c01a7336-21de330462bsm106232865ad.204.2025.02.04.22.22.33 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 04 Feb 2025 22:22:38 -0800 (PST) From: Akihiko Odaki Date: Wed, 05 Feb 2025 15:22:23 +0900 Subject: [PATCH net-next v5 1/7] tun: Refactor CONFIG_TUN_VNET_CROSS_LE 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: <20250205-tun-v5-1-15d0b32e87fa@daynix.com> References: <20250205-tun-v5-0-15d0b32e87fa@daynix.com> In-Reply-To: <20250205-tun-v5-0-15d0b32e87fa@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 Check IS_ENABLED(CONFIG_TUN_VNET_CROSS_LE) to save some lines and make future changes easier. Signed-off-by: Akihiko Odaki Reviewed-by: Willem de Bruijn --- drivers/net/tun.c | 26 ++++++++------------------ 1 file changed, 8 insertions(+), 18 deletions(-) diff --git a/drivers/net/tun.c b/drivers/net/tun.c index e816aaba8e5f2ed06f8832f79553b6c976e75bb8..452fc5104260fe7ff5fdd5cedc5= d2647cbe35c79 100644 --- a/drivers/net/tun.c +++ b/drivers/net/tun.c @@ -298,10 +298,10 @@ static bool tun_napi_frags_enabled(const struct tun_f= ile *tfile) return tfile->napi_frags_enabled; } =20 -#ifdef CONFIG_TUN_VNET_CROSS_LE static inline bool tun_legacy_is_little_endian(struct tun_struct *tun) { - return tun->flags & TUN_VNET_BE ? false : + return !(IS_ENABLED(CONFIG_TUN_VNET_CROSS_LE) && + (tun->flags & TUN_VNET_BE)) && virtio_legacy_is_little_endian(); } =20 @@ -309,6 +309,9 @@ static long tun_get_vnet_be(struct tun_struct *tun, int= __user *argp) { int be =3D !!(tun->flags & TUN_VNET_BE); =20 + if (!IS_ENABLED(CONFIG_TUN_VNET_CROSS_LE)) + return -EINVAL; + if (put_user(be, argp)) return -EFAULT; =20 @@ -319,6 +322,9 @@ static long tun_set_vnet_be(struct tun_struct *tun, int= __user *argp) { int be; =20 + if (!IS_ENABLED(CONFIG_TUN_VNET_CROSS_LE)) + return -EINVAL; + if (get_user(be, argp)) return -EFAULT; =20 @@ -329,22 +335,6 @@ static long tun_set_vnet_be(struct tun_struct *tun, in= t __user *argp) =20 return 0; } -#else -static inline bool tun_legacy_is_little_endian(struct tun_struct *tun) -{ - return virtio_legacy_is_little_endian(); -} - -static long tun_get_vnet_be(struct tun_struct *tun, int __user *argp) -{ - return -EINVAL; -} - -static long tun_set_vnet_be(struct tun_struct *tun, int __user *argp) -{ - return -EINVAL; -} -#endif /* CONFIG_TUN_VNET_CROSS_LE */ =20 static inline bool tun_is_little_endian(struct tun_struct *tun) { --=20 2.48.1 From nobody Sun Dec 14 21:37:47 2025 Received: from mail-pl1-f175.google.com (mail-pl1-f175.google.com [209.85.214.175]) (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 0888422837C for ; Wed, 5 Feb 2025 06:22:47 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.175 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738736570; cv=none; b=bvCsMVmx2+lashewTKl/hUKJGvcPanEcQl+GsaDo4fzRx+thOatsf/hExrARar3Dcd4ftWqiz1Jz2By9jDtYZNZi4tyFWBDeQLKTlxNgRNv9bxJeGcrsGNg1dKsnWKQ7+Olxbb0l8Uy7sEdXAlAsWipfcREAofL/iGbI4Sa1P+4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738736570; c=relaxed/simple; bh=OvIPYK+g9j4h856snHiOWJ7ZQgHA0nLVU5L7vERmbt0=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=gx/FjLypLRHnxSQIpWl5wBUirtYSdjPmxRB5ilQB1hSY5m80WDZgDpI4P4euByOQORYclRsB+Fjn/D6vwd/HQdd8QH+yD2DXuACKav9xXOX2o5qiCE4r0229vdgcAn/1TTTosthdsTfRbCmwAy+GnkyNBi8rRzn7IM2JXwkcuE4= 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=rQiSpLAK; arc=none smtp.client-ip=209.85.214.175 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="rQiSpLAK" Received: by mail-pl1-f175.google.com with SMTP id d9443c01a7336-21ddab8800bso91236215ad.3 for ; Tue, 04 Feb 2025 22:22:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=daynix-com.20230601.gappssmtp.com; s=20230601; t=1738736567; x=1739341367; 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=c3Yb4yc3CLfLvYu/aaxzBml3Yua5P+KV0PLbqfrkL/0=; b=rQiSpLAKLYhgPz/Dq0zwIKV8znShlql2iGSmW+6IMuMdpGfWlQEaVwWGaP7U4lg7q5 ZkYRyXEP4+X5CnhgHKmAccQd5+NS0mWeHh3POI6xr9dU7xPdg84T6OSWGcg0DFdjygh5 uDUPePRXftXd9yj5jyi3FLWSZqhVN3scuyHxheP+PcRNP/NS4cYdJVRLwhn8zwTy04qQ OL0AinXEEcLMxrhJBwW48m2qaUsIk5JNxbceO5wn4Uq4wUzx8dk+KT9046JGI3hcqQCv 8JjkrMRHXWvRs7OsGjLChRdrPgqw+chuT66d/4qYv/15ze0IUEBnHTLK1AisM9iAKo0k m0Qw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1738736567; x=1739341367; 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=c3Yb4yc3CLfLvYu/aaxzBml3Yua5P+KV0PLbqfrkL/0=; b=Dmze4QXOdxzj18jBloU9z/LtMBCeA01uS5k8yKDHGrvC8meJJS+q8eFNTTgYz6gSkQ LIbL60p8z5Qz38lcFG6wl/kBY7j9JjKLRpmRVHMpEdv6VI6ZvWSvIRegepHRUvZOollz 2QLp1Wxsy7WrCkVPyIJG9CeF31oS8Uy1sTWWX07zQZIcovHtDLAZa/x4wSGzeJuvd78k VGVHVXomjJUOfbBynLLvBVNj95LKpHBI3QmWY/i6WmIQUGVdYtnPeRoAMmn2o9O+4kMj numfVTUaoF90W5U5oeZxNniT27Y6VnMX5bwdN75pinHrNknP8VMfZYxEAgrGzYJPNtor 3ffQ== X-Forwarded-Encrypted: i=1; AJvYcCUUmpOR0d1hu9XEggsj5aD6zW3+8EQAkL3Ek4XC/pwezVCn45WeiAx3ySPa/BJw8l1P7eMyGp/JknHli5c=@vger.kernel.org X-Gm-Message-State: AOJu0YzkaKu6DDxmI3cClk0sE7vUvq44LlaleY02rlrURsNMwY5zmcY6 Jj7JxZOepnxZAaZlhTrko2AjOOy+mO5wD54OpTX+lGlyEeUFbJfFujEW1oozP74= X-Gm-Gg: ASbGncvuSQuEka97U9WZpeKC01xSUHy8SsEYLCyB4oT2jNm5IraUwa45qvq02snB+47 IRz2IEMEpaZzBIGHYbO3yeoNUIRTtBKQebyaFShF32saZe8T+9VlCK1/csLqKq+bxFEn4s3RTS/ qDpu4xU8/SUghO6t+aM5duxsMOFXnvUMuamwhnYUx+rcHu0lJTgxSTNy5V/mFaR+UV8+c94DDMa hj40xlu+t9+T4gdMC+zpRVAVjAqxT6BGm0BUxtyDpPdBFQyir+L+QKlpqJg7wQUCQeHjoDZdQ+c cGdcCyb3Pa2sZXzDlxE= X-Google-Smtp-Source: AGHT+IGzWVq9qQMR0OtpSV0vC3qHwySYobptxhoMmB1piJ2/BjXgoNAU3mlOXjwt7ZL5XD+44dzxog== X-Received: by 2002:a05:6a00:2e1b:b0:71e:6c3f:2fb6 with SMTP id d2e1a72fcca58-73035101c2bmr2780925b3a.8.1738736567160; Tue, 04 Feb 2025 22:22:47 -0800 (PST) Received: from localhost ([157.82.207.107]) by smtp.gmail.com with UTF8SMTPSA id d2e1a72fcca58-72fe6427309sm11714424b3a.43.2025.02.04.22.22.41 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 04 Feb 2025 22:22:46 -0800 (PST) From: Akihiko Odaki Date: Wed, 05 Feb 2025 15:22:24 +0900 Subject: [PATCH net-next v5 2/7] tun: Keep hdr_len in tun_get_user() 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: <20250205-tun-v5-2-15d0b32e87fa@daynix.com> References: <20250205-tun-v5-0-15d0b32e87fa@daynix.com> In-Reply-To: <20250205-tun-v5-0-15d0b32e87fa@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 hdr_len is repeatedly used so keep it in a local variable. Signed-off-by: Akihiko Odaki Reviewed-by: Willem de Bruijn --- drivers/net/tun.c | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/drivers/net/tun.c b/drivers/net/tun.c index 452fc5104260fe7ff5fdd5cedc5d2647cbe35c79..9d4aabc3b63c8f9baab82d7ab2b= ba567e9075484 100644 --- a/drivers/net/tun.c +++ b/drivers/net/tun.c @@ -1746,6 +1746,7 @@ static ssize_t tun_get_user(struct tun_struct *tun, s= truct tun_file *tfile, struct virtio_net_hdr gso =3D { 0 }; int good_linear; int copylen; + int hdr_len =3D 0; bool zerocopy =3D false; int err; u32 rxhash =3D 0; @@ -1772,19 +1773,21 @@ static ssize_t tun_get_user(struct tun_struct *tun,= struct tun_file *tfile, if (!copy_from_iter_full(&gso, sizeof(gso), from)) return -EFAULT; =20 - if ((gso.flags & VIRTIO_NET_HDR_F_NEEDS_CSUM) && - tun16_to_cpu(tun, gso.csum_start) + tun16_to_cpu(tun, gso.csum_offse= t) + 2 > tun16_to_cpu(tun, gso.hdr_len)) - gso.hdr_len =3D cpu_to_tun16(tun, tun16_to_cpu(tun, gso.csum_start) + t= un16_to_cpu(tun, gso.csum_offset) + 2); + hdr_len =3D tun16_to_cpu(tun, gso.hdr_len); =20 - if (tun16_to_cpu(tun, gso.hdr_len) > len) + if (gso.flags & VIRTIO_NET_HDR_F_NEEDS_CSUM) { + hdr_len =3D max(tun16_to_cpu(tun, gso.csum_start) + tun16_to_cpu(tun, g= so.csum_offset) + 2, hdr_len); + gso.hdr_len =3D cpu_to_tun16(tun, hdr_len); + } + + if (hdr_len > len) return -EINVAL; iov_iter_advance(from, vnet_hdr_sz - sizeof(gso)); } =20 if ((tun->flags & TUN_TYPE_MASK) =3D=3D IFF_TAP) { align +=3D NET_IP_ALIGN; - if (unlikely(len < ETH_HLEN || - (gso.hdr_len && tun16_to_cpu(tun, gso.hdr_len) < ETH_HLEN))) + if (unlikely(len < ETH_HLEN || (hdr_len && hdr_len < ETH_HLEN))) return -EINVAL; } =20 @@ -1797,9 +1800,7 @@ static ssize_t tun_get_user(struct tun_struct *tun, s= truct tun_file *tfile, * enough room for skb expand head in case it is used. * The rest of the buffer is mapped from userspace. */ - copylen =3D gso.hdr_len ? tun16_to_cpu(tun, gso.hdr_len) : GOODCOPY_LEN; - if (copylen > good_linear) - copylen =3D good_linear; + copylen =3D min(hdr_len ? hdr_len : GOODCOPY_LEN, good_linear); linear =3D copylen; iov_iter_advance(&i, copylen); if (iov_iter_npages(&i, INT_MAX) <=3D MAX_SKB_FRAGS) @@ -1820,10 +1821,7 @@ static ssize_t tun_get_user(struct tun_struct *tun, = struct tun_file *tfile, } else { if (!zerocopy) { copylen =3D len; - if (tun16_to_cpu(tun, gso.hdr_len) > good_linear) - linear =3D good_linear; - else - linear =3D tun16_to_cpu(tun, gso.hdr_len); + linear =3D min(hdr_len, good_linear); } =20 if (frags) { --=20 2.48.1 From nobody Sun Dec 14 21:37:47 2025 Received: from mail-pj1-f51.google.com (mail-pj1-f51.google.com [209.85.216.51]) (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 6A7EC22A1E1 for ; Wed, 5 Feb 2025 06:22:55 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.51 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738736578; cv=none; b=Uz5oc8/BNxZIdy1GckNiDyBsb8/IxJGxfnn5TBaVxQSdSdXDjCKXv0K8hwTSOyffFThEEOWvviOFIjNtCA94RviwwzRY+mHiL64f4iO0Bo+heRMUZLfUhJgFQXsR+MQA3wOJe6hPFo9wWeWuyfAGc80q8Lfj6KmW5EZ874Rbqns= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738736578; c=relaxed/simple; bh=VkcnSd9uth+aU0TZc6KkQboitOv8PTLAY/tRU375O50=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=VI60v9ihhm4+7wqiqpDejZEOe/bcbPde8uksjnv3vWyiYmLISJUvYJpI9kvQTmuAufDW1HGnyDYz67C+xCSitXLx5VWtW5ELMEdLjOko8LIO/iCGeYwUmw2bfiAgdhAfiNQIP+xnJtrmH+KRGNZVD4cmKxQxGg6arVfTW6loLbA= 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=PSnHI9wJ; arc=none smtp.client-ip=209.85.216.51 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="PSnHI9wJ" Received: by mail-pj1-f51.google.com with SMTP id 98e67ed59e1d1-2f9cd8ecbceso2231920a91.0 for ; Tue, 04 Feb 2025 22:22:55 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=daynix-com.20230601.gappssmtp.com; s=20230601; t=1738736574; x=1739341374; 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=7yiQ+gp/M7O1wWD8DLiQZcyuh3+HlUYoKsvgOw1BTbw=; b=PSnHI9wJHtraDhc+/07QzNWgs54+5IWTCeMQOERelHPD00c/Yfb7UrNzC6IOqux9aA zFiZsrkk1XuoYV04VEf/xTkhYDbQQ57BXK/aA/Ny03tUPZllCzUc8FEerX2ktKz5khZK YjK+piER6NMlX6mvLlJt6OUvAtHkv8dzgpy2JtXnbf81vge0CuVsOSeBUFPmN7Ee4Qk5 1Qeyiqtfxcu8QR0Tnov6Oe74ojlYZeWt1F1bFxVOqYKJvan8+RqZY8SZJlYAl82I2UYa LM/s1nYZl/VK5EIt/8SW2hwb45Ht9Zq3/BsvpAPte0Z1SmN+/07PDHtdf6oj+oJKqgfo 4gCQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1738736574; x=1739341374; 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=7yiQ+gp/M7O1wWD8DLiQZcyuh3+HlUYoKsvgOw1BTbw=; b=UX6IIg8gEc2T8c+jFjh9N244KAHc92bjWkm2rQk2fUS7226LtuahBHB03X6MXOKN0l CgSgDQlg0Kwz+WRY23rbDFvqaBWFzIuC1At6c5/BWGoNfvwQbNZ5cHBFsio8tl+JC+Fh gg5Z+LfGVhO7I6dBVRtJ08ayAS+UhV9GQGR3u3XP6Kav84HiEUNRCOiIj2IKneXhn0Ed bZELTRknBmjb9NvoJ2wZhm1phf5e1XpAN5ve8YfbT5Xm/1M94JOczDf9igxm1jWfh/Ak 95s60iRfnYCEvSHjxCBczQGHSPaimXyAbM464lZe/1cdN2JLxEPmLwOG0sMNgEAKA4Rf 3owQ== X-Forwarded-Encrypted: i=1; AJvYcCUUuHxxMs40V+GYKJZ8EDHUg/8nGwbHhlI5tIUX/7rBAbPa8DgLcyATb/gsIIPfl9YdhT0olK5+ogfKBkc=@vger.kernel.org X-Gm-Message-State: AOJu0YyGSBxxJFelGdOMmM9Vv5V2nNki2450RDpAAuQLrO6VG5lmM+P/ L+zvVTsAk0MgyLjqLnX0xVv1f18eeDqZ3Su/ZwIDjC357vZVBWR4R4hofS4DTtk= X-Gm-Gg: ASbGncvUmfxap3+TgyNRn5YsicPnjyKhVLUxb3X+evhKE1tjlUOIrN9Gg9YpXjxgDKY 3pGOsma+eD85o8rODcpIPG3zQYTz5vDo30iKGEQKskG60/hR4inqZVOcfXlWz18qIgPTgGA6QmJ R3/RUTiBJEN6tW0AYEwOOjgwLSNEJNzqI29d78CpHOxihcoLNjNa3ZHhffcVyO83ZpHpSEmNvzh 2p8KezwgleVmi+NLnNvj4B0K7NKU8/u4yQedCi/IRzn7akuOQn7HEO0eFe7ZDTXfT+VbsSWsWeg o6k/VDOtY3tBqBhQC8M= X-Google-Smtp-Source: AGHT+IEcJOQFpqxKnvfD+cBwESRfxy45G0iiGCxNTZyVh5qCbjumW7AjokC8QvgMCRhfirYMLiipfw== X-Received: by 2002:a05:6a00:3cc1:b0:72d:2444:da2d with SMTP id d2e1a72fcca58-7303511c75dmr2598853b3a.9.1738736574442; Tue, 04 Feb 2025 22:22:54 -0800 (PST) Received: from localhost ([157.82.207.107]) by smtp.gmail.com with UTF8SMTPSA id d2e1a72fcca58-72fe69cd801sm11624244b3a.123.2025.02.04.22.22.48 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 04 Feb 2025 22:22:54 -0800 (PST) From: Akihiko Odaki Date: Wed, 05 Feb 2025 15:22:25 +0900 Subject: [PATCH net-next v5 3/7] tun: Decouple vnet from tun_struct 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: <20250205-tun-v5-3-15d0b32e87fa@daynix.com> References: <20250205-tun-v5-0-15d0b32e87fa@daynix.com> In-Reply-To: <20250205-tun-v5-0-15d0b32e87fa@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 vnet-related functions from tun_struct so that we can reuse them for tap in the future. Signed-off-by: Akihiko Odaki Reviewed-by: Willem de Bruijn --- drivers/net/tun.c | 51 ++++++++++++++++++++++++++------------------------- 1 file changed, 26 insertions(+), 25 deletions(-) diff --git a/drivers/net/tun.c b/drivers/net/tun.c index 9d4aabc3b63c8f9baab82d7ab2bba567e9075484..8ddd4b352f0307e52cdff75254b= 5ac1d259d51f8 100644 --- a/drivers/net/tun.c +++ b/drivers/net/tun.c @@ -298,16 +298,16 @@ static bool tun_napi_frags_enabled(const struct tun_f= ile *tfile) return tfile->napi_frags_enabled; } =20 -static inline bool tun_legacy_is_little_endian(struct tun_struct *tun) +static inline bool tun_legacy_is_little_endian(unsigned int flags) { return !(IS_ENABLED(CONFIG_TUN_VNET_CROSS_LE) && - (tun->flags & TUN_VNET_BE)) && + (flags & TUN_VNET_BE)) && virtio_legacy_is_little_endian(); } =20 -static long tun_get_vnet_be(struct tun_struct *tun, int __user *argp) +static long tun_get_vnet_be(unsigned int flags, int __user *argp) { - int be =3D !!(tun->flags & TUN_VNET_BE); + int be =3D !!(flags & TUN_VNET_BE); =20 if (!IS_ENABLED(CONFIG_TUN_VNET_CROSS_LE)) return -EINVAL; @@ -318,7 +318,7 @@ static long tun_get_vnet_be(struct tun_struct *tun, int= __user *argp) return 0; } =20 -static long tun_set_vnet_be(struct tun_struct *tun, int __user *argp) +static long tun_set_vnet_be(unsigned int *flags, int __user *argp) { int be; =20 @@ -329,27 +329,26 @@ static long tun_set_vnet_be(struct tun_struct *tun, i= nt __user *argp) return -EFAULT; =20 if (be) - tun->flags |=3D TUN_VNET_BE; + *flags |=3D TUN_VNET_BE; else - tun->flags &=3D ~TUN_VNET_BE; + *flags &=3D ~TUN_VNET_BE; =20 return 0; } =20 -static inline bool tun_is_little_endian(struct tun_struct *tun) +static inline bool tun_is_little_endian(unsigned int flags) { - return tun->flags & TUN_VNET_LE || - tun_legacy_is_little_endian(tun); + return flags & TUN_VNET_LE || tun_legacy_is_little_endian(flags); } =20 -static inline u16 tun16_to_cpu(struct tun_struct *tun, __virtio16 val) +static inline u16 tun16_to_cpu(unsigned int flags, __virtio16 val) { - return __virtio16_to_cpu(tun_is_little_endian(tun), val); + return __virtio16_to_cpu(tun_is_little_endian(flags), val); } =20 -static inline __virtio16 cpu_to_tun16(struct tun_struct *tun, u16 val) +static inline __virtio16 cpu_to_tun16(unsigned int flags, u16 val) { - return __cpu_to_virtio16(tun_is_little_endian(tun), val); + return __cpu_to_virtio16(tun_is_little_endian(flags), val); } =20 static inline u32 tun_hashfn(u32 rxhash) @@ -1765,6 +1764,7 @@ static ssize_t tun_get_user(struct tun_struct *tun, s= truct 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; =20 if (len < vnet_hdr_sz) return -EINVAL; @@ -1773,11 +1773,11 @@ static ssize_t tun_get_user(struct tun_struct *tun,= struct tun_file *tfile, if (!copy_from_iter_full(&gso, sizeof(gso), from)) return -EFAULT; =20 - hdr_len =3D tun16_to_cpu(tun, gso.hdr_len); + 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(tun, gso.csum_start) + tun16_to_cpu(tun, g= so.csum_offset) + 2, hdr_len); - gso.hdr_len =3D cpu_to_tun16(tun, hdr_len); + 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); } =20 if (hdr_len > len) @@ -1856,7 +1856,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))) { + if (virtio_net_hdr_to_skb(skb, &gso, tun_is_little_endian(tun->flags))) { atomic_long_inc(&tun->rx_frame_errors); err =3D -EINVAL; goto free_skb; @@ -2110,23 +2110,24 @@ 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; =20 if (iov_iter_count(iter) < vnet_hdr_sz) return -EINVAL; =20 if (virtio_net_hdr_from_skb(skb, &gso, - tun_is_little_endian(tun), true, + tun_is_little_endian(flags), true, vlan_hlen)) { struct skb_shared_info *sinfo =3D skb_shinfo(skb); =20 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(tun, gso.gso_size), - tun16_to_cpu(tun, gso.hdr_len)); + 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(tun, gso.hdr_len), 64), true); + min((int)tun16_to_cpu(flags, gso.hdr_len), 64), true); } WARN_ON_ONCE(1); return -EINVAL; @@ -2495,7 +2496,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))) { + if (virtio_net_hdr_to_skb(skb, gso, tun_is_little_endian(tun->flags))) { atomic_long_inc(&tun->rx_frame_errors); kfree_skb(skb); ret =3D -EINVAL; @@ -3324,11 +3325,11 @@ static long __tun_chr_ioctl(struct file *file, unsi= gned int cmd, break; =20 case TUNGETVNETBE: - ret =3D tun_get_vnet_be(tun, argp); + ret =3D tun_get_vnet_be(tun->flags, argp); break; =20 case TUNSETVNETBE: - ret =3D tun_set_vnet_be(tun, argp); + ret =3D tun_set_vnet_be(&tun->flags, argp); break; =20 case TUNATTACHFILTER: --=20 2.48.1 From nobody Sun Dec 14 21:37:47 2025 Received: from mail-pl1-f182.google.com (mail-pl1-f182.google.com [209.85.214.182]) (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 626E122A4E4 for ; Wed, 5 Feb 2025 06:23:02 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.182 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738736585; cv=none; b=EJbRuC1FfALlTRGQ65MNafwhNXHIdGfvrCmo+77h/yXG252FueWbKtilKAhBYLyWF4C7yyWvGJ5FFhmWPl2q8GZ0L5IP5DewuWMH838KXDSsyGDa5SgiryVoXfteUabQQWO+P3+TAZ3mI/yXemEOyxLx98y612Y95gl8IUxjee8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738736585; c=relaxed/simple; bh=1kfwXowcu8r3IMQTXe7PLhRBVMfknEmCsLcWG6R/qn8=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=b2eRP32/AJEzufHTh/NknJU/B40fJUIHFLk+BpZ+Z1gSsFoPIPi3UM4B2S/joQWW2SOobb6Ap2bVZ7AOkRf3v34VbceIw2oAfMHnbeuKG1qZmkKUKmb1quacEHa5zLNhD5Jqsypk8cz6fxuOZ4d5wynRlqwsCBcElN4dPuqPfWk= 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=hEgExfB9; arc=none smtp.client-ip=209.85.214.182 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="hEgExfB9" Received: by mail-pl1-f182.google.com with SMTP id d9443c01a7336-21effc750d2so26347545ad.3 for ; Tue, 04 Feb 2025 22:23:02 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=daynix-com.20230601.gappssmtp.com; s=20230601; t=1738736582; x=1739341382; 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=EdteCPyxaLnTbFrQqSLEpLkKaGkxVoLiFLjqkZyLOko=; b=hEgExfB9gMwg6CbDpuv+o1DVYjlX8gS6Lj36vYVR5me5hZVwBf1u7P7K24Bggw6I9S YdsD1xSyQ1N9ACfsjx4qn4cL+aR6j9VQQbwht1RxhpJ1Gk/XgTW1GX/vKdYW4+Fn62uE fryC66DA7RJsJaSutSconObDWt3gLOHnB02lF0dLv9Gr/UmyX+9Gokr4d9MvFLVQonBs IiRu0A3AfEGSfkN5HlxtzNi4KIM1Cqpkidufn1Nuuos3vc1IHdbch2tuahAJ6XT1rOVD yoSYg7JFw4bjWFRYYChz6SRxQIpgfBjF61b0SlhdqhLbdw4tt7oMC6PVv/Ni/7cR8JYn +eKw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1738736582; x=1739341382; 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=EdteCPyxaLnTbFrQqSLEpLkKaGkxVoLiFLjqkZyLOko=; b=NNyABe5nk6IL/kSFAU+wzfgLv7lHNQ8SbY2dOGbEvRVmCTXhxL4PoqZiGNVQ1vvYzL ys4G3y0siosK8zshJK8k9s255Dy4zVoNa0SIf8/iOoBwNwMdtxLhRJPLW7qFfCR1jzOC N7lcsGrIcEB7HyzMIhLB/+KaHhZEDoKsxK7zG34VLDdgOC/jXCHEpSjs8NlVpRWadcC5 jPGeufEZ0BYNfdvlbUHKbOSv8ycUMFlHxk2Tgra6oBeZm+1rjV8J+HKbOs0fwGdh31yr 0REL+o7grFmZhwCVvH2KfTnzEFhN9EVdvfg7ExORfjnW4ffqhMGwnWfkUY5T23RBEj7+ iR6Q== X-Forwarded-Encrypted: i=1; AJvYcCX6Y0PEe77fRt1YFw3QxkM8xIX8nEkHX7hxRMv5CTBlKpY/RkLROQCjuQWMvVDzC6OtW/+3koLMAL41fyU=@vger.kernel.org X-Gm-Message-State: AOJu0YxJInMEoR3zj3XQsxfW6xkRIyZS47jlDj2yHlkjm6rh1EPOBWdu XdvIqGlJjHy4Fa0UfdOnjGLHifcs4LxPf9jfjrjj8iK7yKxoRq7+IyN9NAkpb/M= X-Gm-Gg: ASbGncstUUTu2W+Fb8+38f3Y8YBoUWX3PO+dTBIGqUktGxAtKfK4QDRPL7xlz7HYEO4 sYyuJCQChbbxvnRX5LuLeWP62rw0sfvkfCi67MRUxcl/WVQ9EtvJztThNP1nXSx4AI4oXHDD1XJ sWsW7QsjvoMzEcb/JTBKrr9ii6Hl5/sFqcXzamjQl/a7VO8nBwli/1Hk7791wxe3Gp5xMjK0qCc 31j3LlVZMyEJsXp9jLIoLOwreIzOAYb7GxZS7FehFRI01UURsH7UWdLVxdqJ3liSw1OISzsvEiJ gLqIJlrT6O9b+IiBUHc= X-Google-Smtp-Source: AGHT+IGS0p/woIeC+Ecmgux0bdZYtHmzuFlzAKlhJ7xY0Zf9qFKBQod0Xje6b5F5RjRzDrSuFL9Qwg== X-Received: by 2002:a17:903:41cf:b0:215:9d58:6f35 with SMTP id d9443c01a7336-21f17dde0f5mr30415915ad.1.1738736581697; Tue, 04 Feb 2025 22:23:01 -0800 (PST) Received: from localhost ([157.82.207.107]) by smtp.gmail.com with UTF8SMTPSA id d9443c01a7336-21de31f7554sm107377935ad.81.2025.02.04.22.22.56 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 04 Feb 2025 22:23:01 -0800 (PST) From: Akihiko Odaki Date: Wed, 05 Feb 2025 15:22:26 +0900 Subject: [PATCH net-next v5 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: <20250205-tun-v5-4-15d0b32e87fa@daynix.com> References: <20250205-tun-v5-0-15d0b32e87fa@daynix.com> In-Reply-To: <20250205-tun-v5-0-15d0b32e87fa@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 8ddd4b352f0307e52cdff75254b5ac1d259d51f8..5bd1c21032ed673ba8e39dd5a48= 8cce11599855b 100644 --- a/drivers/net/tun.c +++ b/drivers/net/tun.c @@ -351,6 +351,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; @@ -1764,25 +1885,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) { @@ -1856,7 +1964,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; @@ -2051,18 +2159,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; @@ -2085,6 +2190,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; @@ -2110,33 +2216,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) { @@ -2496,7 +2583,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; @@ -3080,8 +3167,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 @@ -3288,50 +3373,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; @@ -3387,7 +3428,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 From nobody Sun Dec 14 21:37:47 2025 Received: from mail-pl1-f169.google.com (mail-pl1-f169.google.com [209.85.214.169]) (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 67565228360 for ; Wed, 5 Feb 2025 06:23:10 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.169 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738736592; cv=none; b=T7sWIqge9CG7M3bdwVMkHcljnYXUpdw7j4MooXnb4EbAGfkguGRQ5QAAYPtqZsG4CD61cGLQbSdlGf2LRYBMPo7KS6v4K4I7pzct6fk8QPdFkyIrJm1AAcf8Gi/WsETP01c2e/W1UoGmGEnXmYOHFOAUKJUwv5/YthOgrjoVYnY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738736592; c=relaxed/simple; bh=0QlbLZJmOP0NdrcIFaYBxgRiDd3p8c2JkJWDxnugLEc=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To; b=qVYOOX0vQgWGSq/yORPppWvTCvAqEJBrzZjVxh0izFOScFwOiVliYYknvUgB39q+2dCfjKYVu7AKtnFNsGDKhU5fL4Z+b/73qZei1NSvqpRwvr2a4Pyjx0wvrp3Nbb5gq2FkOSq9Z7iysuhWZUT9IRRfwJRE9gEKmIXXHMwNM5w= 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=v57VuTbX; arc=none smtp.client-ip=209.85.214.169 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="v57VuTbX" Received: by mail-pl1-f169.google.com with SMTP id d9443c01a7336-21628b3fe7dso118881725ad.3 for ; Tue, 04 Feb 2025 22:23:10 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=daynix-com.20230601.gappssmtp.com; s=20230601; t=1738736589; x=1739341389; darn=vger.kernel.org; h=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=c8+srnXR3HbXsFhUvwwqRCwLReYRUH9xaHqIFlOtZiY=; b=v57VuTbXKNLk3m985F9NHXmmts2Z6jiJzjSPnVUAMyD6tO9coW9Qxkq93lcw3Z0dD+ 1cMjTLuGZiHI7XdgEoz6A70JVGSlh75bHyyssZgo4svbxmbEkWs5jy+ehFK618/14vyt zBPtgYDSActKyC+DKBz6m6xOaKhn8pajymbxu7TpqRnxnDs8vnQPERj6qyeRP+j3JTNw 8jpdUlieEycoHWCGfQ7MXXYl+u1Gcdv+E4dBO5FlskDt7VizME6RL1T6VEDJlCedATRq VqhEr+FC7WA/6twY4qzAes+BEqQjQp1KMwhuurIsCdRY9vMdj7ZNbj4mZwg2Sn7MBkVN 6Zug== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1738736589; x=1739341389; h=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=c8+srnXR3HbXsFhUvwwqRCwLReYRUH9xaHqIFlOtZiY=; b=P/hd48xTMp0CpIbrQhhQ6A0nkEe8Shw1w6Wtm4UWuG7P1DbVI+4PiKkdBGKSe6t6Xr ntruTnUVB3mSb4ry16H3Vke8Gbo4MYyhOHaZ2g8WnrDd9nDcQcfggTCX/C0KtI3E+q8Y FUVdTLvGjazENCBHJ38HfoElOP/5ioWhgcFXdhINfGziiq0oQrBSxkmR0IhdGIcVYrG6 GBP51ZUYNny7+M43EOaDtzPETcfFwkf8R7EZQErFwbNe+SAVIqoLQJQHVbVKSjeKRmUL bgeg3O6w798+0RSdelzS6ChXDMC5k4iZ/y99JzCl+meACwnhh+5CZXTeQ2hSVoESfpkO N6UQ== X-Forwarded-Encrypted: i=1; AJvYcCXCMUMqnFC4eO8MPy6kP5iGPnDsX7hsyFMw+mLJtJyo6TdlSAhEvZGZWT4e6mQEBS3EsR50ncIiW+Il39c=@vger.kernel.org X-Gm-Message-State: AOJu0YzrgWaExs/QUTxCa02vf83Iay6lIqnTFxdsaAF5wVRxL7QaMkXk 1DFrgYr8mqeWrJp5ZMu29dQK0MvDHvNcSHzZgPORZ+7vX5/FAlw7P4w4+ruzlNU= X-Gm-Gg: ASbGncs1rzz+yTbT6RlGC26LHFnHr1KTYoSyy0neoAX9yUoDPHuuhT5bkJYBeLWAVaH 25pnyUHuXwr+lWFGR7Ro6WbQtQAXHqkWaMm4dQzkN98msunW6slSUcWgHSHSPfLzFR99872YuDi Ag1uSCIumB3ab4yZQ32m4KyWIa1m4BZj7LOmhGM9IFSoYaU7aw0Xg9DJkigUxIO+vhYB4kFeS0I zymyubeRuC1Spy1Z3Xt7Db94/dyHPaHnt/tuT52peA9WqCju7m78GRC8Ggr1Jh8C1ZsXGerL2Lc sg+o0Fw8t+WqOdMLE04= X-Google-Smtp-Source: AGHT+IGHhMGxwdJctO3sbqAZtpY4VJ3b/3Vc3L0ZWumRV5M3UChkIjjO1qf15ZMVPyOqakS5kJdbUQ== X-Received: by 2002:a05:6a00:10d4:b0:727:99a8:cd31 with SMTP id d2e1a72fcca58-7303513954dmr2789806b3a.14.1738736589512; Tue, 04 Feb 2025 22:23:09 -0800 (PST) Received: from localhost ([157.82.207.107]) by smtp.gmail.com with UTF8SMTPSA id d2e1a72fcca58-72fe64275cfsm12020664b3a.58.2025.02.04.22.23.04 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 04 Feb 2025 22:23:09 -0800 (PST) From: Akihiko Odaki Date: Wed, 05 Feb 2025 15:22:27 +0900 Subject: [PATCH net-next v5 5/7] tun: Extract the vnet handling code 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: <20250205-tun-v5-5-15d0b32e87fa@daynix.com> References: <20250205-tun-v5-0-15d0b32e87fa@daynix.com> In-Reply-To: <20250205-tun-v5-0-15d0b32e87fa@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 X-Mailer: b4 0.14.2 The vnet handling code will be reused by tap. Signed-off-by: Akihiko Odaki --- MAINTAINERS | 2 +- drivers/net/tun.c | 179 +--------------------------------------------= -- drivers/net/tun_vnet.h | 184 +++++++++++++++++++++++++++++++++++++++++++++= ++++ 3 files changed, 187 insertions(+), 178 deletions(-) diff --git a/MAINTAINERS b/MAINTAINERS index 910305c11e8a882da5b49ce5bd55011b93f28c32..bc32b7e23c79ab80b19c8207f14= c5e51a47ec89f 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -23902,7 +23902,7 @@ W: http://vtun.sourceforge.net/tun F: Documentation/networking/tuntap.rst F: arch/um/os-Linux/drivers/ F: drivers/net/tap.c -F: drivers/net/tun.c +F: drivers/net/tun* =20 TURBOCHANNEL SUBSYSTEM M: "Maciej W. Rozycki" diff --git a/drivers/net/tun.c b/drivers/net/tun.c index 5bd1c21032ed673ba8e39dd5a488cce11599855b..b14231a743915c2851eaae49d75= 7b763ec4a8841 100644 --- a/drivers/net/tun.c +++ b/drivers/net/tun.c @@ -83,6 +83,8 @@ #include #include =20 +#include "tun_vnet.h" + static void tun_default_link_ksettings(struct net_device *dev, struct ethtool_link_ksettings *cmd); =20 @@ -94,9 +96,6 @@ static void tun_default_link_ksettings(struct net_device = *dev, * overload it to mean fasync when stored there. */ #define TUN_FASYNC IFF_ATTACH_QUEUE -/* High bits in flags field are unused. */ -#define TUN_VNET_LE 0x80000000 -#define TUN_VNET_BE 0x40000000 =20 #define TUN_FEATURES (IFF_NO_PI | IFF_ONE_QUEUE | IFF_VNET_HDR | \ IFF_MULTI_QUEUE | IFF_NAPI | IFF_NAPI_FRAGS) @@ -298,180 +297,6 @@ static bool tun_napi_frags_enabled(const struct tun_f= ile *tfile) return tfile->napi_frags_enabled; } =20 -static inline bool tun_legacy_is_little_endian(unsigned int flags) -{ - return !(IS_ENABLED(CONFIG_TUN_VNET_CROSS_LE) && - (flags & TUN_VNET_BE)) && - virtio_legacy_is_little_endian(); -} - -static long tun_get_vnet_be(unsigned int flags, int __user *argp) -{ - int be =3D !!(flags & TUN_VNET_BE); - - if (!IS_ENABLED(CONFIG_TUN_VNET_CROSS_LE)) - return -EINVAL; - - if (put_user(be, argp)) - return -EFAULT; - - return 0; -} - -static long tun_set_vnet_be(unsigned int *flags, int __user *argp) -{ - int be; - - if (!IS_ENABLED(CONFIG_TUN_VNET_CROSS_LE)) - return -EINVAL; - - if (get_user(be, argp)) - return -EFAULT; - - if (be) - *flags |=3D TUN_VNET_BE; - else - *flags &=3D ~TUN_VNET_BE; - - return 0; -} - -static inline bool tun_is_little_endian(unsigned int flags) -{ - return flags & TUN_VNET_LE || tun_legacy_is_little_endian(flags); -} - -static inline u16 tun16_to_cpu(unsigned int flags, __virtio16 val) -{ - return __virtio16_to_cpu(tun_is_little_endian(flags), val); -} - -static inline __virtio16 cpu_to_tun16(unsigned int flags, u16 val) -{ - return __cpu_to_virtio16(tun_is_little_endian(flags), val); -} - -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; diff --git a/drivers/net/tun_vnet.h b/drivers/net/tun_vnet.h new file mode 100644 index 0000000000000000000000000000000000000000..dc5e9ec9d04cc8357504af23b15= 52af71155d329 --- /dev/null +++ b/drivers/net/tun_vnet.h @@ -0,0 +1,184 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ +#ifndef TUN_VNET_H +#define TUN_VNET_H + +/* High bits in flags field are unused. */ +#define TUN_VNET_LE 0x80000000 +#define TUN_VNET_BE 0x40000000 + +static inline bool tun_vnet_legacy_is_little_endian(unsigned int flags) +{ + return !(IS_ENABLED(CONFIG_TUN_VNET_CROSS_LE) && + (flags & TUN_VNET_BE)) && + virtio_legacy_is_little_endian(); +} + +static inline long tun_get_vnet_be(unsigned int flags, int __user *argp) +{ + int be =3D !!(flags & TUN_VNET_BE); + + if (!IS_ENABLED(CONFIG_TUN_VNET_CROSS_LE)) + return -EINVAL; + + if (put_user(be, argp)) + return -EFAULT; + + return 0; +} + +static inline long tun_set_vnet_be(unsigned int *flags, int __user *argp) +{ + int be; + + if (!IS_ENABLED(CONFIG_TUN_VNET_CROSS_LE)) + return -EINVAL; + + if (get_user(be, argp)) + return -EFAULT; + + if (be) + *flags |=3D TUN_VNET_BE; + else + *flags &=3D ~TUN_VNET_BE; + + return 0; +} + +static inline bool tun_vnet_is_little_endian(unsigned int flags) +{ + return flags & TUN_VNET_LE || tun_vnet_legacy_is_little_endian(flags); +} + +static inline u16 tun_vnet16_to_cpu(unsigned int flags, __virtio16 val) +{ + return __virtio16_to_cpu(tun_vnet_is_little_endian(flags), val); +} + +static inline __virtio16 cpu_to_tun_vnet16(unsigned int flags, u16 val) +{ + return __cpu_to_virtio16(tun_vnet_is_little_endian(flags), val); +} + +static inline 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 inline int tun_vnet_hdr_get(int sz, unsigned int flags, + struct iov_iter *from, + 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 tun_vnet16_to_cpu(flags, hdr->hdr_len); + + if (hdr->flags & VIRTIO_NET_HDR_F_NEEDS_CSUM) { + hdr_len =3D max(tun_vnet16_to_cpu(flags, hdr->csum_start) + tun_vnet16_t= o_cpu(flags, hdr->csum_offset) + 2, hdr_len); + hdr->hdr_len =3D cpu_to_tun_vnet16(flags, hdr_len); + } + + if (hdr_len > iov_iter_count(from)) + return -EINVAL; + + iov_iter_advance(from, sz - sizeof(*hdr)); + + return hdr_len; +} + +static inline 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 inline 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_vnet_is_little_endian(flags)); +} + +static inline 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_vnet_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, tun_vnet16_to_cpu(flags, hdr->gso_size), + tun_vnet16_to_cpu(flags, hdr->hdr_len)); + print_hex_dump(KERN_ERR, "tun: ", + DUMP_PREFIX_NONE, + 16, 1, skb->head, + min(tun_vnet16_to_cpu(flags, hdr->hdr_len), 64), true); + } + WARN_ON_ONCE(1); + return -EINVAL; + } + + return 0; +} + +#endif /* TUN_VNET_H */ --=20 2.48.1 From nobody Sun Dec 14 21:37:47 2025 Received: from mail-pl1-f177.google.com (mail-pl1-f177.google.com [209.85.214.177]) (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 BAA2722ACC5 for ; Wed, 5 Feb 2025 06:23:17 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.177 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738736599; cv=none; b=RFV0STyYibW/QiBbkmP4sn5Kd/BPt1aa8rElXRjLhY5pgWxPWTIc96zd8+dQ4hGHE+nt+S7b0A5czKXUM/wqJBRNjGVmvA98XdNnbmpnbC8AvcskdQ1P4vHHw1YFdf2YWNm2P1SiISDmPviUoFXYnmWftTYLf5Wx+Ok6ACdz+yA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738736599; c=relaxed/simple; bh=a8oH3PNmwIVYj2tKdIrFjYF4Tj+2irxY4kfMh7WOKvo=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To; b=lTxruTgQEp5JIybk0ci/FYHj7Oj7wKvqPZXNaFjccjbIlLX+v+xYSdYMx0FOT0PHsvmgFSbpqJhV6Qu1RaQnE5xI9l/OpUnTONC5xyvSYdhnTiXmXb3YZJWOvYpgBphIjphlGfoaRx5wz/QV/20jCcwYYUrkV0+mMk27tb6J3aA= 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=RhWE+Q9Y; arc=none smtp.client-ip=209.85.214.177 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="RhWE+Q9Y" Received: by mail-pl1-f177.google.com with SMTP id d9443c01a7336-21670dce0a7so133684025ad.1 for ; Tue, 04 Feb 2025 22:23:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=daynix-com.20230601.gappssmtp.com; s=20230601; t=1738736597; x=1739341397; darn=vger.kernel.org; h=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=M8srIBeyhs4OWM9PodAkxe8Sc4dGj/gPqaYG7YjTXw0=; b=RhWE+Q9YEROWBWGUSsYw4nh41epxfN9ekdl/kBLgKyRwQ/XWMNxfvCWGeJBidggLOG twM0vPMHhK1Y8DeiC38RTqjBea6wvvmOJVW3RlkMBPs/u9tKbv5WfMExqbKBftGbyKg5 er7LClnJskywKV3zwzNZpCkak5i8VF3KY2vlGOtEkEAQ9qtWBcRqVpYw/IVcq+ZcqiEx gtW1Iqi2IcPmtNBPB3Bs9Wi5QwCAf2IAiIvFgiJV3ns4SCSXOKZPYz9/SexaKIc9UC1Q OpLpLGkuyz6RNuxUg0iHOcQBDTz9i6KEfHZOoLCmb+l+FcInIRKEmK2hKERtEE53Es1I NsKQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1738736597; x=1739341397; h=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=M8srIBeyhs4OWM9PodAkxe8Sc4dGj/gPqaYG7YjTXw0=; b=lnSDxSgQKlcnJAzpp2QiWoyFYVr8tJ7sQhwX8vjt3J5c7sbj7hHyj4MR5Y/eh3HsEr YS3Va7DnuIMD6A2aRzfmKdtrUe3L2jiW/oq/SmbfAtXp43XioHb/5EBn+Naw660mz8yV vksIGKPEjK7bILABusBC8koHyAnn31XcRfxFRLwIlLGI9ALZo+rp1mI8X0tSQYkXaYAR +o2Y8DjugJUNQCCjPKBqPmtwXdqVYIx4u6OpySYTfbfL6+hZ9+Fu+X/Qn2OMe8NsoDmu XL05AE3q1sx0AunjoVGIMeXpWIMUFOUlbkMvXaCNl5h3m1oucJWrL5aCPoqetUXYQt5x wLAw== X-Forwarded-Encrypted: i=1; AJvYcCW9G4vjEd8SHYtt/s2Z+ZxC/7D00XKpqJNpZT3c8oc+G3bS4qYz73mSsjUiUzBXqBPXjTjrEkifprjLBkw=@vger.kernel.org X-Gm-Message-State: AOJu0Yxvv0NR5QW5eei3HpKjttLi7LMGp6a6wXMUOBBVsRzPEUaCHoym k0om4I27wqbMHLr+ONVca69pEsJLiuh79vzLQ5Zvre/nvzFzdMhGHgOczFOMu0Y= X-Gm-Gg: ASbGncsQTJvtq8sogpmG2rIwb/11mLULvVIjd3H76buaIPP3fQId+Lk5gfwtN20hTUq fOQ3rK55JemvlxUGrbnn53h3VJvcYRMgbJraXxnCV+nLHfJZ+R80jqOa1vsFPgBDt4yWIB9Hnvf hXFbIfkJdqjLXqBQKnWgJAXgTTxRuccYzgCpfvNdO2bgoQy27lfWdL6MKj7t0AX409OBh+3OmkE cXDAZmCssoChnhHDU8spdYODzXFiqOD85BrzMKexeS2cFqtACbwzw72kzXaAHGCCZQANJKQHbM3 CcA9VW73p3YjwjhokrE= X-Google-Smtp-Source: AGHT+IHg1+FvFT5HDL6SfSKULAJ1AqWAEtxmHva7Bnl4TG97CsA76lSGxTRKSfzGYdWpbEr3lj3N/w== X-Received: by 2002:a05:6a00:2e14:b0:725:ffe:4dae with SMTP id d2e1a72fcca58-73035122ac9mr1991170b3a.10.1738736596777; Tue, 04 Feb 2025 22:23:16 -0800 (PST) Received: from localhost ([157.82.207.107]) by smtp.gmail.com with UTF8SMTPSA id d2e1a72fcca58-72fe631be56sm11600664b3a.4.2025.02.04.22.23.11 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 04 Feb 2025 22:23:16 -0800 (PST) From: Akihiko Odaki Date: Wed, 05 Feb 2025 15:22:28 +0900 Subject: [PATCH net-next v5 6/7] tap: Keep hdr_len in tap_get_user() 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: <20250205-tun-v5-6-15d0b32e87fa@daynix.com> References: <20250205-tun-v5-0-15d0b32e87fa@daynix.com> In-Reply-To: <20250205-tun-v5-0-15d0b32e87fa@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 X-Mailer: b4 0.14.2 hdr_len is repeatedly used so keep it in a local variable. Signed-off-by: Akihiko Odaki Reviewed-by: Willem de Bruijn --- drivers/net/tap.c | 30 +++++++++++++----------------- 1 file changed, 13 insertions(+), 17 deletions(-) diff --git a/drivers/net/tap.c b/drivers/net/tap.c index 5aa41d5f7765a6dcf185bccd3cba2299bad89398..c55c432bac48d395aebc9ceeaa7= 4f7d07e25af4c 100644 --- a/drivers/net/tap.c +++ b/drivers/net/tap.c @@ -645,6 +645,7 @@ static ssize_t tap_get_user(struct tap_queue *q, void *= msg_control, int err; struct virtio_net_hdr vnet_hdr =3D { 0 }; int vnet_hdr_len =3D 0; + int hdr_len =3D 0; int copylen =3D 0; int depth; bool zerocopy =3D false; @@ -663,13 +664,13 @@ static ssize_t tap_get_user(struct tap_queue *q, void= *msg_control, if (!copy_from_iter_full(&vnet_hdr, sizeof(vnet_hdr), from)) goto err; iov_iter_advance(from, vnet_hdr_len - sizeof(vnet_hdr)); - if ((vnet_hdr.flags & VIRTIO_NET_HDR_F_NEEDS_CSUM) && - tap16_to_cpu(q, vnet_hdr.csum_start) + - tap16_to_cpu(q, vnet_hdr.csum_offset) + 2 > - tap16_to_cpu(q, vnet_hdr.hdr_len)) - vnet_hdr.hdr_len =3D cpu_to_tap16(q, - tap16_to_cpu(q, vnet_hdr.csum_start) + - tap16_to_cpu(q, vnet_hdr.csum_offset) + 2); + hdr_len =3D tap16_to_cpu(q, vnet_hdr.hdr_len); + if (vnet_hdr.flags & VIRTIO_NET_HDR_F_NEEDS_CSUM) { + hdr_len =3D max(tap16_to_cpu(q, vnet_hdr.csum_start) + + tap16_to_cpu(q, vnet_hdr.csum_offset) + 2, + hdr_len); + vnet_hdr.hdr_len =3D cpu_to_tap16(q, hdr_len); + } err =3D -EINVAL; if (tap16_to_cpu(q, vnet_hdr.hdr_len) > len) goto err; @@ -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; =20 - copylen =3D vnet_hdr.hdr_len ? - tap16_to_cpu(q, vnet_hdr.hdr_len) : GOODCOPY_LEN; - if (copylen > good_linear) - copylen =3D good_linear; - else if (copylen < ETH_HLEN) + copylen =3D min(hdr_len ? hdr_len : GOODCOPY_LEN, good_linear); + if (copylen < ETH_HLEN) copylen =3D ETH_HLEN; linear =3D copylen; i =3D *from; @@ -697,11 +695,9 @@ static ssize_t tap_get_user(struct tap_queue *q, void = *msg_control, =20 if (!zerocopy) { copylen =3D len; - linear =3D tap16_to_cpu(q, vnet_hdr.hdr_len); - if (linear > good_linear) - linear =3D good_linear; - else if (linear < ETH_HLEN) - linear =3D ETH_HLEN; + linear =3D min(hdr_len, good_linear); + if (copylen < ETH_HLEN) + copylen =3D ETH_HLEN; } =20 skb =3D tap_alloc_skb(&q->sk, TAP_RESERVE, copylen, --=20 2.48.1 From nobody Sun Dec 14 21:37:47 2025 Received: from mail-pj1-f43.google.com (mail-pj1-f43.google.com [209.85.216.43]) (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 3ACB522B5B2 for ; Wed, 5 Feb 2025 06:23:25 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.43 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738736607; cv=none; b=WWZzD9DGFa26MC56GTG24oL5pp6a6bdtLXjVkIezb7ijSFdl1aCL77RbFzJVq6mgLBjZZGRBsWfuxFr8knz317N5qBn1NgPrarh3J70svnM7cKp2uJHJcGJlSDgzbrGg9HNcEGIcEONZXGNceSd7tRD98yEeZQPioO8k9XGXFpY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738736607; c=relaxed/simple; bh=j0g58kzxP4/vEuyCfLiH4Cm8UrUU1sRmr41Z0gm9CHs=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To; b=EYDOSVZNmrZ/cmPzWJv1KI0MwlV2Dfb3ZhqvtnHs7PdlyyOYVFjnLnt+suUJIK57UF5BnMMWUHDHRbIfCG3va4sm9Jc5SX0zqnPsPTelJMD0ZhcPTtPwvWhDDcX5tOcpyGQWKeTnC70ReQJTe2BfGvdYOPf8TGQvI0Xh8EBBVv8= 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=bixQjHby; arc=none smtp.client-ip=209.85.216.43 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="bixQjHby" Received: by mail-pj1-f43.google.com with SMTP id 98e67ed59e1d1-2f9d627b5fbso1766073a91.2 for ; Tue, 04 Feb 2025 22:23:25 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=daynix-com.20230601.gappssmtp.com; s=20230601; t=1738736604; x=1739341404; darn=vger.kernel.org; h=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=lKHFkihW1aXGiNptzm3Sa+/HPN1Hv4LNNLF+gqhLrP8=; b=bixQjHbymQM+QC0x/bX3pnR0UTTs8dByyu0UsPKEdxUisLs9b3BfqTFDqxYnUfHAZi AznDjO5yFfB0fPSqOF4JYAASt71bj4WVw0HLcAD8Mqi7Z4OZ0UBBCzexh5kyqPw+XCXe hIyyTMWMHrdJNK+BcI0biu0D9dpV61Iry+rubRwI9LOGSY7BaOOYXTpqciDSk6cMNGaT mgVSoGb9YcBMz5M8AuqYvZ6aSTpbkGAMpjrMcRBV+DGLszBLdkC9CwcBRjuly5rJE1bL HTifde/ZBTwyj7eDbguWPeXysZLPxZuRupx9XcFP6gce23iCU299w+bjME6Gm5tH024j vB7A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1738736604; x=1739341404; h=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=lKHFkihW1aXGiNptzm3Sa+/HPN1Hv4LNNLF+gqhLrP8=; b=UOCHBq3EjOqY6z6CRatc0jdBkrUILvmQ27hdEzkpW90Ag8bwr7Czr+E/zrV47pB3KR TZvZtGzMKGWzVscyw7x+6XXCd1ZdUj0NUbYTvXF+9c8sau6Shr/vvxT5o8Vh3cU0hPDf IN8VduGu6WqfLw0XRFoio7wg121cVfhcENUOxRiWokPwHv5K7HDIGy/A4d2txtsP2e1g 2DJjyiNX+8/1ftdeDjWlPsjuQa3U4qPw/cP8Z8YBb3ZsqIn7GWDvI+DzCa9/KXa0bbVU xdVb9ykKO/lA/ZDBj4PVhz/HI+qTUwaJAj4pSEE8zYzdm0StqWIrOvlbDJ9RVERFdvw7 NKkA== X-Forwarded-Encrypted: i=1; AJvYcCVpxmc1jgxquY7IXjEDE/F8pSk9BAcmx2P4MEnOC675BtYX+k032WXC5jZ1l6KOaxmU6f7qYOgboI03Zv0=@vger.kernel.org X-Gm-Message-State: AOJu0YxbNfxfV22tj7lh6SXLJjSGqtdlkwRXEbsy/RUr5P/T+3Jt2YrV YrfnchnTB1+3ZMq+M4vw+PcMGhX7L7eNc/GvtHuGpKZAJ9h0GbxflXxLpTQDRVs= X-Gm-Gg: ASbGnctlRcbMVx2J2+kr/09pbr30kd2nPsAavfW8B7rjCFNpLc9wpqxHlt9JMgBShYR I/7ZU3XNNz1nWRQSknOlwSC2wayxWrDxd2XsEALdGH86dzieJ3d/80AA1oQ0MYYyt7vtsgB1wGC CFzN0s0pLn0HTRX5XuPF/qe/xJMfQjbHAOI501riPCmnWYnCp9KoeIf5ujajZcmvhlDgzs6YhTF PAdAnzBfMcsxpUZe+R7RtIyA8V5ZLkZSm74DV5QMcGOUpFeIM947qt9KYS8Oy2H4P49lNlNHsa4 jaX4ot9LLGrtjy6xLJc= X-Google-Smtp-Source: AGHT+IFZKvlrRVLjtwvw+VdsovlMCszHkLbdku1z+OZ4qORt0cXqSHDLFnqL7kzfZxkVlY66TbVvjw== X-Received: by 2002:a05:6a00:400b:b0:72a:8461:d172 with SMTP id d2e1a72fcca58-7303510391fmr3462095b3a.3.1738736604537; Tue, 04 Feb 2025 22:23:24 -0800 (PST) Received: from localhost ([157.82.207.107]) by smtp.gmail.com with UTF8SMTPSA id d2e1a72fcca58-72fe64275c4sm12127023b3a.61.2025.02.04.22.23.19 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 04 Feb 2025 22:23:24 -0800 (PST) From: Akihiko Odaki Date: Wed, 05 Feb 2025 15:22:29 +0900 Subject: [PATCH net-next v5 7/7] tap: Use tun's vnet-related code 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: <20250205-tun-v5-7-15d0b32e87fa@daynix.com> References: <20250205-tun-v5-0-15d0b32e87fa@daynix.com> In-Reply-To: <20250205-tun-v5-0-15d0b32e87fa@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 X-Mailer: b4 0.14.2 tun and tap implements the same vnet-related features so reuse the code. Signed-off-by: Akihiko Odaki Reviewed-by: Willem de Bruijn --- drivers/net/tap.c | 152 ++++++--------------------------------------------= ---- 1 file changed, 16 insertions(+), 136 deletions(-) diff --git a/drivers/net/tap.c b/drivers/net/tap.c index c55c432bac48d395aebc9ceeaa74f7d07e25af4c..40b077aa639be03cf5a6e9a8573= 4833b289f6b86 100644 --- a/drivers/net/tap.c +++ b/drivers/net/tap.c @@ -26,74 +26,9 @@ #include #include =20 -#define TAP_IFFEATURES (IFF_VNET_HDR | IFF_MULTI_QUEUE) - -#define TAP_VNET_LE 0x80000000 -#define TAP_VNET_BE 0x40000000 - -#ifdef CONFIG_TUN_VNET_CROSS_LE -static inline bool tap_legacy_is_little_endian(struct tap_queue *q) -{ - return q->flags & TAP_VNET_BE ? false : - virtio_legacy_is_little_endian(); -} - -static long tap_get_vnet_be(struct tap_queue *q, int __user *sp) -{ - int s =3D !!(q->flags & TAP_VNET_BE); - - if (put_user(s, sp)) - return -EFAULT; - - return 0; -} - -static long tap_set_vnet_be(struct tap_queue *q, int __user *sp) -{ - int s; - - if (get_user(s, sp)) - return -EFAULT; - - if (s) - q->flags |=3D TAP_VNET_BE; - else - q->flags &=3D ~TAP_VNET_BE; - - return 0; -} -#else -static inline bool tap_legacy_is_little_endian(struct tap_queue *q) -{ - return virtio_legacy_is_little_endian(); -} - -static long tap_get_vnet_be(struct tap_queue *q, int __user *argp) -{ - return -EINVAL; -} - -static long tap_set_vnet_be(struct tap_queue *q, int __user *argp) -{ - return -EINVAL; -} -#endif /* CONFIG_TUN_VNET_CROSS_LE */ - -static inline bool tap_is_little_endian(struct tap_queue *q) -{ - return q->flags & TAP_VNET_LE || - tap_legacy_is_little_endian(q); -} - -static inline u16 tap16_to_cpu(struct tap_queue *q, __virtio16 val) -{ - return __virtio16_to_cpu(tap_is_little_endian(q), val); -} +#include "tun_vnet.h" =20 -static inline __virtio16 cpu_to_tap16(struct tap_queue *q, u16 val) -{ - return __cpu_to_virtio16(tap_is_little_endian(q), val); -} +#define TAP_IFFEATURES (IFF_VNET_HDR | IFF_MULTI_QUEUE) =20 static struct proto tap_proto =3D { .name =3D "tap", @@ -655,25 +590,13 @@ static ssize_t tap_get_user(struct tap_queue *q, void= *msg_control, if (q->flags & IFF_VNET_HDR) { vnet_hdr_len =3D READ_ONCE(q->vnet_hdr_sz); =20 - err =3D -EINVAL; - if (len < vnet_hdr_len) + hdr_len =3D tun_vnet_hdr_get(vnet_hdr_len, q->flags, from, &vnet_hdr); + if (hdr_len < 0) { + err =3D hdr_len; goto err; - len -=3D vnet_hdr_len; - - err =3D -EFAULT; - if (!copy_from_iter_full(&vnet_hdr, sizeof(vnet_hdr), from)) - goto err; - iov_iter_advance(from, vnet_hdr_len - sizeof(vnet_hdr)); - hdr_len =3D tap16_to_cpu(q, vnet_hdr.hdr_len); - if (vnet_hdr.flags & VIRTIO_NET_HDR_F_NEEDS_CSUM) { - hdr_len =3D max(tap16_to_cpu(q, vnet_hdr.csum_start) + - tap16_to_cpu(q, vnet_hdr.csum_offset) + 2, - hdr_len); - vnet_hdr.hdr_len =3D cpu_to_tap16(q, hdr_len); } - err =3D -EINVAL; - if (tap16_to_cpu(q, vnet_hdr.hdr_len) > len) - goto err; + + len -=3D vnet_hdr_len; } =20 err =3D -EINVAL; @@ -729,8 +652,7 @@ static ssize_t tap_get_user(struct tap_queue *q, void *= msg_control, skb->dev =3D tap->dev; =20 if (vnet_hdr_len) { - err =3D virtio_net_hdr_to_skb(skb, &vnet_hdr, - tap_is_little_endian(q)); + err =3D tun_vnet_hdr_to_skb(q->flags, skb, &vnet_hdr); if (err) { rcu_read_unlock(); drop_reason =3D SKB_DROP_REASON_DEV_HDR; @@ -793,23 +715,17 @@ static ssize_t tap_put_user(struct tap_queue *q, int total; =20 if (q->flags & IFF_VNET_HDR) { - int vlan_hlen =3D skb_vlan_tag_present(skb) ? VLAN_HLEN : 0; struct virtio_net_hdr vnet_hdr; =20 vnet_hdr_len =3D READ_ONCE(q->vnet_hdr_sz); - if (iov_iter_count(iter) < vnet_hdr_len) - return -EINVAL; - - if (virtio_net_hdr_from_skb(skb, &vnet_hdr, - tap_is_little_endian(q), true, - vlan_hlen)) - BUG(); =20 - if (copy_to_iter(&vnet_hdr, sizeof(vnet_hdr), iter) !=3D - sizeof(vnet_hdr)) - return -EFAULT; + ret =3D tun_vnet_hdr_from_skb(q->flags, NULL, skb, &vnet_hdr); + if (ret) + return ret; =20 - iov_iter_advance(iter, vnet_hdr_len - sizeof(vnet_hdr)); + ret =3D tun_vnet_hdr_put(vnet_hdr_len, iter, &vnet_hdr); + if (ret) + return ret; } total =3D vnet_hdr_len; total +=3D skb->len; @@ -1068,42 +984,6 @@ static long tap_ioctl(struct file *file, unsigned int= cmd, q->sk.sk_sndbuf =3D s; return 0; =20 - case TUNGETVNETHDRSZ: - s =3D q->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; - - q->vnet_hdr_sz =3D s; - return 0; - - case TUNGETVNETLE: - s =3D !!(q->flags & TAP_VNET_LE); - if (put_user(s, sp)) - return -EFAULT; - return 0; - - case TUNSETVNETLE: - if (get_user(s, sp)) - return -EFAULT; - if (s) - q->flags |=3D TAP_VNET_LE; - else - q->flags &=3D ~TAP_VNET_LE; - return 0; - - case TUNGETVNETBE: - return tap_get_vnet_be(q, sp); - - case TUNSETVNETBE: - return tap_set_vnet_be(q, sp); - case TUNSETOFFLOAD: /* let the user check for future flags */ if (arg & ~(TUN_F_CSUM | TUN_F_TSO4 | TUN_F_TSO6 | @@ -1147,7 +1027,7 @@ static long tap_ioctl(struct file *file, unsigned int= cmd, return ret; =20 default: - return -EINVAL; + return tun_vnet_ioctl(&q->vnet_hdr_sz, &q->flags, cmd, sp); } } =20 @@ -1194,7 +1074,7 @@ static int tap_get_user_xdp(struct tap_queue *q, stru= ct xdp_buff *xdp) skb->protocol =3D eth_hdr(skb)->h_proto; =20 if (vnet_hdr_len) { - err =3D virtio_net_hdr_to_skb(skb, gso, tap_is_little_endian(q)); + err =3D tun_vnet_hdr_to_skb(q->flags, skb, gso); if (err) goto err_kfree; } --=20 2.48.1