From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (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 C435833B975 for ; Tue, 2 Jun 2026 08:46:54 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780390015; cv=none; b=L9nJR3Uku2oB3M2SNeVVaCJqoMDBvzAMfzZL5CbQs6yUaKuBMj6KSYeUj2ZVIJA8HqKnAswSPpFU9X40+jv6eruzvXbGxA8/0LkmT0NnyE8Ujf4aW1bT6xJwWyO/OmqRP9Q+BuzY6Ci1ng0BF7ezbMmV58jEytu9SKlDgUFDS4I= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780390015; c=relaxed/simple; bh=nyPy/c43MhBW1KA2zDfA5Z3s1fWNtAUmFemUa0E/v/E=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=bOfzAkyI5A9Y+ad0mariF4Y53eGCId6eAjLSXwZbNLksHCf30yASfu1sEPjv0xExVdVhO3fqkUHxzshXPHo2rSKwCZ623wdlgq/5A/IHwbWfpAjkaLhFzTona2IGpWoiZBwXdrpW+25fLfxVd1dnwB5DHlLJDN/IkUpKNLKoUes= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=af5nuutZ; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="af5nuutZ" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 8AFD31F00893; Tue, 2 Jun 2026 08:46:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1780390014; bh=wEIia4owzoHXAM5Q1QiHWFkRbAEC+rQaMKj1YQisyR8=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=af5nuutZ4ehhaAE98FT7ZzpFCifrcNB2J+b8i1fQyxybDE/z69S96sBtjBGsmrgMs 4lRukFZtE4/cVPtyzUaLy1fk6w295u6zDYruGwsYuAg7uWumov334Su1qSSxNG62dr M/OdrfCkQHyQl/VBi0B5S9fZunQfeaRjTP2E/2tuomxcHDCXy+wwqciEIxnyZkdEX7 wS+nq/0B4WzZfZsJo/kH1/ZfU8CPIIfEqXa7yQIbT9FyiBwm3Yq1DwFGCnnjdyd7xR VV8rGHNBe0N2DioKLSFvoTJGnFPO34D9C4pZl4CWXG/pUh6AdpSgv8MP0mRbDjUdj1 VoGTTbsMd9M1w== From: "Christophe Leroy (CS GROUP)" To: Michael Ellerman , Nicholas Piggin , Madhavan Srinivasan Cc: "Christophe Leroy (CS GROUP)" , linux-kernel@vger.kernel.org, linuxppc-dev@lists.ozlabs.org Subject: [PATCH v2 2/8] powerpc/signal64: Untangle setup_tm_sigcontexts() and user_access_begin() Date: Tue, 2 Jun 2026 10:46:31 +0200 Message-ID: <3273e04aedba47f9196edf3ef59f38e7ceaabdb9.1780389863.git.chleroy@kernel.org> X-Mailer: git-send-email 2.54.0 In-Reply-To: References: Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=2951; i=chleroy@kernel.org; h=from:subject:message-id; bh=nyPy/c43MhBW1KA2zDfA5Z3s1fWNtAUmFemUa0E/v/E=; b=owGbwMvMwCV2d0KB2p7V54MZT6slMWTJzciduenz0qyvoUkSBy+LNr4S468MOK59PfWwzLRZo lP2zV6S0lHKwiDGxSArpshy/D/3rhldX1Lzp+7Sh5nDygQyhIGLUwAm8n8Jw/9io9TzL3V2cihY KafVvmjK11mc0ma2O+PmuYvfX2yJ+K/KyPD2lf7u5ih1vb8PPjXOvJz3o/jTPu1TtwvTE67zmzA p17IBAA== X-Developer-Key: i=chleroy@kernel.org; a=openpgp; fpr=10FFE6F8B390DE17ACC2632368A92FEB01B8DD78 Content-Transfer-Encoding: 8bit Call setup_tm_sigcontexts() before opening user access to avoid having to close and open again. Signed-off-by: Christophe Leroy (CS GROUP) --- v2: Add a stub setup_tm_sigcontexts() for when CONFIG_PPC_TRANSACTIONAL_MEM is not set --- arch/powerpc/kernel/signal_64.c | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/arch/powerpc/kernel/signal_64.c b/arch/powerpc/kernel/signal_64.c index 86bb5bb4c143..9b4cd0bbf4a7 100644 --- a/arch/powerpc/kernel/signal_64.c +++ b/arch/powerpc/kernel/signal_64.c @@ -203,8 +203,7 @@ static long notrace __unsafe_setup_sigcontext(struct sigcontext __user *sc, * examine the transactional registers in the 2nd sigcontext to determine the * real origin of the signal. */ -static long setup_tm_sigcontexts(struct sigcontext __user *sc, - struct sigcontext __user *tm_sc, +static long setup_tm_sigcontexts(struct rt_sigframe __user *frame, struct task_struct *tsk, int signr, sigset_t *set, unsigned long handler, unsigned long msr) @@ -217,6 +216,8 @@ static long setup_tm_sigcontexts(struct sigcontext __user *sc, * Userland shall check AT_HWCAP to know wether it can rely on the * v_regs pointer or not. */ + struct sigcontext __user *sc = &frame->uc.uc_mcontext; + struct sigcontext __user *tm_sc = &frame->uc_transact.uc_mcontext; #ifdef CONFIG_ALTIVEC elf_vrreg_t __user *v_regs = sigcontext_vmx_regs(sc); elf_vrreg_t __user *tm_v_regs = sigcontext_vmx_regs(tm_sc); @@ -325,6 +326,15 @@ static long setup_tm_sigcontexts(struct sigcontext __user *sc, return err; } +#else +static long setup_tm_sigcontexts(struct rt_sigframe __user *frame, + struct task_struct *tsk, + int signr, sigset_t *set, unsigned long handler, + unsigned long msr) +{ + BUILD_BUG(); + return -EINVAL; +} #endif /* @@ -872,6 +882,9 @@ int handle_rt_signal64(struct ksignal *ksig, sigset_t *set, */ if (!MSR_TM_ACTIVE(msr)) prepare_setup_sigcontext(tsk); + else + err |= setup_tm_sigcontexts(frame, tsk, ksig->sig, NULL, + (unsigned long)ksig->ka.sa.sa_handler, msr); if (!user_write_access_begin(frame, sizeof(*frame))) goto badframe; @@ -889,19 +902,6 @@ int handle_rt_signal64(struct ksignal *ksig, sigset_t *set, * ucontext_t (for transactional state) with its uc_link ptr. */ unsafe_put_user(&frame->uc_transact, &frame->uc.uc_link, badframe_block); - - user_write_access_end(); - - err |= setup_tm_sigcontexts(&frame->uc.uc_mcontext, - &frame->uc_transact.uc_mcontext, - tsk, ksig->sig, NULL, - (unsigned long)ksig->ka.sa.sa_handler, - msr); - - if (!user_write_access_begin(&frame->uc.uc_sigmask, - sizeof(frame->uc.uc_sigmask))) - goto badframe; - #endif } else { unsafe_put_user(0, &frame->uc.uc_link, badframe_block); -- 2.54.0