From patchwork Mon Jan 21 09:10:38 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maciej Fijalkowski X-Patchwork-Id: 1028510 X-Patchwork-Delegate: bpf@iogearbox.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@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=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="GNtebC2y"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 43jm4Y3hDDz9s55 for ; Mon, 21 Jan 2019 20:11:09 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727137AbfAUJLA (ORCPT ); Mon, 21 Jan 2019 04:11:00 -0500 Received: from mail-lf1-f68.google.com ([209.85.167.68]:38812 "EHLO mail-lf1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726784AbfAUJK5 (ORCPT ); Mon, 21 Jan 2019 04:10:57 -0500 Received: by mail-lf1-f68.google.com with SMTP id a8so14927937lfk.5 for ; Mon, 21 Jan 2019 01:10:55 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=Lrfa+WMB3a5ZAdgxiBeW/96MxdHxwgYMhQux9k0HMw4=; b=GNtebC2yck6Onq5LnD2hldzLOWoljdBlyf0zucrmhMjZDaxh5QsOxpJa61PuwTnaRn 0yb30HfJ0mERhHQl+imc2SXHdIlaamKbZ0rL9jPFQSm2XuNrLki2N9JSh5h+uokvhp1M 3Jnmes4NFcq2UcRvkDXCSEBidPd/ofxviikPOfjxoN4rd/26u93mu1A01ByT6TnhuJ56 TZ/2O0D9LCBMZyE4uF6VCGQL7LFAYzk52ktfBoFCBBH9xejEBwQy5wqew07yto+cb29D XE4VZ2YjWdIp1noheuqYhQHmAojju/wfE5aemBGhK7hqdXKfvcycYiQ+sLvP2VYr/dRB dgXw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=Lrfa+WMB3a5ZAdgxiBeW/96MxdHxwgYMhQux9k0HMw4=; b=D/PpOERR0epB32w5SXk0q793peZvNFaDtntMf6MOn35zpTkYaqF3Ys+fIJYNW/n+P9 11TxTexKPoBYtxQ7UTLR5TTjJ+9fHSROY70TJlTf3/8JFPntaW4WURgAeI78uMJA41jj qp43cIiN/TBUP0w0ROThTQm8l8DH7vBnKnx8zEh7kFLxmivWJoK4fM1GqYz6+d9gNJ/k Zjxl+hQucY45kWU8wBaGOxkXIV4xplGtcvzo/OKh/BINwSdsZsUuE2h1kYQRzoQ1Rzgi 3yVoLSA6MYrrcwIZB9yJqjHpFBTV82BH/uuN0HFeiDNZ/vH0bE2lcdgS+UMmBVRmeNIY DXrw== X-Gm-Message-State: AJcUukc47l5vwEeVQr8xwQxMb7MPngxq/Gl1xVNYez4XVsrDey8Bn4d/ PVlEPVHXmZK4/K25PaBsLoA= X-Google-Smtp-Source: ALg8bN5XKa412bJ9erHmso0h13ZndNF85oYKBwp03YeXkchNfR149QLt8dxl1Y1uIOAPmQpQzJkN7Q== X-Received: by 2002:a19:f115:: with SMTP id p21mr14014544lfh.20.1548061853995; Mon, 21 Jan 2019 01:10:53 -0800 (PST) Received: from localhost.localdomain (host-185-93-94-63.ip-point.pl. [185.93.94.63]) by smtp.gmail.com with ESMTPSA id q128-v6sm2169147ljq.14.2019.01.21.01.10.53 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 21 Jan 2019 01:10:53 -0800 (PST) From: Maciej Fijalkowski To: daniel@iogearbox.net, ast@kernel.org Cc: netdev@vger.kernel.org, jakub.kicinski@netronome.com, brouer@redhat.com Subject: [PATCH bpf-next v2 5/8] samples: bpf: Extend RLIMIT_MEMLOCK for xdp_{sample_pkts, router_ipv4} Date: Mon, 21 Jan 2019 10:10:38 +0100 Message-Id: <20190121091041.14666-6-maciejromanfijalkowski@gmail.com> X-Mailer: git-send-email 2.16.1 In-Reply-To: <20190121091041.14666-1-maciejromanfijalkowski@gmail.com> References: <20190121091041.14666-1-maciejromanfijalkowski@gmail.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org There is a common problem with xdp samples that happens when user wants to run a particular sample and some bpf program is already loaded. The default 64kb RLIMIT_MEMLOCK resource limit will cause a following error (assuming that xdp sample that is failing was converted to libbpf usage): libbpf: Error in bpf_object__probe_name():Operation not permitted(1). Couldn't load basic 'r0 = 0' BPF program. libbpf: failed to load object './xdp_sample_pkts_kern.o' Fix it in xdp_sample_pkts and xdp_router_ipv4 by setting RLIMIT_MEMLOCK to RLIM_INFINITY. Signed-off-by: Maciej Fijalkowski Reviewed-by: Jakub Kicinski --- samples/bpf/xdp_router_ipv4_user.c | 7 +++++++ samples/bpf/xdp_sample_pkts_user.c | 7 +++++++ 2 files changed, 14 insertions(+) diff --git a/samples/bpf/xdp_router_ipv4_user.c b/samples/bpf/xdp_router_ipv4_user.c index cea2306f5ab7..c63c6beec7d6 100644 --- a/samples/bpf/xdp_router_ipv4_user.c +++ b/samples/bpf/xdp_router_ipv4_user.c @@ -25,6 +25,7 @@ #include #include "bpf_util.h" #include "bpf/libbpf.h" +#include int sock, sock_arp, flags = 0; static int total_ifindex; @@ -609,6 +610,7 @@ static int monitor_route(void) int main(int ac, char **argv) { + struct rlimit r = {RLIM_INFINITY, RLIM_INFINITY}; struct bpf_prog_load_attr prog_load_attr = { .prog_type = BPF_PROG_TYPE_XDP, }; @@ -635,6 +637,11 @@ int main(int ac, char **argv) ifname_list = (argv + 1); } + if (setrlimit(RLIMIT_MEMLOCK, &r)) { + perror("setrlimit(RLIMIT_MEMLOCK)"); + return 1; + } + if (bpf_prog_load_xattr(&prog_load_attr, &obj, &prog_fd)) return 1; diff --git a/samples/bpf/xdp_sample_pkts_user.c b/samples/bpf/xdp_sample_pkts_user.c index 8dd87c1eb560..5f5828ee0761 100644 --- a/samples/bpf/xdp_sample_pkts_user.c +++ b/samples/bpf/xdp_sample_pkts_user.c @@ -12,6 +12,7 @@ #include #include #include +#include #include "perf-sys.h" #include "trace_helpers.h" @@ -99,6 +100,7 @@ static void sig_handler(int signo) int main(int argc, char **argv) { + struct rlimit r = {RLIM_INFINITY, RLIM_INFINITY}; struct bpf_prog_load_attr prog_load_attr = { .prog_type = BPF_PROG_TYPE_XDP, }; @@ -114,6 +116,11 @@ int main(int argc, char **argv) return 1; } + if (setrlimit(RLIMIT_MEMLOCK, &r)) { + perror("setrlimit(RLIMIT_MEMLOCK)"); + return 1; + } + numcpus = get_nprocs(); if (numcpus > MAX_CPUS) numcpus = MAX_CPUS;