From patchwork Wed Sep 11 22:24:30 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Colton Lewis X-Patchwork-Id: 13801169 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 6E0B7EE57D7 for ; Wed, 11 Sep 2024 22:29:38 +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=l4XmBjdboaUqTeMgRqbSdf4DSeJIVFEq/lNcpwN1ftE=; b=TD/pUz1KMngoZmBBUHGCWosAs1 GjFjdCOBtMI/fFJdyeKM5YLD8rTReNYTMC39Puuram+GbKti9Vi2OMB86yEby1lqO2SkxKH3q4jRy CgObpXiMhQX7CRcTTtQI6LTK2Om9kfvh/1drFdcXsv4bigrbLJ/mDQ+CbBTyO7gy+hQviOEL7B0z8 5zAbLVhcNQvIlVCH5G9/7K8opRHIFWZIorDWbgBYocfo3gYlfkC6AWcZmQSaZsczJskJDOVziaQN4 XCH7RvCbb+7p4TEXjL5HzDpbUDaK9oM6qXytCuCzJhR3HyXdIUzb/FC/uOl7MFAY4BLWV7I8IteU6 eOFIdG2w==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1soVq6-0000000BBw5-1oJZ; Wed, 11 Sep 2024 22:29:30 +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 1soVly-0000000BAzK-1Ejs for linux-arm-kernel@lists.infradead.org; Wed, 11 Sep 2024 22:25:15 +0000 Received: by mail-yw1-x114a.google.com with SMTP id 00721157ae682-6db791c42e3so13133167b3.1 for ; Wed, 11 Sep 2024 15:25:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1726093513; x=1726698313; 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=l4XmBjdboaUqTeMgRqbSdf4DSeJIVFEq/lNcpwN1ftE=; b=3a0r4TncWKJnZ4v2+gQT6NdDmmVLuaPWe4tOIaT2l1SFUt6HINbDA5gtq1ME69mmxW kmpVJCoCzMJcowB2KBiAm7tr9GACYvAqv/NuKA6DTJXZyKmmHKb9oFoMDQk/5dKyuC8d dOHQto4AYStFpFEaqOS+pZ1Rq8eKcuhEpz4AA2pCD087CPAxLHnxXzgaMyLFe4by9sS5 kGLp7VqFnoe6qM23dagC/HdGtJODymVRhOavLC2WSG1JPH76XbYc6sJCNwGqWQJz0Mi4 S/ee6sZant6Jh86XXGnUsxC2El77HEzwSUyJjLe/1AAgL5ihk3J/Xj5+e3nkJqU1U3YH qRkA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1726093513; x=1726698313; 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=l4XmBjdboaUqTeMgRqbSdf4DSeJIVFEq/lNcpwN1ftE=; b=RD2E4jEzBwEWVfO8Xb/AfyeTOTTUnv9Nyzr5ZYjuCVx9VcH2nmH/K/XD3zLk2EDGXA 3whec/BGKlbE6Xogrw9PnLoGv1lArs9+cSMV/sabRNeoEqJvyUofYVVrwKrs6iC826qL j23o2ABitfiTybPcrMEEw9OX4ex861bjDiNZDmJ/6IhJpsijV0YnSv5+9/mntZAVTd46 fYRr3CWkC+aGYD93j/CIMwhdVBjdYp+7Ns5UcHZkYIh4h5T7SWPVxYG6TFLjXjE61AXY jgqh1acyDEjy7PqPPZp0NxN9HR5LaJP3Z8tNqTvRWnSHksefqaKbgJheb2d6kzq3+hKr Xofw== X-Forwarded-Encrypted: i=1; AJvYcCVKY9q9Z9rZlA+byGaWd5w5ZKtA5Pjcuf0AJJMtKeYFCZ7sWsr5tuRiFxbq3AZC5dB1ZwjoO13Np/qTRh/i//S6@lists.infradead.org X-Gm-Message-State: AOJu0YyZIzjICKGy2q8vEZ6CoWmuG+WkZ4RCJCbZ4IvnkD02iTRwL8XB FwhGpHo4QvwJZCnVhhjsnN4bCveN7tL1OwVbcY8QP2TSTdBTne5BObUXxkfPCennKsIy3ho5zRO A8wrb4bBFf/UgkpN0dU41hA== X-Google-Smtp-Source: AGHT+IHahPlfxq0OnDlBxbNh4kFfba2/NbBP9j+SjDxLZau6fx+NZ8cgucf9q6YqSrrkRp98eVZcQ/vy+HEi7ntE2A== X-Received: from coltonlewis-kvm.c.googlers.com ([fda3:e722:ac3:cc00:11b:3898:ac11:fa18]) (user=coltonlewis job=sendgmr) by 2002:a05:690c:6083:b0:6c3:e9e5:e6a with SMTP id 00721157ae682-6dbb6ba1041mr322647b3.8.1726093512763; Wed, 11 Sep 2024 15:25:12 -0700 (PDT) Date: Wed, 11 Sep 2024 22:24:30 +0000 In-Reply-To: <20240911222433.3415301-1-coltonlewis@google.com> Mime-Version: 1.0 References: <20240911222433.3415301-1-coltonlewis@google.com> X-Mailer: git-send-email 2.46.0.598.g6f2099f65c-goog Message-ID: <20240911222433.3415301-4-coltonlewis@google.com> Subject: [PATCH v2 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-20240911_152514_384698_354AB28D X-CRM114-Status: GOOD ( 13.76 ) 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);