From nobody Fri Dec 09 12:17:39 2022 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 4NT95J3YSfz4kPlD; Fri, 9 Dec 2022 12:17:40 +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 4NT95J0s9Vz3qqB; Fri, 9 Dec 2022 12:17:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1670588260; 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=vOf2Sbd6QK6ygdJn8CamrZuXY6VTat0xIXtf1iLouPE=; b=vOi+OFq1Y0OuZAq0UwxFLYcBEwPaqB5mrVUoXMrSJlLi6YQak2UUWXKtyCikiFQcMDCgWn 10+BdQfMux8TIbhOsjlNezHMb2CtBUQPbAV3Ky/vDWX0BAH0MJhfWTxJGHlIl2cFbRFn/O UdiAyhZfPlpmkDVrQ9StSYtEiXuSUhr40Ov3ySeu/5vYBJBL9JHcElQ2rV8jv6wc/0jXb+ UBeTKHwuFZiFaLKaKsVKc1ac6wH4xUE3frm9C8IIdwF1S2vk4XPnzukH8H7mgh9UdvGWRv O3D9FxN51wRksuTtG8yi1/7/iEHi/NCL9+4Mn02q18X+fZBomIs9lkq9h98RcQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1670588260; 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=vOf2Sbd6QK6ygdJn8CamrZuXY6VTat0xIXtf1iLouPE=; b=OlwJPjJT1j3MisY/G19HwYqd0PWD8BEwyUP/77UujAwY0tFMbyr7yA48t6CWDvD3+xuaPK Im4E67hITu5HKznE0VOrY5ZyHfjE1ybcBF9JSEoqD6rgPIl7aq9/u7rLINFVzXRKevdo27 rSsSJ9lRO8xY3qrc5g9DcjZ3uEGE//28spdeHHow6AFK1HuK9nMtaV0+MQn2d5JKGpc9rf LnuKpe0E4wSoG9HySq/77AoTmkZAmO30XOQ3CZgT//m3+Vch/1Z/CE/YATGGLb0X1mV6zU RGNjLSe9O1SdVGhhtMnm8+Jm1obFSnhi3BQ1QtbkP1BgKpMgX6mSpD5P+WtKOQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1670588260; a=rsa-sha256; cv=none; b=b7OWbOUwNfgisqBMEUglKzDDS/PLhjnqQmEWIgnOOL9QBk2HTxOknXRoVGx37EkRCMCdJB IRHdF2w566wtDVwE5ubLk7dXM+mBfkuzKvNPV9sAkeCmH90fdsKFY5RqHlEtg2YxXEUawX aJFhtNjjgME/IwiDC1wBRyUTdWJFHSg6DaQ/IB6+L9oyfZBZlfahDKmCFxWNJXtC/2jYwZ TWnc20L9NNQN88to6WxjPjrxmgchhCESvivPHmRLrskBSSg25k7ivYmWAqIjucuFAm0Vq0 VuHmXXR4dDQf9sL1gDM5cPbgKK3O+GiHY0WFwTEpVGZTLoOWanqto6qoUFiXFA== 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 4NT95H68j3zbWv; Fri, 9 Dec 2022 12:17:39 +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 2B9CHdbS086466; Fri, 9 Dec 2022 12:17:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2B9CHdD4086464; Fri, 9 Dec 2022 12:17:39 GMT (envelope-from git) Date: Fri, 9 Dec 2022 12:17:39 GMT Message-Id: <202212091217.2B9CHdD4086464@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: cd086696c2cb - main - vm_pager_allocate(): override resulting object type 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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: cd086696c2cb6d23bac3bc749836d36a9280ae98 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=cd086696c2cb6d23bac3bc749836d36a9280ae98 commit cd086696c2cb6d23bac3bc749836d36a9280ae98 Author: Konstantin Belousov AuthorDate: 2022-12-04 00:37:28 +0000 Commit: Konstantin Belousov CommitDate: 2022-12-09 12:17:03 +0000 vm_pager_allocate(): override resulting object type For dynamically allocated pager type, which inherits the parent's alloc method, type of the returned object is set to the parent's type otherwise. Tested by: pho Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D37097 --- sys/vm/vm_pager.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/sys/vm/vm_pager.c b/sys/vm/vm_pager.c index 08ce98ab5dbd..e24348ed39a0 100644 --- a/sys/vm/vm_pager.c +++ b/sys/vm/vm_pager.c @@ -258,9 +258,14 @@ vm_object_t vm_pager_allocate(objtype_t type, void *handle, vm_ooffset_t size, vm_prot_t prot, vm_ooffset_t off, struct ucred *cred) { + vm_object_t object; + MPASS(type < nitems(pagertab)); - return ((*pagertab[type]->pgo_alloc)(handle, size, prot, off, cred)); + object = (*pagertab[type]->pgo_alloc)(handle, size, prot, off, cred); + if (object != NULL) + object->type = type; + return (object); } /*