From patchwork Thu Sep 19 19:07:48 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Colton Lewis X-Patchwork-Id: 13807963 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 17838CF3962 for ; Thu, 19 Sep 2024 19:11:40 +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=i5Qt5np/Ap8e8S56AX/TaOyn++MQC/aFN8Qv/OewSh4=; b=vArjeKUC5tFYr+i6h53m+7eROF OoeAwJDnvs22DQif9er4NHxO8ahtWIth/4rX70gsfb0K1ptCnGa2z4Ex0qyXVjEFCled+Sk9cDHjm 57Pe9gwPMbeMZNRx9IEbBxhvW+ukieKgh9uqsTatVqSCl6vs5qedhMvgqP/BwphVyAHu4pVXM4oyz 203xqheYWTkoGaLtuUmmI3mgMBFCF1xZ16py6xAkmKKM9FB31+i+MpatLWV7gF1Y5EC7wewXpIipf fGspW+mlF1HRweI8oL6k7Aa0aUcTAtUReFCSxdAMpkJZKfs/wyCQOa6nLiJKLUJeNVoEli2LNlYYk 3eyknIsg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1srMYt-0000000AtQZ-0093; Thu, 19 Sep 2024 19:11:31 +0000 Received: from mail-yw1-x114a.google.com ([2607:f8b0:4864:20::114a]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1srMVc-0000000AsjO-28Kb for linux-arm-kernel@lists.infradead.org; Thu, 19 Sep 2024 19:08:10 +0000 Received: by mail-yw1-x114a.google.com with SMTP id 00721157ae682-6ddd7800846so28773277b3.0 for ; Thu, 19 Sep 2024 12:08:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1726772887; x=1727377687; 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=i5Qt5np/Ap8e8S56AX/TaOyn++MQC/aFN8Qv/OewSh4=; b=3uzSsUKDNlaZani9rsYm1qdaiH7XK935K7FSMbUOT4fvYjx0TbagkqLpxShvx5XvXR yFWDQ9q/mtjsOVvuY5HewbOQ5zwlAdspa30quoFYfPKRHd3t/FdAzqxuazncBdWiE5oZ d/etd4X9O3TAi0ve8hzqKO4NHBLSZ5LV5c4sYmU2uhCXMeHwQBIG+LOd0wATm5jcx3mS Y0dPVI+PbNz0jwboIUlH5sNuh3drhYjgq6cf36XfvFicYD09xp6fwpvX6ruJ5ybYYcqs MkJu3Aw7YlVB5GlaqCCEdAx7Q0/RGr6G264EbjWk2jLgBoqNjXewgs7x92KO2e5/bdtN 0sng== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1726772887; x=1727377687; 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=i5Qt5np/Ap8e8S56AX/TaOyn++MQC/aFN8Qv/OewSh4=; b=ftMW2qlgaxaCfLXKVy5ArCtCk5KkHM7Ak856ejGKiZ4XU8ey8pgoUuxkAS4eAxnimA 52UVk+iBJfnAr/62Lz8uo4xFgUBQ2tCYbJyI/J4lYx+8ORHds3lSqHhBNoV0wGBt9pkq qcImG30oRACx7TvDV3yMVgSRwviw038mXjH3BGBLi4r4xMGjpB+jN59FnEDFJVRviFad DmnZ5ANe+adc1UUmfN3IzZ9UYlRBYdfr2b6MO/UuhQD9X3vRaRbd2Un6KltA+5eVSm/5 VdILB/WuDSz09bRByaSysBJOVRDyEOvyhuEVPFhTKT8wy+0GLIZmyBNFI7FQdlYynFr9 5NHw== X-Forwarded-Encrypted: i=1; AJvYcCUlq2IVcIQ2lBFB7ZjJPEIsRB77g2oy9BQ7/Duc61pXzvrHo82Iklggrsqw4b3ttjoIq8sUSmiMvZGGIIo8Qmbd@lists.infradead.org X-Gm-Message-State: AOJu0YyOcub41lPFr/kp2fFFkXp9ggx674nJOYyEuAvX7MSdSjUWb0By EV4yF2Q6ixwRxHgSXc7Vub6hFZ5FmbsJwRL6tfu4adIP6sC/+KJhqoC7Zdc1VAYlAOghNkoq+Nz 48h1rImWU0mt6zRnd2zmzow== X-Google-Smtp-Source: AGHT+IG+gWtFXvOjppbknvofQy7F475eldlmwCdDkPmmKXe3fWWYdIxyDCZn7gT+ZyDPYmZ3bf2GZI0Klu7wUcLEaA== X-Received: from coltonlewis-kvm.c.googlers.com ([fda3:e722:ac3:cc00:11b:3898:ac11:fa18]) (user=coltonlewis job=sendgmr) by 2002:a81:a88a:0:b0:68d:52a1:bed with SMTP id 00721157ae682-6dfeec11e0amr8827b3.1.1726772886738; Thu, 19 Sep 2024 12:08:06 -0700 (PDT) Date: Thu, 19 Sep 2024 19:07:48 +0000 In-Reply-To: <20240919190750.4163977-1-coltonlewis@google.com> Mime-Version: 1.0 References: <20240919190750.4163977-1-coltonlewis@google.com> X-Mailer: git-send-email 2.46.0.792.g87dc391469-goog Message-ID: <20240919190750.4163977-4-coltonlewis@google.com> Subject: [PATCH v4 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-20240919_120808_568657_2A464AA0 X-CRM114-Status: GOOD ( 14.17 ) 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);