net/mlx5: support queue/RSS actions for external Rx queue

[dpdk.git] / drivers / net / af_xdp / rte_eth_af_xdp.c

diff --git a/drivers/net/af_xdp/rte_eth_af_xdp.c b/drivers/net/af_xdp/rte_eth_af_xdp.c
index 6ac710c..6547913 100644 (file)
--- a/drivers/net/af_xdp/rte_eth_af_xdp.c
+++ b/drivers/net/af_xdp/rte_eth_af_xdp.c
@@ -15,7 +15,6 @@
 #include <linux/ethtool.h>
 #include <linux/sockios.h>
 #include "af_xdp_deps.h"
-#include <bpf/bpf.h>
 
 #include <rte_ethdev.h>
 #include <ethdev_driver.h>
@@ -1071,7 +1070,7 @@ xsk_umem_info *xdp_umem_configure(struct pmd_internals *internals,
                umem = rte_zmalloc_socket("umem", sizeof(*umem), 0,
                                          rte_socket_id());
                if (umem == NULL) {
-                       AF_XDP_LOG(ERR, "Failed to allocate umem info");
+                       AF_XDP_LOG(ERR, "Failed to allocate umem info\n");
                        return NULL;
                }
 
@@ -1084,7 +1083,7 @@ xsk_umem_info *xdp_umem_configure(struct pmd_internals *internals,
                ret = xsk_umem__create(&umem->umem, base_addr, umem_size,
                                &rxq->fq, &rxq->cq, &usr_config);
                if (ret) {
-                       AF_XDP_LOG(ERR, "Failed to create umem");
+                       AF_XDP_LOG(ERR, "Failed to create umem\n");
                        goto err;
                }
                umem->buffer = base_addr;
@@ -1124,7 +1123,7 @@ xsk_umem_info *xdp_umem_configure(struct pmd_internals *internals,
 
        umem = rte_zmalloc_socket("umem", sizeof(*umem), 0, rte_socket_id());
        if (umem == NULL) {
-               AF_XDP_LOG(ERR, "Failed to allocate umem info");
+               AF_XDP_LOG(ERR, "Failed to allocate umem info\n");
                return NULL;
        }
 
@@ -1160,7 +1159,7 @@ xsk_umem_info *xdp_umem_configure(struct pmd_internals *internals,
                               &usr_config);
 
        if (ret) {
-               AF_XDP_LOG(ERR, "Failed to create umem");
+               AF_XDP_LOG(ERR, "Failed to create umem\n");
                goto err;
        }
        umem->mz = mz;
@@ -1176,13 +1175,13 @@ err:
 static int
 load_custom_xdp_prog(const char *prog_path, int if_index, struct bpf_map **map)
 {
-       int ret, prog_fd = -1;
+       int ret, prog_fd;
        struct bpf_object *obj;
 
-       ret = bpf_prog_load(prog_path, BPF_PROG_TYPE_XDP, &obj, &prog_fd);
-       if (ret) {
+       prog_fd = load_program(prog_path, &obj);
+       if (prog_fd < 0) {
                AF_XDP_LOG(ERR, "Failed to load program %s\n", prog_path);
-               return ret;
+               return -1;
        }
 
        /*
@@ -1284,6 +1283,20 @@ xsk_configure(struct pmd_internals *internals, struct pkt_rx_queue *rxq,
                return -ENOMEM;
        txq->umem = rxq->umem;
 
+#if defined(XDP_UMEM_UNALIGNED_CHUNK_FLAG)
+       ret = rte_pktmbuf_alloc_bulk(rxq->umem->mb_pool, fq_bufs, reserve_size);
+       if (ret) {
+               AF_XDP_LOG(DEBUG, "Failed to get enough buffers for fq.\n");
+               goto out_umem;
+       }
+#endif
+
+       ret = reserve_fill_queue(rxq->umem, reserve_size, fq_bufs, &rxq->fq);
+       if (ret) {
+               AF_XDP_LOG(ERR, "Failed to reserve fill queue.\n");
+               goto out_umem;
+       }
+
        cfg.rx_size = ring_size;
        cfg.tx_size = ring_size;
        cfg.libbpf_flags = 0;
@@ -1302,7 +1315,7 @@ xsk_configure(struct pmd_internals *internals, struct pkt_rx_queue *rxq,
                if (ret) {
                        AF_XDP_LOG(ERR, "Failed to load custom XDP program %s\n",
                                        internals->prog_path);
-                       goto err;
+                       goto out_umem;
                }
                internals->custom_prog_configured = 1;
                cfg.libbpf_flags = XSK_LIBBPF_FLAGS__INHIBIT_PROG_LOAD;
@@ -1319,7 +1332,7 @@ xsk_configure(struct pmd_internals *internals, struct pkt_rx_queue *rxq,
 
        if (ret) {
                AF_XDP_LOG(ERR, "Failed to create xsk socket.\n");
-               goto err;
+               goto out_umem;
        }
 
        /* insert the xsk into the xsks_map */
@@ -1331,36 +1344,23 @@ xsk_configure(struct pmd_internals *internals, struct pkt_rx_queue *rxq,
                                          &rxq->xsk_queue_idx, &fd, 0);
                if (err) {
                        AF_XDP_LOG(ERR, "Failed to insert xsk in map.\n");
-                       goto err;
+                       goto out_xsk;
                }
        }
 
-#if defined(XDP_UMEM_UNALIGNED_CHUNK_FLAG)
-       ret = rte_pktmbuf_alloc_bulk(rxq->umem->mb_pool, fq_bufs, reserve_size);
-       if (ret) {
-               AF_XDP_LOG(DEBUG, "Failed to get enough buffers for fq.\n");
-               goto err;
-       }
-#endif
-
        if (rxq->busy_budget) {
                ret = configure_preferred_busy_poll(rxq);
                if (ret) {
                        AF_XDP_LOG(ERR, "Failed configure busy polling.\n");
-                       goto err;
+                       goto out_xsk;
                }
        }
 
-       ret = reserve_fill_queue(rxq->umem, reserve_size, fq_bufs, &rxq->fq);
-       if (ret) {
-               xsk_socket__delete(rxq->xsk);
-               AF_XDP_LOG(ERR, "Failed to reserve fill queue.\n");
-               goto err;
-       }
-
        return 0;
 
-err:
+out_xsk:
+       xsk_socket__delete(rxq->xsk);
+out_umem:
        if (__atomic_sub_fetch(&rxq->umem->refcnt, 1, __ATOMIC_ACQUIRE) == 0)
                xdp_umem_destroy(rxq->umem);
 
@@ -1847,7 +1847,7 @@ afxdp_mp_request_fds(const char *name, struct rte_eth_dev *dev)
        AF_XDP_LOG(DEBUG, "Sending multi-process IPC request for %s\n", name);
        ret = rte_mp_request_sync(&request, &replies, &timeout);
        if (ret < 0 || replies.nb_received != 1) {
-               AF_XDP_LOG(ERR, "Failed to request fds from primary: %d",
+               AF_XDP_LOG(ERR, "Failed to request fds from primary: %d\n",
                           rte_errno);
                return -1;
        }
@@ -1995,8 +1995,8 @@ rte_pmd_af_xdp_probe(struct rte_vdev_device *dev)
        /* Register IPC callback which shares xsk fds from primary to secondary */
        if (!afxdp_dev_count) {
                ret = rte_mp_action_register(ETH_AF_XDP_MP_KEY, afxdp_mp_send_fds);
-               if (ret < 0) {
-                       AF_XDP_LOG(ERR, "%s: Failed to register multi-process IPC callback: %s",
+               if (ret < 0 && rte_errno != ENOTSUP) {
+                       AF_XDP_LOG(ERR, "%s: Failed to register multi-process IPC callback: %s\n",
                                   name, strerror(rte_errno));
                        return -1;
                }