From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id A308BC0650F for ; Tue, 30 Jul 2019 18:48:36 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 73C9F208E4 for ; Tue, 30 Jul 2019 18:48:36 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="GIT7HHa4" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388305AbfG3Ssf (ORCPT ); Tue, 30 Jul 2019 14:48:35 -0400 Received: from mail-pf1-f193.google.com ([209.85.210.193]:42419 "EHLO mail-pf1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2387746AbfG3Sse (ORCPT ); Tue, 30 Jul 2019 14:48:34 -0400 Received: by mail-pf1-f193.google.com with SMTP id q10so30289818pff.9 for ; Tue, 30 Jul 2019 11:48:34 -0700 (PDT) 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 :mime-version:content-transfer-encoding; bh=rVKMHJ626yUJPyeYSG07+3W2EM0mfMZDfApvCRsg+Js=; b=GIT7HHa4JZ9KrB1wsATpaS+WD2IQqW8Tv0BJXNfRFm9N9S+SmVirRe7K9ZlZYNadO4 thb6ywluhUiFcKL/UFmoZhDGYIQjOzNnwdVZLgQUBqG7/8TTzD1EwnbtejFdXuaS5zoO JIEAzT7CuadzCUMT8xjlUhRkgC3yYyywDg/Y+z+cwC04/1GkoKmHm3+wky77yEuytOob 9Xw4DYsirtMuRLk9f64dPoPzog1DlXbwqevqnIn+NwmwOv+7S6x2VE9ywEUoZgypSaiP QHmNxSsy1CwVba228mX6aTdSS6tnpCQPXoyOjso6RZxGY9DZAo0OJ5NP7tY15nXTtWyk S7Eg== 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:mime-version:content-transfer-encoding; bh=rVKMHJ626yUJPyeYSG07+3W2EM0mfMZDfApvCRsg+Js=; b=WT/nHnYSZF27Yk9Lhb5DAzvJOWJ9qk6qOewY+9DipN9ElNC3gUA8uJRuVhmhKB3jSu UpIb1qb9q3VoC/NtVf8xiE5PK23pLZlUPLOB53yVh10FdOu8wNueL64Z4xEqyH7LxNPH ujYX2EbizcIfiJc51SJScIe27CCXORp9JDjG1vxFt8T5dkR8m+6xC6KQoAVY5tMJ4W1b 0BwR11cUvhxKRPUmeZdyIOrQBU9QDGwFhX88OuyHQZQF75r3qMNwZdpvceKjk0DiJK4K ysA70tUhd0AlamMCsmcmJMBsgg5WNioCWXiz4u/r2qPildLeKx9OoM8OET2nHgYcjqBk 2cjQ== X-Gm-Message-State: APjAAAVSD/Ng5FujzltxKtmbLHvscEmZmPt8nMYFqRisc8yl3vaxTTz4 lxx/4BYifEQ0siOtMWQjyW4uJPk= X-Google-Smtp-Source: APXvYqxkZHwawLRnM+vnaRBanp0j1HaeyN/X67+HwJnikCzdvqnv7plKmwOfJDftxXDZHM8yCem5VA== X-Received: by 2002:a63:e20a:: with SMTP id q10mr108139253pgh.24.1564512513775; Tue, 30 Jul 2019 11:48:33 -0700 (PDT) Received: from localhost.localdomain ([211.196.191.92]) by smtp.gmail.com with ESMTPSA id 143sm102878183pgc.6.2019.07.30.11.48.32 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Tue, 30 Jul 2019 11:48:33 -0700 (PDT) From: "Daniel T. Lee" To: Daniel Borkmann , Alexei Starovoitov Cc: netdev@vger.kernel.org Subject: [PATCH 2/2] tools: bpftool: add net unload command to unload XDP on interface Date: Wed, 31 Jul 2019 03:48:21 +0900 Message-Id: <20190730184821.10833-3-danieltimlee@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190730184821.10833-1-danieltimlee@gmail.com> References: <20190730184821.10833-1-danieltimlee@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org By this commit, using `bpftool net unload`, the loaded XDP prog can be unloaded. Unloading the BPF prog will be done through libbpf 'bpf_set_link_xdp_fd' with the progfd set to -1. Signed-off-by: Daniel T. Lee --- tools/bpf/bpftool/net.c | 55 ++++++++++++++++++++++++++++++++++++++++- 1 file changed, 54 insertions(+), 1 deletion(-) diff --git a/tools/bpf/bpftool/net.c b/tools/bpf/bpftool/net.c index d3a4f18b5b95..9d353b6e7d6d 100644 --- a/tools/bpf/bpftool/net.c +++ b/tools/bpf/bpftool/net.c @@ -281,6 +281,31 @@ static int parse_load_args(int argc, char **argv, int *progfd, return 0; } +static int parse_unload_args(int argc, char **argv, + enum net_load_type *load_type, int *ifindex) +{ + if (!REQ_ARGS(2)) + return -EINVAL; + + *load_type = parse_load_type(*argv); + if (*load_type == __MAX_NET_LOAD_TYPE) { + p_err("invalid net load/unload type"); + return -EINVAL; + } + + NEXT_ARG(); + if (!REQ_ARGS(1)) + return -EINVAL; + + *ifindex = if_nametoindex(*argv); + if (!*ifindex) { + p_err("Invalid ifname"); + return -EINVAL; + } + + return 0; +} + static int do_load_unload_xdp(int *progfd, enum net_load_type *load_type, int *ifindex) { @@ -323,6 +348,31 @@ static int do_load(int argc, char **argv) return 0; } +static int do_unload(int argc, char **argv) +{ + enum net_load_type load_type; + int err, progfd, ifindex; + + err = parse_unload_args(argc, argv, &load_type, &ifindex); + if (err) + return err; + + /* to unload xdp prog */ + progfd = -1; + if (is_prefix("xdp", load_type_strings[load_type])) + err = do_load_unload_xdp(&progfd, &load_type, &ifindex); + + if (err < 0) { + p_err("link set %s failed", load_type_strings[load_type]); + return -1; + } + + if (json_output) + jsonw_null(json_wtr); + + return 0; +} + static int do_show(int argc, char **argv) { struct bpf_attach_info attach_info = {}; @@ -406,6 +456,7 @@ static int do_help(int argc, char **argv) fprintf(stderr, "Usage: %s %s { show | list } [dev ]\n" " %s %s load PROG LOAD_TYPE \n" + " %s %s unload LOAD_TYPE \n" " %s %s help\n" "\n" " " HELP_SPEC_PROGRAM "\n" @@ -415,7 +466,8 @@ static int do_help(int argc, char **argv) " to dump program attachments. For program types\n" " sk_{filter,skb,msg,reuseport} and lwt/seg6, please\n" " consult iproute2.\n", - bin_name, argv[-2], bin_name, argv[-2], bin_name, argv[-2]); + bin_name, argv[-2], bin_name, argv[-2], bin_name, argv[-2], + bin_name, argv[-2]); return 0; } @@ -424,6 +476,7 @@ static const struct cmd cmds[] = { { "show", do_show }, { "list", do_show }, { "load", do_load }, + { "unload", do_unload }, { "help", do_help }, { 0 } }; -- 2.20.1