From patchwork Thu Jul 2 09:24:13 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jakub Sitnicki X-Patchwork-Id: 1321196 X-Patchwork-Delegate: bpf@iogearbox.net Return-Path: X-Original-To: incoming-bpf@patchwork.ozlabs.org Delivered-To: patchwork-incoming-bpf@bilbo.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=bpf-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=reject dis=none) header.from=cloudflare.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; secure) header.d=cloudflare.com header.i=@cloudflare.com header.a=rsa-sha256 header.s=google header.b=gCse1RVH; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 49yCNZ29yPz9sPF for ; Thu, 2 Jul 2020 19:24:46 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728332AbgGBJYp (ORCPT ); Thu, 2 Jul 2020 05:24:45 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56524 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728326AbgGBJYn (ORCPT ); Thu, 2 Jul 2020 05:24:43 -0400 Received: from mail-ej1-x630.google.com (mail-ej1-x630.google.com [IPv6:2a00:1450:4864:20::630]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 67E5BC08C5C1 for ; Thu, 2 Jul 2020 02:24:43 -0700 (PDT) Received: by mail-ej1-x630.google.com with SMTP id rk21so28483792ejb.2 for ; Thu, 02 Jul 2020 02:24:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cloudflare.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=dUD5/O5JmmQd9avQsz8vU4NwUpBfW5dUvsNSWV5Va+g=; b=gCse1RVHndTjiEMMEdTrmxPrXahu5yJklsvinv478w8fLdmFReT5moIpZMh3Yd/B8J hyQmEXDCG2YAI7qBv9DSkFqnuXSp9lvejOyHp1Ez3AcbJ9C25D5wvX5PWCxy0kXWLlZB mO4Ot2efiqlJE9KRCFElt0+dtCp+qodhPRU5k= 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=dUD5/O5JmmQd9avQsz8vU4NwUpBfW5dUvsNSWV5Va+g=; b=WfxV9EF19EsGJnIcZjJrqlXpNdoV7pBbm8q/2EKkGREc7sqb/gMiHKia6iTiSHNULO DpiUe/NyNGVXfn01Q2mEx9etnr+kKET5Q8vtjwdGaZlwaxVzdkjN6bkHG2AKZSu1uQMS NXv2Ovd6fZ4bIPVg2TWm2DDuV8o6plVrhkgIryaX0kG6tYoArays2kkx4YLIMTTraAmt p/MhZbh0H1D5ByQ033l3YeMlj+70aKQ2NhNXwVxcFYMA/irBZQ+K4Qq+n78Fpv8nwE1u g74EoLIoeBw2G5OAMfi8Kp61g4ZK76ZdsGPwlf3IDjYWsrdKEcVIXzfxIOYLcxal/IoF KBFA== X-Gm-Message-State: AOAM532yiQCDwAnJRnKLd8Op9aGanoDm1gHBt026qpZDHGf33Dfws1vj yNMvmaV2/kU35OGuSnFrryE8qrey5RQglQ== X-Google-Smtp-Source: ABdhPJy7+mZFxJAc2XBftJ52gIc4NT73Xfq0gFwAfeaJjKfbA3a9Pbfe9xgccv3zEaKQfOVVTZkhDg== X-Received: by 2002:a17:906:2cd5:: with SMTP id r21mr25785889ejr.20.1593681880857; Thu, 02 Jul 2020 02:24:40 -0700 (PDT) Received: from cloudflare.com ([2a02:a310:c262:aa00:b35e:8938:2c2a:ba8b]) by smtp.gmail.com with ESMTPSA id bq8sm2897301ejb.103.2020.07.02.02.24.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 02 Jul 2020 02:24:40 -0700 (PDT) From: Jakub Sitnicki To: bpf@vger.kernel.org Cc: netdev@vger.kernel.org, kernel-team@cloudflare.com, Alexei Starovoitov , Daniel Borkmann , "David S. Miller" , Jakub Kicinski Subject: [PATCH bpf-next v3 13/16] tools/bpftool: Add name mappings for SK_LOOKUP prog and attach type Date: Thu, 2 Jul 2020 11:24:13 +0200 Message-Id: <20200702092416.11961-14-jakub@cloudflare.com> X-Mailer: git-send-email 2.25.4 In-Reply-To: <20200702092416.11961-1-jakub@cloudflare.com> References: <20200702092416.11961-1-jakub@cloudflare.com> MIME-Version: 1.0 Sender: bpf-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: bpf@vger.kernel.org Make bpftool show human-friendly identifiers for newly introduced program and attach type, BPF_PROG_TYPE_SK_LOOKUP and BPF_SK_LOOKUP, respectively. Signed-off-by: Jakub Sitnicki --- Notes: v3: - New patch in v3. tools/bpf/bpftool/common.c | 1 + tools/bpf/bpftool/prog.c | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/tools/bpf/bpftool/common.c b/tools/bpf/bpftool/common.c index 18e5604fe260..c254f6f5a3d6 100644 --- a/tools/bpf/bpftool/common.c +++ b/tools/bpf/bpftool/common.c @@ -63,6 +63,7 @@ const char * const attach_type_name[__MAX_BPF_ATTACH_TYPE] = { [BPF_TRACE_FEXIT] = "fexit", [BPF_MODIFY_RETURN] = "mod_ret", [BPF_LSM_MAC] = "lsm_mac", + [BPF_SK_LOOKUP] = "sk_lookup", }; void p_err(const char *fmt, ...) diff --git a/tools/bpf/bpftool/prog.c b/tools/bpf/bpftool/prog.c index 6863c57effd0..3e6ecc6332e2 100644 --- a/tools/bpf/bpftool/prog.c +++ b/tools/bpf/bpftool/prog.c @@ -59,6 +59,7 @@ const char * const prog_type_name[] = { [BPF_PROG_TYPE_TRACING] = "tracing", [BPF_PROG_TYPE_STRUCT_OPS] = "struct_ops", [BPF_PROG_TYPE_EXT] = "ext", + [BPF_PROG_TYPE_SK_LOOKUP] = "sk_lookup", }; const size_t prog_type_name_size = ARRAY_SIZE(prog_type_name); @@ -1905,7 +1906,7 @@ static int do_help(int argc, char **argv) " cgroup/getsockname4 | cgroup/getsockname6 | cgroup/sendmsg4 |\n" " cgroup/sendmsg6 | cgroup/recvmsg4 | cgroup/recvmsg6 |\n" " cgroup/getsockopt | cgroup/setsockopt |\n" - " struct_ops | fentry | fexit | freplace }\n" + " struct_ops | fentry | fexit | freplace | sk_lookup }\n" " ATTACH_TYPE := { msg_verdict | stream_verdict | stream_parser |\n" " flow_dissector }\n" " METRIC := { cycles | instructions | l1d_loads | llc_misses }\n"