From nobody Sun Oct 22 17:09:48 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 4SD4Z51q8Gz4xYtX; Sun, 22 Oct 2023 17:09:49 +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 4SD4Z51HcVz4bJZ; Sun, 22 Oct 2023 17:09:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697994589; 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=qawgRSZ14sd+Ll3V1bYeFMzeVS03KSRYTRrocxvv0yw=; b=IwqvBY9wW1AP+DxHv91o0youZ2C7CzzLGESRcBy7U2AZVRwgs5fuXmDmzL+XYiqXCKSrUL hvKL2mcT2lSO74Cx54s/+wcSwdmJi6o3HKz9f5O2hA0hhDaqyHqSuSg1sGmQ7JGWONDie4 UmOz7JwyHYO1wTJgoDgU74q+/ba9RZTdfo7+KcgkhSUurflZoenHhAoXRNlBwxumKYmXKt cB9WXBYZcwSsTuSd4IUndTmcmsjjQnR3oHhic6bspxDzdreKp/n0vZ2iV2TBHf/D6VTJK1 XmBuGPI2VrvIBmqkX3curZvonWito8Ou/Z0di02x4OW+2E3qbCW+ozgnJP6fsQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697994589; a=rsa-sha256; cv=none; b=H92oqaI7V8utjxqUoX7pWHoGc+WywK0p1gYyhen0FwpVaSFzIO6hXs7XByLkeTW1zt4p+P Am93j7K3YbYjYox57o9BHHJk3gudXCzpN/RjXHK3G+SsDY6B7IjGfmeJbMYG2rwrgMQ4ne GtTLRYN9EwMTnsO0MqaZVq9URiY9StpbeTLQCTTUY+3hS2dgBBF3lDY3XSNVRS3FotlY73 ZVukI3mRaEDyiZIYw5FuPMzIvL3ucI68e6uYxqgZVb4J/2GYAXbVBruhWzq1N61W90I+C6 PCA43iPEEl6n2yu+jkz1eASFdq3MIbkHUEfGQKSVV8vmIAyboMmAoZT4ZLBuWg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697994589; 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=qawgRSZ14sd+Ll3V1bYeFMzeVS03KSRYTRrocxvv0yw=; b=XkLpewf0C8tjGXNhkiUxXzjJ+QhagT1jw5vyBqAgqjgYLZCBaKBSOzs6AEbMYcGDKU01bL p16Sp9dF5+4+hJdgzLRWleMNpEtfKooNWr9uSxr499Wf2abY4EAINPite7phUP6AW3SdHY BpTnsHqKkJGzHu58KEFcuy2h3TYH/OQQNTvOrFaTVc/prziqfE9yPrJIs0pBvdSVkIj70e 7nDdTmVYmuTZPBW4lZVujgmAhKenyb1/pXyalGw9ltyz+cTeAW2de+W9vSunYXFQXdA/Om nCGmUlUIZMIjj2kFKaK6+VlnCYKi4Misl0ahtr2CX8shQjWnBCbSQT0SW0cFTw== 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 4SD4Z50KwFz1570; Sun, 22 Oct 2023 17:09:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39MH9mcE034993; Sun, 22 Oct 2023 17:09:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39MH9mOA034990; Sun, 22 Oct 2023 17:09:48 GMT (envelope-from git) Date: Sun, 22 Oct 2023 17:09:48 GMT Message-Id: <202310221709.39MH9mOA034990@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mateusz Guzik Subject: git: 5d29ead2e2de - main - thread: reorder td_no_sleeping to plug two 4-byte holes on LP64 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: mjg X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5d29ead2e2decba1940cda805ec9ceb06deb7f0f Auto-Submitted: auto-generated The branch main has been updated by mjg: URL: https://cgit.FreeBSD.org/src/commit/?id=5d29ead2e2decba1940cda805ec9ceb06deb7f0f commit 5d29ead2e2decba1940cda805ec9ceb06deb7f0f Author: Mateusz Guzik AuthorDate: 2023-10-22 15:39:25 +0000 Commit: Mateusz Guzik CommitDate: 2023-10-22 17:09:44 +0000 thread: reorder td_no_sleeping to plug two 4-byte holes on LP64 Sponsored by: Rubicon Communications, LLC ("Netgate") --- sys/kern/kern_thread.c | 2 +- sys/sys/proc.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/kern/kern_thread.c b/sys/kern/kern_thread.c index 4175d1594af4..dcebb08956e6 100644 --- a/sys/kern/kern_thread.c +++ b/sys/kern/kern_thread.c @@ -87,7 +87,7 @@ _Static_assert(offsetof(struct thread, td_flags) == 0x108, "struct thread KBI td_flags"); _Static_assert(offsetof(struct thread, td_pflags) == 0x114, "struct thread KBI td_pflags"); -_Static_assert(offsetof(struct thread, td_frame) == 0x4b8, +_Static_assert(offsetof(struct thread, td_frame) == 0x4b0, "struct thread KBI td_frame"); _Static_assert(offsetof(struct thread, td_emuldata) == 0x6c0, "struct thread KBI td_emuldata"); diff --git a/sys/sys/proc.h b/sys/sys/proc.h index 0b91b2a1a0b5..8c916173b4ef 100644 --- a/sys/sys/proc.h +++ b/sys/sys/proc.h @@ -314,8 +314,8 @@ struct thread { struct osd td_osd; /* (k) Object specific data. */ struct vm_map_entry *td_map_def_user; /* (k) Deferred entries. */ pid_t td_dbg_forked; /* (c) Child pid for debugger. */ - struct vnode *td_vp_reserved;/* (k) Preallocated vnode. */ u_int td_no_sleeping; /* (k) Sleeping disabled count. */ + struct vnode *td_vp_reserved;/* (k) Preallocated vnode. */ void *td_su; /* (k) FFS SU private */ sbintime_t td_sleeptimo; /* (t) Sleep timeout. */ int td_rtcgen; /* (s) rtc_generation of abs. sleep */