netdev - [PATCH bpf-next 06/12] tun: move shared functions to if

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-Id: <20200123014210.38412-7-dsahern@kernel.org>
Date:   Wed, 22 Jan 2020 18:42:04 -0700
From:   David Ahern <dsahern@...nel.org>
To:     netdev@...r.kernel.org
Cc:     prashantbhole.linux@...il.com, jasowang@...hat.com,
        davem@...emloft.net, jakub.kicinski@...ronome.com,
        jbrouer@...hat.com, toke@...hat.com, mst@...hat.com,
        toshiaki.makita1@...il.com, daniel@...earbox.net,
        john.fastabend@...il.com, ast@...nel.org, kafai@...com,
        songliubraving@...com, yhs@...com, andriin@...com,
        dsahern@...il.com
Subject: [PATCH bpf-next 06/12] tun: move shared functions to if_tun.h

From: Prashant Bhole <prashantbhole.linux@...il.com>

This patch moves tun_ptr_free and related functions to if_tun.h. We
will use this function in tap.c in further patches. This was need to
avoid a scenario when tap is built into kernel image, tun is module
but not loaded. Below functions are moved to if_tun.h
- tun_ptr_free
- tun_xdp_to_ptr
- tun_ptr_to_xdp
- tun_ptr_free

Signed-off-by: Prashant Bhole <prashantbhole.linux@...il.com>
---
 drivers/net/tun.c      | 33 ---------------------------------
 include/linux/if_tun.h | 34 ++++++++++++++++++++++++++++++----
 2 files changed, 30 insertions(+), 37 deletions(-)

diff --git a/drivers/net/tun.c b/drivers/net/tun.c
index c3155bc3fc7f..6f12c32df346 100644
--- a/drivers/net/tun.c
+++ b/drivers/net/tun.c
@@ -64,7 +64,6 @@
 #include <net/xdp.h>
 #include <linux/seq_file.h>
 #include <linux/uio.h>
-#include <linux/skb_array.h>
 #include <linux/bpf.h>
 #include <linux/bpf_trace.h>
 #include <linux/mutex.h>
@@ -249,24 +248,6 @@ struct veth {
 	__be16 h_vlan_TCI;
 };
 
-bool tun_is_xdp_frame(void *ptr)
-{
-	return (unsigned long)ptr & TUN_XDP_FLAG;
-}
-EXPORT_SYMBOL(tun_is_xdp_frame);
-
-void *tun_xdp_to_ptr(void *ptr)
-{
-	return (void *)((unsigned long)ptr | TUN_XDP_FLAG);
-}
-EXPORT_SYMBOL(tun_xdp_to_ptr);
-
-void *tun_ptr_to_xdp(void *ptr)
-{
-	return (void *)((unsigned long)ptr & ~TUN_XDP_FLAG);
-}
-EXPORT_SYMBOL(tun_ptr_to_xdp);
-
 static int tun_napi_receive(struct napi_struct *napi, int budget)
 {
 	struct tun_file *tfile = container_of(napi, struct tun_file, napi);
@@ -649,20 +630,6 @@ static struct tun_struct *tun_enable_queue(struct tun_file *tfile)
 	return tun;
 }
 
-void tun_ptr_free(void *ptr)
-{
-	if (!ptr)
-		return;
-	if (tun_is_xdp_frame(ptr)) {
-		struct xdp_frame *xdpf = tun_ptr_to_xdp(ptr);
-
-		xdp_return_frame(xdpf);
-	} else {
-		__skb_array_destroy_skb(ptr);
-	}
-}
-EXPORT_SYMBOL_GPL(tun_ptr_free);
-
 static void tun_queue_purge(struct tun_file *tfile)
 {
 	void *ptr;
diff --git a/include/linux/if_tun.h b/include/linux/if_tun.h
index 5bda8cf457b6..49ca20063a35 100644
--- a/include/linux/if_tun.h
+++ b/include/linux/if_tun.h
@@ -6,6 +6,7 @@
 #ifndef __IF_TUN_H
 #define __IF_TUN_H
 
+#include <linux/skb_array.h>
 #include <uapi/linux/if_tun.h>
 #include <uapi/linux/virtio_net.h>
 
@@ -27,10 +28,35 @@ struct tun_xdp_hdr {
 #if defined(CONFIG_TUN) || defined(CONFIG_TUN_MODULE)
 struct socket *tun_get_socket(struct file *);
 struct ptr_ring *tun_get_tx_ring(struct file *file);
-bool tun_is_xdp_frame(void *ptr);
-void *tun_xdp_to_ptr(void *ptr);
-void *tun_ptr_to_xdp(void *ptr);
-void tun_ptr_free(void *ptr);
+
+static inline bool tun_is_xdp_frame(void *ptr)
+{
+	return (unsigned long)ptr & TUN_XDP_FLAG;
+}
+
+static inline void *tun_xdp_to_ptr(void *ptr)
+{
+	return (void *)((unsigned long)ptr | TUN_XDP_FLAG);
+}
+
+static inline void *tun_ptr_to_xdp(void *ptr)
+{
+	return (void *)((unsigned long)ptr & ~TUN_XDP_FLAG);
+}
+
+static inline void tun_ptr_free(void *ptr)
+{
+	if (!ptr)
+		return;
+	if (tun_is_xdp_frame(ptr)) {
+		struct xdp_frame *xdpf = tun_ptr_to_xdp(ptr);
+
+		xdp_return_frame(xdpf);
+	} else {
+		__skb_array_destroy_skb(ptr);
+	}
+}
+
 #else
 #include <linux/err.h>
 #include <linux/errno.h>
-- 
2.21.1 (Apple Git-122.3)