From nobody Tue Apr 25 09:23:31 2023 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 4Q5Gl73N0gz46vmf; Tue, 25 Apr 2023 09:23:31 +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 4Q5Gl72bw2z3tBq; Tue, 25 Apr 2023 09:23:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682414611; 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=fTjrDHVUzihcuMfHDw8LQWX+Qpedl7warVRPnUIWhjw=; b=uvv9HeQNBF3vJQvnYLimpL24hBLCZ9hOtGEOZM9ybX+IvniLURZUObLPqzM1M66+klkir0 SPWWhICaf6tULW8cZS7y8Br+rQjsf2Wdxsvo5Xleq4DMT64oUx6oT8LrQ3xqEmSvmxcgmS JrDCMyf6fKfQLWuBmoikZfM8iGZqbfJe+Hhjh2zNHLqJAxTfqOh2M2VyW7a/PURZixi7dI 93i3gvgiWuQwB4YDnXopQY/jZHzhmoS29VaL8gEose0yfdPHsbirzdaderqjX+SMZWUxiC VZwB8hE8TVXBrBtHkXfRA9m36GPNmbHA5RZP7gTL4j4WMk8+1xnHGH+lEQAqSw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682414611; 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=fTjrDHVUzihcuMfHDw8LQWX+Qpedl7warVRPnUIWhjw=; b=elt7kVxqaLG7TDHrmxw6Iwq7bnEZb8rl+v3H7eKfA8mLOl4PFE9owfYoeLA4XKSUtZo3uh EIZUQdqcgBe0P6RMpSn0xjEz5UMLUtbGO++9h9p6C2+urTjEYXDow7dcktahxSvOu4BCQE lx9cg4RBjS2Ko5wG1zWpWeWigQH6dSgIt0j4y9KMFfioliTmB7/lBPB5v46Ah0Sc8VEAAh jJrHeT5Xcvg1RfnIuWOsa6vbC8WAFw6yACcXdy7O1bqMZBlWcMWr6yf+bzxFqCvlPxltDS tTdZExTWK+R0E0cA+1JfKxIhOnJqguPo1k0bKfSgk8Es8uZizp8DZujZXb3CBw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1682414611; a=rsa-sha256; cv=none; b=HmGBhaUxpBmnJK0PCDtSGZkzcZDh/SMR2ZwrkohrdwKkAOJh/BkXCM/uUMogqEohQjkvan dPapNFuIJxsmHGLZ1/m69Rn7poxcXtU6GnZUWLiXzZlWGUZRjZfrbl/tDzpGmMBDuVFG9B R3RIV7oD7jQbYIJFteOaliwGnRt/CXPfj8AmyyPSmDD0S4hnOnIICWRAYPlOHHF2CVAQxi jS+baWq7JXEl/DQw+3c3QsRXdjDfeNGf6S9QaARxZS8pDwPPK6RFczRdxnOSRnCePUvc0N /VozDFbcoaAgs6x6DWr+0gQCs0PuLDJnzod70kgD7agpZvvvo8bLGH2NlhBV8g== 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 4Q5Gl71h5qz12Yb; Tue, 25 Apr 2023 09:23:31 +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 33P9NVME031008; Tue, 25 Apr 2023 09:23:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33P9NV49031007; Tue, 25 Apr 2023 09:23:31 GMT (envelope-from git) Date: Tue, 25 Apr 2023 09:23:31 GMT Message-Id: <202304250923.33P9NV49031007@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: 6a9c2e63be23 - main - Add padding for future use on arm64 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: 6a9c2e63be235c046b86804166449ebecc27f429 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=6a9c2e63be235c046b86804166449ebecc27f429 commit 6a9c2e63be235c046b86804166449ebecc27f429 Author: Andrew Turner AuthorDate: 2023-04-24 16:18:47 +0000 Commit: Andrew Turner CommitDate: 2023-04-25 09:23:15 +0000 Add padding for future use on arm64 Allow new features to be supported without changing the size of existing structures. Reviewed by: kib Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D39777 --- sys/arm64/arm64/machdep.c | 4 ++-- sys/arm64/include/pcb.h | 2 +- sys/arm64/include/pmap.h | 1 + sys/arm64/include/proc.h | 2 ++ 4 files changed, 6 insertions(+), 3 deletions(-) diff --git a/sys/arm64/arm64/machdep.c b/sys/arm64/arm64/machdep.c index 8d2e2f81d1d8..c390269f419a 100644 --- a/sys/arm64/arm64/machdep.c +++ b/sys/arm64/arm64/machdep.c @@ -104,10 +104,10 @@ __FBSDID("$FreeBSD$"); #include -_Static_assert(sizeof(struct pcb) == 1216, "struct pcb is incorrect size"); +_Static_assert(sizeof(struct pcb) == 1248, "struct pcb is incorrect size"); _Static_assert(offsetof(struct pcb, pcb_fpusaved) == 136, "pcb_fpusaved changed offset"); -_Static_assert(offsetof(struct pcb, pcb_fpustate) == 160, +_Static_assert(offsetof(struct pcb, pcb_fpustate) == 192, "pcb_fpustate changed offset"); enum arm64_bus arm64_bus_method = ARM64_BUS_NONE; diff --git a/sys/arm64/include/pcb.h b/sys/arm64/include/pcb.h index 35f04787c781..85c92727ca43 100644 --- a/sys/arm64/include/pcb.h +++ b/sys/arm64/include/pcb.h @@ -67,7 +67,7 @@ struct pcb { /* The bits passed to userspace in get_fpcontext */ #define PCB_FP_USERMASK (PCB_FP_STARTED) u_int pcb_vfpcpu; /* Last cpu this thread ran VFP code */ - uint64_t pcb_pad2; + uint64_t pcb_reserved[5]; /* * The userspace VFP state. The pcb_fpusaved pointer will point to diff --git a/sys/arm64/include/pmap.h b/sys/arm64/include/pmap.h index 8e3e81f2a5d3..bf387c9cf25b 100644 --- a/sys/arm64/include/pmap.h +++ b/sys/arm64/include/pmap.h @@ -95,6 +95,7 @@ struct pmap { struct asid_set *pm_asid_set; /* The ASID/VMID set to use */ enum pmap_stage pm_stage; int pm_levels; + uint64_t pm_reserved[4]; }; typedef struct pmap *pmap_t; diff --git a/sys/arm64/include/proc.h b/sys/arm64/include/proc.h index 9a22fe43833a..eb5fe806088a 100644 --- a/sys/arm64/include/proc.h +++ b/sys/arm64/include/proc.h @@ -63,6 +63,8 @@ struct mdthread { struct { struct ptrauth_key apia; } md_ptrauth_kern; + + uint64_t md_reserved[4]; }; struct mdproc {