From nobody Sat Feb 22 01:23:51 2025 X-Original-To: dev-commits-src-main@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 4Z08Qv5vjcz5nlCS; Sat, 22 Feb 2025 01:23:51 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Z08Qv56VHz3dXh; Sat, 22 Feb 2025 01:23:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1740187431; 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=fAJ4gceK7OKoy50Qtw6b/j+YsKJc1U/svfY8mygKYoQ=; b=ZL19yD6+V428wjy55cdhRBKJPpJm0dfbbxV89igcZupBnGwM4noV6ioYkFeYNj4jp+KA6L CRL3y9/CFpjEbAE75sw7FTgpFysFeQ99FYD6c0nPDgK4Z5G5uEK/KfYnCDVSAMR602CL31 y+bAhktNBWyij5HPfg+aBEMParedBlUi02QDLqCrmtXUmFtY1LnhGwenJtDu2DP2DBQmWE C3p46bHt786So4JFflqvDv5khTJ1a827SzxKanc9zvCCXkaIj4ZisQviWa1AqUB8IWGvdn eB1nIpkaGlNqA4TaWCg/dMV6Hw4gHSvmr692i76ofc3AM+jP2/0Zx/aOHj3Liw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1740187431; a=rsa-sha256; cv=none; b=BYgzcXhRHssu+fQRC/2Efusx/oSp+UomfcthTqOSoJh6gWY5vWXdgdFLCn12hIrpW9hhL6 ehq2f0x2BuifGmPyud6NWpnErc7HuhjTmPPm6Wfuu91YJhXeAFCWTW4kcgq2gWtWCHPXjI 4Z2G+aCmOd1FYJTJ49PD67IgymcTbGCn7hjwYCkAnek4PsulhFjfFrxTDJ83fik7wtlnyR j0ENCdHIQ+yVDlYfn9AycBc/u2IJf6ZtE9W0BlT3yMnwVV7kuATx/IWTqWvb6eVxhVScMx ejvLrXnuTewOquetkIaRyPC4lK/T7t4/0nsXiXmzbSZ4IrXkKFgcp8bs3Cx+Ag== 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=1740187431; 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=fAJ4gceK7OKoy50Qtw6b/j+YsKJc1U/svfY8mygKYoQ=; b=mTQVKg1JP2sliyKmfaI2J4CmKIksUgusZwJZ7/zf/EEAnawCrX6ATywhZrsxBDMRqH0jr0 zRsdgDYbBWmiJ4ZvC74chuap1fH2xYW52Nzv3wvNtrju7FiWore5xLiUahdTipNaY2fwfB q3a3r5KG8c9BmbobqMMb3SIWoSb+0Iv+T7VUFIQegUJDjYJa2JUFHEkpB5h5+lYAQVBJmy SVy3MjmxZGwVWtZV6Mmy/1WEGGmQVRfBQ0M6ubEjK6dEPeJApxCSXa22GYG3lRsmSrW94V IB8O9Fcf/zvw/J3HSYn6iNINdPik7T2dsO/9PKuYpv06uKiuixShX7QV0XYLdw== 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 4Z08Qv3zc8zmpF; Sat, 22 Feb 2025 01:23:51 +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 51M1Npc2005937; Sat, 22 Feb 2025 01:23:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51M1NpNC005931; Sat, 22 Feb 2025 01:23:51 GMT (envelope-from git) Date: Sat, 22 Feb 2025 01:23:51 GMT Message-Id: <202502220123.51M1NpNC005931@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: bb1dc6cf9c36 - main - vm_page: define partial page invalidate List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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: bb1dc6cf9c3671c82318e22825d86d54c8d672cb Auto-Submitted: auto-generated The branch main has been updated by dougm: URL: https://cgit.FreeBSD.org/src/commit/?id=bb1dc6cf9c3671c82318e22825d86d54c8d672cb commit bb1dc6cf9c3671c82318e22825d86d54c8d672cb Author: Doug Moore AuthorDate: 2025-02-22 01:22:47 +0000 Commit: Doug Moore CommitDate: 2025-02-22 01:22:47 +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: markj, 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 | 51 +++++++++++++++++++++++++++++++++++++++++++++++ sys/vm/vm_page.h | 2 ++ 4 files changed, 61 insertions(+), 86 deletions(-) diff --git a/sys/fs/tmpfs/tmpfs_subr.c b/sys/fs/tmpfs/tmpfs_subr.c index 41d1f27caf13..37be0b762579 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_grab_zero_partial(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..b4016e9dd6bf 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_grab_zero_partial(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..e4c2aadf5d56 100644 --- a/sys/vm/vm_page.c +++ b/sys/vm/vm_page.c @@ -5086,6 +5086,57 @@ out: return (VM_PAGER_OK); } +/* + * Fill a partial page with zeroes. The object write lock is held on entry and + * exit, but may be temporarily released. + */ +int +vm_page_grab_zero_partial(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..5a166d9ba44c 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_grab_zero_partial(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,