From patchwork Wed Apr 29 14:45:04 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Quentin Monnet X-Patchwork-Id: 1279442 X-Patchwork-Delegate: bpf@iogearbox.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=isovalent.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=isovalent-com.20150623.gappssmtp.com header.i=@isovalent-com.20150623.gappssmtp.com header.a=rsa-sha256 header.s=20150623 header.b=wUbi7mkp; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 49C1Wv37vTz9sSM for ; Thu, 30 Apr 2020 00:45:15 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726773AbgD2OpO (ORCPT ); Wed, 29 Apr 2020 10:45:14 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35602 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S1726456AbgD2OpN (ORCPT ); Wed, 29 Apr 2020 10:45:13 -0400 Received: from mail-wm1-x344.google.com (mail-wm1-x344.google.com [IPv6:2a00:1450:4864:20::344]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 554D3C035493 for ; Wed, 29 Apr 2020 07:45:12 -0700 (PDT) Received: by mail-wm1-x344.google.com with SMTP id u127so2335339wmg.1 for ; Wed, 29 Apr 2020 07:45:12 -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=wUbi7mkpnNEN5zj8+u1ht0k7eGCD4TBzIziguxbHRtKxdpq702xSX1p0yi+H7Pmy79 q/QyCXAMqlHh4OFoXREH9QVKGlfkidf+KNl7b7jbaYtb1Bd8nOggBQMOEsv3lREyI6MW S+7FutxSUe65+1EuBYmtb3vz9fb9y7lhiCkrT/nwY5jvx5v1qB9dfDTgsDx5FFdRhDyv HnxWsvajaIw9XWTics3PDB5GNkOnrIuwyfHNQcWrFYwW9eSZmR1z1ggpiD1xCEj6w/SC fPJKmK0cqSXBLtBrSCLvsKgdN7OPIYMha/rtVR7BpOjShPQWAZs76TUSlzcTdivjTeOj Rs2A== 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=lZkBJVPJhQleyKaBVuFVdR5StnjXDt2uTd2wB0NBzIpCGyiQyRVWKVs3IZiZ5YlBdN 9eLCtm9mxJYDmNN1rzpR45Y0aFzhHtBhxrvFrRC5m9L0oB68qh96OOnIEWqGb6CqUsuv qSrYuHXxeYPwfp5iLfIBvKrRuZ6VXxCpfQcMZRugxJkFJDZ4qf3qKG3B7KsI2665v0/y sspJR3cLJOS5ykTdPuRqwIgVThMJgxg518erKCnsKifuy95iwI6aTHAOL5B6fDYeJbVA +/aI3mrO9Q3JClBG8/wbB+hXo+TerjOXyZWN904GSpP8b2Hnw3f6A0n0NfBYMOpZtdNq e2Hw== X-Gm-Message-State: AGi0Pua6fK259k9Z3Rme/yiygGUfnh+TFS8byVSIhPhgJ+P18qYpxLgV dYM+bAMgCOM94kLqZ7doK6aNxRvKvHw= X-Google-Smtp-Source: APiQypLwdrvK53EjnxC1heRJ+0O+lYXa9rz26GtDEw4NdoFZtPrvL2dF2E9fefS7WeDR/I3BG2Pkfw== X-Received: by 2002:a05:600c:441a:: with SMTP id u26mr3883647wmn.154.1588171511003; Wed, 29 Apr 2020 07:45:11 -0700 (PDT) Received: from localhost.localdomain ([194.53.185.38]) by smtp.gmail.com with ESMTPSA id a10sm20071739wrg.32.2020.04.29.07.45.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 29 Apr 2020 07:45:10 -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 v3 1/3] tools: bpftool: for "feature probe" define "full_mode" bool as global Date: Wed, 29 Apr 2020 15:45:04 +0100 Message-Id: <20200429144506.8999-2-quentin@isovalent.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200429144506.8999-1-quentin@isovalent.com> References: <20200429144506.8999-1-quentin@isovalent.com> MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@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: