From nobody Thu Jul 13 18:30:07 2023 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 4R237M6tHMz2tlLL; Thu, 13 Jul 2023 18:30:07 +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 4R237M6TShz4FPW; Thu, 13 Jul 2023 18:30:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689273007; 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=CQlBehoEPcdnlgWbVfYsKp0/7LMFeok2/+MjKrb6q5s=; b=oK/JJDJ6bJoTAoG1C+wlXZzplYeIZxR1Xm9i7SycuhtBknTzO3a/8awmbLNyTdjigUAc9N J/oSHe762ms7hlAr6aW0cGHpgQX0O3KmA9WItsY270LUD/Jt+dzmIwTscCp866BKL/fIDJ n0yEZebTLnyBWWu+JGlA5j6Baq2alr/ftHhGc/+05x6yYIU89jnH65Sr1LDgdSDljpNeX8 ygGgakcV3MB2IxDNUJoNZVIwvWZobc3EjVD04Hd3ABKinXsN4raydyHmQjyIy7zKy058US qAXiCwvHP4aQZSyCG3e1DEWM2npFn/Dv9CUD2edHU8/uvOGJw2mZDqFaErFf9Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689273007; 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=CQlBehoEPcdnlgWbVfYsKp0/7LMFeok2/+MjKrb6q5s=; b=xWbpdqOaY/lSXxBZanFqXQve6da0cgAkRgArDThznm/KHeLrIuZ1h9KnZqKMyiJm0ClltJ wxb9Klo/4iD06e6fKyxC8Wb0YIYiwWeP4fI/Cfgw3hGPcjk0cO9icIlbHKBnXh1kfWATzw DR1xTmflrqD2gECfU8MF26MBwRGt7q8e6ruMHqP82m152IboKKL6x58wE4AuHLyMCm4fLx Z0tIWhDnL7fW7w1tgs3/7iadCjlgyH3hoZL/cgchyrYur0HZUdpheXwZjzU1eDp3nP083E twFGqAvbODZk1smG1dyQ4G1QiPfEAsiqJNeWKCtoKHIP6xxDIw7GL0Ft91ITNA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1689273007; a=rsa-sha256; cv=none; b=jqu/PcQQW3Y2fLJ8uh3ScRUaHYVgXOtvNETu5EyHtGsAs4SzK1wn2bvkx2hCND3NaHyryP yaRZDHh+wUjIU1DpnSu1QX1+GRIFbQClXjDhLSpAXz+ZWb/6QlqC2HgM47piiblKQx/EGF 3FnRqkiSIk73bAkMMwnAupPW5M5/usCqiz0Do54P/6oSU3w6jPU37x5vb0lzt1kmxlBg+M 7EWjMavIXL1HMKmIijBtJ1S+IsxZD3G9VhysH771vMsDP0Ruee0fOzFm3T1iRr/GZwX2XO uykq1DobUfmSEPsJLT5jQuRCsB8e7gwPC2okB0JsJJfIusBRHOi93IbdCJvoYA== 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 4R237M5TLvz11yB; Thu, 13 Jul 2023 18:30:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 36DIU7oM012920; Thu, 13 Jul 2023 18:30:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36DIU77d012917; Thu, 13 Jul 2023 18:30:07 GMT (envelope-from git) Date: Thu, 13 Jul 2023 18:30:07 GMT Message-Id: <202307131830.36DIU77d012917@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: 8f056492c5e8 - main - vfs_bio: initialize pctries 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: 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: 8f056492c5e846912589dd0e9ceb4f8e682f2782 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by dougm: URL: https://cgit.FreeBSD.org/src/commit/?id=8f056492c5e846912589dd0e9ceb4f8e682f2782 commit 8f056492c5e846912589dd0e9ceb4f8e682f2782 Author: Doug Moore AuthorDate: 2023-07-13 18:28:21 +0000 Commit: Doug Moore CommitDate: 2023-07-13 18:28:21 +0000 vfs_bio: initialize pctries bufobj_init depends on fields bo_dirty.bv_root and bo_clean.bv_root being zeroed on entry and pctrie_init zeroing whatever is passed to them, and so does not call pctrie_init for either of them. That fails if pctrie_init ever changes to do something other that zeroing data, so add explicit calls to them. Reviewed by: cem Differential Revision: https://reviews.freebsd.org/D40978 --- sys/kern/vfs_bio.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sys/kern/vfs_bio.c b/sys/kern/vfs_bio.c index cf01d2a239ea..98b267f89737 100644 --- a/sys/kern/vfs_bio.c +++ b/sys/kern/vfs_bio.c @@ -67,6 +67,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include #include @@ -5152,7 +5153,9 @@ bufobj_init(struct bufobj *bo, void *private) rw_init(BO_LOCKPTR(bo), "bufobj interlock"); bo->bo_private = private; TAILQ_INIT(&bo->bo_clean.bv_hd); + pctrie_init(&bo->bo_clean.bv_root); TAILQ_INIT(&bo->bo_dirty.bv_hd); + pctrie_init(&bo->bo_dirty.bv_root); } void