From nobody Mon Feb 9 17:56:50 2026 Received: from mail-pl1-f169.google.com (mail-pl1-f169.google.com [209.85.214.169]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 93C7513D531 for ; Wed, 29 Jan 2025 13:22:04 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.169 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738156926; cv=none; b=YXVEaopjURqiVg3vz+hnocvZGEZptDoLgJWgfN99poaUqPxNBK7ik/kM/gPj8zXoa9IAyolzQSyup4T8y2vw1STVRsXrNh0gXJfmf/7QIOTwUR1cnJTX1PiLWqWOCqVtzxJaopMS0Jye7tD0iqz7zyMOzQHzkqvjOSusQL+hexU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738156926; c=relaxed/simple; bh=q/8TWQWSC4tAwg+2bGc2o8/xGn4lpq0YIo6w8R998KU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Ro+jHjPD2FsbQSAayNslC2KkkJ26AwJ2m1v7ZnNgdThpYKl+xSicaMHTHIFzxlK4XjsHWharZe3XM/AdbAnMHgAC+JmWPIahixDFDPmeDh1lGJrgCBcJdZheBjvE0AT4xAHxTNM2A6o0I+UmsyyhnHC2Oj1ARYuSUrXj+Qd+I0M= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=i1a1eNen; arc=none smtp.client-ip=209.85.214.169 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="i1a1eNen" Received: by mail-pl1-f169.google.com with SMTP id d9443c01a7336-21636268e43so3572935ad.2 for ; Wed, 29 Jan 2025 05:22:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1738156924; x=1738761724; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=9kq5jxbhmUEoZM+kdlwoh7uFTPoMD9RcTIy1F/a5B80=; b=i1a1eNenCN2tWeBwwJCrjKbqdVIr6BcD//z+OeP2P6mvWz98o9bGYR6FBZuR+OyyUV khHMRJhx0aczq4PtE7c0d94ghUIhWfcsiPZICX9AX1ONpr9fXTmZSsyLfdg6SJFGoE5p aIibGEn812VgjY4rLobqDTtv2ljXPAHpIvs890Nkx8guvDrw9fcajHsVWWcU+kIjY5j8 0n21ByQ05HZT6d6dfzlPj7Dtp8tx7KTDekre3+9QG92CQoGRiajpDZxg644pq5IJ4hm2 9vnZ0i0YXicx/rnjhPplJ8azz/G+oQnlZaAIBNLyo6dn5J9PBGN84Lsm9cEy5YWlILtR EHUA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1738156924; x=1738761724; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=9kq5jxbhmUEoZM+kdlwoh7uFTPoMD9RcTIy1F/a5B80=; b=c4Kua3DlNvB+aKJ/M9pYFg1DLzFBTm9aAzSKn6DfjVdnfvxKRz64lUPyztj2wpClyq zFnaaF+1gQ3KvW/92w0Ftp0dCjmoTPb31+W1+RVa3n5Degve0kbKypjUMqYBhrzsrB7R X1xZ5g9UPCfnzce5Teno8VFgj8TIMa2Qc4X9PABipTvRR/VK8Up6SLiJnqlq0FWUS9Nu eOPNWR9J19Enh179VDVskMFi56carLe/PP/R0cMcz1R/xBfAUAClINSs1DLngp/6V0yR IU+yTi66gQMMVgIMlKDJBx/unDjtP+jfSqLQdplQZtb7tJH9uJn/BhH69wi2vWhIdUOV MKyA== X-Forwarded-Encrypted: i=1; AJvYcCVKbplAiOJep6FXhilPalfVfo+pEboFKIm04TsQD73dExY8903+sFNe1FPL3tXzodISl4KH9AdpnHKejs0=@vger.kernel.org X-Gm-Message-State: AOJu0YxKi7icZahTEeynNVv2q9C82NENxCU2ZjU7tb48SvCAx2YbFGMS BQILsb2MdHkM54bCj6Db5NNFCbrTlmoj61nMsJtZEWgwHtKMrKv1 X-Gm-Gg: ASbGncsAVj1Cj/v4rSr4uNFMPmE71ubDkskSREj8ANY5/XDnc2MMNFoJ/uoi366MrJb XtQ2wGb0onenJEp5z9YytvGY0d/cdfwQ66hcMhv+7hOdb3T68f1ko2EhJQu5+5kAqDb2Tbi9m7n 8mxzTbkB4y9+DybDdDwwBXk/8Xk2TscD4io+B1zXgklJEcT0RcrqT0/EH3dj+iexxSaVh83Zq4G sSX7XRszqrmHaywILfYNLu28tfNlIVe7zwYV8mkcug6bvCSrsx/rubgjiBZi08twbBcjYOOGmRK OKlkPofNmLTOhv3R3MRj/wLcV41n/c6sGEuXA/LX0VCczRHDzA== X-Google-Smtp-Source: AGHT+IEMR52YA8PcQua1hXYBKyOqDnOqJ1npRwUwIgFGGYZDAegRBOM92ReT/AGrlAqHY7XUAu3Pjg== X-Received: by 2002:a17:902:f644:b0:216:2477:e4d3 with SMTP id d9443c01a7336-21dd7df6ad3mr47961825ad.51.1738156923656; Wed, 29 Jan 2025 05:22:03 -0800 (PST) Received: from wheely.local0.net (124-169-212-233.tpgi.com.au. [124.169.212.233]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-21da414131esm98984085ad.157.2025.01.29.05.21.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 29 Jan 2025 05:22:03 -0800 (PST) From: Nicholas Piggin To: "Dmitry V. Levin" Cc: Nicholas Piggin , Oleg Nesterov , Eugene Syromyatnikov , Mike Frysinger , Renzo Davoli , Davide Berardi , strace-devel@lists.strace.io, Madhavan Srinivasan , Christophe Leroy , linuxppc-dev@lists.ozlabs.org, linux-kernel@vger.kernel.org Subject: [RFC PATCH 1/2] powerpc/signal: Clean up pt_regs access Date: Wed, 29 Jan 2025 23:21:42 +1000 Message-ID: <20250129132148.301937-2-npiggin@gmail.com> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250129132148.301937-1-npiggin@gmail.com> References: <20250129132148.301937-1-npiggin@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" There are places in signal code that are made more readable by using a 'regs' local variable instead of finding it from the task. Signed-off-by: Nicholas Piggin --- arch/powerpc/kernel/signal.c | 11 ++++++----- arch/powerpc/kernel/signal_64.c | 5 +++-- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/arch/powerpc/kernel/signal.c b/arch/powerpc/kernel/signal.c index aa17e62f3754..193211b04805 100644 --- a/arch/powerpc/kernel/signal.c +++ b/arch/powerpc/kernel/signal.c @@ -242,6 +242,7 @@ static void check_syscall_restart(struct pt_regs *regs,= struct k_sigaction *ka, =20 static void do_signal(struct task_struct *tsk) { + struct pt_regs *regs =3D tsk->thread.regs; sigset_t *oldset =3D sigmask_to_save(); struct ksignal ksig =3D { .sig =3D 0 }; int ret; @@ -251,12 +252,12 @@ static void do_signal(struct task_struct *tsk) get_signal(&ksig); =20 /* Is there any syscall restart business here ? */ - check_syscall_restart(tsk->thread.regs, &ksig.ka, ksig.sig > 0); + check_syscall_restart(regs, &ksig.ka, ksig.sig > 0); =20 if (ksig.sig <=3D 0) { /* No signal to deliver -- put the saved sigmask back */ restore_saved_sigmask(); - set_trap_norestart(tsk->thread.regs); + set_trap_norestart(regs); return; /* no signals delivered */ } =20 @@ -275,9 +276,9 @@ static void do_signal(struct task_struct *tsk) } =20 /* Re-enable the breakpoints for the signal stack */ - thread_change_pc(tsk, tsk->thread.regs); + thread_change_pc(tsk, regs); =20 - rseq_signal_deliver(&ksig, tsk->thread.regs); + rseq_signal_deliver(&ksig, regs); =20 if (is_32bit_task()) { if (ksig.ka.sa.sa_flags & SA_SIGINFO) @@ -288,7 +289,7 @@ static void do_signal(struct task_struct *tsk) ret =3D handle_rt_signal64(&ksig, oldset, tsk); } =20 - set_trap_norestart(tsk->thread.regs); + set_trap_norestart(regs); signal_setup_done(ret, &ksig, test_thread_flag(TIF_SINGLESTEP)); } =20 diff --git a/arch/powerpc/kernel/signal_64.c b/arch/powerpc/kernel/signal_6= 4.c index 86bb5bb4c143..1f0c43baeff2 100644 --- a/arch/powerpc/kernel/signal_64.c +++ b/arch/powerpc/kernel/signal_64.c @@ -748,6 +748,8 @@ SYSCALL_DEFINE0(rt_sigreturn) sigset_t set; unsigned long msr; =20 + BUG_ON(regs !=3D current->thread.regs); + /* Always make any pending restarted system calls return -EINTR */ current->restart_block.fn =3D do_no_restart_syscall; =20 @@ -827,8 +829,7 @@ SYSCALL_DEFINE0(rt_sigreturn) * MSR[TS] set, but without CPU in the proper state, * causing a TM bad thing. */ - regs_set_return_msr(current->thread.regs, - current->thread.regs->msr & ~MSR_TS_MASK); + regs_set_return_msr(regs, regs->msr & ~MSR_TS_MASK); if (!user_read_access_begin(&uc->uc_mcontext, sizeof(uc->uc_mcontext))) goto badframe; =20 --=20 2.47.1