From nobody Fri Feb 21 21:12:24 2025 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 4Z02rm2MHBz5pMFX; Fri, 21 Feb 2025 21:12:24 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Z02rm1xCqz3Csb; Fri, 21 Feb 2025 21:12:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1740172344; 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=bm9Ms0Btlcsxp4tQkoaYGhdKSXiHJpUWYMWFAzMj6vU=; b=xhTYHEn2kSIFsQLu0LpNm8Uk6vOwavzXPcEwE7CX+FXLZeUcpnJ3MdXntZLcGj2tc+MD5W s5YnaYtpkbaGDhYT78CiO8XGduuLcVrdSvA5IvV9aKuKSZw6xP+wa5EHMjbSrM0a3RQZpz yvCTyFntCWH0rw9Bc9fCggc0SRUYR+oOkdt5lqAk7vOiN+bi2KkPV02rg0N8ZObrn6vcNC 8J+CZD0nZRxIs2s7nJehfVGxzdx/W6JTGr3WYPgx0lHuehnlGivNeIb0G0tkeua/4N0XXW hiy9wCYcz+11AgUW+mJODreJgLCWAb6F40gWaq8IiFSsnU2nf07wVSdWtDwrxA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1740172344; a=rsa-sha256; cv=none; b=XDP3Aez7IKP9wlQt+m06qdpZaDIUAKTqDt47hGjKAkKxSJ0IUnw1ql8xYVgcmiS/aqijhT no75KNZXn6kc33RRv6t7y+aZ8wckJO45Kgluk8fgO/upncuVeq3vcXdP6W02rqc8vdzNd7 /idGLOYzKL531jqXB6yzu4rEUo3pngg7LfqFzKcGbNjeP913mYmEliNlQv6GBTu8WeNI8K rwRzoxlJ9/5QyZgf+3ubFfAL9qo+UHST2b9U9lgAcl+ugE4YHcKEM8pSiD8CCsHmWOKsyT 53N+P3CQHFcxMEUtZdtvIb83e55bfmUrR35NDB13Gn7DxibE/V+0k4f8g9a+uw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1740172344; 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=bm9Ms0Btlcsxp4tQkoaYGhdKSXiHJpUWYMWFAzMj6vU=; b=Hw5Y3TZHgwcMCAufBH50ilp9bcqMvLHNrPZtNLCahstdpUfAnhph+bi0o4JVpiK9z14B0j iBL0M0kbl/FFP3yJu2RH6Oaqf8t0NixjHLP1DKYbJh4ZuY41RJdgt+R7+6FvvBd6y5U5JP 4C2+ZQqk6Kf3dKKnpfk7XuQMzTqtjuUfyw3cRHN/uvY+TRMBuwJW//VRW/0i+kDTCEOuhc Vz1opUT5267oDxneTfOviTN37aEZyYJp19I68rhGu5ESSAfx3IMRnrRibHno8SW9TGPoIA R7tOcSYTynFwrtU1lyNwr4Zn3ITY/FzbNoe6zIndQyfL6CqLUxQ8j78yC8oqbw== 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 4Z02rm1TBGzgK4; Fri, 21 Feb 2025 21:12:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 51LLCO88040266; Fri, 21 Feb 2025 21:12:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51LLCO1T040263; Fri, 21 Feb 2025 21:12:24 GMT (envelope-from git) Date: Fri, 21 Feb 2025 21:12:24 GMT Message-Id: <202502212112.51LLCO1T040263@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Doug Moore Subject: git: 5611a38d8185 - main - vm_page: define partial page invalidate 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dougm X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5611a38d818587b307e1fb110f72d2996c170035 Auto-Submitted: auto-generated The branch main has been updated by dougm: URL: https://cgit.FreeBSD.org/src/commit/?id=5611a38d818587b307e1fb110f72d2996c170035 commit 5611a38d818587b307e1fb110f72d2996c170035 Author: Doug Moore AuthorDate: 2025-02-21 21:11:13 +0000 Commit: Doug Moore CommitDate: 2025-02-21 21:11:13 +0000 vm_page: define partial page invalidate Two different functions in different files do the same thing - fill a partial page with zeroes. Add that functionality to vm_page.c and remove it elsewhere to avoid code duplication. Reviewed by: kib Differential Revision: https://reviews.freebsd.org/D49096 --- sys/fs/tmpfs/tmpfs_subr.c | 47 ++++---------------------------------------- sys/kern/uipc_shm.c | 47 ++++---------------------------------------- sys/vm/vm_page.c | 50 +++++++++++++++++++++++++++++++++++++++++++++++ sys/vm/vm_page.h | 2 ++ 4 files changed, 60 insertions(+), 86 deletions(-) diff --git a/sys/fs/tmpfs/tmpfs_subr.c b/sys/fs/tmpfs/tmpfs_subr.c index 41d1f27caf13..0cac19ed3780 100644 --- a/sys/fs/tmpfs/tmpfs_subr.c +++ b/sys/fs/tmpfs/tmpfs_subr.c @@ -493,50 +493,11 @@ static int tmpfs_partial_page_invalidate(vm_object_t object, vm_pindex_t idx, int base, int end, boolean_t ignerr) { - vm_page_t m; - int rv, error; - - VM_OBJECT_ASSERT_WLOCKED(object); - KASSERT(base >= 0, ("%s: base %d", __func__, base)); - KASSERT(end - base <= PAGE_SIZE, ("%s: base %d end %d", __func__, base, - end)); - error = 0; - -retry: - m = vm_page_grab(object, idx, VM_ALLOC_NOCREAT); - if (m != NULL) { - MPASS(vm_page_all_valid(m)); - } else if (vm_pager_has_page(object, idx, NULL, NULL)) { - m = vm_page_alloc(object, idx, VM_ALLOC_NORMAL | - VM_ALLOC_WAITFAIL); - if (m == NULL) - goto retry; - vm_object_pip_add(object, 1); - VM_OBJECT_WUNLOCK(object); - rv = vm_pager_get_pages(object, &m, 1, NULL, NULL); - VM_OBJECT_WLOCK(object); - vm_object_pip_wakeup(object); - if (rv == VM_PAGER_OK) { - /* - * Since the page was not resident, and therefore not - * recently accessed, immediately enqueue it for - * asynchronous laundering. The current operation is - * not regarded as an access. - */ - vm_page_launder(m); - } else { - vm_page_free(m); - m = NULL; - if (!ignerr) - error = EIO; - } - } - if (m != NULL) { - pmap_zero_page_area(m, base, end - base); - vm_page_set_dirty(m); - vm_page_xunbusy(m); - } + int error; + error = vm_page_partial_page_invalidate(object, idx, base, end); + if (ignerr) + error = 0; return (error); } diff --git a/sys/kern/uipc_shm.c b/sys/kern/uipc_shm.c index 026611a59593..083e95432208 100644 --- a/sys/kern/uipc_shm.c +++ b/sys/kern/uipc_shm.c @@ -697,51 +697,12 @@ static int shm_partial_page_invalidate(vm_object_t object, vm_pindex_t idx, int base, int end) { - vm_page_t m; - int rv; + int error; - VM_OBJECT_ASSERT_WLOCKED(object); - KASSERT(base >= 0, ("%s: base %d", __func__, base)); - KASSERT(end - base <= PAGE_SIZE, ("%s: base %d end %d", __func__, base, - end)); - -retry: - m = vm_page_grab(object, idx, VM_ALLOC_NOCREAT); - if (m != NULL) { - MPASS(vm_page_all_valid(m)); - } else if (vm_pager_has_page(object, idx, NULL, NULL)) { - m = vm_page_alloc(object, idx, - VM_ALLOC_NORMAL | VM_ALLOC_WAITFAIL); - if (m == NULL) - goto retry; - vm_object_pip_add(object, 1); + error = vm_page_partial_page_invalidate(object, idx, base, end); + if (error == EIO) VM_OBJECT_WUNLOCK(object); - rv = vm_pager_get_pages(object, &m, 1, NULL, NULL); - VM_OBJECT_WLOCK(object); - vm_object_pip_wakeup(object); - if (rv == VM_PAGER_OK) { - /* - * Since the page was not resident, and therefore not - * recently accessed, immediately enqueue it for - * asynchronous laundering. The current operation is - * not regarded as an access. - */ - vm_page_launder(m); - } else { - vm_page_free(m); - VM_OBJECT_WUNLOCK(object); - return (EIO); - } - } - if (m != NULL) { - pmap_zero_page_area(m, base, end - base); - KASSERT(vm_page_all_valid(m), ("%s: page %p is invalid", - __func__, m)); - vm_page_set_dirty(m); - vm_page_xunbusy(m); - } - - return (0); + return (error); } static int diff --git a/sys/vm/vm_page.c b/sys/vm/vm_page.c index c105aafca40f..f0f3c1e85564 100644 --- a/sys/vm/vm_page.c +++ b/sys/vm/vm_page.c @@ -5086,6 +5086,56 @@ out: return (VM_PAGER_OK); } +/* + * Fill a partial page with zeroes. + */ +int +vm_page_partial_page_invalidate(vm_object_t object, vm_pindex_t pindex, + int base, int end) +{ + vm_page_t m; + int rv; + + VM_OBJECT_ASSERT_WLOCKED(object); + KASSERT(base >= 0, ("%s: base %d", __func__, base)); + KASSERT(end - base <= PAGE_SIZE, ("%s: base %d end %d", __func__, base, + end)); + +retry: + m = vm_page_grab(object, pindex, VM_ALLOC_NOCREAT); + if (m != NULL) { + MPASS(vm_page_all_valid(m)); + } else if (vm_pager_has_page(object, pindex, NULL, NULL)) { + m = vm_page_alloc(object, pindex, + VM_ALLOC_NORMAL | VM_ALLOC_WAITFAIL); + if (m == NULL) + goto retry; + vm_object_pip_add(object, 1); + VM_OBJECT_WUNLOCK(object); + rv = vm_pager_get_pages(object, &m, 1, NULL, NULL); + VM_OBJECT_WLOCK(object); + vm_object_pip_wakeup(object); + if (rv != VM_PAGER_OK) { + vm_page_free(m); + return (EIO); + } + + /* + * Since the page was not resident, and therefore not recently + * accessed, immediately enqueue it for asynchronous laundering. + * The current operation is not regarded as an access. + */ + vm_page_launder(m); + } else + return (0); + + pmap_zero_page_area(m, base, end - base); + KASSERT(vm_page_all_valid(m), ("%s: page %p is invalid", __func__, m)); + vm_page_set_dirty(m); + vm_page_xunbusy(m); + return (0); +} + /* * Locklessly grab a valid page. If the page is not valid or not yet * allocated this will fall back to the object lock method. diff --git a/sys/vm/vm_page.h b/sys/vm/vm_page.h index 744688bf789b..b568fddab8d4 100644 --- a/sys/vm/vm_page.h +++ b/sys/vm/vm_page.h @@ -627,6 +627,8 @@ vm_page_t vm_page_alloc_noobj_contig_domain(int domain, int req, u_long npages, vm_memattr_t memattr); void vm_page_bits_set(vm_page_t m, vm_page_bits_t *bits, vm_page_bits_t set); bool vm_page_blacklist_add(vm_paddr_t pa, bool verbose); +int vm_page_partial_page_invalidate(vm_object_t object, vm_pindex_t pindex, + int base, int end); vm_page_t vm_page_grab(vm_object_t, vm_pindex_t, int); vm_page_t vm_page_grab_unlocked(vm_object_t, vm_pindex_t, int); int vm_page_grab_pages(vm_object_t object, vm_pindex_t pindex, int allocflags,