From patchwork Mon Jan 21 09:10:33 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maciej Fijalkowski X-Patchwork-Id: 1028505 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="Fb54C3mB"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 43jm4J3hP4z9sDL for ; Mon, 21 Jan 2019 20:10:56 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726766AbfAUJKx (ORCPT ); Mon, 21 Jan 2019 04:10:53 -0500 Received: from mail-lj1-f194.google.com ([209.85.208.194]:36717 "EHLO mail-lj1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725977AbfAUJKv (ORCPT ); Mon, 21 Jan 2019 04:10:51 -0500 Received: by mail-lj1-f194.google.com with SMTP id g11-v6so16854677ljk.3 for ; Mon, 21 Jan 2019 01:10:50 -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=Gu+lRLCqojU/aNbofx5eJ3CQIkvmy/lqHIjU69UFx+4=; b=Fb54C3mBauVP6mUvKfiO6dOuTWjWVckZy1qwj+UPY1Xip+FhoSJDkcMlZNOI7E6Xej Q4cTBXIKJrrudPkCJM98Dz6kHzIJrgvewzOXmDxK7kyBjvC2V+EMp3tMPx/xjVMg3av8 FbFnoU1fXyX4fnWLC+0fTEjw0xcpKqATcoCGBHNDYbCyfNJlLIXI0GiNVrZy2+N87vp9 sHibmZbIWgUg1M42COWTQhGUJUbPjUZqVNIsufdUOWZwJHNLggLQYxDRFURPW+0Mmp/D iNJpe/NV6pzkgA9e4Fd6Pv+sJWl+GE7bEFYdEhbzHlSqe+7s7pRqylUGNxbzX1O3jArH gsVw== 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=Gu+lRLCqojU/aNbofx5eJ3CQIkvmy/lqHIjU69UFx+4=; b=B9G4nAnk7XltYAaIlGYZNOA1qVCV5K2TVhPHBrQEHut4dIATxBi13tkXTouWo8MYdP Xol4cp8MpdVqvG9PsBZto8NQXkAyDtP+7zW4tlHAc8nFAaTqL5YrZmmNuPIWbNTkAGDE oSwfb33O1i93igXu4XpPrP3X+9+jmRW7yAQfqfCnTxjt2Hr+5PcIPJIhLb8XqVaaXdLf uENmMTf4I5nZSyXCFaihrBWBirgG4oGJvQVE9fFAYdnLwe+BLFPW14EZC5ohCt99WIhm 31FgVN/2bqCA1ILCJpJ39ldg6KeQfDQcefjOYoTZ5JdMVdyh38+lqNHW+CwjA8MhvfDg mfuA== X-Gm-Message-State: AJcUukdUo2lqdA41Vacondd4zMcnoYf+TYnfu6S7g4ZUY6x77JiRoOBg G+94flmZz2XU4pvPAQq3FbN2Ab/Q9MI= X-Google-Smtp-Source: ALg8bN65k8ll2fFge7gWFBUjtJ27Eyf3crqz7DH2ja9EZN5yGogUxXXf7kS5Gkt6FHX9k/CIC55Q6g== X-Received: by 2002:a2e:8605:: with SMTP id a5-v6mr16920314lji.145.1548061849351; Mon, 21 Jan 2019 01:10:49 -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.48 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 21 Jan 2019 01:10:48 -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 0/8] xdp: Avoid unloading xdp prog not attached by sample Date: Mon, 21 Jan 2019 10:10:33 +0100 Message-Id: <20190121091041.14666-1-maciejromanfijalkowski@gmail.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. 2nd patch adds a support for getting a program to load based on index. This was added for xdp_redirect_cpu purposes. In patch 3 Jesper removes the read_trace_pipe usage from xdp_redirect_cpu which was a blocker for converting this sample to libbpf usage. 4th patch updates a bunch of xdp samples to make the use of libbpf. Patch 5 adjusts RLIMIT_MEMLOCK for two samples touched in this patchset. 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 8th patch. Thanks! v2: include xdp_redirect_cpu into conversion 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 libbpf: Add a helper for retrieving a prog via index samples: bpf: Convert XDP samples to libbpf usage samples: bpf: Extend RLIMIT_MEMLOCK for xdp_{sample_pkts, router_ipv4} 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 samples/bpf/Makefile | 8 +- samples/bpf/xdp1_user.c | 29 +++++- samples/bpf/xdp_adjust_tail_user.c | 33 +++++-- samples/bpf/xdp_redirect_cpu_user.c | 142 +++++++++++++++++++++--------- samples/bpf/xdp_redirect_map_user.c | 94 ++++++++++++++++---- samples/bpf/xdp_redirect_user.c | 92 +++++++++++++++---- samples/bpf/xdp_router_ipv4_user.c | 171 +++++++++++++++++++++++++----------- samples/bpf/xdp_rxq_info_user.c | 36 ++++++-- samples/bpf/xdp_sample_pkts_user.c | 76 +++++++++++++--- samples/bpf/xdp_tx_iptunnel_user.c | 66 ++++++++++---- samples/bpf/xdpsock_user.c | 25 +++++- tools/lib/bpf/libbpf.c | 20 +++++ tools/lib/bpf/libbpf.h | 7 ++ tools/lib/bpf/libbpf.map | 6 ++ tools/lib/bpf/netlink.c | 84 ++++++++++++++++++ 15 files changed, 710 insertions(+), 179 deletions(-)