From patchwork Mon Jan 1 17:21:44 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xi Ruoyao X-Patchwork-Id: 13508664 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 5D029C4706F for ; Mon, 1 Jan 2024 17:22:54 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 71E106B0275; Mon, 1 Jan 2024 12:22:53 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 6D01A6B0276; Mon, 1 Jan 2024 12:22:53 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 5BD526B0277; Mon, 1 Jan 2024 12:22:53 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id 4A4586B0275 for ; Mon, 1 Jan 2024 12:22:53 -0500 (EST) Received: from smtpin04.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id 209A5A1932 for ; Mon, 1 Jan 2024 17:22:53 +0000 (UTC) X-FDA: 81631412226.04.8D4FE7C Received: from xry111.site (xry111.site [89.208.246.23]) by imf15.hostedemail.com (Postfix) with ESMTP id 65CA6A0013 for ; Mon, 1 Jan 2024 17:22:51 +0000 (UTC) Authentication-Results: imf15.hostedemail.com; dkim=pass header.d=xry111.site header.s=default header.b=DyQU46Wl; dmarc=pass (policy=reject) header.from=xry111.site; spf=pass (imf15.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=1704129771; 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=HWkfPtmeKIwinoUYqjaH8/01M1EBAwuxmKHI9r6fzNk=; b=wCq4Hfjzr5Ob0QDMrtQ2kN9Wxp2ekWf8tzHMUHx+LCYxDCBzb1UPHtvBRNw2rDgywewWWk SA6zdwPTm2ZCNjBambaICsPRTI7gIG2Kd4KE7wj70w0foT1Zu1gVAxkHCmM8svRhN4YjCK c6HWjexbZ6pU3pnIC2XDHS6HraRCqlc= ARC-Authentication-Results: i=1; imf15.hostedemail.com; dkim=pass header.d=xry111.site header.s=default header.b=DyQU46Wl; dmarc=pass (policy=reject) header.from=xry111.site; spf=pass (imf15.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=1704129771; a=rsa-sha256; cv=none; b=CUi+UULfK052LZTsgOv9qbNZDX1zxV86mt4FxFo5fpkxD/adpkqzOzg0YX40kNim+W8L/B uH948v7F2zyMbQwk2mr0x8IhiyZ/gaYYKckickpBFHtOU/QZ5OJJdPJmm8g13QTvKXE7Qm LM+3Zi3u4u8iAV63x0UvAhYooOHZZB0= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=xry111.site; s=default; t=1704129763; bh=kOVhB8eAhMECnpseuk0bXmRz3MVKmBv7ePdWReB+bcU=; h=From:To:Cc:Subject:Date:From; b=DyQU46WlQcXzDRfGJtks7zcVhy3iJMOOA7Bgez0O+zKuP3IIc2sOO2lu0ZBZb90rM CLkX1SoLUCvMlaIQ5RwaXWgvZXYCayzuCokSGZW2zXX2lk6chlYbWNNcolav/EqFWK 2F6OVaVK7+YgUrO7jOatoTY7qu1kjlsjcFAaFoKw= 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 270FA66C94; Mon, 1 Jan 2024 12:22:34 -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] LoongArch: Fix and simplify fcsr initialization on execve Date: Tue, 2 Jan 2024 01:21:44 +0800 Message-ID: <20240101172143.14530-2-xry111@xry111.site> X-Mailer: git-send-email 2.43.0 MIME-Version: 1.0 X-Rspamd-Queue-Id: 65CA6A0013 X-Rspam-User: X-Rspamd-Server: rspam02 X-Stat-Signature: tnkkdqm4kcg41inxkyhaerxksg9164dm X-HE-Tag: 1704129771-957992 X-HE-Meta: U2FsdGVkX19y3h+4lNjOhL4v3SA4b4eWlyKCWHycdFJRFgTNQj+u9R9y7xU1RTbNAgYBp1yKQIy0uwqU3wPcutXCbJD611mGPG9xHGI/jVSq2RBP/qGvyLrcUVB/yblOdksuwQ2zIdvwZ9JcFXKVb8AnxNITRnyXIA1Hy5e0QaHvdGgJnsvfLFBgVTFabrjNInLDDX+7H9tYIQETGw39MyN94azTBeOnni7KFnmffsOOETLi55chOfML2OZCQH4n8Os5tN5KouzWTDloG2R6HTYSJky9aNGPUJKUYx1DXH0J0caRzitQq4s3N8Z1hPongeTQizR1hAjcVLHTntv40ZshxEzNb5E2uDuCA3JFRzqIGcr8XEFEzVUPH/+YPSsViWYuMqcm1sHZ7LXkTLoRh4h7KG4FxJa0pbKzle+rGKuoC+AkqJLURsuq33eOsEuIlmAmbpKXAA/5NfCOU/2T7sq2UOCFFutKewYs6IYhTV+RuEO6Wg249UyerzTBm0GADVMtr0eAgTs2rUTKQHtZVRmg8SNaWkOEyXcFfw/K+hmFZSZkaHL5omoIsHM2Mipx0/FZgZeue/h4T3hezdl6aufD8N6MbW2umYPVCCbbTxT7t+/vAAXkHWh6+vs5ASuAFroa2e1x41Uc/hpedbBNsTC1rN5rGBXuv90ZOBzFMvuujlF9gH2oQj5R8Q/ArajzICTnoXRyEWRdF+2BwN5JRPp8Q7Uq/vWr3iJCGc3UQHena78RRkblUpDt5RMaqsAAC1qzj+DGpcxUmEIIVBDBYFBZ2HzHmWCbGL3V5Xoi7hwMivZP2dUt6K49V4qDahHGJ8cPG4+CCH+fOD+9+EYfLvbqzjH+I/RoDS+HHaMF3FHufR8MYdhOuTHo/0IFihEtpxkIcLpZlB6xL4/e6h7Y4631FIclriVmqqkbpQFis3VfUQ9gFNHPTKIC7jBMgk06nf94CgKGJT1y+Onn0wQ Azg1TyCS ksbqn5N+AzI0fZr55XVi8KbIeL0cYeqgS5I89jyCasvtW1iu1gcSVEaiCJM3V7rNelDfR0TlkuIkZ5IhslDDgHkX4XPNN3Ow3knwMGGKrzP2qsF+QIiQrd+DzmBjVpMjDZt8Bl7tCWyLZAkti4WsznWf6dJN176eeW3nKrDUJZjkeBhUGjz+YPiz71lGVGbDWpL7UG8cEJxjINnOchXpnoBIYriQJSpH8ggo7WfXlFWziFsSp/maWofDY1t9ikxkRDzSgxxEal4H6CVPuuVnkLtghMgIoJcsqRC/uALaBvbct52dsvJES8MZQPOC6mEKm3ZnU3vaMbgJiy2EQmsdAT/FHekjFK+9SQno9T5fMQXtlI3Y= 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) as I don't have a running MIPS hardware now. So for LoongArch, just remove the current->thread.fpu.fcsr setting from SET_PERSONALITY2 and do it in start_thread, after lose_fpu(0). And we just set it to 0, instead of boot_cpu_data.fpu_csr0 (because we should provide the userspace a consistent configuration, no matter how hardware and firmware behave). 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 --- 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..caed58770650 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 = 0; } void flush_thread(void)