From nobody Fri Jan 20 03:23:31 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 4NylFc0L5yz30vhl; Fri, 20 Jan 2023 03:23:32 +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 4NylFb4PjXz3my7; Fri, 20 Jan 2023 03:23:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674185011; 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=F4ksGdXZc9EcWhl3ddPEC3/Oh4L7CcBpdG1MlGeSN9Q=; b=vyKNE+GZ292/upOzm1zDnusnpPoiP6uPAIS3nFp0rwjVSbdvlxUSPoWC38CaIkxXpokP/O pYYDJToe4O4XM3VylFk83bqG0xgtqxuSgjejzrPIT3t9enTesyoUGR5iLuAzJORgWIzgK9 uZcnK5MuIkER/PGZW6+wnYd7ZzvR+liOTwLSN1sQqGOl5UHFMDX6FaYzNxKCRXsBry6WGy 4znMu5w1vKGbF+owv+jI0xJ4T1+KsXikZKqbYvLM9QCi+Y/wETwrUJ0Gv8yuiQfQqhzqY/ ZN5EYxe2aXoFFsj5dk8/sM9wz1zSadaZmBO0TZ/jB0V6Ku8NPZqAfxaPuBuz3w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674185011; 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=F4ksGdXZc9EcWhl3ddPEC3/Oh4L7CcBpdG1MlGeSN9Q=; b=ocfjQw+Y54P46L3yEUSt91C2vvh8G/vUPELMdq4POE5FOaKc9+NIROpZxHsJvdvfD4eBqC eApuJzu6g6KX2JEHKz4fbbMP7X/7JeDwHyaeLYvNJsFbWPreunSa9y6a+A2j/2bppLohmf 7f9n3XkTch4ioYJNnKBuq/kAOQL56UB17xEsMTVIzab9ZtVn5P5b9EcaRXFTlRnNYZBwp0 Q2cMvjsjONSE+t4pH1n8cX4BTW9T9ZEzK4gdxqn1pBE4Zm2cMX+JiM36Wlckk8APlZLwqv GDd1Zw8ZkRRhyiIrKXUmcsnhbGCfsn45Pv6wMSk3BL6ttQCgfuSNE/fYP7EINQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1674185011; a=rsa-sha256; cv=none; b=UaqR68ewwq1I7Y7CIbUQpOQ0A1ryJxLSNO8qMOwPB7CTkbz1VwI6wPSaai66VwuxRoWjPp r2hIXj59W6C3Y9ItWhqVBGRFqnUx/yyjHvKMLHeCo/VSQVQ/CeHkSAUTLd3NNJPj/sMH1p 7GGjnCMiZFTmY8OQmWVqbYv81hq2oUro9ycuhw7etO5HdNP2Ai0fykFrhW6ZeVu45zWzhH zpLlQIf9MWeqmrjwQ5P1tLc6I6Ow81XgGv9uTjUu8azTMIlejQ2xZjJa2LSR+QekzABwwl ALVFwLq736OJF1p+Wfhv7Z8vr09ObCebkcX5Ootve5vUjbVy088HBcey06TQYQ== 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 4NylFb3K4ZzGDL; Fri, 20 Jan 2023 03:23:31 +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 30K3NVS4042269; Fri, 20 Jan 2023 03:23:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30K3NVpg042268; Fri, 20 Jan 2023 03:23:31 GMT (envelope-from git) Date: Fri, 20 Jan 2023 03:23:31 GMT Message-Id: <202301200323.30K3NVpg042268@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: aaac643676bc - stable/13 - vm_page_grab_valid(): clear *mp in case of pager denying 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: aaac643676bce2c80a78069e2c4a45deb50448dc Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=aaac643676bce2c80a78069e2c4a45deb50448dc commit aaac643676bce2c80a78069e2c4a45deb50448dc Author: Konstantin Belousov AuthorDate: 2022-12-17 00:12:14 +0000 Commit: Konstantin Belousov CommitDate: 2023-01-20 03:19:35 +0000 vm_page_grab_valid(): clear *mp in case of pager denying page allocation Tested by: pho (cherry picked from commit 3249449190c2c71ecfc4fa5f518f94ff552df440) --- sys/vm/vm_page.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sys/vm/vm_page.c b/sys/vm/vm_page.c index 736b25a1f2b5..ecabd6c4798e 100644 --- a/sys/vm/vm_page.c +++ b/sys/vm/vm_page.c @@ -4678,8 +4678,10 @@ 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)) + if (!vm_pager_can_alloc_page(object, pindex)) { + *mp = NULL; return (VM_PAGER_AGAIN); + } goto retrylookup; }