From nobody Thu Nov 12 09:27:54 2026 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 4jQFRZ6KBBz70HCw for ; Thu, 12 Nov 2026 09:27:54 +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) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4jQFRZ37jhz4tQk for ; Thu, 12 Nov 2026 09:27:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794475674; 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=zzW87bI8PdL0TZSOc05yctpDYrFBFaS8dZkGjTTZeIs=; b=psP7O/JRWn48mDWtBchz9raaI+cAT4WCNY2Mv1jGNvsaoOYJre9yrCfc8EmmwYXTXKEyJC qSW8bZS/bXHzcR4KRycX/wNfkmAAlmc4fHnldZcWlmYvM/D4A9QRBsmrQZMREuRXnGGmQl XrttPiGKFQo2rDyd8r4pA5R3OM3CiCYHE4/FymOAUl/rVDuwyyfEfs0OZr1IGtQFokv4sA 3n1g42dK16Ue/p12tG4lF9SimcGkZSVNcMFGG2thyKSQeMRiQKOIIKLQaIF90IoknadaHS nO3AV+IbDYc8bF0aeKs5LLLmLG9wiu7RoXcX0b9m9GXhWQdKZLmybkEQLHQogw== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1794475674; b=fnEIgPgh2HenwdJtIsdI7H9Z6XwoWWGLQXIwi9Y7fYVo39CA/EfklfQRa+bIGqYmOiXdc1 RvDx1hnw2Z85DAQVarka7aWrV8bkrnNE2u6exzxbDSfCJU1KID9nMGlin0yivFBfZhS41i 7BZRtca/atuPNAVBlE+q6WDNMqKiMUP8F/mFGrc6UlOg43Sw99TyECXLLoFU7cZ6ETRhrR Jb/DHBspY/jGGJKAr/qX9jANMVM4FPbxeQxQCJlBLn9bsGWgjc2D+fqxPZR1HOEtmaXfFz V4lconpF1qyQECez/imEKnMVXqPVkkqwayGz0wIyOy/JeB4kTG0NBK7gS4UexQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794475674; 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=zzW87bI8PdL0TZSOc05yctpDYrFBFaS8dZkGjTTZeIs=; b=UhRZArMTyyJaTI7bF8SayPMCkPHig5xjqfpfDJm80zo8CNg0mmWkTvABASHMY5i0nbfVzZ Dk9E3ku5DNJzA30UkUUWkEa9AKtsvGDmUdYmwCC+xcAsDq3EySkMYZiVfCRV3Jv+gaBZ9h h+ZKq0vx74sssZamSOmABLjxHOmVKXZAlSTZ4NOOq7GCe0U1JkKDu/kqusGzzhV2fxH1V2 Yv8PwJ2nCJcelXkOQ6a+U17hiYSdOz257ftUYtvGy/QkVHI44M8bAKZa1WrGRZiVLwf3M+ xLjhOOrmNylqKPAhUunN90ZvsIDQEqXCtAhfKFRJwCKkkvk+Y/pvvfVxr2gDhw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4jQFRZ28jXzxG2 for ; Thu, 12 Nov 2026 09:27:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1e007 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 12 Nov 2026 09:27:54 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Olivier Cochard Subject: git: 6046a35b71c2 - main - loader: Read the partition table of md images List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all X-BeenThere: dev-commits-src-all@freebsd.org List-Id: Commit messages for all branches of the src repository List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: olivier X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6046a35b71c297ebe64a766c0d5c04fb62fc0f5f Auto-Submitted: auto-generated Date: Thu, 12 Nov 2026 09:27:54 +0000 Message-Id: <6af5869a.1e007.7b75a6bf@gitrepo.freebsd.org> The branch main has been updated by olivier: URL: https://cgit.FreeBSD.org/src/commit/?id=6046a35b71c297ebe64a766c0d5c04fb62fc0f5f commit 6046a35b71c297ebe64a766c0d5c04fb62fc0f5f Author: Olivier Cochard AuthorDate: 2026-11-08 21:44:38 +0000 Commit: Olivier Cochard CommitDate: 2026-11-12 09:22:04 +0000 loader: Read the partition table of md images md is a DEVT_DISK device but never called disk_open(), so reads always started at offset 0 of the image. A partitioned image, such as a memstick image booted memdisk=, has its partition table there, not a filesystem, and the loader stops with "MD not present". Reviewed by: imp Approved by: imp Sponsored by: Netflix Differential Revision: https://ron-dev.freebsd.org/FreeBSD/src/pulls/99 --- stand/common/md.c | 33 ++++++++++++++++++++++++--------- 1 file changed, 24 insertions(+), 9 deletions(-) diff --git a/stand/common/md.c b/stand/common/md.c index 93301e39a2f5..9da336600e6a 100644 --- a/stand/common/md.c +++ b/stand/common/md.c @@ -31,6 +31,7 @@ #include #include "bootstrap.h" +#include "disk.h" #define MD_FLAG_MASK MD_FLAG_KERNEL @@ -61,6 +62,8 @@ struct devsw md_dev = { .dv_ioctl = noioctl, .dv_print = md_print, .dv_cleanup = nullsys, + .dv_fmtdev = disk_fmtdev, + .dv_parsedev = disk_parsedev, }; /* @@ -172,14 +175,16 @@ static int md_strategy(void *devdata, int rw, daddr_t blk, size_t size, char *buf, size_t *rsize) { - struct devdesc *dev = (struct devdesc *)devdata; + struct disk_devdesc *dev = (struct disk_devdesc *)devdata; struct md_info *md; size_t ofs; - md = md_get_info(dev->d_unit); + md = md_get_info(dev->dd.d_unit); if (md == NULL) return (ENXIO); + blk += dev->d_offset; + if (blk < 0 || (uintmax_t)blk >= md->md_size / MD_BLOCK_SIZE) return (EIO); @@ -209,25 +214,35 @@ static int md_open(struct open_file *f, ...) { va_list ap; - struct devdesc *dev; + struct disk_devdesc *dev; + struct md_info *md; va_start(ap, f); - dev = va_arg(ap, struct devdesc *); + dev = va_arg(ap, struct disk_devdesc *); va_end(ap); - if (md_get_info(dev->d_unit) == NULL) + md = md_get_info(dev->dd.d_unit); + if (md == NULL) return (ENXIO); - return (0); + /* + * The image may be partitioned, as the memstick images used with + * memdisk= are. Without this only offset 0 is reachable, where + * there is no filesystem. + */ + return (disk_open(dev, md->md_size, MD_BLOCK_SIZE)); } static int md_close(struct open_file *f) { - struct devdesc *dev; + struct disk_devdesc *dev; + + dev = (struct disk_devdesc *)(f->f_devdata); + if (md_get_info(dev->dd.d_unit) == NULL) + return (ENXIO); - dev = (struct devdesc *)(f->f_devdata); - return (md_get_info(dev->d_unit) == NULL ? ENXIO : 0); + return (disk_close(dev)); } static int