From patchwork Thu Nov 9 00:41:07 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Josh Poimboeuf X-Patchwork-Id: 163187 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b129:0:b0:403:3b70:6f57 with SMTP id q9csp138428vqs; Wed, 8 Nov 2023 16:44:10 -0800 (PST) X-Google-Smtp-Source: AGHT+IF6w6mFokmj+ynGC1A4aOiAUcmnGXLlccTkACbYsUJxb+8kMW0beO+slSZXMW4Cxf8qxDXD X-Received: by 2002:a17:902:eac6:b0:1cc:6f7b:636a with SMTP id p6-20020a170902eac600b001cc6f7b636amr3457976pld.2.1699490650139; Wed, 08 Nov 2023 16:44:10 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1699490650; cv=none; d=google.com; s=arc-20160816; b=0D5vHNYePD8n2HA8BUjgp0OJFaj5B1+QNCOGkLa7ZSWZRKSXZtR1i0e9tN52pk4dBf aF2gOPnQiwEo9kJVp3G7ac05dxJW9dM2jopvhn7ePTRN10OtXjudq3DKkH48eVwJd9Ct hVwgfnBDfFui4yogRRc9p+UzlwQYwwtWpc9qsVt3VdK2bHbEVcImx42/e3+baESdt1D9 INjWZpeGOrjotjUvTlATYn4lI+7U8SdghmCOrDwHXk79ZrODrjUtgSUJDf0eV9G5idGe AnlDBOiV63sA5Ov6uoaY46NYlaymJy1uVi0lBT7M8lDJzxE+TpQoofg0Ibd+ffFqwQzL k5rg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=3gi05k/04OC1OPD+PesUWEnTdcKhX8838EAvnxV7Wog=; fh=3ahOA1+93SqEqAeT96I/cgRVlate7pzd5ZZzl/6KbbU=; b=a7uGVLQWPkg4f4acH+SZSL9BNNuxxVXVqpexZ7uQ/E95C30HzCD6c9a9nUg8H/l7xv UXmm5L3Y0Gc1K/nKMVgnoS1tRDjakLjQKQDBZK9YyN1Yeu2rtefJQMZmZSFIiA5FYKM+ 9clamiuZ2CP3wdODoyEGHtaYxc1BtdoQ0kBs9ikOuqmGN+kVoc+GwrzWhTx1/SZ8EYM/ /KlyiP5mx00XnFJ3OI4VgAK4vZojvzK024dXrNvWh564AYrqFLiggyjr2+XlH0o2KrxV JcmOe/GPbQFD4GANQoi8R3OndKf5vniAkqDKegQa9am3wigDktV3UT8u7yt0gRHcGa/S 3qsA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=LekKBPpD; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.33 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from lipwig.vger.email (lipwig.vger.email. [23.128.96.33]) by mx.google.com with ESMTPS id q4-20020a170902c9c400b001bf741231f7si3204077pld.570.2023.11.08.16.44.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 08 Nov 2023 16:44:10 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.33 as permitted sender) client-ip=23.128.96.33; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=LekKBPpD; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.33 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by lipwig.vger.email (Postfix) with ESMTP id 3E0C48290BAB; Wed, 8 Nov 2023 16:44:06 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at lipwig.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232165AbjKIAnr (ORCPT + 32 others); Wed, 8 Nov 2023 19:43:47 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48808 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231661AbjKIAnm (ORCPT ); Wed, 8 Nov 2023 19:43:42 -0500 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4BC70C6; Wed, 8 Nov 2023 16:43:40 -0800 (PST) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 5BA41C433CB; Thu, 9 Nov 2023 00:43:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1699490619; bh=74tVzDmLPcHwbDDKMqbOB8N7t7wMHGUYDY+FMXFJ2KU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=LekKBPpDKpVAqs69PeoufY+Ll7vEGOQ6UMGe4vq8n0G3YeziGosRPHLqvIhKOkqWl TQY08u1shmOVtc/K7G7Z/r42NF4+v2bTZAQ43U+HKUwyn5gzBouHHETsTeek06+uYq uU3+H17p9lWYMJ3yPFg8fMeS3H6fAwDf+KTJ0dC3n1kXpJ9xSpNjSbVTPZecZp6z5C o2ZoXy72Syup4MIeKwbKil72fV0InZAtQe56am3XRQNFnS8QGNAs3qsPoum2VliQlv 0FfkR5NSeCbYdoyPOUcHXluW8GjM6kIANxbWYP2If5yDBfMW8P9EtQRl7YYxmUDvFB VaEa8QpvEqm8w== From: Josh Poimboeuf To: Peter Zijlstra , Steven Rostedt , Ingo Molnar , Arnaldo Carvalho de Melo Cc: linux-kernel@vger.kernel.org, x86@kernel.org, Indu Bhagat , Mark Rutland , Alexander Shishkin , Jiri Olsa , Namhyung Kim , Ian Rogers , Adrian Hunter , linux-perf-users@vger.kernel.org, Mark Brown , linux-toolchains@vger.kernel.org Subject: [PATCH RFC 02/10] perf: Remove get_perf_callchain() 'crosstask' argument Date: Wed, 8 Nov 2023 16:41:07 -0800 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (lipwig.vger.email [0.0.0.0]); Wed, 08 Nov 2023 16:44:06 -0800 (PST) X-Spam-Status: No, score=-1.2 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lipwig.vger.email X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1782045108128694776 X-GMAIL-MSGID: 1782045108128694776 get_perf_callchain() doesn't support cross-task unwinding, so it doesn't make much sense to have 'crosstask' as an argument. Instead, have perf_callchain() adjust 'user' accordingly. Signed-off-by: Josh Poimboeuf Acked-by: Namhyung Kim --- include/linux/perf_event.h | 2 +- kernel/bpf/stackmap.c | 5 ++--- kernel/events/callchain.c | 6 +----- kernel/events/core.c | 8 ++++---- 4 files changed, 8 insertions(+), 13 deletions(-) diff --git a/include/linux/perf_event.h b/include/linux/perf_event.h index f4b05954076c..2d8fa253b9df 100644 --- a/include/linux/perf_event.h +++ b/include/linux/perf_event.h @@ -1534,7 +1534,7 @@ extern void perf_callchain_user(struct perf_callchain_entry_ctx *entry, struct p extern void perf_callchain_kernel(struct perf_callchain_entry_ctx *entry, struct pt_regs *regs); extern struct perf_callchain_entry * get_perf_callchain(struct pt_regs *regs, bool kernel, bool user, - u32 max_stack, bool crosstask, bool add_mark); + u32 max_stack, bool add_mark); extern int get_callchain_buffers(int max_stack); extern void put_callchain_buffers(void); extern struct perf_callchain_entry *get_callchain_entry(int *rctx); diff --git a/kernel/bpf/stackmap.c b/kernel/bpf/stackmap.c index b0b0fbff7c18..e4827ca5378d 100644 --- a/kernel/bpf/stackmap.c +++ b/kernel/bpf/stackmap.c @@ -294,8 +294,7 @@ BPF_CALL_3(bpf_get_stackid, struct pt_regs *, regs, struct bpf_map *, map, if (max_depth > sysctl_perf_event_max_stack) max_depth = sysctl_perf_event_max_stack; - trace = get_perf_callchain(regs, kernel, user, max_depth, - false, false); + trace = get_perf_callchain(regs, kernel, user, max_depth, false); if (unlikely(!trace)) /* couldn't fetch the stack trace */ @@ -421,7 +420,7 @@ static long __bpf_get_stack(struct pt_regs *regs, struct task_struct *task, trace = get_callchain_entry_for_task(task, max_depth); else trace = get_perf_callchain(regs, kernel, user, max_depth, - false, false); + false); if (unlikely(!trace)) goto err_fault; diff --git a/kernel/events/callchain.c b/kernel/events/callchain.c index 1e135195250c..aa5f9d11c28d 100644 --- a/kernel/events/callchain.c +++ b/kernel/events/callchain.c @@ -178,7 +178,7 @@ put_callchain_entry(int rctx) struct perf_callchain_entry * get_perf_callchain(struct pt_regs *regs, bool kernel, bool user, - u32 max_stack, bool crosstask, bool add_mark) + u32 max_stack, bool add_mark) { struct perf_callchain_entry *entry; struct perf_callchain_entry_ctx ctx; @@ -209,9 +209,6 @@ get_perf_callchain(struct pt_regs *regs, bool kernel, bool user, } if (regs) { - if (crosstask) - goto exit_put; - if (add_mark) perf_callchain_store_context(&ctx, PERF_CONTEXT_USER); @@ -219,7 +216,6 @@ get_perf_callchain(struct pt_regs *regs, bool kernel, bool user, } } -exit_put: put_callchain_entry(rctx); return entry; diff --git a/kernel/events/core.c b/kernel/events/core.c index b0d62df7df4e..5e41a3b70bcd 100644 --- a/kernel/events/core.c +++ b/kernel/events/core.c @@ -7592,16 +7592,16 @@ perf_callchain(struct perf_event *event, struct pt_regs *regs) { bool kernel = !event->attr.exclude_callchain_kernel; bool user = !event->attr.exclude_callchain_user; - /* Disallow cross-task user callchains. */ - bool crosstask = event->ctx->task && event->ctx->task != current; const u32 max_stack = event->attr.sample_max_stack; struct perf_callchain_entry *callchain; + /* Disallow cross-task user callchains. */ + user &= !event->ctx->task || event->ctx->task == current; + if (!kernel && !user) return &__empty_callchain; - callchain = get_perf_callchain(regs, kernel, user, - max_stack, crosstask, true); + callchain = get_perf_callchain(regs, kernel, user, max_stack, true); return callchain ?: &__empty_callchain; }