From nobody Wed Jul 27 13:52:33 2022 X-Original-To: dev-commits-src-branches@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 4LtFb60fzFz4Xc3L; Wed, 27 Jul 2022 13:52:34 +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 4LtFb602vxz3cTQ; Wed, 27 Jul 2022 13:52:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1658929954; 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=eFy6/HSemTV36sbfRjOjAJv6OE4Dom5dtdpEA0fChE4=; b=rR9fPzl46DsYKjynkGxKtegPkBqLt2I/4wWFqN5Vv/4DOe0LsahrngOlGtxAMuDCG1lKzv 0xmVTreH2y62M8H+fWQ8OyuEKZWUAgDF+1+fCzntQQ+lzZUEkK4i54gV3AgiQiN66pbiVO Wrzv6MFsfn1Kz3cCcd4hv57eQ2s/FZEUzkbRJ1Lzl2sgSk3fIHRUZCHUdN06PnXU/Dhsf0 lhCQuksorXBnT4cVrtAzE7H6QGycKfGtYVJHTkgSZRG4GLol1DQFr7HW/Y3aTqXeyAzqeZ MQJsh27MFhds6h/2oQE0/5qW0vm5SYe7pe0Ty7qTZYHoIQkbHMwPtld95pe2iw== 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 4LtFb56DMmzK4Z; Wed, 27 Jul 2022 13:52:33 +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 26RDqXSV024134; Wed, 27 Jul 2022 13:52:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 26RDqXcL024133; Wed, 27 Jul 2022 13:52:33 GMT (envelope-from git) Date: Wed, 27 Jul 2022 13:52:33 GMT Message-Id: <202207271352.26RDqXcL024133@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: a94380d88c77 - stable/13 - vm_object: Modify various drivers to allocate OBJT_SWAP objects List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/stable/13 X-Git-Reftype: branch X-Git-Commit: a94380d88c77799b9c7a869d5e6712d5f6810997 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1658929954; 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=eFy6/HSemTV36sbfRjOjAJv6OE4Dom5dtdpEA0fChE4=; b=EyBj/AERP7rnkNn85vLxmXanzN+Sbs6YuXS7CN4EyWZCIztAr4igEE4g0VZkeIcmtFMVsp v7cbAtHYJR1TuunDm6VVtiIZ7XBrK3KhXaVPkJisF76Tg9/dbunT30WGteBOPTRXfSdPSM i7AS5wpTltvRwOKr3wWQIuZROy+jso25UchIbqe7JeQ0Ua+R+82n60T1ULirvxFDYznSwl 9WPDR9yu6LC7YUFKRPEGvusr4VlnWJVa1zZi3P52MJMDRjkwuI/w78WYViOYQr5mgESWjq YZfxAVR4GRBdLZBskpl8ISHec2VjU+u2ygpBknQfxWn7oTHjeMzHDs98afkkJg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1658929954; a=rsa-sha256; cv=none; b=uJK2sVU/VNs4Oh+X6Y+jtLjC7xBkqJ6NQjTNEmSqrD0Tw0SbPytVVI6JsdekcPZkbEHAIf qCFkPf58a9vPHTTTcFKIe05ZtuYEctsvhPILd/PJQif1X7INMQrLp+IWqz2henMeY5U/T1 svdQJxZ0po8vCOK3fpz3D9RrInzYGBuuErHgKiYTVgZNvjPLAgfyLCLROaRSLrL2CVY61n 0VPZLlZjs2Zdp0A2yZj858xoNThsbmzbyjBKnBgKQPceqANqfl2JZMlIMMVRAb5WrTB4Fv dJud4bExEEKiBR/Mu0neeUWWo/ytckcSh0O65xq77PZrrEaX2Th/OuUluxjEHg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=a94380d88c77799b9c7a869d5e6712d5f6810997 commit a94380d88c77799b9c7a869d5e6712d5f6810997 Author: Mark Johnston AuthorDate: 2022-07-12 12:51:02 +0000 Commit: Mark Johnston CommitDate: 2022-07-27 13:50:51 +0000 vm_object: Modify various drivers to allocate OBJT_SWAP objects This is in preparation for removal of OBJT_DEFAULT. In particular, it is now cheap to check whether an OBJT_SWAP object has any swap blocks allocated, so the benefit of having a separate OBJT_DEFAULT type is quite marginal, and the OBJT_DEFAULT->SWAP transition is a source of bugs. Reviewed by: alc, hselasky, kib Sponsored by: The FreeBSD Foundation (cherry picked from commit 6b38974085215bcd787be0d138411ec57cf0096e) --- sys/amd64/vmm/vmm.c | 2 +- sys/compat/linuxkpi/common/src/linux_shmemfs.c | 2 +- sys/dev/agp/agp.c | 2 +- sys/dev/agp/agp_i810.c | 2 +- sys/dev/drm2/drm_gem.c | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/sys/amd64/vmm/vmm.c b/sys/amd64/vmm/vmm.c index 587a5bfdfa65..b417a2345bed 100644 --- a/sys/amd64/vmm/vmm.c +++ b/sys/amd64/vmm/vmm.c @@ -697,7 +697,7 @@ vm_alloc_memseg(struct vm *vm, int ident, size_t len, bool sysmem) return (EINVAL); } - obj = vm_object_allocate(OBJT_DEFAULT, len >> PAGE_SHIFT); + obj = vm_object_allocate(OBJT_SWAP, len >> PAGE_SHIFT); if (obj == NULL) return (ENOMEM); diff --git a/sys/compat/linuxkpi/common/src/linux_shmemfs.c b/sys/compat/linuxkpi/common/src/linux_shmemfs.c index ead9cc9d9f40..741bb20c1aab 100644 --- a/sys/compat/linuxkpi/common/src/linux_shmemfs.c +++ b/sys/compat/linuxkpi/common/src/linux_shmemfs.c @@ -84,7 +84,7 @@ linux_shmem_file_setup(const char *name, loff_t size, unsigned long flags) filp->f_count = 1; filp->f_vnode = vp; - filp->f_shmem = vm_pager_allocate(OBJT_DEFAULT, NULL, size, + filp->f_shmem = vm_pager_allocate(OBJT_SWAP, NULL, size, VM_PROT_READ | VM_PROT_WRITE, 0, curthread->td_ucred); if (filp->f_shmem == NULL) { error = -ENOMEM; diff --git a/sys/dev/agp/agp.c b/sys/dev/agp/agp.c index 84e8274ee49d..b4998418b8b4 100644 --- a/sys/dev/agp/agp.c +++ b/sys/dev/agp/agp.c @@ -491,7 +491,7 @@ agp_generic_alloc_memory(device_t dev, int type, vm_size_t size) mem->am_id = sc->as_nextid++; mem->am_size = size; mem->am_type = 0; - mem->am_obj = vm_object_allocate(OBJT_DEFAULT, atop(round_page(size))); + mem->am_obj = vm_object_allocate(OBJT_SWAP, atop(round_page(size))); mem->am_physical = 0; mem->am_offset = 0; mem->am_is_bound = 0; diff --git a/sys/dev/agp/agp_i810.c b/sys/dev/agp/agp_i810.c index 9bca2f556a60..0fcc10058181 100644 --- a/sys/dev/agp/agp_i810.c +++ b/sys/dev/agp/agp_i810.c @@ -1744,7 +1744,7 @@ agp_i810_alloc_memory(device_t dev, int type, vm_size_t size) mem->am_size = size; mem->am_type = type; if (type != 1 && (type != 2 || size == AGP_PAGE_SIZE)) - mem->am_obj = vm_object_allocate(OBJT_DEFAULT, + mem->am_obj = vm_object_allocate(OBJT_SWAP, atop(round_page(size))); else mem->am_obj = 0; diff --git a/sys/dev/drm2/drm_gem.c b/sys/dev/drm2/drm_gem.c index 2692eb2499ae..7cfe09e46c01 100644 --- a/sys/dev/drm2/drm_gem.c +++ b/sys/dev/drm2/drm_gem.c @@ -111,7 +111,7 @@ int drm_gem_object_init(struct drm_device *dev, ("Bad size %ju", (uintmax_t)size)); obj->dev = dev; - obj->vm_obj = vm_pager_allocate(OBJT_DEFAULT, NULL, size, + obj->vm_obj = vm_pager_allocate(OBJT_SWAP, NULL, size, VM_PROT_READ | VM_PROT_WRITE, 0, curthread->td_ucred); obj->refcount = 1;