xsk: Standardize naming of producer ring access functions

Adopt the naming of the producer ring access functions to have a
similar naming convention as the functions in libbpf, but adapted to
the kernel. You first reserve a number of entries that you later
submit to the global state of the ring. This is much clearer, IMO,
than the one that was in the kernel part. Once renamed, we also
discover that two functions are actually the same, so remove one of
them. Some of the primitive ring submission operations are also the
same so break these out into __xskq_prod_submit that the upper level
ring access functions can use.

Signed-off-by: Magnus Karlsson <magnus.karlsson@intel.com>
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
Link: https://lore.kernel.org/bpf/1576759171-28550-5-git-send-email-magnus.karlsson@intel.com

diff --git a/net/xdp/xsk.c b/net/xdp/xsk.c
index e45c27f5cfca0af10ed47339899a3dcd0423afbc..5f2123fe630c92b935d560fa8f92ac480581d4a5 100644 (file)
--- a/net/xdp/xsk.c
+++ b/net/xdp/xsk.c
@@ -167,7 +167,7 @@ static int __xsk_rcv(struct xdp_sock *xs, struct xdp_buff *xdp, u32 len)
 
        offset += metalen;
        addr = xsk_umem_adjust_offset(xs->umem, addr, offset);
-       err = xskq_produce_batch_desc(xs->rx, addr, len);
+       err = xskq_prod_reserve_desc(xs->rx, addr, len);
        if (!err) {
                xskq_discard_addr(xs->umem->fq);
                xdp_return_buff(xdp);
@@ -180,7 +180,7 @@ static int __xsk_rcv(struct xdp_sock *xs, struct xdp_buff *xdp, u32 len)
 
 static int __xsk_rcv_zc(struct xdp_sock *xs, struct xdp_buff *xdp, u32 len)
 {
-       int err = xskq_produce_batch_desc(xs->rx, (u64)xdp->handle, len);
+       int err = xskq_prod_reserve_desc(xs->rx, xdp->handle, len);
 
        if (err)
                xs->rx_dropped++;
@@ -216,7 +216,7 @@ static int xsk_rcv(struct xdp_sock *xs, struct xdp_buff *xdp)
 
 static void xsk_flush(struct xdp_sock *xs)
 {
-       xskq_produce_flush_desc(xs->rx);
+       xskq_prod_submit(xs->rx);
        xs->sk.sk_data_ready(&xs->sk);
 }
 
@@ -247,12 +247,12 @@ int xsk_generic_rcv(struct xdp_sock *xs, struct xdp_buff *xdp)
        memcpy(buffer, xdp->data_meta, len + metalen);
 
        addr = xsk_umem_adjust_offset(xs->umem, addr, metalen);
-       err = xskq_produce_batch_desc(xs->rx, addr, len);
+       err = xskq_prod_reserve_desc(xs->rx, addr, len);
        if (err)
                goto out_drop;
 
        xskq_discard_addr(xs->umem->fq);
-       xskq_produce_flush_desc(xs->rx);
+       xskq_prod_submit(xs->rx);
 
        spin_unlock_bh(&xs->rx_lock);
 
@@ -294,7 +294,7 @@ void __xsk_map_flush(void)
 
 void xsk_umem_complete_tx(struct xdp_umem *umem, u32 nb_entries)
 {
-       xskq_produce_flush_addr_n(umem->cq, nb_entries);
+       xskq_prod_submit_n(umem->cq, nb_entries);
 }
 EXPORT_SYMBOL(xsk_umem_complete_tx);
 
@@ -319,7 +319,7 @@ bool xsk_umem_consume_tx(struct xdp_umem *umem, struct xdp_desc *desc)
                if (!xskq_peek_desc(xs->tx, desc, umem))
                        continue;
 
-               if (xskq_produce_addr_lazy(umem->cq, desc->addr))
+               if (xskq_prod_reserve_addr(umem->cq, desc->addr))
                        goto out;
 
                xskq_discard_desc(xs->tx);
@@ -348,7 +348,7 @@ static void xsk_destruct_skb(struct sk_buff *skb)
        unsigned long flags;
 
        spin_lock_irqsave(&xs->tx_completion_lock, flags);
-       WARN_ON_ONCE(xskq_produce_addr(xs->umem->cq, addr));
+       xskq_prod_submit_addr(xs->umem->cq, addr);
        spin_unlock_irqrestore(&xs->tx_completion_lock, flags);
 
        sock_wfree(skb);
@@ -389,7 +389,7 @@ static int xsk_generic_xmit(struct sock *sk)
                addr = desc.addr;
                buffer = xdp_umem_get_data(xs->umem, addr);
                err = skb_store_bits(skb, 0, buffer, len);
-               if (unlikely(err) || xskq_reserve_addr(xs->umem->cq)) {
+               if (unlikely(err) || xskq_prod_reserve(xs->umem->cq)) {
                        kfree_skb(skb);
                        goto out;
                }
@@ -470,7 +470,7 @@ static __poll_t xsk_poll(struct file *file, struct socket *sock,
                        __xsk_sendmsg(sk);
        }
 
-       if (xs->rx && !xskq_empty_desc(xs->rx))
+       if (xs->rx && !xskq_prod_is_empty(xs->rx))
                mask |= EPOLLIN | EPOLLRDNORM;
        if (xs->tx && !xskq_full_desc(xs->tx))
                mask |= EPOLLOUT | EPOLLWRNORM;

diff --git a/net/xdp/xsk_queue.h b/net/xdp/xsk_queue.h
index 7ad80748f209b33fdbde0dc599d864ce3f3b5834..1b9a350f2e66323480ce39969de5ffbbac5f47ad 100644 (file)
--- a/net/xdp/xsk_queue.h
+++ b/net/xdp/xsk_queue.h
@@ -216,22 +216,17 @@ static inline void xskq_discard_addr(struct xsk_queue *q)
        q->cons_tail++;
 }
 
-static inline int xskq_produce_addr(struct xsk_queue *q, u64 addr)
+static inline int xskq_prod_reserve(struct xsk_queue *q)
 {
-       struct xdp_umem_ring *ring = (struct xdp_umem_ring *)q->ring;
-       unsigned int idx = q->ring->producer;
+       if (xskq_nb_free(q, 1) == 0)
+               return -ENOSPC;
 
        /* A, matches D */
-       ring->desc[idx++ & q->ring_mask] = addr;
-
-       /* Order producer and data */
-       smp_wmb(); /* B, matches C */
-
-       WRITE_ONCE(q->ring->producer, idx);
+       q->cached_prod++;
        return 0;
 }
 
-static inline int xskq_produce_addr_lazy(struct xsk_queue *q, u64 addr)
+static inline int xskq_prod_reserve_addr(struct xsk_queue *q, u64 addr)
 {
        struct xdp_umem_ring *ring = (struct xdp_umem_ring *)q->ring;
 
@@ -243,23 +238,32 @@ static inline int xskq_produce_addr_lazy(struct xsk_queue *q, u64 addr)
        return 0;
 }
 
-static inline void xskq_produce_flush_addr_n(struct xsk_queue *q,
-                                            u32 nb_entries)
+static inline void __xskq_prod_submit(struct xsk_queue *q, u32 idx)
 {
        /* Order producer and data */
        smp_wmb(); /* B, matches C */
 
-       WRITE_ONCE(q->ring->producer, q->ring->producer + nb_entries);
+       WRITE_ONCE(q->ring->producer, idx);
 }
 
-static inline int xskq_reserve_addr(struct xsk_queue *q)
+static inline void xskq_prod_submit(struct xsk_queue *q)
 {
-       if (xskq_nb_free(q, 1) == 0)
-               return -ENOSPC;
+       __xskq_prod_submit(q, q->cached_prod);
+}
 
-       /* A, matches D */
-       q->cached_prod++;
-       return 0;
+static inline void xskq_prod_submit_addr(struct xsk_queue *q, u64 addr)
+{
+       struct xdp_umem_ring *ring = (struct xdp_umem_ring *)q->ring;
+       u32 idx = q->ring->producer;
+
+       ring->desc[idx++ & q->ring_mask] = addr;
+
+       __xskq_prod_submit(q, idx);
+}
+
+static inline void xskq_prod_submit_n(struct xsk_queue *q, u32 nb_entries)
+{
+       __xskq_prod_submit(q, q->ring->producer + nb_entries);
 }
 
 /* Rx/Tx queue */
@@ -330,11 +334,11 @@ static inline void xskq_discard_desc(struct xsk_queue *q)
        q->cons_tail++;
 }
 
-static inline int xskq_produce_batch_desc(struct xsk_queue *q,
-                                         u64 addr, u32 len)
+static inline int xskq_prod_reserve_desc(struct xsk_queue *q,
+                                        u64 addr, u32 len)
 {
        struct xdp_rxtx_ring *ring = (struct xdp_rxtx_ring *)q->ring;
-       unsigned int idx;
+       u32 idx;
 
        if (xskq_nb_free(q, 1) == 0)
                return -ENOSPC;
@@ -347,14 +351,6 @@ static inline int xskq_produce_batch_desc(struct xsk_queue *q,
        return 0;
 }
 
-static inline void xskq_produce_flush_desc(struct xsk_queue *q)
-{
-       /* Order producer and data */
-       smp_wmb(); /* B, matches C */
-
-       WRITE_ONCE(q->ring->producer, q->cached_prod);
-}
-
 static inline bool xskq_full_desc(struct xsk_queue *q)
 {
        /* No barriers needed since data is not accessed */
@@ -362,7 +358,7 @@ static inline bool xskq_full_desc(struct xsk_queue *q)
                q->nentries;
 }
 
-static inline bool xskq_empty_desc(struct xsk_queue *q)
+static inline bool xskq_prod_is_empty(struct xsk_queue *q)
 {
        /* No barriers needed since data is not accessed */
        return READ_ONCE(q->ring->consumer) == READ_ONCE(q->ring->producer);