From nobody Sun Oct 06 13:13:52 2024 X-Original-To: dev-commits-src-main@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 4XM2mJ4wRsz5Y4dV; Sun, 06 Oct 2024 13:13: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XM2mJ41FYz56xy; Sun, 6 Oct 2024 13:13:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728220432; 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=NCvrI4t15f3qaGATw2cZbIE/9MuARtah/stB7U4AWlc=; b=Bouhlov9oKRSXXrKIjWRyi8kUI0/LyxdwIBBetBullHZi2IW0WneNmD8PjWFGvOiewI5Ph iMWfBAN64hxzu6CaB87Mjvw3kSUGM+ItgxSTjZMewO/+fPv4cgiO6KeDooIG7kZMJ6Qv4o In+9BFRLp8vFH4U7ZI74bw3vTTcJSKikV3c0dCihK28VBjmh12PorMDoS3b+pn8kZbaxLr McDAfzV31TyT7IYT2mLKfWgGTne3irGnaCt/zmFZSjv4XqTjKA8xs+cSk3pZi7Fno5JAk/ pM7jot5EiZsZzb/oAn9ZSxEvs6O4KT/PVGamUKonFNYnn2hHbAnHW01SruVqoA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728220432; 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=NCvrI4t15f3qaGATw2cZbIE/9MuARtah/stB7U4AWlc=; b=i7ucaQ1bL/mLFkah9gWXdpOSMK5qKwkrmSCaGMfONZRB26smm7z7tPwKoqRSp827xOzPlj ZGNgGyPisRCYI2+AfYs7sl1+b3d0+x8BAP4eWBSqpv8+1YK1AnA3r2gPqlX7tQNTppoOil ECLYMgk+l2izcOZ11COAXQOJ1xmX2i+TYb5lTT6xDJ2PLfvr8rAlJhzasnp+ImrWGcpOX8 tMnBMfraEQINhMJPDkaAKXfJ0LtyFJxjB5FHwj5lqMtIz6/eegAkExj/ctBkdwt2PaO0zY DGxqu55Ldd0xveUfY+dhFhgbzIcLcf+Ge1M2J3osdyvkFhBY7GX5eCQHm1fPkw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728220432; a=rsa-sha256; cv=none; b=FwIw/UcC5YghCunZHqGkzwnkET57b1hrHjwUbLnsbV5RFPEcgm7hrq9jsbHW2oF3/yjUPU WIlY+k4qlOs9gRA9k8/Stw3nRYc1r6Xg731DESlq5V7APDOgrkqovKd9Z8p2M0oTHcU+zS VjzSlc2OH8zmhUPzpKn6mwPEN+gDQrMpLQ77zK8dOjnsVcs8eANOobxE2nd+gbhAysxVHb AIn3Xbnke5omqjUOBeCPPjYdhVwKvH1BRbRoRjZF3MDQwBOAncDwQPbQ6QaQd6QTWLo7sC kA7trXbPD2/f3d/egYOBorRxHRpmXXSfVTHWs77Y1LcMKYpNpQLz19nR8JYdQg== 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 4XM2mJ3dBZz13pH; Sun, 6 Oct 2024 13:13:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 496DDqJR060972; Sun, 6 Oct 2024 13:13:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 496DDqn2060969; Sun, 6 Oct 2024 13:13:52 GMT (envelope-from git) Date: Sun, 6 Oct 2024 13:13:52 GMT Message-Id: <202410061313.496DDqn2060969@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 9d52823bf1df - main - vm_object: Widen the flags field List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9d52823bf1dfac237e58b5208299aaa5e2df42e9 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=9d52823bf1dfac237e58b5208299aaa5e2df42e9 commit 9d52823bf1dfac237e58b5208299aaa5e2df42e9 Author: Mark Johnston AuthorDate: 2024-10-06 13:07:31 +0000 Commit: Mark Johnston CommitDate: 2024-10-06 13:13:30 +0000 vm_object: Widen the flags field Take advantage of a nearby 2-byte hole to avoid growing the struct. This way, only the offsets of "flags" and "pg_color" change. Bump __FreeBSD_version since some out-of-tree kernel modules may access these fields, though I haven't found any examples so far. Reviewed by: kib MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D35905 --- sys/sys/param.h | 2 +- sys/vm/vm_object.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/sys/param.h b/sys/sys/param.h index 3d772d551ffe..8af2f9594bc1 100644 --- a/sys/sys/param.h +++ b/sys/sys/param.h @@ -73,7 +73,7 @@ * cannot include sys/param.h and should only be updated here. */ #undef __FreeBSD_version -#define __FreeBSD_version 1500024 +#define __FreeBSD_version 1500025 /* * __FreeBSD_kernel__ indicates that this system uses the kernel of FreeBSD, diff --git a/sys/vm/vm_object.h b/sys/vm/vm_object.h index 9155d9cd6d6d..3274f59f958f 100644 --- a/sys/vm/vm_object.h +++ b/sys/vm/vm_object.h @@ -108,8 +108,8 @@ struct vm_object { int shadow_count; /* how many objects that this is a shadow for */ vm_memattr_t memattr; /* default memory attribute for pages */ objtype_t type; /* type of pager */ - u_short flags; /* see below */ u_short pg_color; /* (c) color of first page in obj */ + u_int flags; /* see below */ blockcount_t paging_in_progress; /* (a) Paging (in or out) so don't collapse or destroy */ blockcount_t busy; /* (a) object is busy, disallow page busy. */ int resident_page_count; /* number of resident pages */