From nobody Tue Oct 08 12:39:23 2024 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 4XNFvb6SQLz5ZNZn; Tue, 08 Oct 2024 12:39:23 +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 4XNFvb4RD6z4bb5; Tue, 8 Oct 2024 12:39:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728391163; 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=MZPOsX7V5UPy6zfu/zy+PpstDYryBy/PcV0kH197eDw=; b=KvHPiz/ItMSn5yrgHb+xaGYGyaSP6Exh+mQ88I1Du9veS84EYi4bxBCpL+mPQS6TciTtso lC7ZsA3s+ml4ZbUwb+3nuqsrzyBHgarhRDIJtQJusqg8K+mG5jjoe7pWXGnoezK5YBzRte nVNNbDaLwdkylUgm/osjSO0qk2DB8eRMDk3QJmg9y0OvAru/ouhqb3pIEHVVfGlBoTwMZf nZBcLlEtm1RomUYih9ok2OsxjhigFr7NBpo21parNtCFd2aSTQn6hm649ElJhP76z0nQcl XuNG/Qyz5g6Aq+Rc/Gw/wEtEumJGHyQWCVznC6Ya4Zs1h6hWOXcE5CLtbizToA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728391163; 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=MZPOsX7V5UPy6zfu/zy+PpstDYryBy/PcV0kH197eDw=; b=fEPnd9TiRUv1/dm+GonVE6j+vGIoj4aYKKqjy2d+TUk5Sxr6QqFOWAtkwVgQUMs/yMuZZz zmDO/CyYibbiz8QvOhkBwfL/4MSMPG19vTbJREa3FyrZTH7Ada1EojexNbgFdN9mkLubHj WnSBlCtxcCF1bzg9m97ydeQz1V5dpkowmRTeaeeXk0UcSX+ZyVMaeYINBG/BMe34+EE/KQ 23hjY1QFy7L9uNjaaQRNVfUW3N1kukyG7QzwzDXINQWNRjhVXzR7glXhtH9vNrPO331aUp 4y6o3TlLcKkBgfKpWnNFWk8ig+KaleFQ+Yc1ZOe42LUdgzjBxxjXO3xFbJ3hGQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728391163; a=rsa-sha256; cv=none; b=rGsKePlWllp2KycGASWv64X/hpqQK3dP6+bp0BJ1uT41Ph6cHMYSbipla0m/StX6RFoIGS 3vAQGS05YrvcfoHcLwY3/h2+KqPaRuyXs1MHDRqNLwNKNmIYnA01gh0PQOPH2r5cp4ng61 w3tlv1Exi29cNHu1JH53VRC5vhwcBEnvzLiHbc5wswI4yBIZiyUUGCK3G32CeNsO32LZNj 6dSMBJ2uXDy+ISOhNe4XJoBKgFQZB8UgsC+Hsl6BBHMGYj/4VmkCnpndGo3Yplsj4rLR1Y o+0/wOQ2ywcCoj4LDnJ08S7bEwQLOdOsIrx0TSYy+1/htY2v+PoW59YzxT9TVg== 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 4XNFvb3S9lzWvF; Tue, 8 Oct 2024 12:39:23 +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 498CdNiV012895; Tue, 8 Oct 2024 12:39:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 498CdNTo012892; Tue, 8 Oct 2024 12:39:23 GMT (envelope-from git) Date: Tue, 8 Oct 2024 12:39:23 GMT Message-Id: <202410081239.498CdNTo012892@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: a10870ecea81 - main - posix shm: mark backing objects with SHM_POSIXSHM flag 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a10870ecea813042db7c41e906e1a5c5693f8a34 Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=a10870ecea813042db7c41e906e1a5c5693f8a34 commit a10870ecea813042db7c41e906e1a5c5693f8a34 Author: Konstantin Belousov AuthorDate: 2024-10-07 01:26:38 +0000 Commit: Konstantin Belousov CommitDate: 2024-10-08 12:37:57 +0000 posix shm: mark backing objects with SHM_POSIXSHM flag and consistently store the pointer to shmfd into pager priv data space. Reviewed by: markj Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D46970 --- sys/kern/uipc_shm.c | 16 +++++++++++----- sys/vm/vm_object.h | 2 ++ 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/sys/kern/uipc_shm.c b/sys/kern/uipc_shm.c index a5b2e62c568e..cf98e1410074 100644 --- a/sys/kern/uipc_shm.c +++ b/sys/kern/uipc_shm.c @@ -945,15 +945,20 @@ shm_alloc(struct ucred *ucred, mode_t mode, bool largepage) shmfd->shm_gid = ucred->cr_gid; shmfd->shm_mode = mode; if (largepage) { - shmfd->shm_object = phys_pager_allocate(NULL, + obj = shmfd->shm_object = phys_pager_allocate(NULL, &shm_largepage_phys_ops, NULL, shmfd->shm_size, VM_PROT_DEFAULT, 0, ucred); + VM_OBJECT_WLOCK(shmfd->shm_object); + obj->un_pager.phys.phys_priv = shmfd; + vm_object_set_flag(obj, OBJ_POSIXSHM); + VM_OBJECT_WUNLOCK(shmfd->shm_object); shmfd->shm_lp_alloc_policy = SHM_LARGEPAGE_ALLOC_DEFAULT; } else { obj = vm_pager_allocate(shmfd_pager_type, NULL, shmfd->shm_size, VM_PROT_DEFAULT, 0, ucred); VM_OBJECT_WLOCK(obj); obj->un_pager.swp.swp_priv = shmfd; + vm_object_set_flag(obj, OBJ_POSIXSHM); VM_OBJECT_WUNLOCK(obj); shmfd->shm_object = obj; } @@ -993,11 +998,12 @@ shm_drop(struct shmfd *shmfd) rangelock_destroy(&shmfd->shm_rl); mtx_destroy(&shmfd->shm_mtx); obj = shmfd->shm_object; - if (!shm_largepage(shmfd)) { - VM_OBJECT_WLOCK(obj); + VM_OBJECT_WLOCK(obj); + if (shm_largepage(shmfd)) + obj->un_pager.phys.phys_priv = NULL; + else obj->un_pager.swp.swp_priv = NULL; - VM_OBJECT_WUNLOCK(obj); - } + VM_OBJECT_WUNLOCK(obj); vm_object_deallocate(obj); free(shmfd, M_SHMFD); } diff --git a/sys/vm/vm_object.h b/sys/vm/vm_object.h index 73284fddd2a6..c7f0dd0943ba 100644 --- a/sys/vm/vm_object.h +++ b/sys/vm/vm_object.h @@ -172,6 +172,7 @@ struct vm_object { void *data_ptr; uintptr_t data_val; }; + void *phys_priv; } phys; } un_pager; struct ucred *cred; @@ -202,6 +203,7 @@ struct vm_object { #define OBJ_PAGERPRIV1 0x00004000 /* Pager private */ #define OBJ_PAGERPRIV2 0x00008000 /* Pager private */ #define OBJ_SYSVSHM 0x00010000 /* SysV SHM */ +#define OBJ_POSIXSHM 0x00020000 /* Posix SHM */ /* * Helpers to perform conversion between vm_object page indexes and offsets.