From patchwork Thu Oct 19 22:46:26 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jakub Kicinski X-Patchwork-Id: 828399 X-Patchwork-Delegate: davem@davemloft.net 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="AZaY34db"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3yJ3wL41K2z9t7V for ; Fri, 20 Oct 2017 09:47:30 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753460AbdJSWrU (ORCPT ); Thu, 19 Oct 2017 18:47:20 -0400 Received: from mail-pf0-f194.google.com ([209.85.192.194]:56039 "EHLO mail-pf0-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751718AbdJSWrR (ORCPT ); Thu, 19 Oct 2017 18:47:17 -0400 Received: by mail-pf0-f194.google.com with SMTP id 17so8106116pfn.12 for ; Thu, 19 Oct 2017 15:47:17 -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:in-reply-to:references; bh=wRujQgIkwHCripd9HaNQ/fw1UgUvEpFTuWxms6C2lfg=; b=AZaY34dbOjCKzRJ/dVXl4YxjqLRAKKTnQMQWzxGGdNP4X7lbVHpOvwQlU89WMdylqa Hv9nuhD7/aywFPgZ9O7cCDi1yqc5sVtREFqTQNhstYz5wNxk6PQdazBBwNZPDNkbbCXI L8wTETA4AaYBw3r3pitYEQy77uFYB9DJL8+SGLu82p/Fqa/8uV31FJRhpdnmhAMJfJWY NEgXHyFCRO4vVhxQ+rhrmwPh4OOxiTV3/N09qlPJbgbLYUdxeCCczf7T9tbA4GwHfFUb kwMJoDi8Eejyopr744Pxd1O6GBLLXzDXGdVctmejLFA4ix2KstaiDvZITfCN8SMgNubE TZUw== 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; bh=wRujQgIkwHCripd9HaNQ/fw1UgUvEpFTuWxms6C2lfg=; b=VMYvbxZ1gvDvbjrkbRRqbGoh489/n7EVKp1xvem8el/VYnOgDORGX+oP/3ItN9RcJE yaaGw+HrVLFr0pN9YzhCPccRr9k72obBTWo8PU1NbY2RTD06tQuyzfZ22kfEWlm1BtH4 9+Khhl7d4htS0hnQZ6X/754eVLAc3UHLN9cL3hGffGldLF0gVW7/sPCdDOZDvTh/nKkx TCwx2YjUB5+iFG2v8rwMJ8TnhuhlPirCO+hWnS2ON4wvCjlZaD6o0Fv2XEQWC+FtT7DD s5C6/hHqQSLS3dvbtwwFqK+zEYvAZ8yHY/AVumuKSmGn37up4JyWWr/ahygXamEr7lvd KZgg== X-Gm-Message-State: AMCzsaWgoiP7jTdCZLKA5TVjTKf4NR/sNHessIfuB41wvlurregdN1Vz jlyrDtbKfTAWb+snLls2+Lccze+l X-Google-Smtp-Source: ABhQp+R8kCL9s2sIdNwn//fKILX6oZJNR3ynjiXSTK39pNURChfltkHx7yrHv2n64n14nGw4Mj+PFw== X-Received: by 10.84.248.142 with SMTP id q14mr370204pll.325.1508453236446; Thu, 19 Oct 2017 15:47:16 -0700 (PDT) Received: from jkicinski-Precision-T1700.netronome.com ([75.53.12.129]) by smtp.gmail.com with ESMTPSA id c185sm16969156pfb.112.2017.10.19.15.47.14 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 19 Oct 2017 15:47:15 -0700 (PDT) From: Jakub Kicinski To: netdev@vger.kernel.org Cc: oss-drivers@netronome.com, Quentin Monnet , Jakub Kicinski Subject: [PATCH net-next 8/8] tools: bpftool: add a command to display bpftool version Date: Thu, 19 Oct 2017 15:46:26 -0700 Message-Id: <20171019224626.31608-9-jakub.kicinski@netronome.com> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20171019224626.31608-1-jakub.kicinski@netronome.com> References: <20171019224626.31608-1-jakub.kicinski@netronome.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Quentin Monnet This command can be used to print the version of the tool, which is in fact the version from Linux taken from usr/include/linux/version.h. Example usage: $ bpftool version bpftool v4.14.0 Signed-off-by: Quentin Monnet Signed-off-by: Jakub Kicinski Acked-by: Daniel Borkmann --- tools/bpf/bpftool/Documentation/bpftool.rst | 2 ++ tools/bpf/bpftool/main.c | 14 +++++++++++++- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/tools/bpf/bpftool/Documentation/bpftool.rst b/tools/bpf/bpftool/Documentation/bpftool.rst index f1df1893fb54..45ad8baf1915 100644 --- a/tools/bpf/bpftool/Documentation/bpftool.rst +++ b/tools/bpf/bpftool/Documentation/bpftool.rst @@ -14,6 +14,8 @@ SYNOPSIS **bpftool** batch file *FILE* + **bpftool** version + *OBJECT* := { **map** | **program** } *MAP-COMMANDS* := diff --git a/tools/bpf/bpftool/main.c b/tools/bpf/bpftool/main.c index 8662199ee050..814d19e1b53f 100644 --- a/tools/bpf/bpftool/main.c +++ b/tools/bpf/bpftool/main.c @@ -37,6 +37,7 @@ #include #include #include +#include #include #include #include @@ -62,13 +63,23 @@ static int do_help(int argc, char **argv) fprintf(stderr, "Usage: %s OBJECT { COMMAND | help }\n" " %s batch file FILE\n" + " %s version\n" "\n" " OBJECT := { prog | map }\n", - bin_name, bin_name); + bin_name, bin_name, bin_name); return 0; } +static int do_version(int argc, char **argv) +{ + printf("%s v%d.%d.%d\n", bin_name, + LINUX_VERSION_CODE >> 16, + LINUX_VERSION_CODE >> 8 & 0xf, + LINUX_VERSION_CODE & 0xf); + return 0; +} + int cmd_select(const struct cmd *cmds, int argc, char **argv, int (*help)(int argc, char **argv)) { @@ -128,6 +139,7 @@ static const struct cmd cmds[] = { { "batch", do_batch }, { "prog", do_prog }, { "map", do_map }, + { "version", do_version }, { 0 } };