Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 75553C83009 for ; Wed, 29 Apr 2020 13:05:51 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 5552C2173E for ; Wed, 29 Apr 2020 13:05:51 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=isovalent-com.20150623.gappssmtp.com header.i=@isovalent-com.20150623.gappssmtp.com header.b="kkknD6zn" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726858AbgD2NFv (ORCPT ); Wed, 29 Apr 2020 09:05:51 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48102 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726554AbgD2NFu (ORCPT ); Wed, 29 Apr 2020 09:05:50 -0400 Received: from mail-wm1-x342.google.com (mail-wm1-x342.google.com [IPv6:2a00:1450:4864:20::342]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A3BD0C03C1AD for ; Wed, 29 Apr 2020 06:05:49 -0700 (PDT) Received: by mail-wm1-x342.google.com with SMTP id e26so1938766wmk.5 for ; Wed, 29 Apr 2020 06:05:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=isovalent-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=aRCfBdadPVTEiQclG9/KJeo/s7dbbAmCdTeG8F+tkxA=; b=kkknD6znJD9eKqwpa80nS3XJjm4Vg/Ne2ZPsAgMy5k3r9Cqllji8I7sKWJhmRqGHJk D3pqVbezVxOdWLPlvzfQKeLS91UpCmiNzhcAQ9PdTsLdXb7M0UQr5fALfWLdEhxpf+el ByD4Lw+wxQUgFh/6sp+pbfb2wc+tIvqPnFm2jnPa9uIkDiCbQS62VoWXV5tfZupymSw9 4eJDE4q+Qos3IqcoX5NW+jEN4aSj2+z605FZYvR9ESu2N/58MI7EEsqSlcuKh0FDFUD8 FCUU/DKFcaMwbFv/VI5zB2+RNDqODVPklzyEbYyBQn+xjswZ25ZJgR5AZhXu+7Q+SLk9 jIYg== 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:mime-version:content-transfer-encoding; bh=aRCfBdadPVTEiQclG9/KJeo/s7dbbAmCdTeG8F+tkxA=; b=ZYRuP7DTfkmtIeYQjmgdSXq9hNR+FxjU+3Kqjhyn2gxNDMzdIaXndYm8zrqUOLkVwK yZumMcPE981B9GyOMdNy8B/WbzfKvGLOR0WgfEy7K6tb14DzRwLUKOY4/LHyA1i5W6kE vSuDr8oqknTRzElW5o0Jz8rcB0mXUvg0SswE3XWlpCeL4pkOyAg6xhbzpl910nL6BrGq 7eI6670YLAtzGYzRrbcwiFX0Lo2X08Q9mR+/hHmy8QJvU4gKLsj0zVacYMuMzy6VVMki Rtk7z4mDbV/M2bTxRUpEjrpWsGM5ZEYk8PRBXoxvnHOcg7XNLswvc/XZwPjG5H2r6kCp 1Ytg== X-Gm-Message-State: AGi0PuaxEmG/8uqk/ouruZ1uKnujil9D2pPgxUNlZFCYUKT++rJb/r+v DHClls8hbSp5FXGSaEFG4UP54g== X-Google-Smtp-Source: APiQypJ0KgnHIRKLRRjiH/35QcG9BbymXObY4HmkCzP6WAaOBHXg+Ab/KdZn7oaXvRajqpvCxAtbOg== X-Received: by 2002:a1c:e284:: with SMTP id z126mr3405702wmg.32.1588165548378; Wed, 29 Apr 2020 06:05:48 -0700 (PDT) Received: from localhost.localdomain ([194.53.185.38]) by smtp.gmail.com with ESMTPSA id 74sm31568199wrk.30.2020.04.29.06.05.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 29 Apr 2020 06:05:47 -0700 (PDT) From: Quentin Monnet To: Alexei Starovoitov , Daniel Borkmann Cc: bpf@vger.kernel.org, netdev@vger.kernel.org, Quentin Monnet , Richard Palethorpe , Michael Kerrisk Subject: [PATCH bpf-next v2 1/3] tools: bpftool: for "feature probe" define "full_mode" bool as global Date: Wed, 29 Apr 2020 14:05:32 +0100 Message-Id: <20200429130534.11823-2-quentin@isovalent.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200429130534.11823-1-quentin@isovalent.com> References: <20200429130534.11823-1-quentin@isovalent.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: bpf-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: bpf@vger.kernel.org The "full_mode" variable used for switching between full or partial feature probing (i.e. with or without probing helpers that will log warnings in kernel logs) was piped from the main do_probe() function down to probe_helpers_for_progtype(), where it is needed. Define it as a global variable: the calls will be more readable, and if other similar flags were to be used in the future, we could use global variables as well instead of extending again the list of arguments with new flags. Signed-off-by: Quentin Monnet --- tools/bpf/bpftool/feature.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/tools/bpf/bpftool/feature.c b/tools/bpf/bpftool/feature.c index 88718ee6a438..59e4cb44efbc 100644 --- a/tools/bpf/bpftool/feature.c +++ b/tools/bpf/bpftool/feature.c @@ -35,6 +35,8 @@ static const char * const helper_name[] = { #undef BPF_HELPER_MAKE_ENTRY +static bool full_mode; + /* Miscellaneous utility functions */ static bool check_procfs(void) @@ -540,8 +542,7 @@ probe_helper_for_progtype(enum bpf_prog_type prog_type, bool supported_type, static void probe_helpers_for_progtype(enum bpf_prog_type prog_type, bool supported_type, - const char *define_prefix, bool full_mode, - __u32 ifindex) + const char *define_prefix, __u32 ifindex) { const char *ptype_name = prog_type_name[prog_type]; char feat_name[128]; @@ -678,8 +679,7 @@ static void section_map_types(const char *define_prefix, __u32 ifindex) } static void -section_helpers(bool *supported_types, const char *define_prefix, - bool full_mode, __u32 ifindex) +section_helpers(bool *supported_types, const char *define_prefix, __u32 ifindex) { unsigned int i; @@ -704,8 +704,8 @@ section_helpers(bool *supported_types, const char *define_prefix, define_prefix, define_prefix, define_prefix, define_prefix); for (i = BPF_PROG_TYPE_UNSPEC + 1; i < ARRAY_SIZE(prog_type_name); i++) - probe_helpers_for_progtype(i, supported_types[i], - define_prefix, full_mode, ifindex); + probe_helpers_for_progtype(i, supported_types[i], define_prefix, + ifindex); print_end_section(); } @@ -725,7 +725,6 @@ static int do_probe(int argc, char **argv) enum probe_component target = COMPONENT_UNSPEC; const char *define_prefix = NULL; bool supported_types[128] = {}; - bool full_mode = false; __u32 ifindex = 0; char *ifname; @@ -803,7 +802,7 @@ static int do_probe(int argc, char **argv) goto exit_close_json; section_program_types(supported_types, define_prefix, ifindex); section_map_types(define_prefix, ifindex); - section_helpers(supported_types, define_prefix, full_mode, ifindex); + section_helpers(supported_types, define_prefix, ifindex); section_misc(define_prefix, ifindex); exit_close_json: -- 2.20.1