From nobody Fri Oct 21 18:00:48 2022 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 4MvC1s1mmJz4gM7L; Fri, 21 Oct 2022 18:00:49 +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 4MvC1s1CKmz3DBp; Fri, 21 Oct 2022 18:00:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1666375249; 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=qzDD7FQi4ZFMujAbfCyNolH5XvXICBECd+z+b06Bruo=; b=fiv1lHP3gE5q37mrB7WyHMuW8Z+7Tk6946j8prJOcj/Q29kqYUzD3t8Q6yvassZRfNeYOY iU/vTU++YDDHQ31wXVRbxHascDgGlkQHURhb+mcyEaap9CnExQfNipO02dz5H4CUiUOQ1D zno20GqQSw9lvxfwp59ArnbqOuBZL/vpMqZxgfrE2J/lRMZ4MMKz5R5EhCAci8autHdUvD 7PI7mFdUcAcdCj8OgQZedsdGBocPcnSIHKyUjcTVgC+RPwIojhTkxm8hjb1kiRA0Tlr6eq N0KbWyOm+/qRHbizKqtKqtKuPmCQwcPFl58HF+1n8EO6EhthkbJCnK8VJS5qqA== 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 4MvC1s0HWmzJ2S; Fri, 21 Oct 2022 18:00:49 +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 29LI0m56002626; Fri, 21 Oct 2022 18:00:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 29LI0mVY002625; Fri, 21 Oct 2022 18:00:48 GMT (envelope-from git) Date: Fri, 21 Oct 2022 18:00:48 GMT Message-Id: <202210211800.29LI0mVY002625@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kirk McKusick Subject: git: 243a0eda9ace - main - Increase the maximum size of the journaled soft-updates journal. 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mckusick X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 243a0eda9ace2f4d9cdd5291c352816ddc9ebdb2 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1666375249; 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=qzDD7FQi4ZFMujAbfCyNolH5XvXICBECd+z+b06Bruo=; b=DWeb8078XYbM0UFFmmd+pT8dpr4CNZ4xijH8QiyK2QdAZdJVzdAt7nqLV5M/TSa0fkP774 XDdpt0CqBh4WrtETwLQXkIEe7k+8Bqay2DGXrzSP1MLNd/6QfcUZeOgCetutcgiAzNkVh+ zgqYyN3Bd914LnfSoQOsU/sIXqEsb2AZYsq5goYr5Qt/q/k+TQJao07ur0fvhwHgLUvbbN B3mysQyTBdfVDYuaCSPCnMym94dFrS1Eb4HNIhBmbwPejly7Ck+lb5X+h0iHKi68L11Som vc/8SqhoZuf3sGCxGWodJmXhhqS/2Hczkes/hDsThb3FOk4zFSVelw//EHV18w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1666375249; a=rsa-sha256; cv=none; b=D9cwW8vbJX+2iyv69clzw12YD/vNIg9z8206JQagx/xSMjYWIhqwTPWC/foZ1jyp5uukjK dKzp+CEumxSh0dUe9Cb8v6YEx1qHq2NKF5kBuqLQeJ2gsoLEQyFg8dNLh8OoU6FmgsO8iK BsaMoaR6DGaV/waBzDVJ6OW1lpWRlmVfyzQYZJyRiMGylSND+ddyUG+Dhd/7iIiCgZavBX K0UANpMAZmMG0aRJ77FasdpFFiTaa+J0qWPaR5q7rt4hO39DQ0i0O8lO/ykKfMFDdi7EmH 2ZLe9TVhmlra37dyXwHQzPJsdn3KQh6k+dV0a/lDzi1ebBK72jcueq/ssg3Ovw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mckusick: URL: https://cgit.FreeBSD.org/src/commit/?id=243a0eda9ace2f4d9cdd5291c352816ddc9ebdb2 commit 243a0eda9ace2f4d9cdd5291c352816ddc9ebdb2 Author: Kirk McKusick AuthorDate: 2022-10-21 18:00:00 +0000 Commit: Kirk McKusick CommitDate: 2022-10-21 18:00:00 +0000 Increase the maximum size of the journaled soft-updates journal. The size of the journaled soft-updates journal should be big enough to hold two minutes of filesystem metadata-update activity. The maximum size of the soft updates journal was set in the 1990s. At the time it was assummed that disk arrays would top out at 16 drives and disk writes per drive would top out at 500 per second. Today's I/O subsystems are considerably bigger and faster than those limits. Thus this delta removes the hard upper limit and lets tunefs(8) and newfs(8) set the upper bound based on the size of the filesystem and its cylinder groups. Sponsored by: The FreeBSD Foundation --- sbin/tunefs/tunefs.c | 1 - sys/ufs/ffs/fs.h | 1 - 2 files changed, 2 deletions(-) diff --git a/sbin/tunefs/tunefs.c b/sbin/tunefs/tunefs.c index e59b583ea58b..11956f946ff5 100644 --- a/sbin/tunefs/tunefs.c +++ b/sbin/tunefs/tunefs.c @@ -976,7 +976,6 @@ journal_alloc(int64_t size) */ if (size == 0) { size = (sblock.fs_size * sblock.fs_bsize) / 1024; - size = MIN(SUJ_MAX, size); if (size / sblock.fs_fsize > sblock.fs_fpg) size = sblock.fs_fpg * sblock.fs_fsize; size = MAX(SUJ_MIN, size); diff --git a/sys/ufs/ffs/fs.h b/sys/ufs/ffs/fs.h index bd2b9157e467..c2279c183fc5 100644 --- a/sys/ufs/ffs/fs.h +++ b/sys/ufs/ffs/fs.h @@ -806,7 +806,6 @@ lbn_offset(struct fs *fs, int level) #define JREC_SIZE 32 /* Record and segment header size. */ #define SUJ_MIN (4 * 1024 * 1024) /* Minimum journal size */ -#define SUJ_MAX (32 * 1024 * 1024) /* Maximum journal size */ #define SUJ_FILE ".sujournal" /* Journal file name */ /*