From nobody Sat Apr 19 22:32:53 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 4Zg5xK6krMz5tZJp; Sat, 19 Apr 2025 22:32:53 +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 4Zg5xK5wnzz3nky; Sat, 19 Apr 2025 22:32:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1745101973; 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=pBMb0tg36AgRCArXeLBVjPzPSg+rSUb6Kx0LvdS0KB8=; b=rEzpAzlxfrQOkMWq/9ATDgyFibkRC6FLrcI2rARHpc56E4BJ3vf/kiXStBuiNUHnwY1prt VInNiMoXXGPBqyzkEXtYd0a9cyrdU3xPFNlEeLtNvaE8XozfTAVJykK9XFQqecMhhKGwxN /3EZgj7FEp1UGzn9m0xSsSyFY//CXa2s7En3I4AbWWfvs5XWXBcpwyEzEK6E2z/DtH4CYc UrhkLbn0GX2/sj6acM12+A3hew/PuyWOj85aC/Tgu4kZei2S+27Gs7eFUs/7FYsrAgj1pK PdaIUuUbKjYoZRz0R57JDhVPBHU8Yptyat14IsLwZbyWLtgMzbTdkS8tbrcfnQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1745101973; a=rsa-sha256; cv=none; b=xv0vcyMzW57bUbn71YOcXgDHMEuP/J5WT5D0VRtiVZSel9B5zalC9jeeVm9aR8CvmKgA89 EeWrjtuB4/pGvIz8tNSQV+rARQuZL9IvFWI/Nkwgr8cviuUYK1xraNYZ7TU3d/9nvOHSdS Q9dGr1ANX+BLZm3y5a5EETnc0walRJgId8MwAaysWe+ATBntjj/oZj+K6MczE/j4ErUmrm OSveZIyX2Snos+UC6SlFMiSnVW/OJVHrfvwsiI2c0RCEIEd7mlk+5k57/7DqBFWCSNCjR2 kukz4rli3lsDgi3mA5pFHBN8cFmVCKuIyz3+XrwQS05kz4zAYSegl+xHmKqeEA== 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=1745101973; 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=pBMb0tg36AgRCArXeLBVjPzPSg+rSUb6Kx0LvdS0KB8=; b=B/WKa0kT3H9touF72jmeY2EvM1GrQoluMfzVqpXqJBPnE1nqq4rGBlzLkc5nB/FNsJUiuX Pr7bUxOjjX83V6mHF+gorPz3NF/F3UFrJvICRv/4jKxuS4mrcPB36w5rCW/qT1aN5P/TR3 EEbjUSSHJhuWy+M3XL7Rd7tVn7VGky+r192oZv5wg63rfmtRrnjHC2QKBKdF755KfrBQkr HKMKXowlK/yyv4b8C6ZZ3DkA0VrWvvD7iLYUj3p8E43KfmV57zaUogeyAVjeSoaHpat4I1 RH7JL2TVsbWWH6O4O1CEImZIm9OL0+WfjT3GCEfZ7iMPWmQ7xtEx9O+4GQAluQ== 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 4Zg5xK5JgfzfJg; Sat, 19 Apr 2025 22:32:53 +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 53JMWr8G084401; Sat, 19 Apr 2025 22:32:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 53JMWrL4084398; Sat, 19 Apr 2025 22:32:53 GMT (envelope-from git) Date: Sat, 19 Apr 2025 22:32:53 GMT Message-Id: <202504192232.53JMWrL4084398@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: 97f3a1565d88 - main - linuxkpi: use iterator in zap_vma_ptes 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: 97f3a1565d88b2d9f01ac571e016184935dd6a08 Auto-Submitted: auto-generated The branch main has been updated by dougm: URL: https://cgit.FreeBSD.org/src/commit/?id=97f3a1565d88b2d9f01ac571e016184935dd6a08 commit 97f3a1565d88b2d9f01ac571e016184935dd6a08 Author: Doug Moore AuthorDate: 2025-04-19 22:31:29 +0000 Commit: Doug Moore CommitDate: 2025-04-19 22:31:29 +0000 linuxkpi: use iterator in zap_vma_ptes Change zap_vma_ptes() to use iterators, rather than TAILQ pointers. Reviewed by: kib Differential Revision: https://reviews.freebsd.org/D49918 --- sys/compat/linuxkpi/common/src/linux_compat.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/sys/compat/linuxkpi/common/src/linux_compat.c b/sys/compat/linuxkpi/common/src/linux_compat.c index 30acd1b54e9c..e061504868fd 100644 --- a/sys/compat/linuxkpi/common/src/linux_compat.c +++ b/sys/compat/linuxkpi/common/src/linux_compat.c @@ -59,6 +59,7 @@ #include #include #include +#include #include @@ -647,6 +648,7 @@ int zap_vma_ptes(struct vm_area_struct *vma, unsigned long address, unsigned long size) { + struct pctrie_iter pages; vm_object_t obj; vm_page_t m; @@ -654,9 +656,8 @@ zap_vma_ptes(struct vm_area_struct *vma, unsigned long address, if (obj == NULL || (obj->flags & OBJ_UNMANAGED) != 0) return (-ENOTSUP); VM_OBJECT_RLOCK(obj); - for (m = vm_page_find_least(obj, OFF_TO_IDX(address)); - m != NULL && m->pindex < OFF_TO_IDX(address + size); - m = TAILQ_NEXT(m, listq)) + vm_page_iter_limit_init(&pages, obj, OFF_TO_IDX(address + size)); + VM_RADIX_FOREACH_FROM(m, &pages, OFF_TO_IDX(address)) pmap_remove_all(m); VM_OBJECT_RUNLOCK(obj); return (0);