Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/1115488/?format=api
{ "id": 1115488, "url": "http://patchwork.ozlabs.org/api/patches/1115488/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/1560411450-29121-7-git-send-email-magnus.karlsson@intel.com/", "project": { "id": 46, "url": "http://patchwork.ozlabs.org/api/projects/46/?format=api", "name": "Intel Wired Ethernet development", "link_name": "intel-wired-lan", "list_id": "intel-wired-lan.osuosl.org", "list_email": "intel-wired-lan@osuosl.org", "web_url": "", "scm_url": "", "webscm_url": "", "list_archive_url": "", "list_archive_url_format": "", "commit_url_format": "" }, "msgid": "<1560411450-29121-7-git-send-email-magnus.karlsson@intel.com>", "list_archive_url": null, "date": "2019-06-13T07:37:30", "name": "[bpf-next,6/6] samples/bpf: add use of need_sleep flag in xdpsock", "commit_ref": null, "pull_url": null, "state": "awaiting-upstream", "archived": false, "hash": "18b322c18f0238f12c37149f52a2d072e0807abf", "submitter": { "id": 72726, "url": "http://patchwork.ozlabs.org/api/people/72726/?format=api", "name": "Magnus Karlsson", "email": "magnus.karlsson@intel.com" }, "delegate": { "id": 68, "url": "http://patchwork.ozlabs.org/api/users/68/?format=api", "username": "jtkirshe", "first_name": "Jeff", "last_name": "Kirsher", "email": "jeffrey.t.kirsher@intel.com" }, "mbox": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/1560411450-29121-7-git-send-email-magnus.karlsson@intel.com/mbox/", "series": [ { "id": 113704, "url": "http://patchwork.ozlabs.org/api/series/113704/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/list/?series=113704", "date": "2019-06-13T07:37:25", "name": "add need_wakeup flag to the AF_XDP rings", "version": 1, "mbox": "http://patchwork.ozlabs.org/series/113704/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/1115488/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/1115488/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<intel-wired-lan-bounces@osuosl.org>", "X-Original-To": [ "incoming@patchwork.ozlabs.org", "intel-wired-lan@lists.osuosl.org" ], "Delivered-To": [ "patchwork-incoming@bilbo.ozlabs.org", "intel-wired-lan@lists.osuosl.org" ], "Authentication-Results": [ "ozlabs.org;\n\tspf=pass (mailfrom) smtp.mailfrom=osuosl.org\n\t(client-ip=140.211.166.136; helo=silver.osuosl.org;\n\tenvelope-from=intel-wired-lan-bounces@osuosl.org;\n\treceiver=<UNKNOWN>)", "ozlabs.org;\n\tdmarc=fail (p=none dis=none) header.from=intel.com" ], "Received": [ "from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136])\n\t(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256\n\tbits)) (No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 45PrF14VrFz9sDX\n\tfor <incoming@patchwork.ozlabs.org>;\n\tFri, 14 Jun 2019 03:23:49 +1000 (AEST)", "from localhost (localhost [127.0.0.1])\n\tby silver.osuosl.org (Postfix) with ESMTP id 2532C2155C;\n\tThu, 13 Jun 2019 17:23:48 +0000 (UTC)", "from silver.osuosl.org ([127.0.0.1])\n\tby localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024)\n\twith ESMTP id 2jYF4Y-UfuQt; Thu, 13 Jun 2019 17:23:46 +0000 (UTC)", "from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby silver.osuosl.org (Postfix) with ESMTP id 1007F21552;\n\tThu, 13 Jun 2019 17:23:46 +0000 (UTC)", "from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133])\n\tby ash.osuosl.org (Postfix) with ESMTP id 114241BF363\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tThu, 13 Jun 2019 07:38:11 +0000 (UTC)", "from localhost (localhost [127.0.0.1])\n\tby hemlock.osuosl.org (Postfix) with ESMTP id 0E6CD87EAD\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tThu, 13 Jun 2019 07:38:11 +0000 (UTC)", "from hemlock.osuosl.org ([127.0.0.1])\n\tby localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024)\n\twith ESMTP id W9z9fhu-9zPf for <intel-wired-lan@lists.osuosl.org>;\n\tThu, 13 Jun 2019 07:38:10 +0000 (UTC)", "from mga11.intel.com (mga11.intel.com [192.55.52.93])\n\tby hemlock.osuosl.org (Postfix) with ESMTPS id 4E8F687E81\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tThu, 13 Jun 2019 07:38:10 +0000 (UTC)", "from orsmga004.jf.intel.com ([10.7.209.38])\n\tby fmsmga102.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384;\n\t13 Jun 2019 00:38:10 -0700", "from mkarlsso-mobl.ger.corp.intel.com (HELO VM.ger.corp.intel.com)\n\t([10.103.211.41])\n\tby orsmga004.jf.intel.com with ESMTP; 13 Jun 2019 00:38:05 -0700" ], "X-Virus-Scanned": [ "amavisd-new at osuosl.org", "amavisd-new at osuosl.org" ], "X-Greylist": "domain auto-whitelisted by SQLgrey-1.7.6", "X-Amp-Result": "SKIPPED(no attachment in message)", "X-Amp-File-Uploaded": "False", "X-ExtLoop1": "1", "From": "Magnus Karlsson <magnus.karlsson@intel.com>", "To": "magnus.karlsson@intel.com, bjorn.topel@intel.com, ast@kernel.org,\n\tdaniel@iogearbox.net, netdev@vger.kernel.org, brouer@redhat.com", "Date": "Thu, 13 Jun 2019 09:37:30 +0200", "Message-Id": "<1560411450-29121-7-git-send-email-magnus.karlsson@intel.com>", "X-Mailer": "git-send-email 2.7.4", "In-Reply-To": "<1560411450-29121-1-git-send-email-magnus.karlsson@intel.com>", "References": "<1560411450-29121-1-git-send-email-magnus.karlsson@intel.com>", "X-Mailman-Approved-At": "Thu, 13 Jun 2019 17:23:43 +0000", "Subject": "[Intel-wired-lan] [PATCH bpf-next 6/6] samples/bpf: add use of\n\tneed_sleep flag in xdpsock", "X-BeenThere": "intel-wired-lan@osuosl.org", "X-Mailman-Version": "2.1.29", "Precedence": "list", "List-Id": "Intel Wired Ethernet Linux Kernel Driver Development\n\t<intel-wired-lan.osuosl.org>", "List-Unsubscribe": "<https://lists.osuosl.org/mailman/options/intel-wired-lan>, \n\t<mailto:intel-wired-lan-request@osuosl.org?subject=unsubscribe>", "List-Archive": "<http://lists.osuosl.org/pipermail/intel-wired-lan/>", "List-Post": "<mailto:intel-wired-lan@osuosl.org>", "List-Help": "<mailto:intel-wired-lan-request@osuosl.org?subject=help>", "List-Subscribe": "<https://lists.osuosl.org/mailman/listinfo/intel-wired-lan>, \n\t<mailto:intel-wired-lan-request@osuosl.org?subject=subscribe>", "Cc": "axboe@kernel.dk, maximmi@mellanox.com, kevin.laatz@intel.com,\n\tjakub.kicinski@netronome.com, maciejromanfijalkowski@gmail.com,\n\tbruce.richardson@intel.com, ciara.loftus@intel.com,\n\tilias.apalodimas@linaro.org, xiaolong.ye@intel.com,\n\tintel-wired-lan@lists.osuosl.org, qi.z.zhang@intel.com,\n\tmaciej.fijalkowski@intel.com, bpf@vger.kernel.org", "MIME-Version": "1.0", "Content-Type": "text/plain; charset=\"us-ascii\"", "Content-Transfer-Encoding": "7bit", "Errors-To": "intel-wired-lan-bounces@osuosl.org", "Sender": "\"Intel-wired-lan\" <intel-wired-lan-bounces@osuosl.org>" }, "content": "This commit adds using the need_sleep flag to the xdpsock sample\napplication. It is turned on by default as we think it is a feature\nthat seems to always produce a performance benefit, if the application\nhas been written taking advantage of it. It can be turned off in the\nsample app by using the '-m' command line option.\n\nThe txpush and l2fwd sub applications have also been updated to\nsupport poll() with multiple sockets.\n\nSigned-off-by: Magnus Karlsson <magnus.karlsson@intel.com>\n---\n samples/bpf/xdpsock_user.c | 191 ++++++++++++++++++++++++++++-----------------\n 1 file changed, 119 insertions(+), 72 deletions(-)", "diff": "diff --git a/samples/bpf/xdpsock_user.c b/samples/bpf/xdpsock_user.c\nindex d08ee1a..4b760b8 100644\n--- a/samples/bpf/xdpsock_user.c\n+++ b/samples/bpf/xdpsock_user.c\n@@ -67,7 +67,9 @@ static int opt_ifindex;\n static int opt_queue;\n static int opt_poll;\n static int opt_interval = 1;\n-static u32 opt_xdp_bind_flags;\n+static u32 opt_xdp_bind_flags = XDP_USE_NEED_WAKEUP;\n+static int opt_timeout = 1000;\n+static bool opt_might_sleep = true;\n static __u32 prog_id;\n \n struct xsk_umem_info {\n@@ -346,6 +348,7 @@ static struct option long_options[] = {\n \t{\"interval\", required_argument, 0, 'n'},\n \t{\"zero-copy\", no_argument, 0, 'z'},\n \t{\"copy\", no_argument, 0, 'c'},\n+\t{\"no-might-sleep\", no_argument, 0, 'm'},\n \t{0, 0, 0, 0}\n };\n \n@@ -365,6 +368,7 @@ static void usage(const char *prog)\n \t\t\" -n, --interval=n\tSpecify statistics update interval (default 1 sec).\\n\"\n \t\t\" -z, --zero-copy Force zero-copy mode.\\n\"\n \t\t\" -c, --copy Force copy mode.\\n\"\n+\t\t\" -m, --no-might-sleep Turn off use of driver might sleep flag.\\n\"\n \t\t\"\\n\";\n \tfprintf(stderr, str, prog);\n \texit(EXIT_FAILURE);\n@@ -377,7 +381,7 @@ static void parse_command_line(int argc, char **argv)\n \topterr = 0;\n \n \tfor (;;) {\n-\t\tc = getopt_long(argc, argv, \"Frtli:q:psSNn:cz\", long_options,\n+\t\tc = getopt_long(argc, argv, \"Frtli:q:psSNn:czm\", long_options,\n \t\t\t\t&option_index);\n \t\tif (c == -1)\n \t\t\tbreak;\n@@ -420,6 +424,10 @@ static void parse_command_line(int argc, char **argv)\n \t\tcase 'F':\n \t\t\topt_xdp_flags &= ~XDP_FLAGS_UPDATE_IF_NOEXIST;\n \t\t\tbreak;\n+\t\tcase 'm':\n+\t\t\topt_might_sleep = false;\n+\t\t\topt_xdp_bind_flags &= ~XDP_USE_NEED_WAKEUP;\n+\t\t\tbreak;\n \t\tdefault:\n \t\t\tusage(basename(argv[0]));\n \t\t}\n@@ -444,7 +452,8 @@ static void kick_tx(struct xsk_socket_info *xsk)\n \texit_with_error(errno);\n }\n \n-static inline void complete_tx_l2fwd(struct xsk_socket_info *xsk)\n+static inline void complete_tx_l2fwd(struct xsk_socket_info *xsk,\n+\t\t\t\t struct pollfd *fds)\n {\n \tu32 idx_cq = 0, idx_fq = 0;\n \tunsigned int rcvd;\n@@ -453,7 +462,9 @@ static inline void complete_tx_l2fwd(struct xsk_socket_info *xsk)\n \tif (!xsk->outstanding_tx)\n \t\treturn;\n \n-\tkick_tx(xsk);\n+\tif (!opt_might_sleep || xsk_ring_prod__needs_wakeup(&xsk->tx))\n+\t\tkick_tx(xsk);\n+\n \tndescs = (xsk->outstanding_tx > BATCH_SIZE) ? BATCH_SIZE :\n \t\txsk->outstanding_tx;\n \n@@ -467,6 +478,8 @@ static inline void complete_tx_l2fwd(struct xsk_socket_info *xsk)\n \t\twhile (ret != rcvd) {\n \t\t\tif (ret < 0)\n \t\t\t\texit_with_error(-ret);\n+\t\t\tif (xsk_ring_prod__needs_wakeup(&xsk->umem->fq))\n+\t\t\t\tret = poll(fds, num_socks, opt_timeout);\n \t\t\tret = xsk_ring_prod__reserve(&xsk->umem->fq, rcvd,\n \t\t\t\t\t\t &idx_fq);\n \t\t}\n@@ -490,7 +503,8 @@ static inline void complete_tx_only(struct xsk_socket_info *xsk)\n \tif (!xsk->outstanding_tx)\n \t\treturn;\n \n-\tkick_tx(xsk);\n+\tif (!opt_might_sleep || xsk_ring_prod__needs_wakeup(&xsk->tx))\n+\t\tkick_tx(xsk);\n \n \trcvd = xsk_ring_cons__peek(&xsk->umem->cq, BATCH_SIZE, &idx);\n \tif (rcvd > 0) {\n@@ -500,20 +514,25 @@ static inline void complete_tx_only(struct xsk_socket_info *xsk)\n \t}\n }\n \n-static void rx_drop(struct xsk_socket_info *xsk)\n+static void rx_drop(struct xsk_socket_info *xsk, struct pollfd *fds)\n {\n \tunsigned int rcvd, i;\n \tu32 idx_rx = 0, idx_fq = 0;\n \tint ret;\n \n \trcvd = xsk_ring_cons__peek(&xsk->rx, BATCH_SIZE, &idx_rx);\n-\tif (!rcvd)\n+\tif (!rcvd) {\n+\t\tif (xsk_ring_prod__needs_wakeup(&xsk->umem->fq))\n+\t\t\tret = poll(fds, num_socks, opt_timeout);\n \t\treturn;\n+\t}\n \n \tret = xsk_ring_prod__reserve(&xsk->umem->fq, rcvd, &idx_fq);\n \twhile (ret != rcvd) {\n \t\tif (ret < 0)\n \t\t\texit_with_error(-ret);\n+\t\tif (xsk_ring_prod__needs_wakeup(&xsk->umem->fq))\n+\t\t\tret = poll(fds, num_socks, opt_timeout);\n \t\tret = xsk_ring_prod__reserve(&xsk->umem->fq, rcvd, &idx_fq);\n \t}\n \n@@ -534,42 +553,65 @@ static void rx_drop(struct xsk_socket_info *xsk)\n static void rx_drop_all(void)\n {\n \tstruct pollfd fds[MAX_SOCKS + 1];\n-\tint i, ret, timeout, nfds = 1;\n+\tint i, ret;\n \n \tmemset(fds, 0, sizeof(fds));\n \n \tfor (i = 0; i < num_socks; i++) {\n \t\tfds[i].fd = xsk_socket__fd(xsks[i]->xsk);\n \t\tfds[i].events = POLLIN;\n-\t\ttimeout = 1000; /* 1sn */\n \t}\n \n \tfor (;;) {\n \t\tif (opt_poll) {\n-\t\t\tret = poll(fds, nfds, timeout);\n+\t\t\tret = poll(fds, num_socks, opt_timeout);\n \t\t\tif (ret <= 0)\n \t\t\t\tcontinue;\n \t\t}\n \n \t\tfor (i = 0; i < num_socks; i++)\n-\t\t\trx_drop(xsks[i]);\n+\t\t\trx_drop(xsks[i], fds);\n+\t}\n+}\n+\n+static void tx_only(struct xsk_socket_info *xsk, u32 frame_nb)\n+{\n+\tu32 idx;\n+\n+\tif (xsk_ring_prod__reserve(&xsk->tx, BATCH_SIZE, &idx) == BATCH_SIZE) {\n+\t\tunsigned int i;\n+\n+\t\tfor (i = 0; i < BATCH_SIZE; i++) {\n+\t\t\txsk_ring_prod__tx_desc(&xsk->tx, idx + i)->addr\t=\n+\t\t\t\t(frame_nb + i) << XSK_UMEM__DEFAULT_FRAME_SHIFT;\n+\t\t\txsk_ring_prod__tx_desc(&xsk->tx, idx + i)->len =\n+\t\t\t\tsizeof(pkt_data) - 1;\n+\t\t}\n+\n+\t\txsk_ring_prod__submit(&xsk->tx, BATCH_SIZE);\n+\t\txsk->outstanding_tx += BATCH_SIZE;\n+\t\tframe_nb += BATCH_SIZE;\n+\t\tframe_nb %= NUM_FRAMES;\n \t}\n+\n+\tcomplete_tx_only(xsk);\n }\n \n-static void tx_only(struct xsk_socket_info *xsk)\n+static void tx_only_all(void)\n {\n-\tint timeout, ret, nfds = 1;\n-\tstruct pollfd fds[nfds + 1];\n-\tu32 idx, frame_nb = 0;\n+\tstruct pollfd fds[MAX_SOCKS];\n+\tu32 frame_nb[MAX_SOCKS] = {};\n+\tint i, ret;\n \n \tmemset(fds, 0, sizeof(fds));\n-\tfds[0].fd = xsk_socket__fd(xsk->xsk);\n-\tfds[0].events = POLLOUT;\n-\ttimeout = 1000; /* 1sn */\n+\tfor (i = 0; i < num_socks; i++) {\n+\t\tfds[0].fd = xsk_socket__fd(xsks[i]->xsk);\n+\t\tfds[0].events = POLLOUT;\n+\t}\n \n \tfor (;;) {\n \t\tif (opt_poll) {\n-\t\t\tret = poll(fds, nfds, timeout);\n+\t\t\tret = poll(fds, num_socks, opt_timeout);\n \t\t\tif (ret <= 0)\n \t\t\t\tcontinue;\n \n@@ -577,70 +619,75 @@ static void tx_only(struct xsk_socket_info *xsk)\n \t\t\t\tcontinue;\n \t\t}\n \n-\t\tif (xsk_ring_prod__reserve(&xsk->tx, BATCH_SIZE, &idx) ==\n-\t\t BATCH_SIZE) {\n-\t\t\tunsigned int i;\n-\n-\t\t\tfor (i = 0; i < BATCH_SIZE; i++) {\n-\t\t\t\txsk_ring_prod__tx_desc(&xsk->tx, idx + i)->addr\n-\t\t\t\t\t= (frame_nb + i) <<\n-\t\t\t\t\tXSK_UMEM__DEFAULT_FRAME_SHIFT;\n-\t\t\t\txsk_ring_prod__tx_desc(&xsk->tx, idx + i)->len =\n-\t\t\t\t\tsizeof(pkt_data) - 1;\n-\t\t\t}\n-\n-\t\t\txsk_ring_prod__submit(&xsk->tx, BATCH_SIZE);\n-\t\t\txsk->outstanding_tx += BATCH_SIZE;\n-\t\t\tframe_nb += BATCH_SIZE;\n-\t\t\tframe_nb %= NUM_FRAMES;\n-\t\t}\n-\n-\t\tcomplete_tx_only(xsk);\n+\t\tfor (i = 0; i < num_socks; i++)\n+\t\t\ttx_only(xsks[i], frame_nb[i]);\n \t}\n }\n \n-static void l2fwd(struct xsk_socket_info *xsk)\n+static void l2fwd(struct xsk_socket_info *xsk, struct pollfd *fds)\n {\n-\tfor (;;) {\n-\t\tunsigned int rcvd, i;\n-\t\tu32 idx_rx = 0, idx_tx = 0;\n-\t\tint ret;\n+\tunsigned int rcvd, i;\n+\tu32 idx_rx = 0, idx_tx = 0;\n+\tint ret;\n \n-\t\tfor (;;) {\n-\t\t\tcomplete_tx_l2fwd(xsk);\n+\tcomplete_tx_l2fwd(xsk, fds);\n \n-\t\t\trcvd = xsk_ring_cons__peek(&xsk->rx, BATCH_SIZE,\n-\t\t\t\t\t\t &idx_rx);\n-\t\t\tif (rcvd > 0)\n-\t\t\t\tbreak;\n-\t\t}\n+\trcvd = xsk_ring_cons__peek(&xsk->rx, BATCH_SIZE, &idx_rx);\n+\tif (!rcvd) {\n+\t\tif (xsk_ring_prod__needs_wakeup(&xsk->umem->fq))\n+\t\t\tret = poll(fds, num_socks, opt_timeout);\n+\t\treturn;\n+\t}\n \n+\tret = xsk_ring_prod__reserve(&xsk->tx, rcvd, &idx_tx);\n+\twhile (ret != rcvd) {\n+\t\tif (ret < 0)\n+\t\t\texit_with_error(-ret);\n+\t\tif (xsk_ring_prod__needs_wakeup(&xsk->tx))\n+\t\t\tkick_tx(xsk);\n \t\tret = xsk_ring_prod__reserve(&xsk->tx, rcvd, &idx_tx);\n-\t\twhile (ret != rcvd) {\n-\t\t\tif (ret < 0)\n-\t\t\t\texit_with_error(-ret);\n-\t\t\tret = xsk_ring_prod__reserve(&xsk->tx, rcvd, &idx_tx);\n-\t\t}\n+\t}\n+\n+\tfor (i = 0; i < rcvd; i++) {\n+\t\tu64 addr = xsk_ring_cons__rx_desc(&xsk->rx, idx_rx)->addr;\n+\t\tu32 len = xsk_ring_cons__rx_desc(&xsk->rx, idx_rx++)->len;\n+\t\tchar *pkt = xsk_umem__get_data(xsk->umem->buffer, addr);\n+\n+\t\tswap_mac_addresses(pkt);\n \n-\t\tfor (i = 0; i < rcvd; i++) {\n-\t\t\tu64 addr = xsk_ring_cons__rx_desc(&xsk->rx,\n-\t\t\t\t\t\t\t idx_rx)->addr;\n-\t\t\tu32 len = xsk_ring_cons__rx_desc(&xsk->rx,\n-\t\t\t\t\t\t\t idx_rx++)->len;\n-\t\t\tchar *pkt = xsk_umem__get_data(xsk->umem->buffer, addr);\n+\t\thex_dump(pkt, len, addr);\n+\t\txsk_ring_prod__tx_desc(&xsk->tx, idx_tx)->addr = addr;\n+\t\txsk_ring_prod__tx_desc(&xsk->tx, idx_tx++)->len = len;\n+\t}\n \n-\t\t\tswap_mac_addresses(pkt);\n+\txsk_ring_prod__submit(&xsk->tx, rcvd);\n+\txsk_ring_cons__release(&xsk->rx, rcvd);\n \n-\t\t\thex_dump(pkt, len, addr);\n-\t\t\txsk_ring_prod__tx_desc(&xsk->tx, idx_tx)->addr = addr;\n-\t\t\txsk_ring_prod__tx_desc(&xsk->tx, idx_tx++)->len = len;\n-\t\t}\n+\txsk->rx_npkts += rcvd;\n+\txsk->outstanding_tx += rcvd;\n+}\n+\n+static void l2fwd_all(void)\n+{\n+\tstruct pollfd fds[MAX_SOCKS];\n+\tint i, ret;\n+\n+\tmemset(fds, 0, sizeof(fds));\n+\n+\tfor (i = 0; i < num_socks; i++) {\n+\t\tfds[i].fd = xsk_socket__fd(xsks[i]->xsk);\n+\t\tfds[i].events = POLLOUT | POLLIN;\n+\t}\n \n-\t\txsk_ring_prod__submit(&xsk->tx, rcvd);\n-\t\txsk_ring_cons__release(&xsk->rx, rcvd);\n+\tfor (;;) {\n+\t\tif (opt_poll) {\n+\t\t\tret = poll(fds, num_socks, opt_timeout);\n+\t\t\tif (ret <= 0)\n+\t\t\t\tcontinue;\n+\t\t}\n \n-\t\txsk->rx_npkts += rcvd;\n-\t\txsk->outstanding_tx += rcvd;\n+\t\tfor (i = 0; i < num_socks; i++)\n+\t\t\tl2fwd(xsks[i], fds);\n \t}\n }\n \n@@ -693,9 +740,9 @@ int main(int argc, char **argv)\n \tif (opt_bench == BENCH_RXDROP)\n \t\trx_drop_all();\n \telse if (opt_bench == BENCH_TXONLY)\n-\t\ttx_only(xsks[0]);\n+\t\ttx_only_all();\n \telse\n-\t\tl2fwd(xsks[0]);\n+\t\tl2fwd_all();\n \n \treturn 0;\n }\n", "prefixes": [ "bpf-next", "6/6" ] }