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=-6.8 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS 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 4FF35C433DF for ; Thu, 28 May 2020 13:10:15 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 1BC5B20776 for ; Thu, 28 May 2020 13:10:15 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=cloudflare.com header.i=@cloudflare.com header.b="NGecVZPZ" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2390212AbgE1NKO (ORCPT ); Thu, 28 May 2020 09:10:14 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57884 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2390128AbgE1NKN (ORCPT ); Thu, 28 May 2020 09:10:13 -0400 Received: from mail-ed1-x544.google.com (mail-ed1-x544.google.com [IPv6:2a00:1450:4864:20::544]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9A4D6C08C5C7 for ; Thu, 28 May 2020 06:10:12 -0700 (PDT) Received: by mail-ed1-x544.google.com with SMTP id c35so34272edf.5 for ; Thu, 28 May 2020 06:10:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cloudflare.com; s=google; h=references:user-agent:from:to:cc:subject:in-reply-to:date :message-id:mime-version; bh=qIxCM5clP0V/WHRc0bI4knedWRT4u2sYTHtbg4GlH94=; b=NGecVZPZgXaRfKTyLiGpMgvmTJgXSgVwnajXXcBbDSKTxoiaN9mJrKYngtuyiTiplW 7sBKQED3uX1trxdzOIgMtv2oFb3BkeXwnRr02ZHM1HBtj7/KdEWWskSYfLKqyktYP6W8 bNkaGBZ6vdZ6gqOWEOeb6ERt05Eo/2XAPgHvo= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:references:user-agent:from:to:cc:subject :in-reply-to:date:message-id:mime-version; bh=qIxCM5clP0V/WHRc0bI4knedWRT4u2sYTHtbg4GlH94=; b=ZPOd36TgxETa984vNxcVGBdTIrqZv3Z2M/MVl8I8YR/ANoMrQT3wp9iZBTKypGl+rr fkNfNnk6Murz3bnMG6lI4E5hVFKQXkR540NOJYdbm9+KtPAYyi9R8dlptlw2eKkmGPu0 OkbJ18C50J//Dmf3khmH0/0j24ryT73u9q5DoEN07WGozvM732zKcHSJ/dkbQ3+4fwDc dhTuxP/OOfa9JXzjeqLEmej2h9uDxzEWG83GQEyLQyucOHNSbM+H9xA6PC3lA8fQBKVV vLKUez4L0S2YMWxLAr+sssYCyN/ZG1OIznw9IRpKdFsnxFejGBrOZSNegOe+WH5cW3XW Nezw== X-Gm-Message-State: AOAM533Nd5l7lbKjUsfaZLmoiawZrctdCZ6J5UJdSrcsSrbAreK8V6Cc zCjoNhdF5H6fUVXXJolOfYaWCA== X-Google-Smtp-Source: ABdhPJwRgj9VjmRkwRk09C50qffoR5S1baecvja2acjwg/lNfnUWsFl/Z54kh9cbHqM6ukKa3cUhyA== X-Received: by 2002:a05:6402:3076:: with SMTP id bs22mr3127605edb.161.1590671411269; Thu, 28 May 2020 06:10:11 -0700 (PDT) Received: from cloudflare.com ([2a02:a310:c262:aa00:b35e:8938:2c2a:ba8b]) by smtp.gmail.com with ESMTPSA id h7sm4637066eds.43.2020.05.28.06.10.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 28 May 2020 06:10:10 -0700 (PDT) References: <20200527170840.1768178-1-jakub@cloudflare.com> <20200527170840.1768178-8-jakub@cloudflare.com> User-agent: mu4e 1.1.0; emacs 26.3 From: Jakub Sitnicki To: Andrii Nakryiko Cc: bpf , Networking , kernel-team@cloudflare.com Subject: Re: [PATCH bpf-next 7/8] bpftool: Support link show for netns-attached links In-reply-to: Date: Thu, 28 May 2020 15:10:09 +0200 Message-ID: <87mu5s2ojy.fsf@cloudflare.com> MIME-Version: 1.0 Content-Type: text/plain Sender: bpf-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: bpf@vger.kernel.org On Thu, May 28, 2020 at 08:02 AM CEST, Andrii Nakryiko wrote: > On Wed, May 27, 2020 at 12:16 PM Jakub Sitnicki wrote: >> >> Make `bpf link show` aware of new link type, that is links attached to >> netns. When listing netns-attached links, display netns inode number as its >> identifier and link attach type. >> >> Signed-off-by: Jakub Sitnicki >> --- >> tools/bpf/bpftool/link.c | 19 +++++++++++++++++++ >> 1 file changed, 19 insertions(+) >> >> diff --git a/tools/bpf/bpftool/link.c b/tools/bpf/bpftool/link.c >> index 670a561dc31b..83a17d62c4c3 100644 >> --- a/tools/bpf/bpftool/link.c >> +++ b/tools/bpf/bpftool/link.c >> @@ -17,6 +17,7 @@ static const char * const link_type_name[] = { >> [BPF_LINK_TYPE_TRACING] = "tracing", >> [BPF_LINK_TYPE_CGROUP] = "cgroup", >> [BPF_LINK_TYPE_ITER] = "iter", >> + [BPF_LINK_TYPE_NETNS] = "netns", >> }; >> >> static int link_parse_fd(int *argc, char ***argv) >> @@ -122,6 +123,16 @@ static int show_link_close_json(int fd, struct bpf_link_info *info) >> jsonw_uint_field(json_wtr, "attach_type", >> info->cgroup.attach_type); >> break; >> + case BPF_LINK_TYPE_NETNS: >> + jsonw_uint_field(json_wtr, "netns_ino", >> + info->netns.netns_ino); >> + if (info->netns.attach_type < ARRAY_SIZE(attach_type_name)) >> + jsonw_string_field(json_wtr, "attach_type", >> + attach_type_name[info->netns.attach_type]); >> + else >> + jsonw_uint_field(json_wtr, "attach_type", >> + info->netns.attach_type); >> + break; > > Can you please extract this attach_type handling into a helper func, > it's annoying to read so many repetitive if/elses. Same for plain-text > variant below. Thanks! Looks easy enough. Will be done in v2. > >> default: >> break; >> } >> @@ -190,6 +201,14 @@ static int show_link_close_plain(int fd, struct bpf_link_info *info) >> else >> printf("attach_type %u ", info->cgroup.attach_type); >> break; >> + case BPF_LINK_TYPE_NETNS: >> + printf("\n\tnetns_ino %u ", info->netns.netns_ino); >> + if (info->netns.attach_type < ARRAY_SIZE(attach_type_name)) >> + printf("attach_type %s ", >> + attach_type_name[info->netns.attach_type]); >> + else >> + printf("attach_type %u ", info->netns.attach_type); >> + break; >> default: >> break; >> } >> -- >> 2.25.4 >>