aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/include/linux/if_tun.h
diff options
context:
space:
mode:
authorMaciej Żenczykowski <maze@google.com>2020-08-18 18:07:10 -0700
committerAlexei Starovoitov <ast@kernel.org>2020-08-19 14:02:49 -0700
commit596b5ef458f903d4362fb3c69967b6d8a23334bd (patch)
treefd3ad5165cdb78b0e52481b349157d08930d1d27 /include/linux/if_tun.h
parentnet-tun: Add type safety to tun_xdp_to_ptr() and tun_ptr_to_xdp() (diff)
downloadwireguard-linux-596b5ef458f903d4362fb3c69967b6d8a23334bd.tar.xz
wireguard-linux-596b5ef458f903d4362fb3c69967b6d8a23334bd.zip
net-tun: Eliminate two tun/xdp related function calls from vhost-net
This provides a minor performance boost by virtue of inlining instead of cross module function calls. Test: builds Signed-off-by: Maciej Żenczykowski <maze@google.com> Signed-off-by: Alexei Starovoitov <ast@kernel.org> Link: https://lore.kernel.org/bpf/20200819010710.3959310-2-zenczykowski@gmail.com
Diffstat (limited to 'include/linux/if_tun.h')
-rw-r--r--include/linux/if_tun.h15
1 files changed, 12 insertions, 3 deletions
diff --git a/include/linux/if_tun.h b/include/linux/if_tun.h
index 6c37e1dbc5df..2a7660843444 100644
--- a/include/linux/if_tun.h
+++ b/include/linux/if_tun.h
@@ -27,9 +27,18 @@ 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(struct xdp_frame *xdp);
-struct xdp_frame *tun_ptr_to_xdp(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(struct xdp_frame *xdp)
+{
+ return (void *)((unsigned long)xdp | TUN_XDP_FLAG);
+}
+static inline struct xdp_frame *tun_ptr_to_xdp(void *ptr)
+{
+ return (void *)((unsigned long)ptr & ~TUN_XDP_FLAG);
+}
void tun_ptr_free(void *ptr);
#else
#include <linux/err.h>