From nobody Mon Oct 13 16:08:03 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 4clj1c10w3z6C0Kg; Mon, 13 Oct 2025 16:08:04 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4clj1c0Lffz3t7l; Mon, 13 Oct 2025 16:08:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760371684; 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=8V446QKLvg5Nu9GfJcu/kkFQ1BgbckW9iYChgw1a8As=; b=P4upysI250LHUIN7YpAjAOaVXUKXbo3sRYhOL41shHmuXwlASS/gN4hHZHcLdPkgfHQNhp ADghLQOVmyQSBDFRWOvPcE/oyBkAFHdD8tnOiO6cWpi4MoPhdb5F7ygmdELP78ZwZ60bwr q7hWMurOB7hkd3ctUuP0zxpaCcuBjMBq2heUX2vt8hehjkvpEg4zorLOH1PO0lwFfm2jPb MjQ7PfJ8gdpP9CYlr/+ez7/+5R0cZNDZDMNpU/zJpsiYJ0DgZ7hNGuHoG9WVEzdrDxwK3G 9Ttf6DsNik7M13IeCPv73ZrfGVppaS3XTMmgPMqdBrsUrz+KUUBjpHa1IBjqrA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760371684; 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=8V446QKLvg5Nu9GfJcu/kkFQ1BgbckW9iYChgw1a8As=; b=YiOB3XmYKU8CCGyQtmW7UMkMTrRM6Zu2KMDs/l6VO++bJi/XBRxOrEBPfio9VDCYM4N6Uo 3VgEDpiqlXSeRXzSVyWty8jurFeYJhNveuGPJoyBt75rHgiUWBUe4GjSaDc1Txe2Ce1sU/ IlfV/XWvf8l0OBnL4B/iVlWOaV7umf4VVHlxQSvbOSLi52b33OCZhKccbiyAC4VtbdAlkl ZGor2zGBw5XY9Ax8eBFxYfviVNvbBuLeoSokSfwSFIDMoQUoxG9StEiI765r79VIxNdq9b WAHzM5CaqBAefRDELghOheERcm3juAUTmuerXU8H2A1A/f0rdkJfMv8E0xQjHA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1760371684; a=rsa-sha256; cv=none; b=i66lGxWp/oQojeUDdvztPSrjsOCdVSzIQ7OzVgMZKpIuaLNZGPMiFZICSo9Jd0WyPF0Ims bM9j7V4HxEyomq+bxQz6ublE5wCx2qIYnespblUyDd+yPVLFxiA6liuFzdn1XTPuVsJPk5 TANvt6wG12bXVqESTTfwhKg1xkITqOMMrvwuhgCjvE8Zt7E/5jun0uAYDGNJjJAcaqXeaP hC4iStSZ24UhqN93P9F1HqrIeyr4JcdVbxWcscvq1PJbux0OaXtBf+6RL+Byq9Hp0naCD7 J3Ybh3IEALnYAiqPDQFrLg5d8hiA5IeZblW7LPdZgyKKM9nc2pHLgJZRbz51Hw== 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 4clj1b73RHz1CDj; Mon, 13 Oct 2025 16:08:03 +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 59DG83v1026448; Mon, 13 Oct 2025 16:08:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59DG83i6026445; Mon, 13 Oct 2025 16:08:03 GMT (envelope-from git) Date: Mon, 13 Oct 2025 16:08:03 GMT Message-Id: <202510131608.59DG83i6026445@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Chuck Silvers Subject: git: 24458c243162 - main - mdconfig_test: determine page size at run time rather than assuming 4k 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: chs X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 24458c243162db4170ba9404d7cb5411af09ab31 Auto-Submitted: auto-generated The branch main has been updated by chs: URL: https://cgit.FreeBSD.org/src/commit/?id=24458c243162db4170ba9404d7cb5411af09ab31 commit 24458c243162db4170ba9404d7cb5411af09ab31 Author: Chuck Silvers AuthorDate: 2025-10-13 16:07:43 +0000 Commit: Chuck Silvers CommitDate: 2025-10-13 16:07:43 +0000 mdconfig_test: determine page size at run time rather than assuming 4k Sponsored by: Netflix Reviewed by: imp Differential Revision: https://reviews.freebsd.org/D52736 --- sbin/mdconfig/tests/mdconfig_test.sh | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/sbin/mdconfig/tests/mdconfig_test.sh b/sbin/mdconfig/tests/mdconfig_test.sh index ea87ff5d542d..cc29c188cbd8 100755 --- a/sbin/mdconfig/tests/mdconfig_test.sh +++ b/sbin/mdconfig/tests/mdconfig_test.sh @@ -274,22 +274,23 @@ attach_size_rounddown() attach_size_rounddown_body() { local md - local ss=8192 - local ms=$(($ss + 4096)) - local ms2=$((2 * $ss + 4096)) + local pgsz=$(pagesize) + local ss=$(($pgsz * 2)) + local ms=$(($ss + $pgsz)) + local ms2=$((2 * $ss + $pgsz)) - # Use a sector size that's a likely multiple of PAGE_SIZE, as md(4) + # Use a sector size that's a multiple of the kernel page size, as md(4) # expects that for swap MDs. atf_check -s exit:0 -o save:mdconfig.out -e empty \ -x "mdconfig -a -t swap -S $ss -s ${ms}b" md=$(cat mdconfig.out) - # 12288 bytes should be rounded down to one sector. - check_diskinfo "$md" 8192 1 $ss + # one sector plus one page should be rounded down to one sector. + check_diskinfo "$md" $ss 1 $ss # Resize and verify that the new size was also rounded down. atf_check -s exit:0 -o empty -e empty \ -x "mdconfig -r -u ${md#md} -s ${ms2}b" - check_diskinfo "$md" 16384 2 $ss + check_diskinfo "$md" $((2 * $ss)) 2 $ss } attach_size_rounddown_cleanup() {