From patchwork Fri Feb 1 21:42:22 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maciej Fijalkowski X-Patchwork-Id: 1035211 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="RL1xHX15"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 43rrLf5pVDz9sBZ for ; Sat, 2 Feb 2019 08:47:54 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726639AbfBAVrx (ORCPT ); Fri, 1 Feb 2019 16:47:53 -0500 Received: from mail-lj1-f195.google.com ([209.85.208.195]:46039 "EHLO mail-lj1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726275AbfBAVrw (ORCPT ); Fri, 1 Feb 2019 16:47:52 -0500 Received: by mail-lj1-f195.google.com with SMTP id s5-v6so7007986ljd.12 for ; Fri, 01 Feb 2019 13:47: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=xONCTyQf54zE9Ch0AwN7k8Es5+NLc/XLFiMMDS6li/8=; b=RL1xHX15cYOTuAVyMr0TzsZcAThd2Gt6xvPqluD0UjM1pbp01NqYC3B2JpoN5cexU+ NkpAXXlNOZO5TenJuMlp0b7Cb1OPoaYnkaSnhOq+V9JI76nNMzk2QOc0L930wYlvLn3b MzAhtB/EKr6zOiCM6toXa2sAt4XHVBgoiHr4XJWWJUCkoI5+EWm0ZH+TuFDne8iq3ci1 mlNlTQ8Q1T0fModUoxzBXScUQt9/XqqJyVnmc8IHeb8S7lemz7ZsoHX72KAeT/XHZ6XF kTC2v3brkx8UGdO3FJafrX2/HX16AhVFlPz2Vb3UMX8NHcPRxzSo5FDWow6jKucta6zW uS3Q== 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=xONCTyQf54zE9Ch0AwN7k8Es5+NLc/XLFiMMDS6li/8=; b=mLde2bJQOV50AGRccIxmFyRusVZLN3Xvs+ISzRNVqX4cF1WdVNSVEQ3rzyj8s0526u RDnroK5z0AAmKM5CWWFBk4ToB5le4UYGo0aGugz49/PNOEd0dc5ZxRv2/sh7crFUfzls FhFayCuNZoGzoBd8SV8hlUTZ7HW9PibpIl+wh1StdNq8jszPb0w1Lh/YwN/f68uynGYS FYdNezCo4NQQeA0G88mVvu6KbCf6Yt98sSsqDZay7xWOx4ef+jvRBhADbupR1ewuwDa1 DpGzeTfjhMMQAYUN/sJjecG24iGJQFfUuOIfi3VNOFSXitLVzJNX78cnDzlIFsBbRZbf sqVw== X-Gm-Message-State: AHQUAuaWRA7HiTh1w+4gGfu796YSh1C1T8E3hIJJgQNMw4HkYiYkGWZJ WhYgAI8mr2S/FiGkLs9WpqE= X-Google-Smtp-Source: AHgI3IZkfdK8JyZa5I7BwpZIY3wPkPNsVuYoIk5mBmVsmRq8F4zQVcH3OzEYb4DshXHhmVMCfpkJ7Q== X-Received: by 2002:a2e:8156:: with SMTP id t22-v6mr15201883ljg.32.1549057669958; Fri, 01 Feb 2019 13:47: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 d24-v6sm1456213ljg.2.2019.02.01.13.47.49 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 01 Feb 2019 13:47:49 -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 v6 0/8] xdp: Avoid unloading xdp prog not attached by sample Date: Fri, 1 Feb 2019 22:42:22 +0100 Message-Id: <20190201214230.1441-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 v5->v6: * rebase 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(-)