From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 6DE8F15FCF2; Mon, 27 May 2024 19:00:19 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1716836419; cv=none; b=jKga8H8Kh2ITUbpxu74TvBLbEbzRBwmcKCOOseFEWwvZmCqgRVNDFVo9Xc28G8VpuI2pqbW0n1IISsMeXKN6ndP5kXwNrCPGpIzHVXLxjKp58ARBlMeib0qna1sOdbXu+Kw/xRC8clPYz3+cdkLzC5RPAEz/yicSM9vlZNjlqbs= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1716836419; c=relaxed/simple; bh=NpLR1xGBq3C0C3Tfmtj6D7XCHm2csqZL9/aLid3PlBc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Dt+SE0df24XezHOSw3PvNfzMbHQXug0/v0YSWicmDTpTrl9u81MjnuuLW9joFITN5omyZ9eQ62pk7ChNofxA9XDtYkTG3Sze+RyYuR3yNIXLmYh2lKOc/q8k6oUOuAtQZlxvzQwVvdfeaq7fAsurhS+kf9xpyqNcFdh/YKhgdzo= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=eS6K1hBw; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="eS6K1hBw" Received: by smtp.kernel.org (Postfix) with ESMTPSA id A35F3C2BBFC; Mon, 27 May 2024 19:00:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1716836419; bh=NpLR1xGBq3C0C3Tfmtj6D7XCHm2csqZL9/aLid3PlBc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=eS6K1hBw7Tqn+wRNrJHJq81GLPt1q2UBBvuy6H021z0UE6JVX3L0gCYCLs9Hl2Z+Q o5JddwlCNcToh+QTXIpRJq8JgsxYFV9yuh3SJGRvYqq58qX26ZRGukimoj0mDjTCwc or34Vt3e+LD4Hr42fhARaUflDKtDzKdv7aWHfdCw= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Johannes Nixdorf , Will Deacon Subject: [PATCH 6.9 005/427] Revert "arm64: fpsimd: Implement lazy restore for kernel mode FPSIMD" Date: Mon, 27 May 2024 20:50:52 +0200 Message-ID: <20240527185602.272329157@linuxfoundation.org> X-Mailer: git-send-email 2.45.1 In-Reply-To: <20240527185601.713589927@linuxfoundation.org> References: <20240527185601.713589927@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.9-stable review patch. If anyone has any objections, please let me know. ------------------ From: Will Deacon commit b8995a18417088bb53f87c49d200ec72a9dd4ec1 upstream. This reverts commit 2632e25217696712681dd1f3ecc0d71624ea3b23. Johannes (and others) report data corruption with dm-crypt on Apple M1 which has been bisected to this change. Revert the offending commit while we figure out what's going on. Cc: stable@vger.kernel.org Reported-by: Johannes Nixdorf Link: https://lore.kernel.org/all/D1B7GPIR9K1E.5JFV37G0YTIF@shadowice.org/ Signed-off-by: Will Deacon Signed-off-by: Greg Kroah-Hartman --- arch/arm64/include/asm/processor.h | 1 - arch/arm64/kernel/fpsimd.c | 18 ------------------ 2 files changed, 19 deletions(-) --- a/arch/arm64/include/asm/processor.h +++ b/arch/arm64/include/asm/processor.h @@ -171,7 +171,6 @@ struct thread_struct { struct debug_info debug; /* debugging */ struct user_fpsimd_state kernel_fpsimd_state; - unsigned int kernel_fpsimd_cpu; #ifdef CONFIG_ARM64_PTR_AUTH struct ptrauth_keys_user keys_user; #ifdef CONFIG_ARM64_PTR_AUTH_KERNEL --- a/arch/arm64/kernel/fpsimd.c +++ b/arch/arm64/kernel/fpsimd.c @@ -1509,30 +1509,12 @@ void do_fpsimd_exc(unsigned long esr, st static void fpsimd_load_kernel_state(struct task_struct *task) { - struct cpu_fp_state *last = this_cpu_ptr(&fpsimd_last_state); - - /* - * Elide the load if this CPU holds the most recent kernel mode - * FPSIMD context of the current task. - */ - if (last->st == &task->thread.kernel_fpsimd_state && - task->thread.kernel_fpsimd_cpu == smp_processor_id()) - return; - fpsimd_load_state(&task->thread.kernel_fpsimd_state); } static void fpsimd_save_kernel_state(struct task_struct *task) { - struct cpu_fp_state cpu_fp_state = { - .st = &task->thread.kernel_fpsimd_state, - .to_save = FP_STATE_FPSIMD, - }; - fpsimd_save_state(&task->thread.kernel_fpsimd_state); - fpsimd_bind_state_to_cpu(&cpu_fp_state); - - task->thread.kernel_fpsimd_cpu = smp_processor_id(); } void fpsimd_thread_switch(struct task_struct *next)