Co-developed-by: Tim Gebauer <[email protected]>
Signed-off-by: Tim Gebauer <[email protected]>
Signed-off-by: Simon Schippers <[email protected]>
---
drivers/net/tap.c | 9 +++++++++
drivers/net/tun.c | 9 +++++++++
include/linux/if_tap.h | 4 ++++
include/linux/if_tun.h | 5 +++++
4 files changed, 27 insertions(+)
diff --git a/drivers/net/tap.c b/drivers/net/tap.c
index 651d48612329..9720481f6d41 100644
--- a/drivers/net/tap.c
+++ b/drivers/net/tap.c
@@ -1268,6 +1268,15 @@ int tap_ring_consume_batched(struct file *file,
}
EXPORT_SYMBOL_GPL(tap_ring_consume_batched);
+void tap_ring_unconsume(struct file *file, void **batch, int n,
+ void (*destroy)(void *))
+{
+ struct tap_queue *q = file->private_data;
+
+ ptr_ring_unconsume(&q->ring, batch, n, destroy);
+}
+EXPORT_SYMBOL_GPL(tap_ring_unconsume);
+
struct ptr_ring *tap_get_ptr_ring(struct file *file)
{
struct tap_queue *q;
diff --git a/drivers/net/tun.c b/drivers/net/tun.c
index 7566b22780fb..25b170e903e1 100644
--- a/drivers/net/tun.c
+++ b/drivers/net/tun.c
@@ -3813,6 +3813,15 @@ int tun_ring_consume_batched(struct file *file,
}
EXPORT_SYMBOL_GPL(tun_ring_consume_batched);
+void tun_ring_unconsume(struct file *file, void **batch, int n,
+ void (*destroy)(void *))
+{
+ struct tun_file *tfile = file->private_data;
+
+ ptr_ring_unconsume(&tfile->tx_ring, batch, n, destroy);
+}
+EXPORT_SYMBOL_GPL(tun_ring_unconsume);
+
struct ptr_ring *tun_get_tx_ring(struct file *file)
{
struct tun_file *tfile;
diff --git a/include/linux/if_tap.h b/include/linux/if_tap.h
index 2e5542d6aef4..0cf8cf200d52 100644
--- a/include/linux/if_tap.h
+++ b/include/linux/if_tap.h
@@ -12,6 +12,8 @@ struct socket;
struct socket *tap_get_socket(struct file *);
struct ptr_ring *tap_get_ptr_ring(struct file *file);
int tap_ring_consume_batched(struct file *file, void **array, int n);
+void tap_ring_unconsume(struct file *file, void **batch, int n,
+ void (*destroy)(void *));
#else
#include <linux/err.h>
#include <linux/errno.h>
@@ -28,6 +30,8 @@ static inline int tap_ring_consume_batched(struct file *f,
{
return 0;
}
+static inline void tap_ring_unconsume(struct file *file, void **batch,
+ int n, void (*destroy)(void *)) {}
#endif /* CONFIG_TAP */
/*
diff --git a/include/linux/if_tun.h b/include/linux/if_tun.h
index 5b41525ac007..bd954bb117e8 100644
--- a/include/linux/if_tun.h
+++ b/include/linux/if_tun.h
@@ -23,6 +23,8 @@ struct tun_msg_ctl {
struct socket *tun_get_socket(struct file *);
struct ptr_ring *tun_get_tx_ring(struct file *file);
int tun_ring_consume_batched(struct file *file, void **array, int n);
+void tun_ring_unconsume(struct file *file, void **batch, int n,
+ void (*destroy)(void *));
static inline bool tun_is_xdp_frame(void *ptr)
{
@@ -62,6 +64,9 @@ static inline int tun_ring_consume_batched(struct file *file,
return 0;
}
+static inline void tun_ring_unconsume(struct file *file, void **batch,
+ int n, void (*destroy)(void *)) {}
+
static inline bool tun_is_xdp_frame(void *ptr)
{
return false;
--
2.43.0
