From patchwork Fri Sep 6 08:33:43 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christophe Leroy X-Patchwork-Id: 1981704 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.ozlabs.org (client-ip=112.213.38.117; helo=lists.ozlabs.org; envelope-from=linuxppc-dev+bounces-1085-incoming=patchwork.ozlabs.org@lists.ozlabs.org; receiver=patchwork.ozlabs.org) Received: from lists.ozlabs.org (lists.ozlabs.org [112.213.38.117]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4X0TzK2jl5z1yh1 for ; Fri, 6 Sep 2024 18:34:04 +1000 (AEST) Received: from boromir.ozlabs.org (localhost [127.0.0.1]) by lists.ozlabs.org (Postfix) with ESMTP id 4X0TzF3YCcz301w; Fri, 6 Sep 2024 18:34:01 +1000 (AEST) X-Original-To: linuxppc-dev@lists.ozlabs.org Authentication-Results: lists.ozlabs.org; arc=none smtp.remote-ip=93.17.235.10 ARC-Seal: i=1; a=rsa-sha256; d=lists.ozlabs.org; s=201707; t=1725611641; cv=none; b=Nsx4YdwLEJejdxInXvFItn1H2VSUw3oU51XLPtNNpgO+cCDZw90Y28vaYR9LQylePc833gUBCK5z7+VCxW1vekmiOrMouKUmZft4ew8HqjoDK4sq8vqvaMmFR6Bfci+brv9BT9RZnc4/bgzT6GWUMvIbmZ7VMqRdpiU3Mxq/Mtz5T/G1+1iSUDdT4ag6UDZm7PNEr6zYELWF5mcwt2w2Fex5zHvNfDYX36CXcHe/o5bJJc0rLmH7lKN9dN7mk3MXsaop7A/qmyloz118ANwyZtarzZXXtT2iXx/OJMD0ZkgtPd/ll9r3bE0krEEbQBq+2VUNhTAkpeYeoPjTTvveyw== ARC-Message-Signature: i=1; a=rsa-sha256; d=lists.ozlabs.org; s=201707; t=1725611641; c=relaxed/relaxed; bh=QbvtDo7P2vNO9IUSXClLF5Rye7XXZsayZsV9CkwldlY=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=UlkTyBxgvhmAcpVHPKn9L4YTgsTfA0i5PkokdAyZd1XZxe5V5gUSWJjT0KgB28Llk98z4LfYdGB1bHzE73if1teq/WPU2P7plWk0FvfMG9iuQnep3hJZWSAZB1dd+fUqPiiAl96ooB1GKdu1Sugd/pQOkyvBe1fxO6JHL8RreHQ2xWVWKDfLh9v1tUzBgWqOZ0ltorueypIyXZu2rhuNojv3ZqiJE9hppRD+lIQAnEVLj/rZH3R/OH7pKLj81jJBkKN/sVkasSasKVsdnf7nuOAMFqA6Bdf6xPPb6MwVXrxloUNsPhmXONnTmFYsKelInh+SazuWsD8cmO1pb11Zog== ARC-Authentication-Results: i=1; lists.ozlabs.org; dmarc=pass (p=quarantine dis=none) header.from=csgroup.eu; spf=pass (client-ip=93.17.235.10; helo=pegase2.c-s.fr; envelope-from=christophe.leroy@csgroup.eu; receiver=lists.ozlabs.org) smtp.mailfrom=csgroup.eu Authentication-Results: lists.ozlabs.org; dmarc=pass (p=quarantine dis=none) header.from=csgroup.eu Authentication-Results: lists.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=csgroup.eu (client-ip=93.17.235.10; helo=pegase2.c-s.fr; envelope-from=christophe.leroy@csgroup.eu; receiver=lists.ozlabs.org) Received: from pegase2.c-s.fr (pegase2.c-s.fr [93.17.235.10]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 4X0TzF16xTz301n for ; Fri, 6 Sep 2024 18:34:00 +1000 (AEST) Received: from localhost (mailhub3.si.c-s.fr [172.26.127.67]) by localhost (Postfix) with ESMTP id 4X0Tz86SRrz9sRs; Fri, 6 Sep 2024 10:33:56 +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 LvZ6uifAMcER; Fri, 6 Sep 2024 10:33:56 +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 4X0Tz85Ztlz9sRr; Fri, 6 Sep 2024 10:33:56 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by messagerie.si.c-s.fr (Postfix) with ESMTP id ACDED8B77C; Fri, 6 Sep 2024 10:33:56 +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 ZD8DcvanrHnh; Fri, 6 Sep 2024 10:33:56 +0200 (CEST) Received: from PO20335.idsi0.si.c-s.fr (unknown [192.168.235.70]) by messagerie.si.c-s.fr (Postfix) with ESMTP id E92688B764; Fri, 6 Sep 2024 10:33:55 +0200 (CEST) From: Christophe Leroy To: "Jason A . Donenfeld" Cc: Christophe Leroy , linux-kernel@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, Michael Ellerman , Nicholas Piggin , Naveen N Rao , Vincenzo Frascino , Andrei Vagin Subject: [PATCH 1/2] powerpc/vdso: Fix VDSO data access when running in a non-root time namespace Date: Fri, 6 Sep 2024 10:33:43 +0200 Message-ID: <700dbf296d02e32376329774be35cfbead08041d.1725611321.git.christophe.leroy@csgroup.eu> X-Mailer: git-send-email 2.44.0 X-Mailing-List: linuxppc-dev@lists.ozlabs.org List-Id: List-Help: List-Post: List-Subscribe: , , List-Unsubscribe: MIME-Version: 1.0 X-Developer-Signature: v=1; a=ed25519-sha256; t=1725611624; l=3823; i=christophe.leroy@csgroup.eu; s=20211009; h=from:subject:message-id; bh=k9FuvOEmK/1gQYxA9EMdGLyTvjpxpy8oRJUJTi/fyuI=; b=nX3SmYIkJKIljITFXxDqbMnj5EJjUmmKYZfNZ9b9qaKQ+lctkvzNw/1Ss42lUZ48SFSTtdwZs EH3vr4+iyWCBtSGBkf7IpshNODLT7CY7pJ8qJa5FsxLxVwIxQt6MDwD X-Developer-Key: i=christophe.leroy@csgroup.eu; a=ed25519; pk=HIzTzUj91asvincQGOFx6+ZF5AoUuP9GdOtQChs7Mm0= When running in a non-root time namespace, the global VDSO data page is replaced by a dedicated namespace data page and the global data page is mapped next to it. Detailed explanations can be found at commit 660fd04f9317 ("lib/vdso: Prepare for time namespace support"). When it happens, __kernel_get_syscall_map and __kernel_get_tbfreq and __kernel_sync_dicache don't work anymore because they read 0 instead of the data they need. To address that, clock_mode has to be read. When it is set to VDSO_CLOCKMODE_TIMENS, it means it is a dedicated namespace data page and the global data is located on the following page. Add a macro called get_realdatapage which reads clock_mode and add PAGE_SIZE to the pointer provided by get_datapage macro when clock_mode is equal to VDSO_CLOCKMODE_TIMENS. Use this new macro instead of get_datapage macro except for time functions as they handle it internally. Fixes: 74205b3fc2ef ("powerpc/vdso: Add support for time namespaces") Signed-off-by: Christophe Leroy Acked-by: Michael Ellerman (powerpc) --- arch/powerpc/include/asm/vdso_datapage.h | 15 +++++++++++++++ arch/powerpc/kernel/asm-offsets.c | 2 ++ arch/powerpc/kernel/vdso/cacheflush.S | 2 +- arch/powerpc/kernel/vdso/datapage.S | 4 ++-- 4 files changed, 20 insertions(+), 3 deletions(-) diff --git a/arch/powerpc/include/asm/vdso_datapage.h b/arch/powerpc/include/asm/vdso_datapage.h index e17500c5237e..248dee138f7b 100644 --- a/arch/powerpc/include/asm/vdso_datapage.h +++ b/arch/powerpc/include/asm/vdso_datapage.h @@ -113,6 +113,21 @@ extern struct vdso_arch_data *vdso_data; addi \ptr, \ptr, (_vdso_datapage - 999b)@l .endm +#include +#include + +.macro get_realdatapage ptr scratch + get_datapage \ptr +#ifdef CONFIG_TIME_NS + lwz \scratch, VDSO_CLOCKMODE_OFFSET(\ptr) + xoris \scratch, \scratch, VDSO_CLOCKMODE_TIMENS@h + xori \scratch, \scratch, VDSO_CLOCKMODE_TIMENS@l + cntlzw \scratch, \scratch + rlwinm \scratch, \scratch, PAGE_SHIFT - 5, 1 << PAGE_SHIFT + add \ptr, \ptr, \scratch +#endif +.endm + #endif /* __ASSEMBLY__ */ #endif /* __KERNEL__ */ diff --git a/arch/powerpc/kernel/asm-offsets.c b/arch/powerpc/kernel/asm-offsets.c index eedb2e04c785..131a8cc10dbe 100644 --- a/arch/powerpc/kernel/asm-offsets.c +++ b/arch/powerpc/kernel/asm-offsets.c @@ -347,6 +347,8 @@ int main(void) #else OFFSET(CFG_SYSCALL_MAP32, vdso_arch_data, syscall_map); #endif + OFFSET(VDSO_CLOCKMODE_OFFSET, vdso_arch_data, data[0].clock_mode); + DEFINE(VDSO_CLOCKMODE_TIMENS, VDSO_CLOCKMODE_TIMENS); #ifdef CONFIG_BUG DEFINE(BUG_ENTRY_SIZE, sizeof(struct bug_entry)); diff --git a/arch/powerpc/kernel/vdso/cacheflush.S b/arch/powerpc/kernel/vdso/cacheflush.S index 0085ae464dac..3b2479bd2f9a 100644 --- a/arch/powerpc/kernel/vdso/cacheflush.S +++ b/arch/powerpc/kernel/vdso/cacheflush.S @@ -30,7 +30,7 @@ END_FTR_SECTION_IFSET(CPU_FTR_COHERENT_ICACHE) #ifdef CONFIG_PPC64 mflr r12 .cfi_register lr,r12 - get_datapage r10 + get_realdatapage r10, r11 mtlr r12 .cfi_restore lr #endif diff --git a/arch/powerpc/kernel/vdso/datapage.S b/arch/powerpc/kernel/vdso/datapage.S index db8e167f0166..2b19b6201a33 100644 --- a/arch/powerpc/kernel/vdso/datapage.S +++ b/arch/powerpc/kernel/vdso/datapage.S @@ -28,7 +28,7 @@ V_FUNCTION_BEGIN(__kernel_get_syscall_map) mflr r12 .cfi_register lr,r12 mr. r4,r3 - get_datapage r3 + get_realdatapage r3, r11 mtlr r12 #ifdef __powerpc64__ addi r3,r3,CFG_SYSCALL_MAP64 @@ -52,7 +52,7 @@ V_FUNCTION_BEGIN(__kernel_get_tbfreq) .cfi_startproc mflr r12 .cfi_register lr,r12 - get_datapage r3 + get_realdatapage r3, r11 #ifndef __powerpc64__ lwz r4,(CFG_TB_TICKS_PER_SEC + 4)(r3) #endif From patchwork Fri Sep 6 08:33:44 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christophe Leroy X-Patchwork-Id: 1981705 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.ozlabs.org (client-ip=2404:9400:2:0:216:3eff:fee1:b9f1; helo=lists.ozlabs.org; envelope-from=linuxppc-dev+bounces-1086-incoming=patchwork.ozlabs.org@lists.ozlabs.org; receiver=patchwork.ozlabs.org) Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2404:9400:2:0:216:3eff:fee1:b9f1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4X0TzN1WMBz1yh1 for ; Fri, 6 Sep 2024 18:34:08 +1000 (AEST) Received: from boromir.ozlabs.org (localhost [127.0.0.1]) by lists.ozlabs.org (Postfix) with ESMTP id 4X0TzK5wmcz3050; Fri, 6 Sep 2024 18:34:05 +1000 (AEST) X-Original-To: linuxppc-dev@lists.ozlabs.org Authentication-Results: lists.ozlabs.org; arc=none smtp.remote-ip=93.17.235.10 ARC-Seal: i=1; a=rsa-sha256; d=lists.ozlabs.org; s=201707; t=1725611645; cv=none; b=KfeYWAMk1uogMdZj7Q4qTes5rbqeITpry2H1IR/dlt5rcHwhrLELYH00vuIzxjmbQrilXYj4SzBxakQUWzn3yA0qCnGhmH1nqjMQVBBGQfyMvyOv1+9quibgCMk/AGhXCAgfp5dGjVdiOz8+0dtWnJA54FHrroI9x+ZEhrUnk5UpNwdTQS/4tP290pKACbPXOrw0g4RPWhbAHGJvERHsF4ZV1CpWan3ECxeyuoCxqGgGuYLd+cbQvOmtUFOGfjeaVP4nbzwlQ07yKTGL2lzbEWGd7LXIjR/Bq2dnMwynkwdkDqgbvtxLjMWDSb6JrGplQ6i5hTisoYInw5P2vZ/Y0w== ARC-Message-Signature: i=1; a=rsa-sha256; d=lists.ozlabs.org; s=201707; t=1725611645; c=relaxed/relaxed; bh=F0dByEMbBNrHYadE3BNWO/hL0v/BE4O2RShKCAAa2/w=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=TQqHdmBbVjb3y9GcZRAMgvbbqAx5PdZnxPCGW8UAfeOYC+efE4nDVRJnqyOz1iNIe3Gj05i6rzrky6CgrwZjE1voNRkbhnwlDFywjR4kW5Ke2TYKV9SQ+2eStEb4nwWd+/NK/5Jz873TTo4IKmXfvkjIFpvAknImJgXd+tKJwcEao8bPCr8r2hik3wZp18gM7mxQTgmDgxO6Y27hKNJEZRht+ENQpO3+7ZMu3ItZFojn/qrmLkoEbOhiPMrorIBYx23wF/sK2FP8DfgNwibP8DI7u2jPBixe2TB5xsD+vykH+2rCla+CjUNYFo5X4cwjx8H5WIQnkofp1ltLZNewCQ== ARC-Authentication-Results: i=1; lists.ozlabs.org; dmarc=pass (p=quarantine dis=none) header.from=csgroup.eu; spf=pass (client-ip=93.17.235.10; helo=pegase2.c-s.fr; envelope-from=christophe.leroy@csgroup.eu; receiver=lists.ozlabs.org) smtp.mailfrom=csgroup.eu Authentication-Results: lists.ozlabs.org; dmarc=pass (p=quarantine dis=none) header.from=csgroup.eu Authentication-Results: lists.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=csgroup.eu (client-ip=93.17.235.10; helo=pegase2.c-s.fr; envelope-from=christophe.leroy@csgroup.eu; receiver=lists.ozlabs.org) Received: from pegase2.c-s.fr (pegase2.c-s.fr [93.17.235.10]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 4X0TzK3bVHz301n for ; Fri, 6 Sep 2024 18:34:05 +1000 (AEST) Received: from localhost (mailhub3.si.c-s.fr [172.26.127.67]) by localhost (Postfix) with ESMTP id 4X0Tz94Jn1z9sRy; Fri, 6 Sep 2024 10:33:57 +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 TG1PLnKkNXF4; Fri, 6 Sep 2024 10:33:57 +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 4X0Tz93Vpdz9sRr; Fri, 6 Sep 2024 10:33:57 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by messagerie.si.c-s.fr (Postfix) with ESMTP id 699B78B764; Fri, 6 Sep 2024 10:33:57 +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 VLDe3sqJRDYo; Fri, 6 Sep 2024 10:33:57 +0200 (CEST) Received: from PO20335.idsi0.si.c-s.fr (unknown [192.168.235.70]) by messagerie.si.c-s.fr (Postfix) with ESMTP id A81EB8B778; Fri, 6 Sep 2024 10:33:56 +0200 (CEST) From: Christophe Leroy To: "Jason A . Donenfeld" Cc: Christophe Leroy , linux-kernel@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, Michael Ellerman , Nicholas Piggin , Naveen N Rao , Vincenzo Frascino , Andrei Vagin Subject: [PATCH 2/2] Fixup for 3279be36b671 ("powerpc/vdso: Wire up getrandom() vDSO implementation on VDSO32") Date: Fri, 6 Sep 2024 10:33:44 +0200 Message-ID: X-Mailer: git-send-email 2.44.0 In-Reply-To: <700dbf296d02e32376329774be35cfbead08041d.1725611321.git.christophe.leroy@csgroup.eu> References: <700dbf296d02e32376329774be35cfbead08041d.1725611321.git.christophe.leroy@csgroup.eu> X-Mailing-List: linuxppc-dev@lists.ozlabs.org List-Id: List-Help: List-Post: List-Subscribe: , , List-Unsubscribe: MIME-Version: 1.0 X-Developer-Signature: v=1; a=ed25519-sha256; t=1725611624; l=744; i=christophe.leroy@csgroup.eu; s=20211009; h=from:subject:message-id; bh=/x35oQvh5k9BBpuokbemChsJLjrttc1Fa44tLuwAFfM=; b=6AyXhA5x8UZSu669tkJkKDz05fAfvHARHPnGBuOcxmLsRUSQZjSVlBinNk/3LziSPIHodw8YT aqVJFistZ+yA8GVNsGzoeVOdDkyVE+7aaFPvHHqGvviH98kG7qziZXJ X-Developer-Key: i=christophe.leroy@csgroup.eu; a=ed25519; pk=HIzTzUj91asvincQGOFx6+ZF5AoUuP9GdOtQChs7Mm0= Use the new get_realdatapage macro instead of get_datapage Signed-off-by: Christophe Leroy --- arch/powerpc/kernel/vdso/getrandom.S | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/powerpc/kernel/vdso/getrandom.S b/arch/powerpc/kernel/vdso/getrandom.S index a957cd2b2b03..f3bbf931931c 100644 --- a/arch/powerpc/kernel/vdso/getrandom.S +++ b/arch/powerpc/kernel/vdso/getrandom.S @@ -31,7 +31,7 @@ PPC_STL r2, PPC_MIN_STKFRM + STK_GOT(r1) .cfi_rel_offset r2, PPC_MIN_STKFRM + STK_GOT #endif - get_datapage r8 + get_realdatapage r8, r11 addi r8, r8, VDSO_RNG_DATA_OFFSET bl CFUNC(DOTSYM(\funct)) PPC_LL r0, PPC_MIN_STKFRM + PPC_LR_STKOFF(r1)