From patchwork Fri Aug 30 15:57:06 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christophe Leroy X-Patchwork-Id: 13785298 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 E63B5CA1005 for ; Fri, 30 Aug 2024 15:57:31 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 7F4476B018A; Fri, 30 Aug 2024 11:57:31 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 7A4346B018B; Fri, 30 Aug 2024 11:57:31 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 644D46B018C; Fri, 30 Aug 2024 11:57:31 -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 454036B018A for ; Fri, 30 Aug 2024 11:57:31 -0400 (EDT) Received: from smtpin14.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id EBF921A1ADA for ; Fri, 30 Aug 2024 15:57:30 +0000 (UTC) X-FDA: 82509366660.14.1F7183D Received: from pegase2.c-s.fr (pegase2.c-s.fr [93.17.235.10]) by imf11.hostedemail.com (Postfix) with ESMTP id A126C40025 for ; Fri, 30 Aug 2024 15:57:28 +0000 (UTC) Authentication-Results: imf11.hostedemail.com; dkim=none; spf=pass (imf11.hostedemail.com: domain of christophe.leroy@csgroup.eu designates 93.17.235.10 as permitted sender) smtp.mailfrom=christophe.leroy@csgroup.eu; dmarc=pass (policy=quarantine) header.from=csgroup.eu ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1725033404; 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=bAaAJer/SOxoXeEjksg12mvdPyk2wcVeO7+mxAYZB9RQkoeKfxU4V/4H6lmzaDxCnWQbgL RjMwtkZqjzrxjxEkir2ygO2oaXihcRdVphcBdnv7WrMKiiiuxcbQMBZRXoElDS7rJNfxmL Rk15MicpcDJ69NwlRb9ZXGANhlHWghI= ARC-Authentication-Results: i=1; imf11.hostedemail.com; dkim=none; spf=pass (imf11.hostedemail.com: domain of christophe.leroy@csgroup.eu designates 93.17.235.10 as permitted sender) smtp.mailfrom=christophe.leroy@csgroup.eu; dmarc=pass (policy=quarantine) header.from=csgroup.eu ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1725033404; a=rsa-sha256; cv=none; b=PKMU74nSpzt344L0ZTGc7kNQu1B6Q2Lw6JrMHXrJg/zldWRuDJKcvuaZV6I6Tgm+F/FUrc lrYhKk53VCV16NPAxOkzMZyZbgzlqjkCHXZXdQYDD2S1yzppytdGxJ6LMBAh4EEnMatYMD HNbEiX2vawbm3uozPIGjOdAG/uTRHFc= Received: from localhost (mailhub3.si.c-s.fr [172.26.127.67]) by localhost (Postfix) with ESMTP id 4WwN7z3h8Qz9sSH; Fri, 30 Aug 2024 17:57:19 +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 HMgbftnZ8nbN; Fri, 30 Aug 2024 17:57:19 +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 4WwN7y61GNz9sS7; Fri, 30 Aug 2024 17:57:18 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by messagerie.si.c-s.fr (Postfix) with ESMTP id BA8D48B799; Fri, 30 Aug 2024 17:57:18 +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 Nr-gvXNmG0Cw; Fri, 30 Aug 2024 17:57:18 +0200 (CEST) Received: from PO20335.idsi0.si.c-s.fr (unknown [192.168.234.133]) by messagerie.si.c-s.fr (Postfix) with ESMTP id C44E88B764; Fri, 30 Aug 2024 17:57:17 +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 v3 2/5] powerpc/vdso32: Add crtsavres Date: Fri, 30 Aug 2024 17:57:06 +0200 Message-ID: <8ee8ae8dd7dcd565a46926f164d549b21fcb419c.1725031952.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=1725033425; l=2796; i=christophe.leroy@csgroup.eu; s=20211009; h=from:subject:message-id; bh=utdv6V/SvZxVA50hOk7t/lkGWDvSE1q/kJYchx6i5SU=; b=42jpAPflsOn3qVlMzH5/Gqfu25AjaEU/oJWoPfoeM5YZD4jpO4qqtwcz3emXwiSz6I53fTUGL itD2EsCfXO+CDXfDWiCxQ1kXwwjwpt5ONIwLyuzPLdu4/6bUeFIyJ3Z X-Developer-Key: i=christophe.leroy@csgroup.eu; a=ed25519; pk=HIzTzUj91asvincQGOFx6+ZF5AoUuP9GdOtQChs7Mm0= X-Rspamd-Server: rspam03 X-Rspam-User: X-Rspamd-Queue-Id: A126C40025 X-Stat-Signature: wybts7cwbwippi7e9b6d48trsj5mamgh X-HE-Tag: 1725033448-744870 X-HE-Meta: U2FsdGVkX18bKRYoi3ihHsgkMAI7EP00A0kowfnods/fmgMMiBEjIyWgxHRZg1d5CoValky6FppRiel5MZoIhd45irk5hbknQ0latK9hsA/8V9yfHuLZT9okILK8x5eBkFxH+Nqt1E1DV24PaKO2t7FlnSF2hWDdzU/nKPFCx4S+EdPnJzXiAoB5WNjQ+szHJ9lLiBbeZt/h9S4hS0I6OSE+dx/yEqVtmxCleQEi+CAnYXVTzFe2qoDjEW3H6zm8uRMt7Ulyog6iCTOcld0DfszTwfhpq4n/iXdfpS8yAun0xfZSmQquAVVdlKJZ3ONej3bAmRuSAdqC3ReUDeTFJH2Gsv0SuTFnQ18mKaJ21FirfnC4RdPuY09TCWoXoqLuAXfB1/J35tWhm7aaSG3xNhRlgyLqQ5bVmQkqFuxPWDqxzqXZiN0VRcnX1eBtCfa4oUx9Geueb4cNP/tCbH9TAhLK+jUvlsX9OOolJTYYToCLTxil7cvA3eNlUFuqh86anm1xzB9HcErxpv0XfDDsiVbWeIFXJFvX0DRCR8P548k36pYF5jF5bwrkl0CGwe3jooUM+mTNTjZ1eYfX00RU+3tCt4z6/DDVbmXf9oYKm/KonYGWNDt8H5HAOAOSeXyD0K7FSV/HJ54CTGJ5gxCwGpsU9A5Gt9t7TpHbK0s9PyrhBnLos9cNuRIWuSx0TRUFgFzfG5U+8a1PonH4SRTTsp3fnY6QjjUYctXfil8hfaWpNCmAatj9S5BkcaDz8AT2V1Rs/XBIdzwe9K7YQ2zbRB3G0UHkrw5qfJ48lscfB+amw+HR60zGERF1EG7tyUl72wj5CW94w8WoxFj9fu4Bz8iEu+RH5u9ZLBvbHOMaQT0GRI8xZLyZP5yK443fHWi7XGQZGzhNhxzRS/14erJ72o0dkZpbmxaZuXxhpfIunEiLH5aVSiG8beBvXCzRu5iOU8Yrc5ZMHsTrtxuvEZq cLcUA977 8onyrNfaPnxHCtQyyqtgtvK8Jl6ZArVMKEsEijL1HJlKf++Rb/UCeeJj7tMh0tVl0bESQXxAqknubOS16JNjHmT4o0R0xCeiIv3A/22b8XUwCuUYnpUafq0IqpVAF/gBYheIK 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