From patchwork Wed Sep 4 20:41:31 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Colton Lewis X-Patchwork-Id: 13791430 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 0D37ECD4F30 for ; Wed, 4 Sep 2024 20:46:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Type:Cc:To:From: Subject:Message-ID:References:Mime-Version:In-Reply-To:Date:Reply-To: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=yF63B/qB2C2mWkkN7Sev/IpM9OI4DaouC6axCITdljM=; b=d41l4sP4HtLKkF3x1vEHoERXDA uOJTYtrA9tbW/eXJNE2keEZFRWEoBkOGMFn/v+oZQOOPDNcDDQpRfDNDeQVNjHUAgEYU0MurlSZKB hrAYWLDKPsH5AX33QZkuhnIBFSVLzuH2lr00j21lFrzIeYY3qV2cCG1FqLxuzhfcq1G4fQMeuQmQ+ U0MvMtK+MsMD/ITsKAmbDNz7+O0WwaIm1+ZwOMuG4udHLeMCISU8i30yy0UIFMJoTALPss095anxI +w/jG3jG8PVqCb0gFgRNhwhEKGF4WKGqmn0RSTJas1XxtpOkreRnh70kiRmOhvWkuFgOXxXKENPr1 VosBTgQQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1slwtR-000000061qG-08Hb; Wed, 04 Sep 2024 20:46:21 +0000 Received: from mail-yw1-x114a.google.com ([2607:f8b0:4864:20::114a]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1slwpj-000000060kI-2PCh for linux-arm-kernel@lists.infradead.org; Wed, 04 Sep 2024 20:42:33 +0000 Received: by mail-yw1-x114a.google.com with SMTP id 00721157ae682-6d4426ad833so144540217b3.2 for ; Wed, 04 Sep 2024 13:42:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1725482549; x=1726087349; darn=lists.infradead.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=yF63B/qB2C2mWkkN7Sev/IpM9OI4DaouC6axCITdljM=; b=2pJkrgKKchUCPrQB2MLCS49kjvtFg/4zuUAdtD8IPcvrKWDQwra8XIVH9fOxxjA7e6 8MXAsv/ZWxOtJeGyj7eA7ai9QYHrx9PGIhsMhJujkmrHIkNkkH9qK0NHS+HhC5TsPTjK GwCB+IrHoWukssN9J6fQjnciDNy31zK1RJfHKrDyFoqMyOcVSp4ZK+PBXHDNneqPWOo/ jwkaBFRBMnB5yamjB7BnHeFKBFFyPYY6BOKkNCU2s078C5wVD4UQD0hIHPfM/jKtNTtC j8sJ9JIiWs+Q7FmugRa24Y9zVJILZVbsLWvay1rpkKQq6ctFTWiwsZz4Crr5NxBghJaI KRGg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1725482549; x=1726087349; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=yF63B/qB2C2mWkkN7Sev/IpM9OI4DaouC6axCITdljM=; b=D1KBF+T4BJUMqCfZMOywM7ucYWQ0lc7vFRCRLC45wKiDLzQha163H5ZhCJkAdb53dt OEFcJh/Svf6d6SJWSOyoaTfeCy/aKFN92BvFbBie2w3Aeup0793YGJNCuZRR6nnPvXRg k526JPUEG7so5VbaECxPHPGbK35FFyWzVn8e6ZGzXenozdlwhlldKVnOwcuUfJq308hv y6SA2yhExvzuljJ/iYFPZBObtNMZreFETqN2GW16B82cJlHeHoHzt0k4RzOzLepdR4S2 J689e4xy6CrMwG4H9eWj6hq9Qh/6DfwPSCJvSwGnqODufx0wTgcsWwG/Ys0QIIdhUoLb eXJQ== X-Forwarded-Encrypted: i=1; AJvYcCVRK0AhPgjAbEkxyX3tZ49ryFmg+XAmeRZv5P6vLtlL4ETf2PPBVbstaEgiXJiRtHlg1Laq2TEHvFpQWWi814tS@lists.infradead.org X-Gm-Message-State: AOJu0YxA46Iwth/jsCAKEht5gFcfn6JBhaWUWIvJRveQCbTF/hA+6cnn TGPSS9IYURM2ob3s5xORtCEUohmiyWoEGoXAtpZ8VyOJVH4C098FxGVl/Mh2nj1GowmFeJpMZe3 oWKrMft7xh4jTRLZDnBAGcg== X-Google-Smtp-Source: AGHT+IHnCAVHhUCP2jsg9QIrX/diUprCN0SQ2aen+GiK4qTsvqjsoiEZxfc39AEm13a4QPmtILTk2j9/pAbTWP98xg== X-Received: from coltonlewis-kvm.c.googlers.com ([fda3:e722:ac3:cc00:2b:ff92:c0a8:14ce]) (user=coltonlewis job=sendgmr) by 2002:a25:b612:0:b0:e0e:499f:3d9b with SMTP id 3f1490d57ef6-e1a79fb4d7bmr28585276.1.1725482549203; Wed, 04 Sep 2024 13:42:29 -0700 (PDT) Date: Wed, 4 Sep 2024 20:41:31 +0000 In-Reply-To: <20240904204133.1442132-1-coltonlewis@google.com> Mime-Version: 1.0 References: <20240904204133.1442132-1-coltonlewis@google.com> X-Mailer: git-send-email 2.46.0.469.g59c65b2a67-goog Message-ID: <20240904204133.1442132-4-coltonlewis@google.com> Subject: [PATCH 3/5] powerpc: perf: Use perf_arch_instruction_pointer() From: Colton Lewis To: kvm@vger.kernel.org Cc: Oliver Upton , Sean Christopherson , Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Namhyung Kim , Mark Rutland , Alexander Shishkin , Jiri Olsa , Ian Rogers , Adrian Hunter , Kan Liang , Will Deacon , Russell King , Catalin Marinas , Michael Ellerman , Nicholas Piggin , Christophe Leroy , Naveen N Rao , Heiko Carstens , Vasily Gorbik , Alexander Gordeev , Christian Borntraeger , Sven Schnelle , Thomas Gleixner , Borislav Petkov , Dave Hansen , x86@kernel.org, "H . Peter Anvin" , linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linuxppc-dev@lists.ozlabs.org, linux-s390@vger.kernel.org, Colton Lewis X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240904_134231_638939_2C590D29 X-CRM114-Status: GOOD ( 14.14 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Make sure powerpc uses the arch-specific function now that those have been reorganized. Signed-off-by: Colton Lewis --- arch/powerpc/perf/callchain.c | 2 +- arch/powerpc/perf/callchain_32.c | 2 +- arch/powerpc/perf/callchain_64.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/powerpc/perf/callchain.c b/arch/powerpc/perf/callchain.c index 6b4434dd0ff3..26aa26482c9a 100644 --- a/arch/powerpc/perf/callchain.c +++ b/arch/powerpc/perf/callchain.c @@ -51,7 +51,7 @@ perf_callchain_kernel(struct perf_callchain_entry_ctx *entry, struct pt_regs *re lr = regs->link; sp = regs->gpr[1]; - perf_callchain_store(entry, perf_instruction_pointer(regs)); + perf_callchain_store(entry, perf_arch_instruction_pointer(regs)); if (!validate_sp(sp, current)) return; diff --git a/arch/powerpc/perf/callchain_32.c b/arch/powerpc/perf/callchain_32.c index ea8cfe3806dc..ddcc2d8aa64a 100644 --- a/arch/powerpc/perf/callchain_32.c +++ b/arch/powerpc/perf/callchain_32.c @@ -139,7 +139,7 @@ void perf_callchain_user_32(struct perf_callchain_entry_ctx *entry, long level = 0; unsigned int __user *fp, *uregs; - next_ip = perf_instruction_pointer(regs); + next_ip = perf_arch_instruction_pointer(regs); lr = regs->link; sp = regs->gpr[1]; perf_callchain_store(entry, next_ip); diff --git a/arch/powerpc/perf/callchain_64.c b/arch/powerpc/perf/callchain_64.c index 488e8a21a11e..115d1c105e8a 100644 --- a/arch/powerpc/perf/callchain_64.c +++ b/arch/powerpc/perf/callchain_64.c @@ -74,7 +74,7 @@ void perf_callchain_user_64(struct perf_callchain_entry_ctx *entry, struct signal_frame_64 __user *sigframe; unsigned long __user *fp, *uregs; - next_ip = perf_instruction_pointer(regs); + next_ip = perf_arch_instruction_pointer(regs); lr = regs->link; sp = regs->gpr[1]; perf_callchain_store(entry, next_ip);