From patchwork Mon Sep 2 12:04:39 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christophe Leroy X-Patchwork-Id: 13787162 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 kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 89B61CD13CF for ; Mon, 2 Sep 2024 12:05:02 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 031B58D00C6; Mon, 2 Sep 2024 08:05:02 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id ED2AB8D0065; Mon, 2 Sep 2024 08:05:01 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id D739E8D00C6; Mon, 2 Sep 2024 08:05:01 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id B7BDB8D0065 for ; Mon, 2 Sep 2024 08:05:01 -0400 (EDT) Received: from smtpin30.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id A53B9121DA2 for ; Mon, 2 Sep 2024 12:05:00 +0000 (UTC) X-FDA: 82519667160.30.5E025E8 Received: from pegase2.c-s.fr (pegase2.c-s.fr [93.17.235.10]) by imf07.hostedemail.com (Postfix) with ESMTP id 5E1EC40015 for ; Mon, 2 Sep 2024 12:04:58 +0000 (UTC) Authentication-Results: imf07.hostedemail.com; dkim=none; dmarc=pass (policy=quarantine) header.from=csgroup.eu; spf=pass (imf07.hostedemail.com: domain of christophe.leroy@csgroup.eu designates 93.17.235.10 as permitted sender) smtp.mailfrom=christophe.leroy@csgroup.eu ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1725278594; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=MwCQPr+DkzFiDHzjMK222UDVKoya0EMyZrgWc4ytvxg=; b=ZM+/wDqsUVcOgp4CMJsTwIRjmzwKdiRzwwtKWNA98XUN1JZNRbnh9ZcHiQXNGccuLPYD9U KL08WNO2UCQWFss4DbyZSvPwCy8VnDQS15LKBFzXtCpEi2ZIDsUyQKh9k371f1G8joK6wC yO5jNMNaM2Z9sH9OIfDowTy4IC/EiKU= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1725278594; a=rsa-sha256; cv=none; b=IyzZaHBjb9H8QEDDiNj2yadf/aC80zNZeASkaZf4v/ZzIL0wtkRUq4OeW7Nx/cbr0aAPjl E2nECme1A5wSf9EzmUFbUMbfD6tBR0qS62sYzxL4g2xWqNTDLEkkPTlVoG4UcYom0oJjt+ B/aZ/9maw8OgiJGjmcOLDIyZMmpmW/8= ARC-Authentication-Results: i=1; imf07.hostedemail.com; dkim=none; dmarc=pass (policy=quarantine) header.from=csgroup.eu; spf=pass (imf07.hostedemail.com: domain of christophe.leroy@csgroup.eu designates 93.17.235.10 as permitted sender) smtp.mailfrom=christophe.leroy@csgroup.eu Received: from localhost (mailhub3.si.c-s.fr [172.26.127.67]) by localhost (Postfix) with ESMTP id 4Wy6rH5V0Vz9sSV; Mon, 2 Sep 2024 14:04:47 +0200 (CEST) X-Virus-Scanned: amavisd-new at c-s.fr Received: from pegase2.c-s.fr ([172.26.127.65]) by localhost (pegase2.c-s.fr [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id vJhtm8-Ff2cI; Mon, 2 Sep 2024 14:04:47 +0200 (CEST) Received: from messagerie.si.c-s.fr (messagerie.si.c-s.fr [192.168.25.192]) by pegase2.c-s.fr (Postfix) with ESMTP id 4Wy6rH4B4sz9sS7; Mon, 2 Sep 2024 14:04:47 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by messagerie.si.c-s.fr (Postfix) with ESMTP id 7580B8B76D; Mon, 2 Sep 2024 14:04:47 +0200 (CEST) X-Virus-Scanned: amavisd-new at c-s.fr Received: from messagerie.si.c-s.fr ([127.0.0.1]) by localhost (messagerie.si.c-s.fr [127.0.0.1]) (amavisd-new, port 10023) with ESMTP id qez3Etxhe6dG; Mon, 2 Sep 2024 14:04:47 +0200 (CEST) Received: from PO20335.idsi0.si.c-s.fr (unknown [192.168.234.167]) by messagerie.si.c-s.fr (Postfix) with ESMTP id 7D5DC8B763; Mon, 2 Sep 2024 14:04:46 +0200 (CEST) From: Christophe Leroy To: Andrew Morton , Steven Rostedt , Masami Hiramatsu , Mathieu Desnoyers , Michael Ellerman , Nicholas Piggin , Naveen N Rao , Nathan Chancellor , Nick Desaulniers , Bill Wendling , Justin Stitt , Shuah Khan , "Jason A . Donenfeld" Cc: Christophe Leroy , linux-kernel@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, linux-kselftest@vger.kernel.org, llvm@lists.linux.dev, linux-fsdevel@vger.kernel.org, linux-mm@kvack.org, linux-trace-kernel@vger.kernel.org, Adhemerval Zanella , Xi Ruoyao Subject: [PATCH v4 2/5] powerpc/vdso32: Add crtsavres Date: Mon, 2 Sep 2024 14:04:39 +0200 Message-ID: <68f022cd01d7fd215009256aed3d5f27ee925981.1725278148.git.christophe.leroy@csgroup.eu> X-Mailer: git-send-email 2.44.0 In-Reply-To: References: MIME-Version: 1.0 X-Developer-Signature: v=1; a=ed25519-sha256; t=1725278679; l=2796; i=christophe.leroy@csgroup.eu; s=20211009; h=from:subject:message-id; bh=utdv6V/SvZxVA50hOk7t/lkGWDvSE1q/kJYchx6i5SU=; b=s67OYlL5X7V2d40xn8vuyrgdm7ubwX4XDr1KdDfBPv85sGKEFLXISvI/Je/87m7MiEhlKbAnt u43Je4blYzoC6I3MfEBGUWZSCOQQ7mPA/fN0sx5faPAMgGQy9Vvob9k X-Developer-Key: i=christophe.leroy@csgroup.eu; a=ed25519; pk=HIzTzUj91asvincQGOFx6+ZF5AoUuP9GdOtQChs7Mm0= X-Rspamd-Server: rspam07 X-Rspamd-Queue-Id: 5E1EC40015 X-Stat-Signature: uorned6z94kwnb83d6pshgwybyrt7b7k X-Rspam-User: X-HE-Tag: 1725278698-971772 X-HE-Meta: U2FsdGVkX19DB2kFEjI9ElQM/0Y3SHK8KXYgeXExaTNg1jacoEx9Koqt57tLxYstf8MLU4o3V5s1iRIc5oOzO3tpugaxwM6fJffpoBW3KOsFDpm9GnuOkVTSubbzJR7lAKa8BDNnPn4a/4wloSJWEPAUdpDfVmMd3IA1LplrZmAGJ36bleKKSQDEeByNcq2AFPAhnS8rndCpun65fUTbxcybThZJnxreJR2qEyBsF6V2vAXSgFwKS60DodHqn+5kXFhI/y72eWmokWyPCpWyzHlk3aehRlet3R80TfjqEkmfx9VTlkP6tMF+osHWyE+x/kUYeH8gldwNUw68XlclnTy9zdT3oEZ20rgS+xMyxmNxu9zehIwQD9Pa5ll7b64LQHTCWG2J9VxGd8/zNakzH9FrKmaSTnQm9DGFp6Hx+/dP7tNp5V/lOfdTcy6htwFLG4g+Av31B83W5RCzRg/55gZZVQBfYbLpmAbBZrHS6oa0MVQGS9xtD9EA0vGfhYaPacaCnzGz5OErcX5LBuEidbT375i4eJXQ9T+4+tgBb/Kl/uCwE8uzbveiUtbqgVocwHTikZegoIw6ZRJXkfgyxTWXhGTME4oo229CDyUzTSLoG1qJFwzck+UHSyBGbd09jlDX3pQfE51u2TmTMkUUS2z1uBMSVY8/ju1dC/lUTfnv/jkY/1uxmrAdjIOWphsVYSjOHbHo/haa434cDeuMYtrrAs+GszPYQpRMiA4gWkxqj58MzrOKhp6x8XEulTbaDSHfNJkYJUtrT63/mjJV+8TYPzPjzkVCgiNEjdjAir3J/YgLRg6aA1UBuOO4yCLkXcfKuESHdl66hNzQoOquwnO0qyrZd1b+nyILiQUEfjhAs7NrHQF0SxmFFWT777EV78zPAOx3VBwC/wyjD2rkWqrub7C8pubfY/sZ29CrVeEdQQILuGu0jgSaV8u3bWTzjZsRergcX0SPGKWafRp w4VCh44K nYQ/V1CTUiI4rzp1BQdRmMBbJe/v2b7jGFu9hN5hIRvs1fIfeK/gSOnc/Die9J2cQqDW/+ety7Y6SZVc7ApNFmuqti8CD4wMxtwAE18FUmMf0mQ4wcf9Y5NLU/w9dizaBOdkX X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: Commit 08c18b63d965 ("powerpc/vdso32: Add missing _restgpr_31_x to fix build failure") added _restgpr_31_x to the vdso for gettimeofday, but the work on getrandom shows that we will need more of those functions. Remove _restgpr_31_x and link in crtsavres.o so that we get all save/restore functions when optimising the kernel for size. Signed-off-by: Christophe Leroy --- arch/powerpc/kernel/vdso/Makefile | 5 ++++- arch/powerpc/kernel/vdso/gettimeofday.S | 13 ------------- 2 files changed, 4 insertions(+), 14 deletions(-) diff --git a/arch/powerpc/kernel/vdso/Makefile b/arch/powerpc/kernel/vdso/Makefile index 1425b6edc66b..c07a425b8f78 100644 --- a/arch/powerpc/kernel/vdso/Makefile +++ b/arch/powerpc/kernel/vdso/Makefile @@ -43,6 +43,7 @@ else endif targets := $(obj-vdso32) vdso32.so.dbg vgettimeofday-32.o +targets += crtsavres-32.o obj-vdso32 := $(addprefix $(obj)/, $(obj-vdso32)) targets += $(obj-vdso64) vdso64.so.dbg vgettimeofday-64.o obj-vdso64 := $(addprefix $(obj)/, $(obj-vdso64)) @@ -68,7 +69,7 @@ targets += vdso64.lds CPPFLAGS_vdso64.lds += -P -C # link rule for the .so file, .lds has to be first -$(obj)/vdso32.so.dbg: $(obj)/vdso32.lds $(obj-vdso32) $(obj)/vgettimeofday-32.o FORCE +$(obj)/vdso32.so.dbg: $(obj)/vdso32.lds $(obj-vdso32) $(obj)/vgettimeofday-32.o $(obj)/crtsavres-32.o FORCE $(call if_changed,vdso32ld_and_check) $(obj)/vdso64.so.dbg: $(obj)/vdso64.lds $(obj-vdso64) $(obj)/vgettimeofday-64.o FORCE $(call if_changed,vdso64ld_and_check) @@ -76,6 +77,8 @@ $(obj)/vdso64.so.dbg: $(obj)/vdso64.lds $(obj-vdso64) $(obj)/vgettimeofday-64.o # assembly rules for the .S files $(obj-vdso32): %-32.o: %.S FORCE $(call if_changed_dep,vdso32as) +$(obj)/crtsavres-32.o: %-32.o: $(srctree)/arch/powerpc/lib/crtsavres.S FORCE + $(call if_changed_dep,vdso32as) $(obj)/vgettimeofday-32.o: %-32.o: %.c FORCE $(call if_changed_dep,vdso32cc) $(obj-vdso64): %-64.o: %.S FORCE diff --git a/arch/powerpc/kernel/vdso/gettimeofday.S b/arch/powerpc/kernel/vdso/gettimeofday.S index 48fc6658053a..67254ac9c8bb 100644 --- a/arch/powerpc/kernel/vdso/gettimeofday.S +++ b/arch/powerpc/kernel/vdso/gettimeofday.S @@ -118,16 +118,3 @@ V_FUNCTION_END(__kernel_clock_getres) V_FUNCTION_BEGIN(__kernel_time) cvdso_call __c_kernel_time call_time=1 V_FUNCTION_END(__kernel_time) - -/* Routines for restoring integer registers, called by the compiler. */ -/* Called with r11 pointing to the stack header word of the caller of the */ -/* function, just beyond the end of the integer restore area. */ -#ifndef __powerpc64__ -_GLOBAL(_restgpr_31_x) -_GLOBAL(_rest32gpr_31_x) - lwz r0,4(r11) - lwz r31,-4(r11) - mtlr r0 - mr r1,r11 - blr -#endif