Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/816751/?format=api
{ "id": 816751, "url": "http://patchwork.ozlabs.org/api/patches/816751/?format=api", "web_url": "http://patchwork.ozlabs.org/project/netdev/patch/e0a30e266c6eb9a5ebe99ee42b3b3dc6fea170f8.1505956723.git.daniel@iogearbox.net/", "project": { "id": 7, "url": "http://patchwork.ozlabs.org/api/projects/7/?format=api", "name": "Linux network development", "link_name": "netdev", "list_id": "netdev.vger.kernel.org", "list_email": "netdev@vger.kernel.org", "web_url": null, "scm_url": null, "webscm_url": null, "list_archive_url": "", "list_archive_url_format": "", "commit_url_format": "" }, "msgid": "<e0a30e266c6eb9a5ebe99ee42b3b3dc6fea170f8.1505956723.git.daniel@iogearbox.net>", "list_archive_url": null, "date": "2017-09-21T08:42:29", "name": "[iproute2,master,2/2] bpf: properly output json for xdp", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": true, "hash": "6056e23be579219a84ba8ed852ae605544af670a", "submitter": { "id": 65705, "url": "http://patchwork.ozlabs.org/api/people/65705/?format=api", "name": "Daniel Borkmann", "email": "daniel@iogearbox.net" }, "delegate": { "id": 389, "url": "http://patchwork.ozlabs.org/api/users/389/?format=api", "username": "shemminger", "first_name": "stephen", "last_name": "hemminger", "email": "shemminger@vyatta.com" }, "mbox": "http://patchwork.ozlabs.org/project/netdev/patch/e0a30e266c6eb9a5ebe99ee42b3b3dc6fea170f8.1505956723.git.daniel@iogearbox.net/mbox/", "series": [ { "id": 4331, "url": "http://patchwork.ozlabs.org/api/series/4331/?format=api", "web_url": "http://patchwork.ozlabs.org/project/netdev/list/?series=4331", "date": "2017-09-21T08:42:27", "name": "BPF/XDP json follow-up", "version": 1, "mbox": "http://patchwork.ozlabs.org/series/4331/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/816751/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/816751/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<netdev-owner@vger.kernel.org>", "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=<UNKNOWN>)", "Received": [ "from vger.kernel.org (vger.kernel.org [209.132.180.67])\n\tby ozlabs.org (Postfix) with ESMTP id 3xyVVZ4fDKz9t42\n\tfor <patchwork-incoming@ozlabs.org>;\n\tThu, 21 Sep 2017 18:42:46 +1000 (AEST)", "(majordomo@vger.kernel.org) by vger.kernel.org via listexpand\n\tid S1752021AbdIUImp (ORCPT <rfc822;patchwork-incoming@ozlabs.org>);\n\tThu, 21 Sep 2017 04:42:45 -0400", "from www62.your-server.de ([213.133.104.62]:40233 \"EHLO\n\twww62.your-server.de\" rhost-flags-OK-OK-OK-OK) by vger.kernel.org\n\twith ESMTP id S1751649AbdIUImn (ORCPT\n\t<rfc822;netdev@vger.kernel.org>); Thu, 21 Sep 2017 04:42:43 -0400", "from [85.7.161.218] (helo=localhost)\n\tby www62.your-server.de with esmtpsa\n\t(TLSv1.2:DHE-RSA-AES128-GCM-SHA256:128) (Exim 4.85_2)\n\t(envelope-from <daniel@iogearbox.net>)\n\tid 1dux4B-0003ZS-0t; Thu, 21 Sep 2017 10:42:39 +0200" ], "From": "Daniel Borkmann <daniel@iogearbox.net>", "To": "stephen@networkplumber.org", "Cc": "ast@fb.com, netdev@vger.kernel.org,\n\tDaniel Borkmann <daniel@iogearbox.net>", "Subject": "[PATCH iproute2 master 2/2] bpf: properly output json for xdp", "Date": "Thu, 21 Sep 2017 10:42:29 +0200", "Message-Id": "<e0a30e266c6eb9a5ebe99ee42b3b3dc6fea170f8.1505956723.git.daniel@iogearbox.net>", "X-Mailer": "git-send-email 1.9.3", "In-Reply-To": [ "<cover.1505956723.git.daniel@iogearbox.net>", "<cover.1505956723.git.daniel@iogearbox.net>" ], "References": [ "<cover.1505956723.git.daniel@iogearbox.net>", "<cover.1505956723.git.daniel@iogearbox.net>" ], "X-Authenticated-Sender": "daniel@iogearbox.net", "X-Virus-Scanned": "Clear (ClamAV 0.99.2/23858/Thu Sep 21 02:46:36 2017)", "Sender": "netdev-owner@vger.kernel.org", "Precedence": "bulk", "List-ID": "<netdev.vger.kernel.org>", "X-Mailing-List": "netdev@vger.kernel.org" }, "content": "After merging net-next branch into master, Stephen asked\nto fix up json dump for XDP. Thus, rework the json dump a\nbit, such that 'ip -json l' looks as below.\n\n [{\n \"ifindex\": 1,\n \"ifname\": \"lo\",\n \"flags\": [\"LOOPBACK\",\"UP\",\"LOWER_UP\"],\n \"mtu\": 65536,\n \"xdp\": {\n \"mode\": 2,\n \"prog\": {\n \"id\": 5,\n \"tag\": \"e1e9d0ec0f55d638\",\n \"jited\": 1\n }\n },\n \"qdisc\": \"noqueue\",\n \"operstate\": \"UNKNOWN\",\n \"linkmode\": \"DEFAULT\",\n \"group\": \"default\",\n \"txqlen\": 1000,\n \"link_type\": \"loopback\",\n \"address\": \"00:00:00:00:00:00\",\n \"broadcast\": \"00:00:00:00:00:00\"\n },[...]\n ]\n\nSigned-off-by: Daniel Borkmann <daniel@iogearbox.net>\n---\n ip/iplink_xdp.c | 74 ++++++++++++++++++++++++++++++++++-----------------------\n lib/bpf.c | 19 ++++++++++-----\n 2 files changed, 57 insertions(+), 36 deletions(-)", "diff": "diff --git a/ip/iplink_xdp.c b/ip/iplink_xdp.c\nindex 71f7798..2d2953a 100644\n--- a/ip/iplink_xdp.c\n+++ b/ip/iplink_xdp.c\n@@ -14,9 +14,9 @@\n \n #include <linux/bpf.h>\n \n+#include \"json_print.h\"\n #include \"xdp.h\"\n #include \"bpf_util.h\"\n-#include \"ip_common.h\"\n \n extern int force;\n \n@@ -82,6 +82,22 @@ int xdp_parse(int *argc, char ***argv, struct iplink_req *req, bool generic,\n \treturn 0;\n }\n \n+static void xdp_dump_json(struct rtattr *tb[IFLA_XDP_MAX + 1])\n+{\n+\t__u32 prog_id = 0;\n+\t__u8 mode;\n+\n+\tmode = rta_getattr_u8(tb[IFLA_XDP_ATTACHED]);\n+\tif (tb[IFLA_XDP_PROG_ID])\n+\t\tprog_id = rta_getattr_u32(tb[IFLA_XDP_PROG_ID]);\n+\n+\topen_json_object(\"xdp\");\n+\tprint_uint(PRINT_JSON, \"mode\", NULL, mode);\n+\tif (prog_id)\n+\t\tbpf_dump_prog_info(NULL, prog_id);\n+\tclose_json_object();\n+}\n+\n void xdp_dump(FILE *fp, struct rtattr *xdp, bool link, bool details)\n {\n \tstruct rtattr *tb[IFLA_XDP_MAX + 1];\n@@ -94,34 +110,32 @@ void xdp_dump(FILE *fp, struct rtattr *xdp, bool link, bool details)\n \t\treturn;\n \n \tmode = rta_getattr_u8(tb[IFLA_XDP_ATTACHED]);\n-\tif (is_json_context()) {\n-\t\tprint_uint(PRINT_JSON, \"attached\", NULL, mode);\n-\t} else {\n-\t\tif (mode == XDP_ATTACHED_NONE)\n-\t\t\treturn;\n-\t\telse if (details && link)\n-\t\t\tfprintf(fp, \"%s prog/xdp\", _SL_);\n-\t\telse if (mode == XDP_ATTACHED_DRV)\n-\t\t\tfprintf(fp, \"xdp\");\n-\t\telse if (mode == XDP_ATTACHED_SKB)\n-\t\t\tfprintf(fp, \"xdpgeneric\");\n-\t\telse if (mode == XDP_ATTACHED_HW)\n-\t\t\tfprintf(fp, \"xdpoffload\");\n-\t\telse\n-\t\t\tfprintf(fp, \"xdp[%u]\", mode);\n-\n-\t\tif (tb[IFLA_XDP_PROG_ID])\n-\t\t\tprog_id = rta_getattr_u32(tb[IFLA_XDP_PROG_ID]);\n-\t\tif (!details) {\n-\t\t\tif (prog_id && !link)\n-\t\t\t\tfprintf(fp, \"/id:%u\", prog_id);\n-\t\t\tfprintf(fp, \" \");\n-\t\t\treturn;\n-\t\t}\n-\n-\t\tif (prog_id) {\n-\t\t\tfprintf(fp, \" \");\n-\t\t\tbpf_dump_prog_info(fp, prog_id);\n-\t\t}\n+\tif (mode == XDP_ATTACHED_NONE)\n+\t\treturn;\n+\telse if (is_json_context())\n+\t\treturn details ? (void)0 : xdp_dump_json(tb);\n+\telse if (details && link)\n+\t\tfprintf(fp, \"%s prog/xdp\", _SL_);\n+\telse if (mode == XDP_ATTACHED_DRV)\n+\t\tfprintf(fp, \"xdp\");\n+\telse if (mode == XDP_ATTACHED_SKB)\n+\t\tfprintf(fp, \"xdpgeneric\");\n+\telse if (mode == XDP_ATTACHED_HW)\n+\t\tfprintf(fp, \"xdpoffload\");\n+\telse\n+\t\tfprintf(fp, \"xdp[%u]\", mode);\n+\n+\tif (tb[IFLA_XDP_PROG_ID])\n+\t\tprog_id = rta_getattr_u32(tb[IFLA_XDP_PROG_ID]);\n+\tif (!details) {\n+\t\tif (prog_id && !link)\n+\t\t\tfprintf(fp, \"/id:%u\", prog_id);\n+\t\tfprintf(fp, \" \");\n+\t\treturn;\n+\t}\n+\n+\tif (prog_id) {\n+\t\tfprintf(fp, \" \");\n+\t\tbpf_dump_prog_info(fp, prog_id);\n \t}\n }\ndiff --git a/lib/bpf.c b/lib/bpf.c\nindex cfa1f79..10ea23a 100644\n--- a/lib/bpf.c\n+++ b/lib/bpf.c\n@@ -40,6 +40,7 @@\n #include <arpa/inet.h>\n \n #include \"utils.h\"\n+#include \"json_print.h\"\n \n #include \"bpf_util.h\"\n #include \"bpf_elf.h\"\n@@ -186,23 +187,29 @@ int bpf_dump_prog_info(FILE *f, uint32_t id)\n \tint fd, ret, dump_ok = 0;\n \tSPRINT_BUF(tmp);\n \n-\tfprintf(f, \"id %u \", id);\n+\topen_json_object(\"prog\");\n+\tprint_uint(PRINT_ANY, \"id\", \"id %u \", id);\n \n \tfd = bpf_prog_fd_by_id(id);\n \tif (fd < 0)\n-\t\treturn dump_ok;\n+\t\tgoto out;\n \n \tret = bpf_prog_info_by_fd(fd, &info, &len);\n \tif (!ret && len) {\n-\t\tfprintf(f, \"tag %s \",\n-\t\t\thexstring_n2a(info.tag, sizeof(info.tag),\n-\t\t\t\t tmp, sizeof(tmp)));\n-\t\tif (info.jited_prog_len)\n+\t\tint jited = !!info.jited_prog_len;\n+\n+\t\tprint_string(PRINT_ANY, \"tag\", \"tag %s \",\n+\t\t\t hexstring_n2a(info.tag, sizeof(info.tag),\n+\t\t\t\t\t tmp, sizeof(tmp)));\n+\t\tprint_uint(PRINT_JSON, \"jited\", NULL, jited);\n+\t\tif (jited && !is_json_context())\n \t\t\tfprintf(f, \"jited \");\n \t\tdump_ok = 1;\n \t}\n \n \tclose(fd);\n+out:\n+\tclose_json_object();\n \treturn dump_ok;\n }\n \n", "prefixes": [ "iproute2", "master", "2/2" ] }