From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0C442C433FE for ; Thu, 3 Nov 2022 04:55:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230461AbiKCEzK (ORCPT ); Thu, 3 Nov 2022 00:55:10 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38698 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230363AbiKCEzF (ORCPT ); Thu, 3 Nov 2022 00:55:05 -0400 Received: from mail-yb1-xb49.google.com (mail-yb1-xb49.google.com [IPv6:2607:f8b0:4864:20::b49]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A4C4D17E04 for ; Wed, 2 Nov 2022 21:55:04 -0700 (PDT) Received: by mail-yb1-xb49.google.com with SMTP id v81-20020a252f54000000b006cb87d7042cso1100391ybv.20 for ; Wed, 02 Nov 2022 21:55:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=cc:to:from:subject:references:mime-version:message-id:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=NO4EAaPdlCi62iB+M5zDGMRqIBRUtwLFDoXq6ZpSfuw=; b=ZoYo3Un1fIQpifOfk/INmb5tD31LpNepPPNKxroFffZ4XwuFjCmiylh1CpaLi0fMUE ZRTnvSK5Tu2RJsmP79Wx0JqMWvB9BEwZEhUEmGGuV7LGjx3Y9K6EOiYl+fXGtre0vLRM hIHWg1tID6B3vpAftbn9wjCNLXbezQmt3NbfbPcpPXjS10QWHqpMOppzX3I7Lv0qbfB+ XzqwAKx40rlBCIbIrRNixgnvJ5QNVMEBnFywIgfLhqIEyra1MTEHE5nHNwzsB+zwuXMC eOfPLGu1rHP0zjRUGS/JXEUXTAFuhW4pAWj02EH2B+3Hga2MHADSKqFy3NuOlhASOjlu 6l3w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:from:subject:references:mime-version:message-id:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=NO4EAaPdlCi62iB+M5zDGMRqIBRUtwLFDoXq6ZpSfuw=; b=kuTvQMcqWRkmE+VFEqCb5ZmkHeWTqP+I4e2Qe8jo6EUQi4aBb6H4OyiRKBsb5Ilah+ jRBzYzntGvNfAMqFzKd+iI8Pv6Y4Xfj5hiTIVzGPEA5RcOvIZHqN+9B3NBDv9yap57Z9 2loQTg56oTjLoS3ZUF9U3c9J4hbNVEcHUvG0CUf9YnehBF/pTfbRLAY3Piq853m5bSip 2pQ8FSFofD1pCtgF+oVtqaRpGE3i+TUCFu7g+BXs0lbDqzBxNCAvG7N47cy3p2QD3Ftk h7f341U/nleQk/GIS0yoW0VNSmmrNVfRkaY5zgR8IK4lazZCMgbS+p9bAi3Ri2rZbCxP J2zg== X-Gm-Message-State: ACrzQf1dw6OGl2MAD2fvvEDn6ukENnuvgHnh7m7n8kwHTh/zE36sdg60 SOK1n4zVXOY7yyRX3SxeS6VFm3CieRfA X-Google-Smtp-Source: AMsMyM78oSDtfnW3xt5/Y4SvXCBCzuGhCfgfLwau6qa/1+zrjdA//EUcxUaLxEYHCfaMpS07MmHoCpn3Q57+ X-Received: from irogers.svl.corp.google.com ([2620:15c:2d4:203:8a9d:7f38:6465:2d7b]) (user=irogers job=sendgmr) by 2002:a0d:c501:0:b0:36a:ca92:d207 with SMTP id h1-20020a0dc501000000b0036aca92d207mr189850ywd.429.1667451303556; Wed, 02 Nov 2022 21:55:03 -0700 (PDT) Date: Wed, 2 Nov 2022 21:54:32 -0700 In-Reply-To: <20221103045437.163510-1-irogers@google.com> Message-Id: <20221103045437.163510-3-irogers@google.com> Mime-Version: 1.0 References: <20221103045437.163510-1-irogers@google.com> X-Mailer: git-send-email 2.38.1.273.g43a17bfeac-goog Subject: [PATCH v1 2/7] perf trace: Etcsnoop fix libbpf 1.0+ compatibility From: Ian Rogers To: Leo Yan , Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Mark Rutland , Alexander Shishkin , Jiri Olsa , Namhyung Kim , linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Stephane Eranian , Ian Rogers Content-Type: text/plain; charset="UTF-8" Precedence: bulk List-ID: X-Mailing-List: linux-perf-users@vger.kernel.org Don't use deprecated and now broken map style. Avoid use of tools/perf/include/bpf/bpf.h and use the more regular BPF headers. Add "< 0" checks to fix BPF verifier failures about potentially negative values being passed to bpf_perf_event_output. Add a raw_syscalls:sys_enter to avoid the evlist being empty and causing perf trace to exit during argument parsing. Signed-off-by: Ian Rogers --- tools/perf/examples/bpf/etcsnoop.c | 41 ++++++++++++++++++++++++------ 1 file changed, 33 insertions(+), 8 deletions(-) diff --git a/tools/perf/examples/bpf/etcsnoop.c b/tools/perf/examples/bpf/etcsnoop.c index e81b535346c0..a04109d9b2b5 100644 --- a/tools/perf/examples/bpf/etcsnoop.c +++ b/tools/perf/examples/bpf/etcsnoop.c @@ -5,7 +5,7 @@ * * Test it with: * - * perf trace -e tools/perf/examples/bpf/augmented_syscalls.c cat /etc/passwd > /dev/null + * perf trace -e tools/perf/examples/bpf/etcsnoop.c cat /etc/passwd > /dev/null * * It'll catch some openat syscalls related to the dynamic linked and * the last one should be the one for '/etc/passwd'. @@ -19,10 +19,17 @@ * tools/perf/include/bpf/stdio.h. */ -#include +#include +#include /* bpf-output associated map */ -bpf_map(__augmented_syscalls__, PERF_EVENT_ARRAY, int, u32, __NR_CPUS__); +struct __augmented_syscalls__ { + __uint(type, BPF_MAP_TYPE_PERF_EVENT_ARRAY); + __type(key, int); + __type(value, __u32); + __uint(max_entries, __NR_CPUS__); +} __augmented_syscalls__ SEC(".maps"); + struct augmented_filename { int size; @@ -30,6 +37,9 @@ struct augmented_filename { char value[64]; }; +#define syscall_enter(name) \ + SEC("!syscalls:sys_enter_" #name) syscall_enter_ ## name + #define augmented_filename_syscall_enter(syscall) \ struct augmented_enter_##syscall##_args { \ struct syscall_enter_##syscall##_args args; \ @@ -39,17 +49,25 @@ int syscall_enter(syscall)(struct syscall_enter_##syscall##_args *args) \ { \ char etc[6] = "/etc/"; \ struct augmented_enter_##syscall##_args augmented_args = { .filename.reserved = 0, }; \ - probe_read(&augmented_args.args, sizeof(augmented_args.args), args); \ - augmented_args.filename.size = probe_read_str(&augmented_args.filename.value, \ + long size; \ + \ + if (bpf_probe_read(&augmented_args.args, sizeof(augmented_args.args), args) < 0) \ + return -1; \ + \ + size = bpf_probe_read_str(&augmented_args.filename.value, \ sizeof(augmented_args.filename.value), \ args->filename_ptr); \ + if (size < 0) \ + return -1; \ + \ + augmented_args.filename.size = size; \ if (__builtin_memcmp(augmented_args.filename.value, etc, 4) != 0) \ return 0; \ /* If perf_event_output fails, return non-zero so that it gets recorded unaugmented */ \ - return perf_event_output(args, &__augmented_syscalls__, BPF_F_CURRENT_CPU, \ + return bpf_perf_event_output(args, &__augmented_syscalls__, BPF_F_CURRENT_CPU, \ &augmented_args, \ (sizeof(augmented_args) - sizeof(augmented_args.filename.value) + \ - augmented_args.filename.size)); \ + size)); \ } struct syscall_enter_openat_args { @@ -73,4 +91,11 @@ struct syscall_enter_open_args { augmented_filename_syscall_enter(open); -license(GPL); +struct syscall_enter_args; + +SEC("raw_syscalls:sys_enter") +int sys_enter(struct syscall_enter_args *args) +{ + return 0; +} +char _license[] SEC("license") = "GPL"; -- 2.38.1.273.g43a17bfeac-goog