But it seems we'd better not limit the use of this max_tx_budget? We
don't know what the best fit for various use cases is. If the type
needs to be downsized to a smaller one like u16, another related
consideration is that dev_tx_weight deserves the same treatment?
Or let me adjust to 'int' then?
> It does fit in an existing hole. Is it also a warm cacheline wherever
> this is touched in the hot path?
Oh, right. max_tx_budget is almost a read-only member while the rest
of the same cacheline are frequently changed. I'm going to change as
below:
diff --git a/include/net/xdp_sock.h b/include/net/xdp_sock.h
index 8eecafad92c0..fca7723ad8b3 100644
--- a/include/net/xdp_sock.h
+++ b/include/net/xdp_sock.h
@@ -70,7 +70,6 @@ struct xdp_sock {
* preventing other XSKs from being starved.
*/
u32 tx_budget_spent;
- u32 max_tx_budget;
/* Statistics */
u64 rx_dropped;
@@ -85,6 +84,7 @@ struct xdp_sock {
struct list_head map_list;
/* Protects map_list */
spinlock_t map_list_lock;
+ u32 max_tx_budget;
/* Protects multiple processes in the control path */
struct mutex mutex;
struct xsk_queue *fq_tmp; /* Only as tmp storage before bind */
Then it will be put into one read-mostly cacheline and also not add an
extra hole :)
>
> >
> > /* Statistics */
> > u64 rx_dropped;
> > diff --git a/include/uapi/linux/if_xdp.h b/include/uapi/linux/if_xdp.h
> > index 44f2bb93e7e6..07c6d21c2f1c 100644
> > --- a/include/uapi/linux/if_xdp.h
> > +++ b/include/uapi/linux/if_xdp.h
> > @@ -79,6 +79,7 @@ struct xdp_mmap_offsets {
> > #define XDP_UMEM_COMPLETION_RING 6
> > #define XDP_STATISTICS 7
> > #define XDP_OPTIONS 8
> > +#define XDP_MAX_TX_BUDGET 9
> >
> > struct xdp_umem_reg {
> > __u64 addr; /* Start of packet data area */
> > diff --git a/net/xdp/xsk.c b/net/xdp/xsk.c
> > index 72c000c0ae5f..7c47f665e9d1 100644
> > --- a/net/xdp/xsk.c
> > +++ b/net/xdp/xsk.c
> > @@ -33,9 +33,6 @@
> > #include "xdp_umem.h"
> > #include "xsk.h"
> >
> > -#define TX_BATCH_SIZE 32
> > -#define MAX_PER_SOCKET_BUDGET (TX_BATCH_SIZE)
> > -
> > void xsk_set_rx_need_wakeup(struct xsk_buff_pool *pool)
> > {
> > if (pool->cached_need_wakeup & XDP_WAKEUP_RX)
> > @@ -424,7 +421,9 @@ bool xsk_tx_peek_desc(struct xsk_buff_pool *pool, struct xdp_desc *desc)
> > rcu_read_lock();
> > again:
> > list_for_each_entry_rcu(xs, &pool->xsk_tx_list, tx_list) {
> > - if (xs->tx_budget_spent >= MAX_PER_SOCKET_BUDGET) {
> > + int max_budget = READ_ONCE(xs->max_tx_budget);
> > +
> > + if (xs->tx_budget_spent >= max_budget) {
> > budget_exhausted = true;
> > continue;
> > }
> > @@ -779,7 +778,7 @@ static struct sk_buff *xsk_build_skb(struct xdp_sock *xs,
> > static int __xsk_generic_xmit(struct sock *sk)
> > {
> > struct xdp_sock *xs = xdp_sk(sk);
> > - u32 max_batch = TX_BATCH_SIZE;
> > + u32 max_budget = READ_ONCE(xs->max_tx_budget);
> > bool sent_frame = false;
> > struct xdp_desc desc;
> > struct sk_buff *skb;
> > @@ -797,7 +796,7 @@ static int __xsk_generic_xmit(struct sock *sk)
> > goto out;
> >
> > while (xskq_cons_peek_desc(xs->tx, &desc, xs->pool)) {
> > - if (max_batch-- == 0) {
> > + if (max_budget-- == 0) {
> > err = -EAGAIN;
> > goto out;
> > }
> > @@ -1437,6 +1436,18 @@ static int xsk_setsockopt(struct socket *sock, int level, int optname,
> > mutex_unlock(&xs->mutex);
> > return err;
> > }
> > + case XDP_MAX_TX_BUDGET:
> > + {
> > + unsigned int budget;
> > +
> > + if (optlen < sizeof(budget))
> > + return -EINVAL;
> > + if (copy_from_sockptr(&budget, optval, sizeof(budget)))
> > + return -EFAULT;
> > +
> > + WRITE_ONCE(xs->max_tx_budget, budget);
>
> Sanitize input: bounds check
Thanks for catching this.
I will change it like this:
WRITE_ONCE(xs->max_tx_budget, min_t(int, budget, INT_MAX));?
Thanks,
Jason
>
> > + return 0;
> > + }
> > default:
> > break;
> > }
> > @@ -1588,6 +1599,18 @@ static int xsk_getsockopt(struct socket *sock, int level, int optname,
> >
> > return 0;
> > }
> > + case XDP_MAX_TX_BUDGET:
> > + {
> > + unsigned int budget = READ_ONCE(xs->max_tx_budget);
> > +
> > + if (copy_to_user(optval, &budget, sizeof(budget)))
> > + return -EFAULT;
> > + if (put_user(sizeof(budget), optlen))
> > + return -EFAULT;
> > +
> > + return 0;
> > + }
> > +
> > default:
> > break;
> > }
> > @@ -1734,6 +1757,7 @@ static int xsk_create(struct net *net, struct socket *sock, int protocol,
> >
> > xs = xdp_sk(sk);
> > xs->state = XSK_READY;
> > + xs->max_tx_budget = 32;
> > mutex_init(&xs->mutex);
> >
> > INIT_LIST_HEAD(&xs->map_list);
> > diff --git a/tools/include/uapi/linux/if_xdp.h b/tools/include/uapi/linux/if_xdp.h
> > index 44f2bb93e7e6..07c6d21c2f1c 100644
> > --- a/tools/include/uapi/linux/if_xdp.h
> > +++ b/tools/include/uapi/linux/if_xdp.h
> > @@ -79,6 +79,7 @@ struct xdp_mmap_offsets {
> > #define XDP_UMEM_COMPLETION_RING 6
> > #define XDP_STATISTICS 7
> > #define XDP_OPTIONS 8
> > +#define XDP_MAX_TX_BUDGET 9
> >
> > struct xdp_umem_reg {
> > __u64 addr; /* Start of packet data area */
> > --
> > 2.43.5
> >
>
>
