From patchwork Mon Jan 28 19:16:06 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maciej Fijalkowski X-Patchwork-Id: 1032193 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="L3GhKNBF"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 43pK9v2ncGz9sDB for ; Tue, 29 Jan 2019 06:16:35 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727513AbfA1TQe (ORCPT ); Mon, 28 Jan 2019 14:16:34 -0500 Received: from mail-lf1-f65.google.com ([209.85.167.65]:38447 "EHLO mail-lf1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726914AbfA1TQd (ORCPT ); Mon, 28 Jan 2019 14:16:33 -0500 Received: by mail-lf1-f65.google.com with SMTP id a8so12734914lfk.5 for ; Mon, 28 Jan 2019 11:16:32 -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=3TrmlhmnrVCOhlmyArbOO/qh8WKCJ4mcPA5HhLRXjII=; b=L3GhKNBFy8IP1Z7ltXRMDCkAPOuokvreUs61sUMqcmH8Rtoya6yGtaPXCyNk5KYkaZ 0dIPMyyNvnQtJJZ0yAf0wwzv2ZX8UmxfAUxn3/0OcYcN9qdvlpAI1P2OhjU+atzT0yW8 rwUl+iFY9ril+wJpkTVAebmQ9feREJAOpp1mLOoEZNdguV/nDvbDh3xkSgSW0G/iuY5e aNJ865TlVRGzICuYiap1VFjZCJFAzr5gq0CkjfKUPL+dpesv/46rHQrzSS1fnToAOZWX h2r/bX0OJBQtJfDlsRNX82cg/A2E0fkEZ+piyd9Z8dqmnTd18C3NR99LEg4TZ2y+gMrm reDA== 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=3TrmlhmnrVCOhlmyArbOO/qh8WKCJ4mcPA5HhLRXjII=; b=C55j6f7GwWVcjOJ/VZic93YqROpPb9RWW3PCTsLGA7Id2mB2XBGOd8tlz3aAuO4Dae qR7CDyl4FQZUoODwRK9B6fPUKYpR9au6lQotFELOfa/ECQ/NkXlXK1RLI0Tj6qOSLd4A UGogt3Pq8teyMIsF1yDt/gwXqTYioHArSJYvma0cfJ2YqaEplKcKPqx79AhxtHYpcGOl tyvV6m85duVnRoekbquBGlZFgsIEGOuJ6cnNfnRPa14dLrw6ac4H93KzxhQAEiPuxkQE s2OE8qCc7F+34m2/XUfVBlAxeLtYf1Ybm7OApn49nL6CH6C6T+etCWtplTq9dwc5ojlN KBlw== X-Gm-Message-State: AJcUukdbibA20D1lrRhAK7i2FphMkrr2exL1BZQvj39EoixnW0G+qGqP t26UM5cebIrjFdhqlW3p2Fmcg8rN X-Google-Smtp-Source: ALg8bN4UD7pDFqLeuSZ5XyYL6q+QymYeLtPmesQOTutuo+Gs/0SMSFMvsRHQa3qPNcHWoeIxdlaDng== X-Received: by 2002:a19:41c4:: with SMTP id o187mr17391199lfa.32.1548702991851; Mon, 28 Jan 2019 11:16:31 -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 q3sm3003462lff.42.2019.01.28.11.16.30 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 28 Jan 2019 11:16:31 -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 v4 0/7] xdp: Avoid unloading xdp prog not attached by sample Date: Mon, 28 Jan 2019 20:16:06 +0100 Message-Id: <20190128191613.11705-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. 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. Patch 5 makes the samples behavior similar to what iproute2 does when loading xdp prog - the "force" flag is introduced. Patch 6 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 7. 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 Jesper Dangaard Brouer (1): samples/bpf: xdp_redirect_cpu have not need for read_trace_pipe Maciej Fijalkowski (6): 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} 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 | 191 +++++++++++++++++++++++++----------- 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 | 6 ++ tools/lib/bpf/libbpf.h | 4 + tools/lib/bpf/libbpf.map | 2 + tools/lib/bpf/netlink.c | 84 ++++++++++++++++ 15 files changed, 720 insertions(+), 197 deletions(-)