From patchwork Fri Feb 1 00:19:46 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maciej Fijalkowski X-Patchwork-Id: 1034532 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="NT7Acq7D"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 43rHmy6wLrz9sMl for ; Fri, 1 Feb 2019 11:20:18 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728316AbfBAAUR (ORCPT ); Thu, 31 Jan 2019 19:20:17 -0500 Received: from mail-lj1-f193.google.com ([209.85.208.193]:41754 "EHLO mail-lj1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728020AbfBAAUQ (ORCPT ); Thu, 31 Jan 2019 19:20:16 -0500 Received: by mail-lj1-f193.google.com with SMTP id k15-v6so4282946ljc.8 for ; Thu, 31 Jan 2019 16:20:15 -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; bh=leMsCapC4RkMoIDREq1+mxgxJv2UygPYtrQty6pJyR4=; b=NT7Acq7DKBhUjdX2xAt/Z1TkLX4obMVBIhg08ljozgukTxvYc+ZtfWpJHOuD4EWZux VZ/Qr/W6tG25JosU2kVrZzEhLJLjx9hB84Ol5aCKPTldDknpgXSgAAAukCvX1OFq51E9 aaw5UrFYDsMfefCKGG+Da/DSl+agbyyEZux73eVggFRDfElg7eA4q2l1GTBbzVGd5dP2 lLQNzcV9Kjif+5+LRaLgdVrPqYFGgznn+iDoiKng9xHeOc1miiJcEvqdcH6lXTZnz2c4 2lpbDW5xLs0yVPWaopu4SvFdkx/brvHNIKZDGV7dzSXnar7di6XUGTnYEVGQRDiqvKR7 qfuQ== 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; bh=leMsCapC4RkMoIDREq1+mxgxJv2UygPYtrQty6pJyR4=; b=k3lJQ5wDAoMC8u7CbMXuE/e7zQHtteyHrFl2oqHiQcNvZZXtWILHnMC8XBXuJtpzBi hbOQWE53ErtZq5FRqSqZtcl+mi1BVzeI8WjhT0HnD5Ycw5jTRaobU9ZkAfX9ubNzVcf1 l2r64oSU3Nd+f076UvP+H2A2SdEXpG90x8phy8pgxZsl+lzm8ifDe2pyLsvhHG1IBGEx YHOQORB8DwXzJPAE3if5albUy/PsIAaY0fX2+lMb1fxhBj1E2Nze/t4Y4kgA8MUol96d A44HWwd0HiOvBE+aYKZCJP8Rkx0+PG2IsDRi3X4kwgaRXcCFmG2SCD7DYag423d/Tr1w WE+A== X-Gm-Message-State: AJcUukdE53NORbqbrcfkMh4iI1ICIaeFW7BmTz+X10irzTFnLhcIAPkI 80fyLFI8KGEm5BRGtgoMuAA= X-Google-Smtp-Source: ALg8bN4h0dEeW8uaooOiFKeOOfKPHpjzepsDbyZPYz8wqijXcIeIIKOJ4kIVyYurM39fku0pECxeWg== X-Received: by 2002:a2e:5303:: with SMTP id h3-v6mr29286740ljb.35.1548980414852; Thu, 31 Jan 2019 16:20:14 -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 j18-v6sm1005495ljc.52.2019.01.31.16.20.13 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 31 Jan 2019 16:20:14 -0800 (PST) From: Maciej Fijalkowski X-Google-Original-From: Maciej Fijalkowski To: daniel@iogearbox.net, ast@kernel.org Cc: netdev@vger.kernel.org, jakub.kicinski@netronome.com, brouer@redhat.com, john.fastabend@gmail.com Subject: [PATCH bpf-next v5 0/8] xdp: Avoid unloading xdp prog not attached by sample Date: Fri, 1 Feb 2019 01:19:46 +0100 Message-Id: <20190201001954.4130-1-maciej.fijalkowski@intel.com> X-Mailer: git-send-email 2.16.1 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Hi! This patchset tries to address the situation where: * user loads a particular xdp sample application that does stats polling * user loads another sample application on the same interface * then, user sends SIGINT/SIGTERM to the app that was attached as a first one * second application ends up with an unloaded xdp program 1st patch contains a helper libbpf function for getting the map fd by a given map name. In patch 2 Jesper removes the read_trace_pipe usage from xdp_redirect_cpu which was a blocker for converting this sample to libbpf usage. 3rd patch updates a bunch of xdp samples to make the use of libbpf. Patch 4 adjusts RLIMIT_MEMLOCK for two samples touched in this patchset. In patch 5 extack messages are added for cases where dev_change_xdp_fd returns with an error so user has an idea what was the reason for not attaching the xdp program onto interface. Patch 6 makes the samples behavior similar to what iproute2 does when loading xdp prog - the "force" flag is introduced. Patch 7 introduces the libbpf function that will query the driver from userspace about the currently attached xdp prog id. Use it in samples that do polling by checking the prog id in signal handler and comparing it with previously stored one which is the scope of patch 8. Thanks! v1->v2: * add a libbpf helper for getting a prog via relative index * include xdp_redirect_cpu into conversion v2->v3: mostly addressing Daniel's/Jesper's comments * get rid of the helper from v1->v2 * feed the xdp_redirect_cpu with program name instead of number v3->v4: * fix help message in xdp_sample_pkts v4->v5: * in get_link_xdp_fd, assign prog_id only when libbpf_nl_get_link returned with 0 * add extack messages in dev_change_xdp_fd * check the return value of bpf_get_link_xdp_id when exiting from sample progs Jesper Dangaard Brouer (1): samples/bpf: xdp_redirect_cpu have not need for read_trace_pipe Maciej Fijalkowski (7): libbpf: Add a helper for retrieving a map fd for a given name samples/bpf: Convert XDP samples to libbpf usage samples/bpf: Extend RLIMIT_MEMLOCK for xdp_{sample_pkts, router_ipv4} xdp: Provide extack messages when prog attachment failed samples/bpf: Add a "force" flag to XDP samples libbpf: Add a support for getting xdp prog id on ifindex samples/bpf: Check the prog id before exiting net/core/dev.c | 12 ++- samples/bpf/Makefile | 8 +- samples/bpf/xdp1_user.c | 34 ++++++- samples/bpf/xdp_adjust_tail_user.c | 38 +++++-- samples/bpf/xdp_redirect_cpu_user.c | 196 +++++++++++++++++++++++++----------- samples/bpf/xdp_redirect_map_user.c | 106 +++++++++++++++---- samples/bpf/xdp_redirect_user.c | 103 ++++++++++++++++--- samples/bpf/xdp_router_ipv4_user.c | 179 +++++++++++++++++++++++--------- samples/bpf/xdp_rxq_info_user.c | 41 ++++++-- samples/bpf/xdp_sample_pkts_user.c | 81 ++++++++++++--- samples/bpf/xdp_tx_iptunnel_user.c | 71 ++++++++++--- samples/bpf/xdpsock_user.c | 30 +++++- tools/lib/bpf/libbpf.c | 6 ++ tools/lib/bpf/libbpf.h | 4 + tools/lib/bpf/libbpf.map | 2 + tools/lib/bpf/netlink.c | 85 ++++++++++++++++ 16 files changed, 796 insertions(+), 200 deletions(-)