From patchwork Tue Oct 8 06:16:55 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: "Samudrala, Sridhar" X-Patchwork-Id: 1173112 X-Patchwork-Delegate: bpf@iogearbox.net Return-Path: X-Original-To: incoming-bpf@patchwork.ozlabs.org Delivered-To: patchwork-incoming-bpf@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=bpf-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=intel.com Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 46nRvb2PC5z9sPT for ; Tue, 8 Oct 2019 17:16:59 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730050AbfJHGQ6 (ORCPT ); Tue, 8 Oct 2019 02:16:58 -0400 Received: from mga04.intel.com ([192.55.52.120]:63837 "EHLO mga04.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729802AbfJHGQ6 (ORCPT ); Tue, 8 Oct 2019 02:16:58 -0400 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga008.jf.intel.com ([10.7.209.65]) by fmsmga104.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 07 Oct 2019 23:16:56 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.67,269,1566889200"; d="scan'208";a="187206757" Received: from arch-p28.jf.intel.com ([10.166.187.31]) by orsmga008.jf.intel.com with ESMTP; 07 Oct 2019 23:16:55 -0700 From: Sridhar Samudrala To: magnus.karlsson@intel.com, bjorn.topel@intel.com, netdev@vger.kernel.org, bpf@vger.kernel.org, sridhar.samudrala@intel.com, intel-wired-lan@lists.osuosl.org, maciej.fijalkowski@intel.com, tom.herbert@intel.com Subject: [PATCH bpf-next 4/4] xdpsock: add an option to create AF_XDP sockets in XDP_DIRECT mode Date: Mon, 7 Oct 2019 23:16:55 -0700 Message-Id: <1570515415-45593-5-git-send-email-sridhar.samudrala@intel.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1570515415-45593-1-git-send-email-sridhar.samudrala@intel.com> References: <1570515415-45593-1-git-send-email-sridhar.samudrala@intel.com> Sender: bpf-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: bpf@vger.kernel.org This option enables an AF_XDP socket to bind with a XDP_DIRECT flag that allows packets received on the associated queue to be received directly when an XDP program is not attached. Signed-off-by: Sridhar Samudrala Acked-by: Björn Töpel --- samples/bpf/xdpsock_user.c | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/samples/bpf/xdpsock_user.c b/samples/bpf/xdpsock_user.c index 405c4e091f8b..6f4633769968 100644 --- a/samples/bpf/xdpsock_user.c +++ b/samples/bpf/xdpsock_user.c @@ -129,6 +129,9 @@ static void print_benchmark(bool running) if (opt_poll) printf("poll() "); + if (opt_xdp_bind_flags & XDP_DIRECT) + printf("direct-xsk "); + if (running) { printf("running..."); fflush(stdout); @@ -202,7 +205,8 @@ static void int_exit(int sig) dump_stats(); xsk_socket__delete(xsks[0]->xsk); (void)xsk_umem__delete(umem); - remove_xdp_program(); + if (!(opt_xdp_bind_flags & XDP_DIRECT)) + remove_xdp_program(); exit(EXIT_SUCCESS); } @@ -213,7 +217,8 @@ static void __exit_with_error(int error, const char *file, const char *func, fprintf(stderr, "%s:%s:%i: errno: %d/\"%s\"\n", file, func, line, error, strerror(error)); dump_stats(); - remove_xdp_program(); + if (!(opt_xdp_bind_flags & XDP_DIRECT)) + remove_xdp_program(); exit(EXIT_FAILURE); } @@ -363,6 +368,7 @@ static struct option long_options[] = { {"frame-size", required_argument, 0, 'f'}, {"no-need-wakeup", no_argument, 0, 'm'}, {"unaligned", no_argument, 0, 'u'}, + {"direct-xsk", no_argument, 0, 'd'}, {0, 0, 0, 0} }; @@ -386,6 +392,7 @@ static void usage(const char *prog) " -m, --no-need-wakeup Turn off use of driver need wakeup flag.\n" " -f, --frame-size=n Set the frame size (must be a power of two in aligned mode, default is %d).\n" " -u, --unaligned Enable unaligned chunk placement\n" + " -d, --direct-xsk Direct packets to XDP socket.\n" "\n"; fprintf(stderr, str, prog, XSK_UMEM__DEFAULT_FRAME_SIZE); exit(EXIT_FAILURE); @@ -398,7 +405,7 @@ static void parse_command_line(int argc, char **argv) opterr = 0; for (;;) { - c = getopt_long(argc, argv, "Frtli:q:psSNn:czf:mu", + c = getopt_long(argc, argv, "Frtli:q:psSNn:czf:mud", long_options, &option_index); if (c == -1) break; @@ -452,7 +459,9 @@ static void parse_command_line(int argc, char **argv) opt_need_wakeup = false; opt_xdp_bind_flags &= ~XDP_USE_NEED_WAKEUP; break; - + case 'd': + opt_xdp_bind_flags |= XDP_DIRECT; + break; default: usage(basename(argv[0])); }