From nobody Thu May 1 06:46:22 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 4Zp4Mg5c7kz5thfm; Thu, 01 May 2025 06:46:23 +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 4Zp4Mf705wz3xtp; Thu, 01 May 2025 06:46:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746081983; 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=LBw7E0nYZKGL4NOxLA3LAFSGRMZYe1H3Lc1PFVxIeKk=; b=A4kn3yeoPRgW3RX4QH5zuTpc+97Z1J3rSwLCVsSMBmo60oytM7YNmGc8plQM5KdADSL1bw Y5Ihtx0+d6nT7JBHZAh+2Q4pj08ne7RrouFRmfdWIZcIzdpC6tc+MUz64QxmKmAAZu+DXK 5acGsyQhWUSO9gJBJzoqjOAtc7rwDX427F3FjpGsLPB4sMj5Gvnk+mzHP3xJtrcMtkCjLw 7/PN0DiK3PJrUjeOvOWROfugzGk6tsgigi69PcE8nXRrjzw8nE0wvsZktfrcEYxzqGBLAr iVZlE3gmFhEdSqvXMPqOQJDQpkGvGoH3rRcA9LxCjD/Izg0VFHZMBAXCxr2M8w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746081983; 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=LBw7E0nYZKGL4NOxLA3LAFSGRMZYe1H3Lc1PFVxIeKk=; b=kmRz+gWx+J9ZRQhRqkeQomyBARsAWr46DAfB6wniVDjTP55+1YJYX5ryoqsUjziejQ6o7I CWFVqvijdymVKjXYM6glE2ZPBBYxyuIIQCc9cHhoPb2y73onyNR4E1+LtWyecBS177JNoE ZY34wRf+K6xPOHdT8Qjqch4N096FJHKAvnuFh90CJdupY00kuqfKoVpt6lUY+p/uD9ZDab /MuaDE40bFfuz4/JGY3QqfjouzXbaQslXvrT/lt533jFafQoYZcKBOC5Gt8Vcygu26rXDf lMc9+0E4uZXym4gXtdcp1hnXzVD7uO/sGxsCuTU/q5ctkPxUyY9o5QEumB4Gog== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1746081983; a=rsa-sha256; cv=none; b=nihKOXy7pQQjMlWxeJy2cZR5tO818ANuXIwMLah5eG7Ockv9woAAe24wWqo3DyA/8phX6T Gh/VvV2PAjnMHOSajdmHsPVW44z55Pp/uqPyavrVwlmu0EyUv+oNNkM2b5QgHxHi7PDXXc qUI6vnBi+Lz4u4/EQTBkf+WugsU8cbxo6Zh+7DiPQXaQbbqi2ReRNc1sKGIe6GeSkgka4f st4l61XelTHbpBKYJzss847GkSELDzcVP55jUNUbJPRgJCsKMk6Uz2CIMdeJvGNcpH0mGh 1n7vEL0lZMLAYh1zYwy14TiyzYRkB5OCRQhNW/1YsTdI0ZjhEwV4cY3VR+SvbQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4Zp4Mf5mp7z2KT; Thu, 01 May 2025 06:46:22 +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 5416kMT8093837; Thu, 1 May 2025 06:46:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5416kM9N093834; Thu, 1 May 2025 06:46:22 GMT (envelope-from git) Date: Thu, 1 May 2025 06:46:22 GMT Message-Id: <202505010646.5416kM9N093834@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: 130374a97b24 - main - uma_core: change listq to plinks.q in temp lists 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: 130374a97b247cf62f64c69d8a570092c42be246 Auto-Submitted: auto-generated The branch main has been updated by dougm: URL: https://cgit.FreeBSD.org/src/commit/?id=130374a97b247cf62f64c69d8a570092c42be246 commit 130374a97b247cf62f64c69d8a570092c42be246 Author: Doug Moore AuthorDate: 2025-05-01 06:43:49 +0000 Commit: Doug Moore CommitDate: 2025-05-01 06:43:49 +0000 uma_core: change listq to plinks.q in temp lists Change the two functions that use local tailq variables to use the plinks.q field, instead of the listq field, for the pointers. This will resolve one source of conflict when the tailq field and the object field come to share the same space in a future change to the vm_page definition. Reviewed by: alc, kib Differential Revision: https://reviews.freebsd.org/D50094 --- sys/vm/uma_core.c | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/sys/vm/uma_core.c b/sys/vm/uma_core.c index 61b03ef24925..5189f7405400 100644 --- a/sys/vm/uma_core.c +++ b/sys/vm/uma_core.c @@ -1986,18 +1986,18 @@ pcpu_page_alloc(uma_zone_t zone, vm_size_t bytes, int domain, uint8_t *pflag, } if (__predict_false(p == NULL)) goto fail; - TAILQ_INSERT_TAIL(&alloctail, p, listq); + TAILQ_INSERT_TAIL(&alloctail, p, plinks.q); } if ((addr = kva_alloc(bytes)) == 0) goto fail; zkva = addr; - TAILQ_FOREACH(p, &alloctail, listq) { + TAILQ_FOREACH(p, &alloctail, plinks.q) { pmap_qenter(zkva, &p, 1); zkva += PAGE_SIZE; } return ((void*)addr); fail: - TAILQ_FOREACH_SAFE(p, &alloctail, listq, p_next) { + TAILQ_FOREACH_SAFE(p, &alloctail, plinks.q, p_next) { vm_page_unwire_noq(p); vm_page_free(p); } @@ -2036,11 +2036,7 @@ noobj_alloc(uma_zone_t zone, vm_size_t bytes, int domain, uint8_t *flags, while (npages > 0) { p = vm_page_alloc_noobj_domain(domain, req); if (p != NULL) { - /* - * Since the page does not belong to an object, its - * listq is unused. - */ - TAILQ_INSERT_TAIL(&alloctail, p, listq); + TAILQ_INSERT_TAIL(&alloctail, p, plinks.q); npages--; continue; } @@ -2048,7 +2044,7 @@ noobj_alloc(uma_zone_t zone, vm_size_t bytes, int domain, uint8_t *flags, * Page allocation failed, free intermediate pages and * exit. */ - TAILQ_FOREACH_SAFE(p, &alloctail, listq, p_next) { + TAILQ_FOREACH_SAFE(p, &alloctail, plinks.q, p_next) { vm_page_unwire_noq(p); vm_page_free(p); } @@ -2058,7 +2054,7 @@ noobj_alloc(uma_zone_t zone, vm_size_t bytes, int domain, uint8_t *flags, zkva = keg->uk_kva + atomic_fetchadd_long(&keg->uk_offset, round_page(bytes)); retkva = zkva; - TAILQ_FOREACH(p, &alloctail, listq) { + TAILQ_FOREACH(p, &alloctail, plinks.q) { pmap_qenter(zkva, &p, 1); zkva += PAGE_SIZE; }