[{"id":1797801,"web_url":"http://patchwork.ozlabs.org/comment/1797801/","msgid":"<687bb1ee-9774-9257-aeb8-40d92b177fce@netronome.com>","list_archive_url":null,"date":"2017-11-02T10:48:40","subject":"Re: [PATCH net-next V2 2/3] tools: bpftool: show filenames of pinned\n\tobjects","submitter":{"id":72609,"url":"http://patchwork.ozlabs.org/api/people/72609/","name":"Quentin Monnet","email":"quentin.monnet@netronome.com"},"content":"2017-11-02 16:59 UTC+0900 ~ Prashant Bhole \n> Added support to show filenames of pinned objects.\n> \n> For example:\n> \n\n[…]\n\n> \n> Signed-off-by: Prashant Bhole \n> ---\n> v2:\n> - Dynamically identify bpf-fs moutpoint\n> - Close files descriptors before returning on error\n> - Fixed line break for proper output formatting\n> - Code style: wrapped lines > 80, used reverse christmastree style\n\nThanks for those changes!\n\n> \n> tools/bpf/bpftool/common.c | 93 ++++++++++++++++++++++++++++++++++++++++++++++\n> tools/bpf/bpftool/main.c | 8 ++++\n> tools/bpf/bpftool/main.h | 17 +++++++++\n> tools/bpf/bpftool/map.c | 21 +++++++++++\n> tools/bpf/bpftool/prog.c | 24 ++++++++++++\n> 5 files changed, 163 insertions(+)\n> \n> diff --git a/tools/bpf/bpftool/common.c b/tools/bpf/bpftool/common.c\n> index 4556947709ee..78a16c02c778 100644\n> --- a/tools/bpf/bpftool/common.c\n> +++ b/tools/bpf/bpftool/common.c\n> @@ -45,6 +45,8 @@\n> #include \n> #include \n> #include \n> +#include \n> +#include \n> \n> #include \n> \n> @@ -290,3 +292,94 @@ void print_hex_data_json(uint8_t *data, size_t len)\n> \t\tjsonw_printf(json_wtr, \"\\\"0x%02hhx\\\"\", data[i]);\n> \tjsonw_end_array(json_wtr);\n> }\n> +\n> +int build_pinned_obj_table(struct pinned_obj_table *tab,\n> +\t\t\t enum bpf_obj_type type)\n> +{\n> +\tstruct bpf_prog_info pinned_info = {};\n> +\t__u32 len = sizeof(pinned_info);\n> +\tstruct pinned_obj *obj_node = NULL;\n> +\tenum bpf_obj_type objtype;\n> +\tstruct mntent *mntent = NULL;\n> +\tFILE *mntfile = NULL;\n> +\tchar *bpf_dir = NULL;\n> +\tFTSENT *ftse = NULL;\n> +\tFTS *ftsp = NULL;\n> +\tint fd, err;\n> +\n> +\tmntfile = setmntent(\"/proc/mounts\", \"r\");\n> +\tif (!mntfile)\n> +\t\treturn -1;\n> +\n> +\twhile ((mntent = getmntent(mntfile)) != NULL) {\n> +\t\tif (strncmp(mntent->mnt_type, \"bpf\", 3) == 0) {\n> +\t\t\tbpf_dir = mntent->mnt_dir;\n> +\t\t\tbreak;\n\nIt works well to find a bpf virtual file system, but it stops after the\nfirst one it finds, although it is possible to have several bpffs on the\nsystem. Since you already have all the logics, could you move the\nfts_read() step inside this loop, so as to browse all existing bpffs\ninstead of just the first one?\n\n> +\t\t}\n> +\t}\n> +\tfclose(mntfile);\n> +\n> +\tif (bpf_dir) {\n> +\t\tchar *path[] = {bpf_dir, 0};\n> +\n> +\t\tftsp = fts_open(path, 0, NULL);\n> +\t\tif (!ftsp)\n> +\t\t\treturn -1;\n> +\t} else {\n> +\t\treturn -1;\n> +\t}\n> +\n> +\n\nNitpicking again: this time, you have too many blank lines here :-)\n\n> +\twhile ((ftse = fts_read(ftsp)) != NULL) {\n> +\t\tif (!(ftse->fts_info & FTS_F))\n> +\t\t\tcontinue;\n> +\t\tfd = open_obj_pinned(ftse->fts_path);\n> +\t\tif (fd < 0)\n> +\t\t\tcontinue;\n> +\n> +\t\tobjtype = get_fd_type(fd);\n> +\t\tif (objtype != type) {\n> +\t\t\tclose(fd);\n> +\t\t\tcontinue;\n> +\t\t}\n> +\t\tmemset(&pinned_info, 0, sizeof(pinned_info));\n> +\t\terr = bpf_obj_get_info_by_fd(fd, &pinned_info, &len);\n> +\t\tif (err) {\n> +\t\t\tclose(fd);\n> +\t\t\tcontinue;\n> +\t\t}\n> +\n> +\t\tobj_node = malloc(sizeof(*obj_node));\n> +\t\tif (!obj_node) {\n> +\t\t\tclose(fd);\n> +\t\t\tfts_close(ftsp);\n> +\t\t\treturn -1;\n> +\t\t}\n> +\n> +\t\tmemset(obj_node, 0, sizeof(*obj_node));\n> +\t\tobj_node->id = pinned_info.id;\n> +\t\tobj_node->path = strdup(ftse->fts_path);\n> +\t\thash_add(tab->table, &obj_node->hash, obj_node->id);\n> +\n> +\t\tclose(fd);\n> +\t}\n> +\n> +\tfts_close(ftsp);\n> +\treturn 0;\n> +}\n> +\n> +void delete_pinned_obj_table(struct pinned_obj_table *tab)\n> +{\n> +\tstruct pinned_obj *obj;\n> +\tstruct hlist_node *tmp;\n> +\tunsigned int bkt;\n> +\n> +\tif (hash_empty(tab->table))\n> +\t\treturn;\n> +\n> +\thash_for_each_safe(tab->table, bkt, tmp, obj, hash) {\n> +\t\thash_del(&obj->hash);\n> +\t\tfree(obj->path);\n> +\t\tfree(obj);\n> +\t}\n> +}\n> diff --git a/tools/bpf/bpftool/main.c b/tools/bpf/bpftool/main.c\n> index 78d9afb74ef4..6ad53f1797fa 100644\n> --- a/tools/bpf/bpftool/main.c\n> +++ b/tools/bpf/bpftool/main.c\n> @@ -54,6 +54,8 @@ static int (*last_do_help)(int argc, char **argv);\n> json_writer_t *json_wtr;\n> bool pretty_output;\n> bool json_output;\n> +struct pinned_obj_table prog_table;\n> +struct pinned_obj_table map_table;\n> \n> void usage(void)\n> {\n> @@ -272,6 +274,9 @@ int main(int argc, char **argv)\n> \tjson_output = false;\n> \tbin_name = argv[0];\n> \n> +\thash_init(prog_table.table);\n> +\thash_init(map_table.table);\n> +\n> \twhile ((opt = getopt_long(argc, argv, \"Vhpj\",\n> \t\t\t\t options, NULL)) >= 0) {\n> \t\tswitch (opt) {\n> @@ -311,5 +316,8 @@ int main(int argc, char **argv)\n> \tif (json_output)\n> \t\tjsonw_destroy(&json_wtr);\n> \n> +\tdelete_pinned_obj_table(&prog_table);\n> +\tdelete_pinned_obj_table(&map_table);\n> +\n> \treturn ret;\n> }\n> diff --git a/tools/bpf/bpftool/main.h b/tools/bpf/bpftool/main.h\n> index 4b5685005cb0..bd6d0663228b 100644\n> --- a/tools/bpf/bpftool/main.h\n> +++ b/tools/bpf/bpftool/main.h\n> @@ -42,6 +42,7 @@\n> #include \n> #include \n> #include \n> +#include \n> \n> #include \"json_writer.h\"\n> \n> @@ -70,11 +71,27 @@ extern const char *bin_name;\n> \n> extern json_writer_t *json_wtr;\n> extern bool json_output;\n> +extern struct pinned_obj_table prog_table;\n> +extern struct pinned_obj_table map_table;\n> \n> bool is_prefix(const char *pfx, const char *str);\n> void fprint_hex(FILE *f, void *arg, unsigned int n, const char *sep);\n> void usage(void) __attribute__((noreturn));\n> \n> +struct pinned_obj_table {\n> +\tDECLARE_HASHTABLE(table, 16);\n> +};\n> +\n> +struct pinned_obj {\n> +\t__u32 id;\n> +\tchar *path;\n> +\tstruct hlist_node hash;\n> +};\n> +\n> +int build_pinned_obj_table(struct pinned_obj_table *table,\n> +\t\t\t\t\t\t enum bpf_obj_type type);\n\nThanks for wrapping, but it does not seem to be aligned correctly.\n“enum” should be aligned with “struct” from line above, and tabulations\nshould be 8-character long.\n\nQuentin","headers":{"Return-Path":"","X-Original-To":"patchwork-incoming@ozlabs.org","Delivered-To":"patchwork-incoming@ozlabs.org","Authentication-Results":["ozlabs.org;\n\tspf=none (mailfrom) smtp.mailfrom=vger.kernel.org\n\t(client-ip=209.132.180.67; helo=vger.kernel.org;\n\tenvelope-from=netdev-owner@vger.kernel.org;\n\treceiver=)","ozlabs.org; dkim=pass (2048-bit key;\n\tunprotected) header.d=netronome-com.20150623.gappssmtp.com\n\theader.i=@netronome-com.20150623.gappssmtp.com\n\theader.b=\"1WtP1eUd\"; dkim-atps=neutral"],"Received":["from vger.kernel.org (vger.kernel.org [209.132.180.67])\n\tby ozlabs.org (Postfix) with ESMTP id 3ySMJb72GTz9sRW\n\tfor ;\n\tThu, 2 Nov 2017 21:48:47 +1100 (AEDT)","(majordomo@vger.kernel.org) by vger.kernel.org via listexpand\n\tid S1755550AbdKBKsq (ORCPT );\n\tThu, 2 Nov 2017 06:48:46 -0400","from mail-wm0-f66.google.com ([74.125.82.66]:56803 \"EHLO\n\tmail-wm0-f66.google.com\" rhost-flags-OK-OK-OK-OK) by vger.kernel.org\n\twith ESMTP id S1752237AbdKBKsn (ORCPT\n\t); Thu, 2 Nov 2017 06:48:43 -0400","by mail-wm0-f66.google.com with SMTP id z3so10346944wme.5\n\tfor ; Thu, 02 Nov 2017 03:48:43 -0700 (PDT)","from [172.20.1.75] (host-79-78-33-110.static.as9105.net.\n\t[79.78.33.110]) by smtp.gmail.com with ESMTPSA id\n\t23sm2579499edx.8.2017.11.02.03.48.41\n\t(version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);\n\tThu, 02 Nov 2017 03:48:41 -0700 (PDT)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=netronome-com.20150623.gappssmtp.com; s=20150623;\n\th=subject:to:cc:references:from:message-id:date:user-agent\n\t:mime-version:in-reply-to:content-language:content-transfer-encoding; \n\tbh=WhJGfWjwgBwOj3IbXzk6RWise/ebc1YbD9gfe/sWK3I=;\n\tb=1WtP1eUdYOgSzlyLdJOU/iExFwNeRIHSGVrR48rn0twqMBPzdc98NL3UBG/S8N6XaR\n\t0zIkQTgfP/CwTalRuBP5JIY5MgTuuSPPThXVBRrA1ugB4A0UxxJZ0bhZiNQ5qEz/MNR1\n\t26bVXMzVFD07eGglN6OZmu8JACXBo7WYQ22TRc2vSxEe4FeH7gp9h+MHagpyF4FSQF+d\n\tVD48kIckJ8eD3X4ajqJulEc2+CiyjIsTcfIYSy6+miK8T71GbXNEpnGJ5QU7CLbcnL95\n\t7e+1ZZ0JQhXCN4VeKKmYJUug98KNrdPo7Hm6ROfg++VDd1qKxNSSrky+fFG8K1Sh4XEi\n\tfUrw==","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20161025;\n\th=x-gm-message-state:subject:to:cc:references:from:message-id:date\n\t:user-agent:mime-version:in-reply-to:content-language\n\t:content-transfer-encoding;\n\tbh=WhJGfWjwgBwOj3IbXzk6RWise/ebc1YbD9gfe/sWK3I=;\n\tb=gHaLQWZytMqWWKoF+YcsnSyvZAZyU/O6Wy7sr0Ir96UqzTkibDwqsfqtY/YV8rjA2t\n\tfV9JJAbOfk9XhuUKUbcf42XpqLiEI1JpbTEDSRaNhY+S5ko9Vb0PrR6hlqy0+Aplreho\n\tlNIbQYYE7Iq44+w7OfDHw/QWxbwOHnVnqnCieNJ+Vylh1VooRSi1i8XtDTQJBF+3czcW\n\tTPLTipRUkEKR2YJhfTZ0vbaCjA8NYFmIO5XX2h+RQfhmMT9Ky8YtNnsi7O1GQDdZ/ilU\n\tBPM3u/PO1N2rBVOlhPZjZGPEm+u2OOKdvypbpubwWhF7AejK0Prqzgf50f1u/tLogWVT\n\tvOSg==","X-Gm-Message-State":"AMCzsaV94AKJkcHqPNrkZ7+R2tO7CjJUSpwlELcxI0We7Nm5tPkpQ2uV\n\tL7JXSBo85E8Z1rCni72g70aHdA==","X-Google-Smtp-Source":"ABhQp+TPFnZZNe7YyeuH4Vd9LFKEYtvUntYccQb3irHQZcXeXjlM35Q6IS3bZE4n5FjNwqnhC8y48g==","X-Received":"by 10.80.167.34 with SMTP id h31mr4112876edc.43.1509619722347;\n\tThu, 02 Nov 2017 03:48:42 -0700 (PDT)","Subject":"Re: [PATCH net-next V2 2/3] tools: bpftool: show filenames of pinned\n\tobjects","To":"Prashant Bhole ,\n\t\"David S . Miller\" ","Cc":"netdev@vger.kernel.org, Alexei Starovoitov ,\n\tDaniel Borkmann ,\n\tJakub Kicinski ","References":"<20171102075917.2780-1-bhole_prashant_q7@lab.ntt.co.jp>\n\t<20171102075917.2780-3-bhole_prashant_q7@lab.ntt.co.jp>","From":"Quentin Monnet ","Message-ID":"<687bb1ee-9774-9257-aeb8-40d92b177fce@netronome.com>","Date":"Thu, 2 Nov 2017 10:48:40 +0000","User-Agent":"Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101\n\tThunderbird/52.4.0","MIME-Version":"1.0","In-Reply-To":"<20171102075917.2780-3-bhole_prashant_q7@lab.ntt.co.jp>","Content-Type":"text/plain; charset=utf-8","Content-Language":"en-US","Content-Transfer-Encoding":"8bit","Sender":"netdev-owner@vger.kernel.org","Precedence":"bulk","List-ID":"","X-Mailing-List":"netdev@vger.kernel.org"}},{"id":1799458,"web_url":"http://patchwork.ozlabs.org/comment/1799458/","msgid":"<007b01d356c5$09575220$1c05f660$@lab.ntt.co.jp>","list_archive_url":null,"date":"2017-11-06T06:03:58","subject":"RE: [PATCH net-next V2 2/3] tools: bpftool: show filenames of\n\tpinned objects","submitter":{"id":72702,"url":"http://patchwork.ozlabs.org/api/people/72702/","name":"Prashant Bhole","email":"bhole_prashant_q7@lab.ntt.co.jp"},"content":"> From: Quentin Monnet [mailto:quentin.monnet@netronome.com]\n> \n> 2017-11-02 16:59 UTC+0900 ~ Prashant Bhole\n> \n> > Added support to show filenames of pinned objects.\n> >\n> > For example:\n> >\n> \n> […]\n> \n> >\n> > Signed-off-by: Prashant Bhole \n> > ---\n> > v2:\n> > - Dynamically identify bpf-fs moutpoint\n> > - Close files descriptors before returning on error\n> > - Fixed line break for proper output formatting\n> > - Code style: wrapped lines > 80, used reverse christmastree style\n> \n> Thanks for those changes!\n> \n> >\n> > tools/bpf/bpftool/common.c | 93\n> ++++++++++++++++++++++++++++++++++++++++++++++\n> > tools/bpf/bpftool/main.c | 8 ++++\n> > tools/bpf/bpftool/main.h | 17 +++++++++\n> > tools/bpf/bpftool/map.c | 21 +++++++++++\n> > tools/bpf/bpftool/prog.c | 24 ++++++++++++\n> > 5 files changed, 163 insertions(+)\n> >\n> > diff --git a/tools/bpf/bpftool/common.c b/tools/bpf/bpftool/common.c\n> > index 4556947709ee..78a16c02c778 100644\n> > --- a/tools/bpf/bpftool/common.c\n> > +++ b/tools/bpf/bpftool/common.c\n> > @@ -45,6 +45,8 @@\n> > #include \n> > #include \n> > #include \n> > +#include \n> > +#include \n> >\n> > #include \n> >\n> > @@ -290,3 +292,94 @@ void print_hex_data_json(uint8_t *data, size_t len)\n> > \t\tjsonw_printf(json_wtr, \"\\\"0x%02hhx\\\"\", data[i]);\n> > \tjsonw_end_array(json_wtr);\n> > }\n> > +\n> > +int build_pinned_obj_table(struct pinned_obj_table *tab,\n> > +\t\t\t enum bpf_obj_type type)\n> > +{\n> > +\tstruct bpf_prog_info pinned_info = {};\n> > +\t__u32 len = sizeof(pinned_info);\n> > +\tstruct pinned_obj *obj_node = NULL;\n> > +\tenum bpf_obj_type objtype;\n> > +\tstruct mntent *mntent = NULL;\n> > +\tFILE *mntfile = NULL;\n> > +\tchar *bpf_dir = NULL;\n> > +\tFTSENT *ftse = NULL;\n> > +\tFTS *ftsp = NULL;\n> > +\tint fd, err;\n> > +\n> > +\tmntfile = setmntent(\"/proc/mounts\", \"r\");\n> > +\tif (!mntfile)\n> > +\t\treturn -1;\n> > +\n> > +\twhile ((mntent = getmntent(mntfile)) != NULL) {\n> > +\t\tif (strncmp(mntent->mnt_type, \"bpf\", 3) == 0) {\n> > +\t\t\tbpf_dir = mntent->mnt_dir;\n> > +\t\t\tbreak;\n> \n> It works well to find a bpf virtual file system, but it stops after the first one it\n> finds, although it is possible to have several bpffs on the system. Since you\n> already have all the logics, could you move the\n> fts_read() step inside this loop, so as to browse all existing bpffs instead of just\n> the first one?\n> \n\nThanks. Sending V3 soon with this change and other coding style fixes.\n\nPrashant","headers":{"Return-Path":"","X-Original-To":"patchwork-incoming@ozlabs.org","Delivered-To":"patchwork-incoming@ozlabs.org","Authentication-Results":"ozlabs.org;\n\tspf=none (mailfrom) smtp.mailfrom=vger.kernel.org\n\t(client-ip=209.132.180.67; helo=vger.kernel.org;\n\tenvelope-from=netdev-owner@vger.kernel.org;\n\treceiver=)","Received":["from vger.kernel.org (vger.kernel.org [209.132.180.67])\n\tby ozlabs.org (Postfix) with ESMTP id 3yVhqR42mDz9s7p\n\tfor ;\n\tMon, 6 Nov 2017 17:05:07 +1100 (AEDT)","(majordomo@vger.kernel.org) by vger.kernel.org via listexpand\n\tid S1750853AbdKFGE7 convert rfc822-to-8bit (ORCPT\n\t);\n\tMon, 6 Nov 2017 01:04:59 -0500","from tama500.ecl.ntt.co.jp ([129.60.39.148]:53029 \"EHLO\n\ttama500.ecl.ntt.co.jp\" rhost-flags-OK-OK-OK-OK) by vger.kernel.org\n\twith ESMTP id S1750715AbdKFGE6 (ORCPT\n\t); Mon, 6 Nov 2017 01:04:58 -0500","from vc2.ecl.ntt.co.jp (vc2.ecl.ntt.co.jp [129.60.86.154])\n\tby tama500.ecl.ntt.co.jp (8.13.8/8.13.8) with ESMTP id vA664X77014404;\n\tMon, 6 Nov 2017 15:04:33 +0900","from vc2.ecl.ntt.co.jp (localhost [127.0.0.1])\n\tby vc2.ecl.ntt.co.jp (Postfix) with ESMTP id B21A85F594;\n\tMon, 6 Nov 2017 15:04:33 +0900 (JST)","from jcms-pop21.ecl.ntt.co.jp (jcms-pop21.ecl.ntt.co.jp\n\t[129.60.87.134])\n\tby vc2.ecl.ntt.co.jp (Postfix) with ESMTP id A568F5F593;\n\tMon, 6 Nov 2017 15:04:33 +0900 (JST)","from PrashantPC (unknown [129.60.241.220])\n\tby jcms-pop21.ecl.ntt.co.jp (Postfix) with ESMTPSA id 9D6C3400560;\n\tMon, 6 Nov 2017 15:04:33 +0900 (JST)"],"From":"\"Prashant Bhole\" ","References":"<20171102075917.2780-1-bhole_prashant_q7@lab.ntt.co.jp>\n\t<20171102075917.2780-3-bhole_prashant_q7@lab.ntt.co.jp>\n\t<687bb1ee-9774-9257-aeb8-40d92b177fce@netronome.com>","In-Reply-To":"<687bb1ee-9774-9257-aeb8-40d92b177fce@netronome.com>","Subject":"RE: [PATCH net-next V2 2/3] tools: bpftool: show filenames of\n\tpinned objects","Date":"Mon, 6 Nov 2017 15:03:58 +0900","Message-ID":"<007b01d356c5$09575220$1c05f660$@lab.ntt.co.jp>","MIME-Version":"1.0","Content-Type":"text/plain;\n charset=\"utf-8\"","Content-Transfer-Encoding":"8BIT","X-Mailer":"Microsoft Outlook 15.0","Content-Language":"en-us","Thread-Index":"AQMNvtGx1pIjWWYuVBqcUaLvjvZv8wL5ifhNAH3X17ugdk96kA==","To":"\"'Quentin Monnet'\" ","Cc":", \"'Alexei Starovoitov'\" ,\n\t\"'Daniel Borkmann'\" ,\n\t\"'Jakub Kicinski'\" ,\n\t\"'David S . Miller'\" ","X-TM-AS-MML":"disable","Sender":"netdev-owner@vger.kernel.org","Precedence":"bulk","List-ID":"","X-Mailing-List":"netdev@vger.kernel.org"}}]