From patchwork Thu Nov 9 00:41:06 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Josh Poimboeuf X-Patchwork-Id: 163185 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b129:0:b0:403:3b70:6f57 with SMTP id q9csp138306vqs; Wed, 8 Nov 2023 16:43:49 -0800 (PST) X-Google-Smtp-Source: AGHT+IGjVhUZK+dmMOkW3/jGv46eLWj8HrI+6llWD6vnQ3FP49GDdbdtNwx+eUr3ZmdgVAaNZUrI X-Received: by 2002:a05:6808:9b7:b0:3b2:eab1:918 with SMTP id e23-20020a05680809b700b003b2eab10918mr162715oig.29.1699490629591; Wed, 08 Nov 2023 16:43:49 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1699490629; cv=none; d=google.com; s=arc-20160816; b=e/qp4rIbA2AiroIdLTqi8oesC1phKmzfErGzt9U4rqU89+F9ABYwQciIHs+5g+SPQ8 jyDdwoPEf13lXQhs65VllqCy2K0cOmWoODXyuSsCeXFE++BEYAz4wZXoMmhfT/ofYd7h Wwy3oSAkB4vsF0Gl+gMgnbZu5laxDdPfE17eNFHIRpBYpqPK4JuCVHLOVl2pcMe5rNcz akSyMI9/ipZgYi9lO1T/vCSz8Wfjl1j7lgExRnUst4oSHiIktudwXvYLJlPZ/EBdvt9X c126fFf5MHR/GtEoEi7/7coyNwTXrc76+mXfSVXquGHa74upjhj0S64Mz4Kkn3bOo8y2 4ytg== 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=TUQezbqAI0GEvn0Ww5LWeN0VgSL9Nl1wST1aROJBqz4=; fh=3ahOA1+93SqEqAeT96I/cgRVlate7pzd5ZZzl/6KbbU=; b=pJDh2oWUi8m7wx2grA9tsGEp0t88QWvDlE19I54eauYsZFRKD4y8k/SKzGKwlEoqhz 3qYN6prlYZlEmYRbj4K5YhHcnNEGe7Kb3nr02UiKDNmlclk651yanIXLEjtmTZfuW/4z awWhIfIG//Teeo7+p6EFdK8FgHJLrXwVA1Nno1CNOopgs6AmL/oKYX6WOCiTzF65cLQ+ 9qSJ7sONqGaT795apGdIhYqmOwRBTKYCWPBw+JQpiMlDXlkIeRzAUYKqDsvoerOC28oT W2Tsfc9Mvgx/+zW6SbIbGkmXh+gM9LizpKJTweEvXkK7ORG/nfXlI45Sx+QrlsBWcrRJ Mn/w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=dKAGQWH3; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 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 snail.vger.email (snail.vger.email. [23.128.96.37]) by mx.google.com with ESMTPS id u9-20020a655c09000000b005b90b2d9178si5675656pgr.796.2023.11.08.16.43.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 08 Nov 2023 16:43:49 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) client-ip=23.128.96.37; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=dKAGQWH3; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 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 snail.vger.email (Postfix) with ESMTP id A24D5822CAF4; Wed, 8 Nov 2023 16:43:48 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232102AbjKIAno (ORCPT + 32 others); Wed, 8 Nov 2023 19:43:44 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48782 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230515AbjKIAnl (ORCPT ); Wed, 8 Nov 2023 19:43:41 -0500 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 88DB418E; Wed, 8 Nov 2023 16:43:39 -0800 (PST) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 9534DC433C9; Thu, 9 Nov 2023 00:43:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1699490619; bh=4+3ZnMlsc/QpNeAUS1yS0d/MnrzAaX9AOG0Qj3+lXzU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=dKAGQWH3CcMl08puONswfb5ftsDQf75y295GZbojL3VfiIeY6vg1VEB7aoHCCd7Lv M/BesqpG6Io/cpueK6CzvYyuWe7n70LK3plfTLc0sMBHBdQQ2fBZVLHtDxeROfDYtf 00tt1/+7+CCJlr62wDeOtDZwGJD2pJntLDJb/Bj9p39Gh4Em8rF5xPUmiV9UwlXoIl mGim56lCK1BkdUvjiz12z1wqCA0xw0u4+6xatapMLRvAsv3kTA1N/kXMwptFBRnVXw +mFhB9SQRWGXN0RLnSV4+x5kqVs0RA7JQwrSp9EG+/7AR5SelF3IOYGCFANj+644bl Boubij6+Nv2ow== 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 01/10] perf: Remove get_perf_callchain() 'init_nr' argument Date: Wed, 8 Nov 2023 16:41:06 -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 (snail.vger.email [0.0.0.0]); Wed, 08 Nov 2023 16:43:48 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1782045086080652004 X-GMAIL-MSGID: 1782045086080652004 The 'init_nr' argument has double duty: it's used to initialize both the number of contexts and the number of stack entries. That's confusing and the callers always pass zero anyway. Hard code the zero. Signed-off-by: Josh Poimboeuf Acked-by: Namhyung Kim --- include/linux/perf_event.h | 2 +- kernel/bpf/stackmap.c | 4 ++-- kernel/events/callchain.c | 12 ++++++------ kernel/events/core.c | 2 +- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/include/linux/perf_event.h b/include/linux/perf_event.h index afb028c54f33..f4b05954076c 100644 --- a/include/linux/perf_event.h +++ b/include/linux/perf_event.h @@ -1533,7 +1533,7 @@ DECLARE_PER_CPU(struct perf_callchain_entry, perf_callchain_entry); extern void perf_callchain_user(struct perf_callchain_entry_ctx *entry, struct pt_regs *regs); 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, u32 init_nr, bool kernel, bool user, +get_perf_callchain(struct pt_regs *regs, bool kernel, bool user, u32 max_stack, bool crosstask, bool add_mark); extern int get_callchain_buffers(int max_stack); extern void put_callchain_buffers(void); diff --git a/kernel/bpf/stackmap.c b/kernel/bpf/stackmap.c index d6b277482085..b0b0fbff7c18 100644 --- a/kernel/bpf/stackmap.c +++ b/kernel/bpf/stackmap.c @@ -294,7 +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, 0, kernel, user, max_depth, + trace = get_perf_callchain(regs, kernel, user, max_depth, false, false); if (unlikely(!trace)) @@ -420,7 +420,7 @@ static long __bpf_get_stack(struct pt_regs *regs, struct task_struct *task, else if (kernel && task) trace = get_callchain_entry_for_task(task, max_depth); else - trace = get_perf_callchain(regs, 0, kernel, user, max_depth, + trace = get_perf_callchain(regs, kernel, user, max_depth, false, false); if (unlikely(!trace)) goto err_fault; diff --git a/kernel/events/callchain.c b/kernel/events/callchain.c index 1273be84392c..1e135195250c 100644 --- a/kernel/events/callchain.c +++ b/kernel/events/callchain.c @@ -177,7 +177,7 @@ put_callchain_entry(int rctx) } struct perf_callchain_entry * -get_perf_callchain(struct pt_regs *regs, u32 init_nr, bool kernel, bool user, +get_perf_callchain(struct pt_regs *regs, bool kernel, bool user, u32 max_stack, bool crosstask, bool add_mark) { struct perf_callchain_entry *entry; @@ -188,11 +188,11 @@ get_perf_callchain(struct pt_regs *regs, u32 init_nr, bool kernel, bool user, if (!entry) return NULL; - ctx.entry = entry; - ctx.max_stack = max_stack; - ctx.nr = entry->nr = init_nr; - ctx.contexts = 0; - ctx.contexts_maxed = false; + ctx.entry = entry; + ctx.max_stack = max_stack; + ctx.nr = entry->nr = 0; + ctx.contexts = 0; + ctx.contexts_maxed = false; if (kernel && !user_mode(regs)) { if (add_mark) diff --git a/kernel/events/core.c b/kernel/events/core.c index 683dc086ef10..b0d62df7df4e 100644 --- a/kernel/events/core.c +++ b/kernel/events/core.c @@ -7600,7 +7600,7 @@ perf_callchain(struct perf_event *event, struct pt_regs *regs) if (!kernel && !user) return &__empty_callchain; - callchain = get_perf_callchain(regs, 0, kernel, user, + callchain = get_perf_callchain(regs, kernel, user, max_stack, crosstask, true); return callchain ?: &__empty_callchain; }