From nobody Fri Jan 20 03:23:30 2023 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 4NylFZ4kM9z30vfS; Fri, 20 Jan 2023 03:23:30 +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 4NylFZ3RNHz3n9J; Fri, 20 Jan 2023 03:23:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674185010; 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=XmSmKRBt2+Y1ba8rZts3H3yyWLOw7/fERFOaMCxCDas=; b=O5g6GcjjSOK4OqpdgGabCwLdKYUVeQlAleQa+mR+fq10AW9veb48klZAN09jvdvPfbWcxB aYq1sZ2O5KO3OdpDQEDWJ1R7On23YMkJToU+AK0EYh1+IDWpHXstPPZAEOn0jkkoi7biPD uGDNc9/D5kTmbhToYdg6Fsn8RD7q3dQLYuk8xau16zVvJW9eupTKqyJo1zE1c26GKHrh49 Wl9UlOl32Ehuejt3QifzsWZyD4EhSq0t0mgAF6N3M8GOa36fnCN7p48armP57B1LbrZERt CkSxctPvpNHhfqYoFhnND2uRYWecCelXD1HXr4+KoP/0Pjn6mlr2dQwj6zqCfA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674185010; 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=XmSmKRBt2+Y1ba8rZts3H3yyWLOw7/fERFOaMCxCDas=; b=mnGLmop8in78050R7ZLZF8KYapwKLkbhnoSHfCyBRLHxhiE1CLodPJAR1h+jya2NvVtmab YnEiV2UMNxSfThEFLAKGzEiUn7iN4ouvF9DGZSB9hq8iJq/kJfC1ASSmCoLAajH4zu0Tx8 2SAQEa+KaFvvV2Qp2MOoxiWSmrgvcKpQ2rSwhZOF98Q6BUyoW7iyTFFHr5GDhm7ekPzc/Q 4EW3q8wLOpiVtAWhUGqzRLQKejMPAGazE4dcLqHvTZjwF+NcAwKR0vMdjWhnqrjzJzusYD 5Oncus3Q0w3FS3/wKkHlh/z5+BdwCy6k1eXdoQAqFldQW5mZy33Yna8IvJvhRw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1674185010; a=rsa-sha256; cv=none; b=BzNOABvBCBG+MO9tTiZvzafcSDZKarUvTW8dj6kKJ3nbIEky/oRX/FWUBO21gbTSNbQjfl rahZNJo5cVzW/nO9gXyH+GOS2D1nfuvJtTyr3x07ebYF+VQJh67QbvTS6D+J9uVjtStCBG wWFRwbKf0I1CZzXR/JH/f/zuHkLkDc35ci7KL4ip9kj+2YB7NAg9HapcWxAhYhmEbetoYT +Lp+Ra4htYPAoh3HmW5lfa8LOFNC4NLPF5AH/vT6vOP4E5qzmkRaAC8mBpi7miLhGhpja0 ZLBa9M+1kjFKJdR0EFNntjEAjeLBFq+snJyrFpwb9m8Tuk8wQL4s2lUDJgD4Rw== 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 4NylFZ2MHNzFtn; Fri, 20 Jan 2023 03:23:30 +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 30K3NUCm042245; Fri, 20 Jan 2023 03:23:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30K3NUmW042244; Fri, 20 Jan 2023 03:23:30 GMT (envelope-from git) Date: Fri, 20 Jan 2023 03:23:30 GMT Message-Id: <202301200323.30K3NUmW042244@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 7d05e01b3e59 - stable/13 - vm_pager: add method to veto page allocation 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: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 7d05e01b3e59c12f1b7a07dbf3b0ed11ac62ed13 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=7d05e01b3e59c12f1b7a07dbf3b0ed11ac62ed13 commit 7d05e01b3e59c12f1b7a07dbf3b0ed11ac62ed13 Author: Konstantin Belousov AuthorDate: 2022-10-20 13:15:46 +0000 Commit: Konstantin Belousov CommitDate: 2023-01-20 03:19:29 +0000 vm_pager: add method to veto page allocation Tested by: pho (cherry picked from commit ec201dddfbddd3a77dd3f3afc9b007d0e13e7ad1) --- sys/vm/vm_fault.c | 4 ++++ sys/vm/vm_page.c | 4 ++++ sys/vm/vm_pager.c | 1 + sys/vm/vm_pager.h | 11 +++++++++++ 4 files changed, 20 insertions(+) diff --git a/sys/vm/vm_fault.c b/sys/vm/vm_fault.c index 32b09fc469d7..605cf1203554 100644 --- a/sys/vm/vm_fault.c +++ b/sys/vm/vm_fault.c @@ -1192,6 +1192,10 @@ vm_fault_allocate(struct faultstate *fs) #if VM_NRESERVLEVEL > 0 vm_object_color(fs->object, atop(fs->vaddr) - fs->pindex); #endif + if (!vm_pager_can_alloc_page(fs->object, fs->pindex)) { + unlock_and_deallocate(fs); + return (FAULT_FAILURE); + } alloc_req = P_KILLED(curproc) ? VM_ALLOC_SYSTEM : VM_ALLOC_NORMAL; if (fs->object->type != OBJT_VNODE && diff --git a/sys/vm/vm_page.c b/sys/vm/vm_page.c index 0030bf47c814..736b25a1f2b5 100644 --- a/sys/vm/vm_page.c +++ b/sys/vm/vm_page.c @@ -2029,6 +2029,8 @@ vm_page_alloc_domain_after(vm_object_t object, vm_pindex_t pindex, int domain, flags = 0; m = NULL; + if (!vm_pager_can_alloc_page(object, pindex)) + return (NULL); pool = object != NULL ? VM_FREEPOOL_DEFAULT : VM_FREEPOOL_DIRECT; again: #if VM_NRESERVLEVEL > 0 @@ -4676,6 +4678,8 @@ retrylookup: *mp = NULL; return (VM_PAGER_FAIL); } else if ((m = vm_page_alloc(object, pindex, pflags)) == NULL) { + if (!vm_pager_can_alloc_page(object, pindex)) + return (VM_PAGER_AGAIN); goto retrylookup; } diff --git a/sys/vm/vm_pager.c b/sys/vm/vm_pager.c index 5ba37189a273..ea5ce36f1963 100644 --- a/sys/vm/vm_pager.c +++ b/sys/vm/vm_pager.c @@ -424,6 +424,7 @@ vm_pager_alloc_dyn_type(struct pagerops *ops, int base_type) FIX(freespace); FIX(page_inserted); FIX(page_removed); + FIX(can_alloc_page); #undef FIX } pagertab[res] = ops; /* XXXKIB should be rel, but acq is too much */ diff --git a/sys/vm/vm_pager.h b/sys/vm/vm_pager.h index 5917bf651760..0e248d871250 100644 --- a/sys/vm/vm_pager.h +++ b/sys/vm/vm_pager.h @@ -71,6 +71,7 @@ typedef void pgo_freespace_t(vm_object_t object, vm_pindex_t start, vm_size_t size); typedef void pgo_page_inserted_t(vm_object_t object, vm_page_t m); typedef void pgo_page_removed_t(vm_object_t object, vm_page_t m); +typedef boolean_t pgo_can_alloc_page_t(vm_object_t object, vm_pindex_t pindex); struct pagerops { int pgo_kvme_type; @@ -91,6 +92,7 @@ struct pagerops { pgo_freespace_t *pgo_freespace; pgo_page_inserted_t *pgo_page_inserted; pgo_page_removed_t *pgo_page_removed; + pgo_can_alloc_page_t *pgo_can_alloc_page; }; extern const struct pagerops defaultpagerops; @@ -273,6 +275,15 @@ vm_pager_page_removed(vm_object_t object, vm_page_t m) method(object, m); } +static __inline bool +vm_pager_can_alloc_page(vm_object_t object, vm_pindex_t pindex) +{ + pgo_can_alloc_page_t *method; + + method = pagertab[object->type]->pgo_can_alloc_page; + return (method != NULL ? method(object, pindex) : true); +} + int vm_pager_alloc_dyn_type(struct pagerops *ops, int base_type); void vm_pager_free_dyn_type(objtype_t type);