From patchwork Tue Jan 2 10:17:12 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xi Ruoyao X-Patchwork-Id: 13508944 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 AD733C46CD2 for ; Tue, 2 Jan 2024 10:17:48 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 18D956B0157; Tue, 2 Jan 2024 05:17:48 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 13E346B0158; Tue, 2 Jan 2024 05:17:48 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 004976B015B; Tue, 2 Jan 2024 05:17:47 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id E17886B0157 for ; Tue, 2 Jan 2024 05:17:47 -0500 (EST) Received: from smtpin06.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id A326212066A for ; Tue, 2 Jan 2024 10:17:47 +0000 (UTC) X-FDA: 81633969774.06.2B6FC11 Received: from xry111.site (xry111.site [89.208.246.23]) by imf11.hostedemail.com (Postfix) with ESMTP id F178C40025 for ; Tue, 2 Jan 2024 10:17:44 +0000 (UTC) Authentication-Results: imf11.hostedemail.com; dkim=pass header.d=xry111.site header.s=default header.b=BX985uIF; dmarc=pass (policy=reject) header.from=xry111.site; spf=pass (imf11.hostedemail.com: domain of xry111@xry111.site designates 89.208.246.23 as permitted sender) smtp.mailfrom=xry111@xry111.site ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1704190665; 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:references:dkim-signature; bh=9evvBPxCKojHJFJD1eXmZlK80bg2cINtJg4H+v8BObw=; b=tRIVBCsCPTFB5yxJT3Y+MWdIK8Ro26kG5wGFGoo+vQVWVie4VWLi0QczuA9D0b7tPTJkZA 4ovXoYmzxbDHZldll40KEeJJM+sVVv3JdTSH8ZUyA+FCNp7lQS6h9Hk9eQT0QzPY56eEVH cvvpa/81ACSrN0HdwWeH0HfOtQW9JbY= ARC-Authentication-Results: i=1; imf11.hostedemail.com; dkim=pass header.d=xry111.site header.s=default header.b=BX985uIF; dmarc=pass (policy=reject) header.from=xry111.site; spf=pass (imf11.hostedemail.com: domain of xry111@xry111.site designates 89.208.246.23 as permitted sender) smtp.mailfrom=xry111@xry111.site ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1704190665; a=rsa-sha256; cv=none; b=lEseivQant7P23ADTPFJ/5WAsaZhmI9D1CvWamcrV6Ziu/haQyIOd2tiU3HlEwmEG+4nkJ fNxoXzjKdGWmTqBwUS3q8v7UwZSCobxkqELeR9dPHQNTAa2brycBnvQ6g9aKGyByQms+cU lxkAtmOKSuCmPs79NBMhnG1/2s9osLA= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=xry111.site; s=default; t=1704190660; bh=uf8dTMlebu51EEyODmvtuTNr9cflN5DSEjldk9W9h34=; h=From:To:Cc:Subject:Date:From; b=BX985uIFo3e6UGkmqcICVT/dwtYlVpg8OS6/Uj5fCTXQdj6/pg88XQNip2xKm5YWx LZXtYyQv8zoZ2mxu3sylfE6XgsSp8FHlKcVbOr5MARlXKtE1LocLlArj9eS/hpdPkd 0q3n5fOgCe9CY47rMwF/khW6llIwjkfiU/PuVlkI= Received: from stargazer.. (unknown [IPv6:240e:358:11a9:2200:dc73:854d:832e:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (Client did not present a certificate) (Authenticated sender: xry111@xry111.site) by xry111.site (Postfix) with ESMTPSA id 79D4666BFB; Tue, 2 Jan 2024 05:17:35 -0500 (EST) From: Xi Ruoyao To: Huacai Chen , WANG Xuerui Cc: Eric Biederman , Kees Cook , Tiezhu Yang , Jinyang He , Jiaxun Yang , loongarch@lists.linux.dev, linux-mm@kvack.org, linux-kernel@vger.kernel.org, Xi Ruoyao , stable@vger.kernel.org Subject: [PATCH v2] LoongArch: Fix and simplify fcsr initialization on execve Date: Tue, 2 Jan 2024 18:17:12 +0800 Message-ID: <20240102101711.10872-2-xry111@xry111.site> X-Mailer: git-send-email 2.43.0 MIME-Version: 1.0 X-Rspamd-Queue-Id: F178C40025 X-Rspam-User: X-Rspamd-Server: rspam04 X-Stat-Signature: ristkmm4re4erbghmskxfjw4iqrgwcdt X-HE-Tag: 1704190664-721872 X-HE-Meta: U2FsdGVkX19i3J9WM4xMdXFmV+SmfCJJsNB+6oFSa/9elHaW+pBdyBQ6GQn32ie0LoIv6RlbbIqTe/A0GLReuRRq3NGGjieYAE1PeruFn+s3U8y2SCKrKgGvg4nQTalvx4EkHyrcdAuT9UWLKovLB+wX+YXXFHiqJAwa4scmXUlZHrP05yaP7sT8jzsBBjzJs3Hikt+Fppm12/RHKXGA9GFxoZUioP4cMInc1EZijElQ2/yEl+6fG+r10rbw8oypBJl7KhWJtXBCJIAiPyplnVrsOo+iOjA+aCntum4ZBGCRk39tUdbFRnlsKf39ddo66ZH9//KpT6FfCHurTmHUfDM1K0hmk7ox8qEVmIfcyo0r4j+QEU2ekC43Yf70sp1WJBZ19PLIdPprwSEHINE0/wldkjZ2PGeaWJb9EzN12fmDlA94SPV8Qy20aGOFIyGDlcwnmpNNcvL6qSGXzAP5bx90acM4z1EaTVao1N5rMbO39jm62xAWRfSZgRAqAnarGTcclfB0Qj7WT5hdLZXuhC/WxGFGRWQZ7JU1BAwl9cnOX+5V6MZwgsrIiXaOUESyKX/tbV9K4q28KyYsrqLn7ZmIb1MfHg8hy0eStyE+W8a6CMYJfPJXPw6BosGZqLW0Is6RGLkNAghI+5T0i0YRlsrh4zn1a5fAOcSMPq0W6fKPqS+xfMu9bMQPr5cXLGtNmyamROjNAeXpEjim71jKG6PP/4aL0y8QjEbBlnIi4gwACDR0TcyZ876Gj5YVS4sYV1umgGI+gGWmuU8ALA92aVxa3+KYWFdwxCkvsGC8BCGXEGZYXQIFs3etqIwdR2aS+Mlf3IQWkh1HB/TAF48YAEDHCMQcpPwoJNO0sBsRLW2NkVRJLUrmaGuIFvI/rYMsGUFzNulMUNQ5UqhC0VHSvF5o+q1Bhm7E7XSwEKM2Mo+yVBvX4omTOlSFCHRF7QsebCu5hv+AGi58mEjpb7v nUrWVfu+ IOqiKGB3QgVj8FQIFSryYCZ73Wt9Vlg08pur7EaHlldOK2UabzuxuCWU1RR0TrmuZVrRHKwrGq+sl6MWm1XwLZaIy3aL9oRA3Ujt/hPGIpdqQOybcMaq0uiOr2MHydocsnVUs2H80LHATQzskP+ZcP+lKEiMnd5rpAUTw38F7OMdp4KCnskF9Vrt1ifGcKfaT29JJYnNJiZ4OOeARaUPkE9+npKzu826B4lIrvRGM7/ppsk1DnWdtH5CynKMNwUSMZBz6xg55GUuQDdX43Q/LUWfd2ChKq0jasQUepfszDaqg9UuzCMcyiBy9zTtolIYWs7cDwE1y/N+fHAeVHL5cskwyvXP84aFYIil8qoVUWMr52D8= 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: There has been a lingering bug in LoongArch Linux systems causing some GCC tests to intermittently fail (see Closes link). I've made a minimal reproducer: zsh% cat measure.s .align 4 .globl _start _start: movfcsr2gr $a0, $fcsr0 bstrpick.w $a0, $a0, 16, 16 beqz $a0, .ok break 0 .ok: li.w $a7, 93 syscall 0 zsh% cc mesaure.s -o measure -nostdlib zsh% echo $((1.0/3)) 0.33333333333333331 zsh% while ./measure; do ; done This while loop should not stop as POSIX is clear that execve must set fenv to the default, where FCSR should be zero. But in fact it will just stop after running for a while (normally less than 30 seconds). Note that "$((1.0/3))" is needed to reproduce the issue because it raises FE_INVALID and makes fcsr0 non-zero. The problem is we are relying on SET_PERSONALITY2 to reset current->thread.fpu.fcsr. But SET_PERSONALITY2 is executed before start_thread which calls lose_fpu(0). We can see if kernel preempt is enabled, we may switch to another thread after SET_PERSONALITY2 but before lose_fpu(0). Then bad thing happens: during the thread switch the value of the fcsr0 register is stored into current->thread.fpu.fcsr, making it dirty again. The issue can be fixed by setting current->thread.fpu.fcsr after lose_fpu(0) because lose_fpu clears TIF_USEDFPU, then the thread switch won't touch current->thread.fpu.fcsr. The only other architecture setting FCSR in SET_PERSONALITY2 is MIPS. They do this for supporting different FP flavors (NaN encodings etc). which do not exist on LoongArch. I'm not sure how MIPS evades the issue (or maybe it's just buggy too) but I'll investigate it later. For LoongArch, just remove the current->thread.fpu.fcsr setting from SET_PERSONALITY2 and do it in start_thread, after lose_fpu(0). The while loop failing with the mainline kernel has survived one hour after this change. Closes: https://github.com/loongson-community/discussions/issues/7 Fixes: 803b0fc5c3f2 ("LoongArch: Add process management") Cc: stable@vger.kernel.org Signed-off-by: Xi Ruoyao --- v1 -> v2: - Still set current->thread.fpu.fcsr to boot_cpu_data.fpu_csr0 instead of constant 0. arch/loongarch/include/asm/elf.h | 5 ----- arch/loongarch/kernel/elf.c | 5 ----- arch/loongarch/kernel/process.c | 1 + 3 files changed, 1 insertion(+), 10 deletions(-) diff --git a/arch/loongarch/include/asm/elf.h b/arch/loongarch/include/asm/elf.h index 9b16a3b8e706..f16bd42456e4 100644 --- a/arch/loongarch/include/asm/elf.h +++ b/arch/loongarch/include/asm/elf.h @@ -241,8 +241,6 @@ void loongarch_dump_regs64(u64 *uregs, const struct pt_regs *regs); do { \ current->thread.vdso = &vdso_info; \ \ - loongarch_set_personality_fcsr(state); \ - \ if (personality(current->personality) != PER_LINUX) \ set_personality(PER_LINUX); \ } while (0) @@ -259,7 +257,6 @@ do { \ clear_thread_flag(TIF_32BIT_ADDR); \ \ current->thread.vdso = &vdso_info; \ - loongarch_set_personality_fcsr(state); \ \ p = personality(current->personality); \ if (p != PER_LINUX32 && p != PER_LINUX) \ @@ -340,6 +337,4 @@ extern int arch_elf_pt_proc(void *ehdr, void *phdr, struct file *elf, extern int arch_check_elf(void *ehdr, bool has_interpreter, void *interp_ehdr, struct arch_elf_state *state); -extern void loongarch_set_personality_fcsr(struct arch_elf_state *state); - #endif /* _ASM_ELF_H */ diff --git a/arch/loongarch/kernel/elf.c b/arch/loongarch/kernel/elf.c index 183e94fc9c69..0fa81ced28dc 100644 --- a/arch/loongarch/kernel/elf.c +++ b/arch/loongarch/kernel/elf.c @@ -23,8 +23,3 @@ int arch_check_elf(void *_ehdr, bool has_interpreter, void *_interp_ehdr, { return 0; } - -void loongarch_set_personality_fcsr(struct arch_elf_state *state) -{ - current->thread.fpu.fcsr = boot_cpu_data.fpu_csr0; -} diff --git a/arch/loongarch/kernel/process.c b/arch/loongarch/kernel/process.c index 767d94cce0de..3f9cae615f52 100644 --- a/arch/loongarch/kernel/process.c +++ b/arch/loongarch/kernel/process.c @@ -92,6 +92,7 @@ void start_thread(struct pt_regs *regs, unsigned long pc, unsigned long sp) clear_used_math(); regs->csr_era = pc; regs->regs[3] = sp; + current->thread.fpu.fcsr = boot_cpu_data.fpu_csr0; } void flush_thread(void)