From patchwork Mon Oct 23 16:24:04 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jakub Kicinski X-Patchwork-Id: 829394 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@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; dkim=pass (2048-bit key; unprotected) header.d=netronome-com.20150623.gappssmtp.com header.i=@netronome-com.20150623.gappssmtp.com header.b="uiaMR8cm"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3yLMF72TkCz9t5s for ; Tue, 24 Oct 2017 03:24:59 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751529AbdJWQY4 (ORCPT ); Mon, 23 Oct 2017 12:24:56 -0400 Received: from mail-pg0-f66.google.com ([74.125.83.66]:51684 "EHLO mail-pg0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751277AbdJWQYz (ORCPT ); Mon, 23 Oct 2017 12:24:55 -0400 Received: by mail-pg0-f66.google.com with SMTP id p9so12156221pgc.8 for ; Mon, 23 Oct 2017 09:24:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=netronome-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id; bh=5i0D1V4SBC0SvStX5Z9IZsjaGVjKdHf0ZsPV1J9kkxo=; b=uiaMR8cmCG6LbQ2Ip+L4odkLgBPM0jfoE1T8EwbjJr3+nMq0dSNyac/pHGO96zwUMz 7UBShn76DLMA9Zo9TgUV/vHl8hxAhiSdyyU6vAs795sHTzI7z+5JqIAqSBT48XzRC71t UWCOY2FHiYgoBUfSj8vApfS5516/rRRLiVWdfMIoSc5M4q7edDbuvKODIqiMZJIF2qWE NdkWhYp3dWQlpvgAikH06iSaWR+NcKKnmCpPn+t3hJyzNkyA8dD/ls1u56B/hzfXC5ik Tvf4k4/djqYFgmLNeIJd/ySIWt850J64VFk7NV31BbosxOhThQIKAGrNUdjjtaSz1NJc C1GA== 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=5i0D1V4SBC0SvStX5Z9IZsjaGVjKdHf0ZsPV1J9kkxo=; b=XT7J9p/tZSIN9VcQH5PmQTXJV5c2P3l6s+/Neu+O8y7+FJkqNy84YSM0fz0/tHGZqw TDxNJFbRjlZu5c9AJw08TDTCUhVNVhz1M2Sq4EfZByJkC+cILdiO2mr3t1PtRW77Z4PH PCejCc2WIVQAH4SePt20CXhLgVX4S7ijsMm+aMHJ5+cljAElN0VAqT/X1BxJEpOtho1n 8QPR8xnd1hPHxRvO61tusl1FRU+dwWbZXaQCpkb6Dgjg8D/s5ry30SYW+uwD8AMi2pWY BVWulHOenQLWMfv0gosTl6SZHyBiHAXrFAdRYyEYkoNNVmwJTRuK5tHQrFOAKszKdrMs 7aIQ== X-Gm-Message-State: AMCzsaUwEBi7/AXmzObFH5flLbCNu6e/1JTmo0KXfZtk3CeFgOCxJZvD LNd75HwORR1/SFW9xdtnNNms8vIO X-Google-Smtp-Source: ABhQp+SWB3EzPxBCecByLl8a+85F4Ar4o5VXQm9H7bhHNWIkVPZNul3fCn/4JYRTv2SMizbXkI8X3w== X-Received: by 10.98.217.138 with SMTP id b10mr14002610pfl.39.1508775894326; Mon, 23 Oct 2017 09:24:54 -0700 (PDT) Received: from jkicinski-Precision-T1700.netronome.com ([75.53.12.129]) by smtp.gmail.com with ESMTPSA id a19sm13586540pfh.30.2017.10.23.09.24.53 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 23 Oct 2017 09:24:53 -0700 (PDT) From: Jakub Kicinski To: netdev@vger.kernel.org Cc: oss-drivers@netronome.com, alexei.starovoitov@gmail.com, daniel@iogearbox.net, Jakub Kicinski Subject: [PATCH net-next 00/12] tools: bpftool: Add JSON output to bpftool Date: Mon, 23 Oct 2017 09:24:04 -0700 Message-Id: <20171023162416.32753-1-jakub.kicinski@netronome.com> X-Mailer: git-send-email 2.14.1 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Quentin says: This series introduces support for JSON output to all bpftool commands. It adds option parsing, and several options are created: * -j, --json Switch to JSON output. * -p, --pretty Switch to JSON and print it in a human-friendly fashion. * -h, --help Print generic help message. * -V, --version Print version number. This code uses a "json_writer", which is a copy of the one written by Stephen Hemminger in iproute2. Acked-by: Alexei Starovoitov --- I don't know if there is an easy way to share the code for json_write without copying the file, so I am very open to suggestions on this matter. Quentin Monnet (12): tools: bpftool: copy JSON writer from iproute2 repository tools: bpftool: add option parsing to bpftool, --help and --version tools: bpftool: introduce --json and --pretty options tools: bpftool: add JSON output for `bpftool prog show *` command tools: bpftool: add JSON output for `bpftool prog dump jited *` command tools: bpftool: add JSON output for `bpftool prog dump xlated *` command tools: bpftool: add JSON output for `bpftool map *` commands tools: bpftool: add JSON output for `bpftool batch file FILE` command tools: bpftool: turn err() and info() macros into functions tools: bpftool: provide JSON output for all possible commands tools: bpftool: add cosmetic changes for the manual pages tools: bpftool: update documentation for --json and --pretty usage tools/bpf/bpftool/Documentation/bpftool-map.rst | 44 ++- tools/bpf/bpftool/Documentation/bpftool-prog.rst | 81 +++++- tools/bpf/bpftool/Documentation/bpftool.rst | 30 +- tools/bpf/bpftool/common.c | 36 ++- tools/bpf/bpftool/jit_disasm.c | 86 +++++- tools/bpf/bpftool/json_writer.c | 356 +++++++++++++++++++++++ tools/bpf/bpftool/json_writer.h | 72 +++++ tools/bpf/bpftool/main.c | 121 +++++++- tools/bpf/bpftool/main.h | 43 ++- tools/bpf/bpftool/map.c | 253 ++++++++++++---- tools/bpf/bpftool/prog.c | 271 +++++++++++++---- 11 files changed, 1209 insertions(+), 184 deletions(-) create mode 100644 tools/bpf/bpftool/json_writer.c create mode 100644 tools/bpf/bpftool/json_writer.h