From nobody Sun Jul 17 11:24:20 2022 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 4Lm2mj15dgz4T27w; Sun, 17 Jul 2022 11:24:21 +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 4Lm2mj0Bd7z3Pks; Sun, 17 Jul 2022 11:24:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1658057061; 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=4F6IEidiW2rdD0YBTa45OIhjxnS6e6nShr7dxzBHFWg=; b=Q7HN8TPOWZzBycB9ocQ3AF636LMI3L+tQJPkJcI6MS10eOHsTnmx5Gg/4CiYKowI/QALgO xwb5OmHjzXDAlw2XEU9bxPHAidTdu96tzFjWMlzDbHpufyx/fOy+8blw8sz5ssSA+vQvBZ 64Ey7CLDYDJYGldaHC0PEihxXXwa5xJ2mUPibWdfVdM/92JecrBEGC9VIIpcD+IlE8AOdt ahuCFb66uEWzrnJ0DngwirxZMrL8+wgcZh05hrnHmOhaowXxZvx6UG7ZmysqyIDoDvz7pP DsuapVOiOuV0Ze8yo++aurbI6QsLbda7YfH5iCfk+KwVdfoBbM1sBhCuStjZ6A== 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 4Lm2mh6J20zyQh; Sun, 17 Jul 2022 11:24:20 +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 26HBOKZC014301; Sun, 17 Jul 2022 11:24:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 26HBOKvK014300; Sun, 17 Jul 2022 11:24:20 GMT (envelope-from git) Date: Sun, 17 Jul 2022 11:24:20 GMT Message-Id: <202207171124.26HBOKvK014300@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: 1424f65bbcb3 - main - vm_pager: Remove the default pager 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: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1424f65bbcb3283c899c356bf38ef0a9930add34 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1658057061; 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=4F6IEidiW2rdD0YBTa45OIhjxnS6e6nShr7dxzBHFWg=; b=wDZOwGxyyX9RHgQUr4fu2ViCQwmMMJAtKTGy2wGBqoOzcMk1EhpVSccpOCCWxt6bKnmSyX n7/XWJ+t1bTYC04Ws8OSNHcuou6XwuBMS0ZUIHmaXvFPc9r2dcM7w5QVDHcN4IKPipJc0V jYrlNKgTV1udovaGUFukTEahy5MrP4BWwj3JqmhO0BM+QFhPddDlrO9XsR2cKhKB31atNQ i6Gv5CWKjJpZcAanqWd3jdnUuo+JS8R/ypuAW0QkCPRhSlpT6k0tJwBxMQEzLQb9shCoh3 03I9SRkvM7klszAjtn61JtfrYnj0PKs6zouJOkv6EQdRXmUSJZneUjRAZVNP0A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1658057061; a=rsa-sha256; cv=none; b=xhok/BxHDu1rlK9SPLd3I7GN4jZC++AFi2J+/ABWzseCvoj4z7Px9SHVV3/TAGMLU4W1jM Q+lS1swgCY4OVUtGS2l6Vq/uS7khCC0uvY5NlUIG3e2q3qbQ5DVfVa6QWdMDvfgYlWTdR7 mGVKF2TJ+ytSQfdhRV/axXf1cIFILy/5oDroT9squAw1f0/KsvyEC/UUY1nCLIbOeTkL40 h6BSQwQ4S+dAAA4zYaFLzhHxRElwiPayqQIq3OqrS4YWdn+5x74d/x4pbDcKnR38U2IoNt C7cCS+HCKuHsR3LdRRnStSC2bFFoCK0PrP6CWMC3qzrhj5WASohCI7I4669LsQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=1424f65bbcb3283c899c356bf38ef0a9930add34 commit 1424f65bbcb3283c899c356bf38ef0a9930add34 Author: Mark Johnston AuthorDate: 2022-07-16 15:30:19 +0000 Commit: Mark Johnston CommitDate: 2022-07-17 11:09:48 +0000 vm_pager: Remove the default pager It's unused now. Keep the OBJ_DEFAULT identifier, but make it an alias of OBJT_SWAP for the benefit of out-of-tree code. Reviewed by: alc, imp, kib Tested by: pho Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D35790 --- sys/conf/files | 1 - sys/vm/default_pager.c | 158 ------------------------------------------------- sys/vm/vm.h | 3 +- sys/vm/vm_pager.c | 5 +- 4 files changed, 4 insertions(+), 163 deletions(-) diff --git a/sys/conf/files b/sys/conf/files index 11b7e0357c79..30cd9eb7e741 100644 --- a/sys/conf/files +++ b/sys/conf/files @@ -5181,7 +5181,6 @@ ufs/ufs/ufs_lookup.c optional ffs ufs/ufs/ufs_quota.c optional ffs ufs/ufs/ufs_vfsops.c optional ffs ufs/ufs/ufs_vnops.c optional ffs -vm/default_pager.c standard vm/device_pager.c standard vm/phys_pager.c standard vm/redzone.c optional DEBUG_REDZONE diff --git a/sys/vm/default_pager.c b/sys/vm/default_pager.c deleted file mode 100644 index d07a84f8c98e..000000000000 --- a/sys/vm/default_pager.c +++ /dev/null @@ -1,158 +0,0 @@ -/*- - * SPDX-License-Identifier: BSD-4-Clause - * - * Copyright (c) 1995, David Greenman - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by David Greenman. - * 4. The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ - -#include -__FBSDID("$FreeBSD$"); - -#include -#include -#include -#include -#include -#include -#include - -#include -#include -#include -#include -#include - -static vm_object_t default_pager_alloc(void *, vm_ooffset_t, vm_prot_t, - vm_ooffset_t, struct ucred *); -static void default_pager_dealloc(vm_object_t); -static int default_pager_getpages(vm_object_t, vm_page_t *, int, - int *, int *); -static void default_pager_putpages(vm_object_t, vm_page_t *, int, - boolean_t, int *); -static boolean_t default_pager_haspage(vm_object_t, vm_pindex_t, int *, - int *); - -/* - * pagerops for OBJT_DEFAULT - "default pager". - * - * This pager handles anonymous (no handle) swap-backed memory, just - * like the swap pager. It allows several optimizations based on the - * fact that no pages of a default object can be swapped out. The - * most important optimization is in vm_fault(), where the pager is - * never asked for a non-resident page. Instead, a freshly allocated - * zeroed page is used. - * - * On the first request to page out a page from a default object, the - * object is converted to swap pager type. - */ -const struct pagerops defaultpagerops = { - .pgo_kvme_type = KVME_TYPE_DEFAULT, - .pgo_alloc = default_pager_alloc, - .pgo_dealloc = default_pager_dealloc, - .pgo_getpages = default_pager_getpages, - .pgo_putpages = default_pager_putpages, - .pgo_haspage = default_pager_haspage, -}; - -/* - * Return an initialized object. - */ -static vm_object_t -default_pager_alloc(void *handle, vm_ooffset_t size, vm_prot_t prot, - vm_ooffset_t offset, struct ucred *cred) -{ - vm_object_t object; - - if (handle != NULL) - panic("default_pager_alloc: handle specified"); - if (cred != NULL) { - if (!swap_reserve_by_cred(size, cred)) - return (NULL); - crhold(cred); - } - object = vm_object_allocate(OBJT_DEFAULT, - OFF_TO_IDX(round_page(offset + size))); - if (cred != NULL) { - object->cred = cred; - object->charge = size; - } - return (object); -} - -/* - * Deallocate resources associated with the object. - */ -static void -default_pager_dealloc(vm_object_t object) -{ - - /* Reserved swap is released by vm_object_destroy(). */ - object->type = OBJT_DEAD; -} - -/* - * Load pages from backing store. - */ -static int -default_pager_getpages(vm_object_t object, vm_page_t *m, int count, - int *rbehind, int *rahead) -{ - - /* - * Since an OBJT_DEFAULT object is converted to OBJT_SWAP by the first - * call to the putpages method, this function will never be called on - * a vm_page with assigned swap. - */ - return (VM_PAGER_FAIL); -} - -/* - * Store pages to backing store. - */ -static void -default_pager_putpages(vm_object_t object, vm_page_t *m, int count, - int flags, int *rtvals) -{ - - /* The swap pager will convert the object to OBJT_SWAP. */ - swappagerops.pgo_putpages(object, m, count, flags, rtvals); -} - -/* - * Tell us whether the requested (object,index) is available from the object's - * backing store. - */ -static boolean_t -default_pager_haspage(vm_object_t object, vm_pindex_t pindex, int *before, - int *after) -{ - - /* An OBJT_DEFAULT object has no backing store. */ - return (FALSE); -} diff --git a/sys/vm/vm.h b/sys/vm/vm.h index 72b0191298d9..d0cc399dab79 100644 --- a/sys/vm/vm.h +++ b/sys/vm/vm.h @@ -89,8 +89,9 @@ typedef u_char vm_prot_t; /* protection codes */ #define VM_PROT_DEFAULT VM_PROT_ALL enum obj_type { - OBJT_DEFAULT, + OBJT_RESERVED = 0, /* was OBJT_DEFAULT */ OBJT_SWAP, + OBJT_DEFAULT = OBJT_SWAP, OBJT_VNODE, OBJT_DEVICE, OBJT_PHYS, diff --git a/sys/vm/vm_pager.c b/sys/vm/vm_pager.c index 9b66964b8d8f..2f8afd69a1b4 100644 --- a/sys/vm/vm_pager.c +++ b/sys/vm/vm_pager.c @@ -166,7 +166,6 @@ static const struct pagerops deadpagerops = { }; const struct pagerops *pagertab[16] __read_mostly = { - [OBJT_DEFAULT] = &defaultpagerops, [OBJT_SWAP] = &swappagerops, [OBJT_VNODE] = &vnodepagerops, [OBJT_DEVICE] = &devicepagerops, @@ -190,7 +189,7 @@ vm_pager_init(void) */ for (i = 0; i < OBJT_FIRST_DYN; i++) { pgops = &pagertab[i]; - if ((*pgops)->pgo_init != NULL) + if (*pgops != NULL && (*pgops)->pgo_init != NULL) (*(*pgops)->pgo_init)(); } } @@ -402,7 +401,7 @@ vm_pager_alloc_dyn_type(struct pagerops *ops, int base_type) mtx_lock(&pagertab_lock); MPASS(base_type == -1 || - (base_type >= OBJT_DEFAULT && base_type < nitems(pagertab))); + (base_type >= OBJT_SWAP && base_type < nitems(pagertab))); for (res = OBJT_FIRST_DYN; res < nitems(pagertab); res++) { if (pagertab[res] == NULL) break;