From nobody Wed Jun 29 14:54:52 2022 X-Original-To: dev-commits-src-all@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 697F7870E3A; Wed, 29 Jun 2022 14:54:52 +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 4LY4Hw2XpFz4lhZ; Wed, 29 Jun 2022 14:54:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1656514492; 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=kXhjKS9DbePVyQnNK9BQPQBqsDkLR7FB/ZrriTnb9QE=; b=dxMThA/hDJQT1yts+yqE12KGYYiBalmUiOh+CeOaDLtC0/E3yPs/jbyAAIeooWqArMijb0 N9Ufsvlvdhu9MJWwfojwIWnjeChNe87Xh/U15ajVtErnAlrcRv5Zx+nCH1HKtztpT4U7WI 60z2cmL/Cddf8ZZdZuat/bu69W6/97CdbP2lL7BOQsJ9MlRe5mDzAhTZvTEMd64m2Xk0Yi t7rdRO4d4ckFJTzn//jkBoMmcsb5R58ylmThvHXDBMr6HQ1kqvHJabNg+SdCSfNCBaOVH0 yv3ECZVgxreTD6gd3Not/zyODoyGKBFrjJ8BARVC4MbC92hCmTFCgXHRWUliQg== 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 372C213A3D; Wed, 29 Jun 2022 14:54:52 +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 25TEsqVH048562; Wed, 29 Jun 2022 14:54:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 25TEsqOx048561; Wed, 29 Jun 2022 14:54:52 GMT (envelope-from git) Date: Wed, 29 Jun 2022 14:54:52 GMT Message-Id: <202206291454.25TEsqOx048561@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Turner Subject: git: baf8f20a4af4 - main - Split out vfp_new_thread List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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/main X-Git-Reftype: branch X-Git-Commit: baf8f20a4af43283a1fbee49b0c2ad906074f20f Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1656514492; 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=kXhjKS9DbePVyQnNK9BQPQBqsDkLR7FB/ZrriTnb9QE=; b=d/nC3ZhPpRo6nzBWFRMFpDwBLsEb1ZLwL6YhmuAr3n7B88Mq30PtNYqhD453dh6sxlMIkl 5VP0ZILvq+nSBW4/B4xt7SYUvR7329A0QxJWzJw/7gk+LVxehs9CJoBOVL7vhLu+qSlbTR NaRVeZjwc5528dWvjh/TrmEGJXHNWi4X6Tn/Ab++EB+xpREcrK5cOn3RMNHLCjohuoKLKV GzVcO2IKZI1xBvJeY/35x8IchLe53VWg9CG8IIJLfOtjpPiSAgVLD2kdXkAmo/ehThsJYm Zah1Q3Yd4yMt0RsriKaDo3+ae7LCAAGNUQQ8EEbeQGU/w1w/RCa3sWht0jhSvQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1656514492; a=rsa-sha256; cv=none; b=pu/k6y0TWr9Oado2/V2F8hRV9HCj44eZunO6uVKFSU4enqhGrf3IYy82qjwV8OlTea5Qmk JRScEjT8esxdfgPXczopOhSnA8dltwo3MY1vBiIwFwClpkld4Tpc0AkvStBpylxriUENY4 Y9RkTRyLPsOs6bWha8laJW+qWDCbwszbZnSCgNujGeP8q3sM5vF115qlAwlqB3iomuoDUi QdM10U6KtA1w9yrafBpyNaTOjKh+H+2GEZ3O2MG3JGEIKptEiIs0gCtfQd4NoVPLj0j8oM F3Hzu4q6DTkK+GWfNCSV64fh3dblXYI+iCiHzjZuygRQWTnyiM9jG9bAhovPGA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=baf8f20a4af43283a1fbee49b0c2ad906074f20f commit baf8f20a4af43283a1fbee49b0c2ad906074f20f Author: Andrew Turner AuthorDate: 2022-06-24 11:53:15 +0000 Commit: Andrew Turner CommitDate: 2022-06-29 14:15:43 +0000 Split out vfp_new_thread To keep the vfp thread creation code in one place move into vfp.c. This will also help with adding SVE support as it depends on VFP. Reviewed by: markj Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D35615 --- sys/arm64/arm64/vfp.c | 26 ++++++++++++++++++++++++++ sys/arm64/arm64/vm_machdep.c | 10 +++++----- sys/arm64/include/vfp.h | 1 + 3 files changed, 32 insertions(+), 5 deletions(-) diff --git a/sys/arm64/arm64/vfp.c b/sys/arm64/arm64/vfp.c index a481b5ebb3ba..8fc756f8a888 100644 --- a/sys/arm64/arm64/vfp.c +++ b/sys/arm64/arm64/vfp.c @@ -199,6 +199,32 @@ vfp_save_state(struct thread *td, struct pcb *pcb) critical_exit(); } +/* + * Update the VFP state for a forked process or new thread. The PCB will + * have been copied from the old thread. + */ +void +vfp_new_thread(struct thread *newtd, struct thread *oldtd, bool fork) +{ + struct pcb *newpcb; + + newpcb = newtd->td_pcb; + + /* Kernel threads start with clean VFP */ + if ((oldtd->td_pflags & TDP_KTHREAD) != 0) { + newpcb->pcb_fpflags &= + ~(PCB_FP_STARTED | PCB_FP_KERN | PCB_FP_NOSAVE); + } else { + MPASS((newpcb->pcb_fpflags & (PCB_FP_KERN|PCB_FP_NOSAVE)) == 0); + if (!fork) { + newpcb->pcb_fpflags &= ~PCB_FP_STARTED; + } + } + + newpcb->pcb_fpusaved = &newpcb->pcb_fpustate; + newpcb->pcb_vfpcpu = UINT_MAX; +} + /* * Reset the FP state to avoid leaking state from the parent process across * execve() (and to ensure that we get a consistent floating point environment diff --git a/sys/arm64/arm64/vm_machdep.c b/sys/arm64/arm64/vm_machdep.c index feb439314f50..006bf5127d25 100644 --- a/sys/arm64/arm64/vm_machdep.c +++ b/sys/arm64/arm64/vm_machdep.c @@ -109,8 +109,8 @@ cpu_fork(struct thread *td1, struct proc *p2, struct thread *td2, int flags) td2->td_pcb->pcb_x[20] = (uintptr_t)td2; td2->td_pcb->pcb_lr = (uintptr_t)fork_trampoline; td2->td_pcb->pcb_sp = (uintptr_t)td2->td_frame; - td2->td_pcb->pcb_fpusaved = &td2->td_pcb->pcb_fpustate; - td2->td_pcb->pcb_vfpcpu = UINT_MAX; + + vfp_new_thread(td2, td1, true); /* Setup to release spin count in fork_exit(). */ td2->td_md.md_spinlock_count = 1; @@ -187,9 +187,9 @@ cpu_copy_thread(struct thread *td, struct thread *td0) td->td_pcb->pcb_x[20] = (uintptr_t)td; td->td_pcb->pcb_lr = (uintptr_t)fork_trampoline; td->td_pcb->pcb_sp = (uintptr_t)td->td_frame; - td->td_pcb->pcb_fpflags &= ~(PCB_FP_STARTED | PCB_FP_KERN | PCB_FP_NOSAVE); - td->td_pcb->pcb_fpusaved = &td->td_pcb->pcb_fpustate; - td->td_pcb->pcb_vfpcpu = UINT_MAX; + + /* Update VFP state for the new thread */ + vfp_new_thread(td, td0, false); /* Setup to release spin count in fork_exit(). */ td->td_md.md_spinlock_count = 1; diff --git a/sys/arm64/include/vfp.h b/sys/arm64/include/vfp.h index b28c6edf3c53..a450a5f31fdd 100644 --- a/sys/arm64/include/vfp.h +++ b/sys/arm64/include/vfp.h @@ -68,6 +68,7 @@ struct thread; void vfp_init(void); void vfp_discard(struct thread *); +void vfp_new_thread(struct thread *, struct thread *, bool); void vfp_reset_state(struct thread *, struct pcb *); void vfp_restore_state(void); void vfp_save_state(struct thread *, struct pcb *);