From nobody Mon May 15 15:45:59 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QKkHC5mb0z4BlhZ; Mon, 15 May 2023 15:45:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QKkHC47n8z3JBm; Mon, 15 May 2023 15:45:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1684165559; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=K44qL9TvTMp0/PikE05RtTbeke9agd7objFsvPbG6OQ=; b=DEj4mcpa8ARzopf5MqH64CcYX2pvAdhEusN/uz73/en4+WEuf3dmaJSrtzKBFby3qP4Sig t5fjksuNNrDrg3L3CqQUL11RW8f14/zj2oQjZhBFNP/O0qUm5Z+dPH2hc/cJF9iyrSUzPl mcUdROnDRzr5w4oG6DLpg6FeaotiEHvpaRxNlm35gGtVe7KGZsbm0e6C+DCwaoPwr6sDIb TGuqiq00CJ3cSxt7w/g2rgdr8gv9O058bkDt4O9WlOSoQPpp2Z9d5iypFRt2Hj8SZspQ/P p3fxLyqrenst8BZI5lbgpyhXywvyQOQFfeNNOcvLW3TxX4QI65+OS9d2ZX+RAA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1684165559; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=K44qL9TvTMp0/PikE05RtTbeke9agd7objFsvPbG6OQ=; b=bi+8Z/HPzKtctEY3WxzLi81diTJRunOvSDYodMilfNcuvN0uJNHr28lc+GL8CpavSNlN2p msL3JUsLFr7UZl9R6JaIJZwpcbfNJ0MMrkDjzFl++dkExTiCjdbZT4TGu8jHVaKmNB3ULS RSOzYuPba5XcHcTELn/G0sj+4z+xM7ZI3QcabN+wqBePabDMpVVcAXGVwm5+JyNdbau2O3 0YKxvCESs86VCfGUEYcCY6hw3+Xu8pF8omCcU7Tm3peubUb/h5PHEGEePTN0O74JD/xzm2 2jZ0BDzcTl+4j1QcXuiY48tcgv7aETXS9N7vAAAVkiXo265TtGMaQdDTgW6Kqw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1684165559; a=rsa-sha256; cv=none; b=T/W+aY5V+8yS91ITiF42sGjKvMw+2/WshKwuuo/EeySPmZBnq9uZhHAnOm6VREl41OztTH 1eeDU7/8tDWmZ9s+IEB0PlAubQIb9fRtBJAh25RCfHTWdWVK2QsY42tXlwLRKSyKrbwrmF KwtfaLWcSc/6fZ+64EuGnspxg4WE9ph7iAvAfkLh1l0NXDwD3HSV1/f5TTJDDg7XSuVMxe P9VQCcv5uLu5AVdrUeKklqhgDGlEMLMvqju36pLOBVs3+dXz/MpsKBXJYhfSCT7HvoNBpF p3vFrKWwBZZD2N8GVMoh/ejs12RdL5dZw5OtnF+vQaKciG/tY4gAhVXbe9xwug== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4QKkHC3Fv0zmTc; Mon, 15 May 2023 15:45:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 34FFjxbr073454; Mon, 15 May 2023 15:45:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34FFjxh8073453; Mon, 15 May 2023 15:45:59 GMT (envelope-from git) Date: Mon, 15 May 2023 15:45:59 GMT Message-Id: <202305151545.34FFjxh8073453@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Andrew Turner Subject: git: bd011976c6cf - stable/13 - Always read the VFP regs in the arm64 fill_fpregs List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: andrew X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: bd011976c6cf769baa04c55e48d9cda8a2ba60be Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=bd011976c6cf769baa04c55e48d9cda8a2ba60be commit bd011976c6cf769baa04c55e48d9cda8a2ba60be Author: Andrew Turner AuthorDate: 2023-01-18 09:30:20 +0000 Commit: Andrew Turner CommitDate: 2023-05-15 10:54:21 +0000 Always read the VFP regs in the arm64 fill_fpregs The PCB_FP_STARTED is used to indicate that the current VFP context has been used since either 1. the start of the thread, or 2. exiting a kernel FP context. When case 2 was added to the kernel this could cause incorrect results to be returned when a thread exits the kernel FP context and fill_fpregs is called before it has restored the VFP state, e.g. by trappin on a userspace VFP instruction. In both of the cases the base save area is still valid so reduce the use of the PCB_FP_STARTED flag check to help decide if we need to store the current threads VFP state. Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D37994 (cherry picked from commit 95dd6974b591ce76bf8d29adcc0dd01b4b281ffd) --- sys/arm64/arm64/exec_machdep.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/sys/arm64/arm64/exec_machdep.c b/sys/arm64/arm64/exec_machdep.c index cc589731ae6a..a55048461682 100644 --- a/sys/arm64/arm64/exec_machdep.c +++ b/sys/arm64/arm64/exec_machdep.c @@ -147,16 +147,17 @@ fill_fpregs(struct thread *td, struct fpreg *regs) */ if (td == curthread) vfp_save_state(td, pcb); + } - KASSERT(pcb->pcb_fpusaved == &pcb->pcb_fpustate, - ("Called fill_fpregs while the kernel is using the VFP")); - memcpy(regs->fp_q, pcb->pcb_fpustate.vfp_regs, - sizeof(regs->fp_q)); - regs->fp_cr = pcb->pcb_fpustate.vfp_fpcr; - regs->fp_sr = pcb->pcb_fpustate.vfp_fpsr; - } else + KASSERT(pcb->pcb_fpusaved == &pcb->pcb_fpustate, + ("Called fill_fpregs while the kernel is using the VFP")); + memcpy(regs->fp_q, pcb->pcb_fpustate.vfp_regs, + sizeof(regs->fp_q)); + regs->fp_cr = pcb->pcb_fpustate.vfp_fpcr; + regs->fp_sr = pcb->pcb_fpustate.vfp_fpsr; +#else + memset(regs, 0, sizeof(*regs)); #endif - memset(regs, 0, sizeof(*regs)); return (0); }