From nobody Thu May 11 13:33:00 2023 X-Original-To: dev-commits-src-branches@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 4QHCWd36vWz4BFKM; Thu, 11 May 2023 13:33:01 +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 4QHCWd0Hqlz4GZh; Thu, 11 May 2023 13:33:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683811981; 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=YY18BV+QGSZOWPU3l6j43DiYpeJVPKE815M04wWedyE=; b=JjGVunU+Hl/PqBfoR+MF0xcIJUe5JI1dFazmreGliVJ70w/WfvaSC1w4rxb7sLw5YLVXxS qCtGL4hMZyqRITDqZPLIiMQjvqfZpZF52MJLfPMWRODZKDwYYH+gVvlERkOv7fNY8xcfuK LOi/cAL256Mr4SbNntYpSy6y27qaqa1/mVlK3WdfqhbpPgg2GTpWatJTzuWTc8coN5Vog8 1n+dSo+2/7Q1oCPeCnax86zIEM4cuT+iwtEuEqKVBiq9Vhce2KuXYhXFDkFJ/5NaAXU0Cs xx03u6/CFxZllgVLPyXbC/rIDpNIKnxzgKsgllHYAsoXnwt+VQTuK+b5GRFL0A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683811981; 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=YY18BV+QGSZOWPU3l6j43DiYpeJVPKE815M04wWedyE=; b=VsOKI6/PjDgA9glQaDt5ePSu1LOw6aeLM7Vb7tmNafp1t+aKj7OEWsMalqb3XgEGq5OZBv TWd6lvOFGFYV2C94B9jhGqXbJ5/Mma7lP1CXrXPZ6+7IYLFUhBIM9maaOJluSXzUQ4zSMj R11KWqBEQZLKl3l7x/0+5OEVhQ7Xrd5shT62hhjdajPzD86hNDEu6Vlb0VX7Szj7y9owtl FO82HcF3ER2SGCwXhYxAxl9MLAtNRKdKBJ80uMiUxGsTKZOSppxuWro0yU5Jt2bsOcpAWr pBFq17bIOeGaPGtxGz267CtYiDvcCW1tAlONB66VSgdLa52xdj+lvIyXoHG7/w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1683811981; a=rsa-sha256; cv=none; b=Xy+qcpBWd2Eu1gL65cj7LVCw4AVmOIhB4Hp740zoVJUJMIfuAmhf4YOEjCxy7CragZvuAA TNcXztU9DKtoLjNlhDVTQS8DUEliX6i+QjoGmLyQ4dPvKHOaToPj1rWZEKQ7ReBzhUE2CC RH8EWqS3UVNcS2rRJ3YscRZXbZ+ZvnbmVeFnQOeNwh73Nx8DHXwv53A2E4ojcSHGkTxTWZ Gp1Wf5ct4sxwIqkGTf2Xiu5mbaKATAKJlpe7t3Ffi+FaX+dOkpBNQXuX7KXFd4Bas4t3J8 xx0gqyzuVtxsMTBzEWYN1AOSOrfwGWsYlqVWSxzO9r1PgyacgzO+bxNB9tKX7w== 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 4QHCWc6PFyzv4j; Thu, 11 May 2023 13:33:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 34BDX0Rr076811; Thu, 11 May 2023 13:33:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34BDX0wX076810; Thu, 11 May 2023 13:33:00 GMT (envelope-from git) Date: Thu, 11 May 2023 13:33:00 GMT Message-Id: <202305111333.34BDX0wX076810@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: aec3c884057a - stable/13 - buf: Dynamically allocate per-CPU buffer queues List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: aec3c884057ab3f95e8c88a346694966df637303 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=aec3c884057ab3f95e8c88a346694966df637303 commit aec3c884057ab3f95e8c88a346694966df637303 Author: Mark Johnston AuthorDate: 2023-05-10 14:05:32 +0000 Commit: Mark Johnston CommitDate: 2023-05-11 13:32:32 +0000 buf: Dynamically allocate per-CPU buffer queues To reduce static bloat. No functional change intended. PR: 269572 Reviewed by: mjg, kib, emaste MFC after: 2 weeks Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D39808 (cherry picked from commit e72f7ed43eefaf305c33c232bc2c33d997427f58) --- sys/kern/vfs_bio.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sys/kern/vfs_bio.c b/sys/kern/vfs_bio.c index 174a6e0b556a..cb94dbd81021 100644 --- a/sys/kern/vfs_bio.c +++ b/sys/kern/vfs_bio.c @@ -116,7 +116,7 @@ struct bufqueue { #define BQ_ASSERT_LOCKED(bq) mtx_assert(BQ_LOCKPTR((bq)), MA_OWNED) struct bufdomain { - struct bufqueue bd_subq[MAXCPU + 1]; /* Per-cpu sub queues + global */ + struct bufqueue *bd_subq; struct bufqueue bd_dirtyq; struct bufqueue *bd_cleanq; struct mtx_padalign bd_run_lock; @@ -1901,6 +1901,9 @@ bd_init(struct bufdomain *bd) { int i; + /* Per-CPU clean buf queues, plus one global queue. */ + bd->bd_subq = mallocarray(mp_maxid + 2, sizeof(struct bufqueue), + M_BIOBUF, M_WAITOK | M_ZERO); bd->bd_cleanq = &bd->bd_subq[mp_maxid + 1]; bq_init(bd->bd_cleanq, QUEUE_CLEAN, mp_maxid + 1, "bufq clean lock"); bq_init(&bd->bd_dirtyq, QUEUE_DIRTY, -1, "bufq dirty lock");