From patchwork Mon Oct 16 17:12:54 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jakub Kicinski X-Patchwork-Id: 826435 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="bP/bC4JS"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3yG4f14lDHz9sBZ for ; Tue, 17 Oct 2017 04:13:13 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753331AbdJPRNK (ORCPT ); Mon, 16 Oct 2017 13:13:10 -0400 Received: from mail-pg0-f54.google.com ([74.125.83.54]:43569 "EHLO mail-pg0-f54.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752141AbdJPRNJ (ORCPT ); Mon, 16 Oct 2017 13:13:09 -0400 Received: by mail-pg0-f54.google.com with SMTP id s75so6471583pgs.0 for ; Mon, 16 Oct 2017 10:13:09 -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=3yic1xd9y2G0tXOQHLVjRDW63iifJm02xx6gqMVnDFo=; b=bP/bC4JS3wBOyB+XkOYtkF9AaDSHt+dKY/vEnYckZXdPgpN9g6GOmgKKclLWB+pb56 8v7r3GzxM9TP90x9NbuSSUwi5Or4DjR1l/1KTb4Cwn3bq5bu7fU2/80tiCxaj/nwOyOB OaBH3DWQaaJBfZhDkpHe/TqhkkkDpDPuWuP0gP0L0+kDozyQLStwT2Q7mrUejinvGxlQ JSnFvY1SRqrIqJp3jijib3lrLrIgTTEoqx98DYaXQPiDTVUkbG9MRCoc8QkIVaG3t2vg 34903jGarS5q+GmVdAAB864BQxHAfcMOfSIbb//J8dLEsEsnGQ46JFuau3TlA6t0tWjD PQlw== 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=3yic1xd9y2G0tXOQHLVjRDW63iifJm02xx6gqMVnDFo=; b=J1IEH2CWm1J+kbIrmuwihzETEX4SMOrkPAYN0LgRfyWClLNxocyQk5BSyDxENuZxe9 i40j7QlVd7zc8MzHo/kpASNgJw2/CagttCSvH8StOQLlJZqkqETN2Ym/BuKJcGRrlEPB whOxtw4Lq05PiQOsZ+oup2r4EcPn+xYVtAFCLK+gDfT1hZ6BwvRdtAcbY0LYXrjZXp+w aM9X3j2qwnwoPmpJ2H9wdm/DDiHC4AbgxdLQLP0eT772RvzSWC/mGR1DcKP812BhKluP 6srgGGp7ks1ybj0gFWvd1HHOOqSeDYRWbGGb/3N8G3VlaYp/akpqOsKxVtSMaDhwZmr9 Vr4g== X-Gm-Message-State: AMCzsaUTiTs7PH6O5FCZGt+P3lreoOji9C4sKfUMcPj99cZTksZgVn4M i87jfsgoxwavdRLiqtlgAkmAECKQ X-Google-Smtp-Source: AOwi7QCuRIwZE11a1KnlsghXRLw2lUBcGY4i9WbfveTOdeGf5P5evsmFtMFAxP5vShl2TdsG0PUuyg== X-Received: by 10.99.37.193 with SMTP id l184mr9055976pgl.14.1508173988582; Mon, 16 Oct 2017 10:13:08 -0700 (PDT) Received: from jkicinski-Precision-T1700.netronome.com ([75.53.12.129]) by smtp.gmail.com with ESMTPSA id k25sm14179078pgf.62.2017.10.16.10.13.07 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 16 Oct 2017 10:13:08 -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] tools: bpftool: use more common tag format Date: Mon, 16 Oct 2017 10:12:54 -0700 Message-Id: <20171016171254.26225-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 Program tag is usually displayed as string of bytes without any separators (e.g. as "aa5520b1090cfeb6" vs MAC addr-like format bpftool uses currently: "aa:55:20:b1:09:0c:fe:b6"). Make bptfool use the more common format both for displaying the tag and selecting the program by tag. This was pointed out in review but I misunderstood the comment. Signed-off-by: Jakub Kicinski Reviewed-by: Simon Horman Acked-by: Daniel Borkmann Acked-by: Alexei Starovoitov --- tools/bpf/bpftool/Documentation/bpftool-prog.rst | 2 +- tools/bpf/bpftool/main.h | 3 +-- tools/bpf/bpftool/prog.c | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/tools/bpf/bpftool/Documentation/bpftool-prog.rst b/tools/bpf/bpftool/Documentation/bpftool-prog.rst index 04d12f768f06..3968f0bd37db 100644 --- a/tools/bpf/bpftool/Documentation/bpftool-prog.rst +++ b/tools/bpf/bpftool/Documentation/bpftool-prog.rst @@ -55,7 +55,7 @@ EXAMPLES **# bpftool prog show** :: - 10: xdp name some_prog tag 00:5a:3d:21:23:62:0c:8b + 10: xdp name some_prog tag 005a3d2123620c8b loaded_at Sep 29/20:11 uid 0 xlated 528B jited 370B memlock 4096B map_ids 10 diff --git a/tools/bpf/bpftool/main.h b/tools/bpf/bpftool/main.h index 8e809b2bb311..844e4ef6db56 100644 --- a/tools/bpf/bpftool/main.h +++ b/tools/bpf/bpftool/main.h @@ -53,8 +53,7 @@ #define NEXT_ARGP() ({ (*argc)--; (*argv)++; if (*argc < 0) usage(); }) #define BAD_ARG() ({ err("what is '%s'?\n", *argv); -1; }) -#define BPF_TAG_FMT "%02hhx:%02hhx:%02hhx:%02hhx:" \ - "%02hhx:%02hhx:%02hhx:%02hhx" +#define BPF_TAG_FMT "%02hhx%02hhx%02hhx%02hhx%02hhx%02hhx%02hhx%02hhx" #define HELP_SPEC_PROGRAM \ "PROG := { id PROG_ID | pinned FILE | tag PROG_TAG }" diff --git a/tools/bpf/bpftool/prog.c b/tools/bpf/bpftool/prog.c index 9e2681c83717..d60f5307b6e2 100644 --- a/tools/bpf/bpftool/prog.c +++ b/tools/bpf/bpftool/prog.c @@ -224,7 +224,7 @@ static int show_prog(int fd) printf("name %s ", info.name); printf("tag "); - print_hex(info.tag, BPF_TAG_SIZE, ":"); + print_hex(info.tag, BPF_TAG_SIZE, ""); printf("\n"); if (info.load_time) {