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 9EA90EEC8; Tue, 8 Oct 2024 12:28:32 +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=1728390512; cv=none; b=P5SVVUD79bqO0BH3Qv9tQujEeL0R0OWjXgMNR0w389i+5mZYgSElEb0QQvm7R6wTPm4QI2EQO28gKXrijtXyz/CdlmVTTAjMx1ZIC153bCxDWCnIFNlWkU08hX2+l/TGX+cTL+v5HVtjy6lqZEDd6ke6eajigiVFeoewUtYao0E= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1728390512; c=relaxed/simple; bh=ql4bfz2Iz6jbvmN8rj9cVCLOqK2s8duia+S2BlOcH2U=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=AOefGSACVfLTTIwOJ0kNfqHTW2uv79UGcFtoj0LsRPYt8qW+qyU0xCySVxWl+BmcxwJ+q0Ej/N6P4jaDY/EPy5lwHp4G5ZATZ2qu60p/LpFOKIYNDwp6Ky0UYtVTtQCLHl8you+YrLYYDdARDdwJJmkgBQFIsQk0Yy42Z4iHZ+g= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=B0Q6c6HE; 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="B0Q6c6HE" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 22CCCC4CEC7; Tue, 8 Oct 2024 12:28:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1728390512; bh=ql4bfz2Iz6jbvmN8rj9cVCLOqK2s8duia+S2BlOcH2U=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=B0Q6c6HEZ8iF1jMbzXhdGGrhxsZyk1OR8grsKyOpmsm6CcS/lc4RWaUya0s4COW2g hZDcx8L+XNQVc2U6h0jmTADBango9kGCYdu0hWSWucLe3WjuCj3F/6EiXx+DtuCNwn vBDKcLLZcdfEYhLGcg8fyaTqCHx8mbxYq3xdxKrU= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Helge Deller Subject: [PATCH 6.10 311/482] parisc: Fix itlb miss handler for 64-bit programs Date: Tue, 8 Oct 2024 14:06:14 +0200 Message-ID: <20241008115700.672808241@linuxfoundation.org> X-Mailer: git-send-email 2.46.2 In-Reply-To: <20241008115648.280954295@linuxfoundation.org> References: <20241008115648.280954295@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.10-stable review patch. If anyone has any objections, please let me know. ------------------ From: Helge Deller commit 9542130937e9dc707dd7c6b7af73326437da2d50 upstream. For an itlb miss when executing code above 4 Gb on ILP64 adjust the iasq/iaoq in the same way isr/ior was adjusted. This fixes signal delivery for the 64-bit static test program from http://ftp.parisc-linux.org/src/64bit.tar.gz. Note that signals are handled by the signal trampoline code in the 64-bit VDSO which is mapped into high userspace memory region above 4GB for 64-bit processes. Signed-off-by: Helge Deller Cc: stable@vger.kernel.org # v4.19+ Signed-off-by: Greg Kroah-Hartman --- arch/parisc/kernel/entry.S | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) --- a/arch/parisc/kernel/entry.S +++ b/arch/parisc/kernel/entry.S @@ -1051,8 +1051,7 @@ ENTRY_CFI(intr_save) /* for os_hpmc */ STREG %r16, PT_ISR(%r29) STREG %r17, PT_IOR(%r29) -#if 0 && defined(CONFIG_64BIT) - /* Revisit when we have 64-bit code above 4Gb */ +#if defined(CONFIG_64BIT) b,n intr_save2 skip_save_ior: @@ -1060,8 +1059,7 @@ skip_save_ior: * need to adjust iasq/iaoq here in the same way we adjusted isr/ior * above. */ - extrd,u,* %r8,PSW_W_BIT,1,%r1 - cmpib,COND(=),n 1,%r1,intr_save2 + bb,COND(>=),n %r8,PSW_W_BIT,intr_save2 LDREG PT_IASQ0(%r29), %r16 LDREG PT_IAOQ0(%r29), %r17 /* adjust iasq/iaoq */