d/numam-dpdk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

net/af_xdp: fix build with Linux < 5.4

Browse Source 
Prior to this change, two implementations of rx_syscall_handler
existed although only one was needed (for the zero copy path which
is only available from kernel 5.4 and onwards). Remove the second
definition from compat.h and move the first definition back to where
it is called in the Rx function. Doing this removes a build warning
on kernels before 5.4 which complained about the second function
being defined but not used.

Fixes: 2aa51cdd559e ("net/af_xdp: fix trigger for syscall on Tx")

Signed-off-by: Ciara Loftus <ciara.loftus@intel.com>
This commit is contained in:
Ciara Loftus 2021-05-10 09:47:54 +01:00 committed by Ferruh Yigit
parent b75fc6b190
commit 89233c081c
2 changed files with 12 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
drivers/net/af_xdp/compat.h
View File

@ -42,37 +42,12 @@ create_shared_socket(struct xsk_socket **xsk_ptr __rte_unused,
#endif #endif
#ifdef XDP_USE_NEED_WAKEUP #ifdef XDP_USE_NEED_WAKEUP
static void
rx_syscall_handler(struct xsk_ring_prod *q, uint32_t busy_budget,
struct pollfd *fds, struct xsk_socket *xsk)
{
/* we can assume a kernel >= 5.11 is in use if busy polling is enabled
* and thus we can safely use the recvfrom() syscall which is only
* supported for AF_XDP sockets in kernels >= 5.11.
*/
if (busy_budget) {
(void)recvfrom(xsk_socket__fd(xsk), NULL, 0,
MSG_DONTWAIT, NULL, NULL);
return;
}
if (xsk_ring_prod__needs_wakeup(q))
(void)poll(fds, 1, 1000);
}
static int static int
tx_syscall_needed(struct xsk_ring_prod *q) tx_syscall_needed(struct xsk_ring_prod *q)
{ {
return xsk_ring_prod__needs_wakeup(q); return xsk_ring_prod__needs_wakeup(q);
} }
#else #else
static void
rx_syscall_handler(struct xsk_ring_prod *q __rte_unused, uint32_t busy_budget,
struct pollfd *fds __rte_unused, struct xsk_socket *xsk)
{
if (busy_budget)
(void)recvfrom(xsk_socket__fd(xsk), NULL, 0,
MSG_DONTWAIT, NULL, NULL);
}
static int static int
tx_syscall_needed(struct xsk_ring_prod *q __rte_unused) tx_syscall_needed(struct xsk_ring_prod *q __rte_unused)
{ {

14
drivers/net/af_xdp/rte_eth_af_xdp.c
View File

@ -272,8 +272,18 @@ af_xdp_rx_zc(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts)
nb_pkts = xsk_ring_cons__peek(rx, nb_pkts, &idx_rx); nb_pkts = xsk_ring_cons__peek(rx, nb_pkts, &idx_rx);
if (nb_pkts == 0) { if (nb_pkts == 0) {
rx_syscall_handler(&rxq->fq, rxq->busy_budget, &rxq->fds[0], /* we can assume a kernel >= 5.11 is in use if busy polling is
rxq->xsk); * enabled and thus we can safely use the recvfrom() syscall
* which is only supported for AF_XDP sockets in kernels >=
* 5.11.
*/
if (rxq->busy_budget) {
(void)recvfrom(xsk_socket__fd(rxq->xsk), NULL, 0,
MSG_DONTWAIT, NULL, NULL);
} else if (xsk_ring_prod__needs_wakeup(fq)) {
(void)poll(&rxq->fds[0], 1, 1000);
}
return 0; return 0;
} }