net-tun: add type safety to tun_xdp_to_ptr() and tun_ptr_to_xdp()
Subsystems (4)
PATCH 1/2 net-tun: add type safety to tun_xdp_to_ptr() and tun_ptr_to_xdp()
From: Maciej Żenczykowski <[email protected]>
This reduces likelihood of incorrect use.
Test: builds
Signed-off-by Maciej Żenczykowski <[email protected]>
--- drivers/net/tun.c | 6 +++--- include/linux/if_tun.h | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-)
drivers/net/tun.c +3 -3
@@ -225,13 +225,13 @@ bool tun_is_xdp_frame(void *ptr) }EXPORT_SYMBOL (tun_is_xdp_frame); -void *tun_xdp_to_ptr (void *ptr) +void *tun_xdp_to_ptr (struct xdp_frame *xdp) { -return (void *)((unsigned long )ptr |TUN_XDP_FLAG ); +return (void *)((unsigned long )xdp |TUN_XDP_FLAG ); }EXPORT_SYMBOL (tun_xdp_to_ptr); -void *tun_ptr_to_xdp (void *ptr) +struct xdp_frame *tun_ptr_to_xdp (void *ptr) {return (void *)((unsigned long )ptr & ~TUN_XDP_FLAG ); }
include/linux/if_tun.h +4 -4
@@ -28,8 +28,8 @@ struct tun_xdp_hdr {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_xdp_to_ptr (struct xdp_frame *xdp); +struct xdp_frame *tun_ptr_to_xdp (void *ptr);void tun_ptr_free (void *ptr);#else #include <linux/err.h>
@@ -48,11 +48,11 @@ static inline bool tun_is_xdp_frame(void *ptr) {return false; } -static inline void *tun_xdp_to_ptr (void *ptr) +static inline void *tun_xdp_to_ptr (struct xdp_frame *xdp) {return NULL ; } -static inline void *tun_ptr_to_xdp (void *ptr) +static inline struct xdp_frame *tun_ptr_to_xdp (void *ptr) {return NULL ; }
Signature · 1 line
2.28.0.220.ged08abb693-goog
PATCH 2/2 net-tun: eliminate two tun/xdp related function calls from vhost-net
From: Maciej Żenczykowski <[email protected]>
This provides a minor performance boost by virtue of inlining instead of cross module function calls.
Test: builds
Signed-off-by Maciej Żenczykowski <[email protected]>
--- drivers/net/tun.c | 18 ------------------ include/linux/if_tun.h | 15 ++++++++++++--- 2 files changed, 12 insertions(+), 21 deletions(-)
drivers/net/tun.c +0 -18
@@ -219,24 +219,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 (struct xdp_frame *xdp) -{ -return (void *)((unsigned long )xdp |TUN_XDP_FLAG ); -} -EXPORT_SYMBOL (tun_xdp_to_ptr); - -struct xdp_frame *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);
include/linux/if_tun.h +12 -3
@@ -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>
Signature · 1 line
2.28.0.220.ged08abb693-goog
Alexei Starovoitov
AppliedQuoted 7 lines · Maciej Żenczykowski
From: Maciej Żenczykowski <[email protected]>
This reduces likelihood of incorrect use.
Test: builds
Signed-off-by Maciej Żenczykowski <[email protected]>
Applied. Thanks