From nobody Wed Aug 6 06:02:25 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 4bxfpB3nNQz64Dw6; Wed, 06 Aug 2025 06:02:26 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bxfp95hkSz3tNR; Wed, 06 Aug 2025 06:02:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1754460145; 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=u4B09yxO8ndTGkTEanMyVZ7s5AyBxBvK6cK2s2YkAr8=; b=lwxWwpW9TEISW+HoqG5HtvKisGSwPizF2xrpCjRdJBfnJNhPuI9ruGFGiJDDRJBwNloLci yGYVN1bY0s7J4BMmSZplb6UvmXTPfhX+7+Cm2Aj4DJE4iEw9c6WHNANm3YZrJMGHX/jqqr 9rPYG6bbCA8r/vdXEIqEx4UDt3t3XTHjT3B2uFd5+mcyenHFL8Et6n7AlG5xK/Ssj7k8j8 +WSEt2UG2Wd/NvcHx4QvmxDqz0q+8qKRL33/8iwIHi+KWupRW9L3CW0JwK27wY6syQXGSy iLRrDxrnvLW12n+ULk5psoYQC0hu1AX31TzNcTQy4EpGrTfO09+mlrko1ncX9g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1754460145; 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=u4B09yxO8ndTGkTEanMyVZ7s5AyBxBvK6cK2s2YkAr8=; b=YiYuEH4fc9HvxK5h1JioH0UkARyEKxaE33VhHsN6FxLg/y/CANC5S0TSuMwzuVYDA+mUM+ Wmxaq7Ev/fdQkrBhOS0cpKXMOI4qhbuGUfFgEdTxWLotwj1BBZA2SsAqvbKzhtB/19AWY3 pcjOjA/eL/UKIQKiC7lwQe/ebRkcUeUXKjv85strsCHl/r0gFkofsgEvf1UY3jlTNN9G2A PDIHwjBJ+ti/pVtNV4flk1hkaHLWzC2qmxtBzh3S3Q+Qr4AenbR1hLZHjhsfcYYydGko0G TvI2VH2bndgaCbtYJiHASAvDwlekzvj5Uj3j87uPGvFC14+l72OxPiWW5bt71Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1754460145; a=rsa-sha256; cv=none; b=fGQYuTl9v74DU6vQay6IByx+0SuRRwOyBGkBpNc/BFtbjomE0xQRELCUGIVVNVSewXJ0XS KlB1lzYiNL+zFjxwNmVoP12gNObq3kHFoiNYG91F+/L8rZgFTMSZTBDr+oLzGQQqSX3Sb6 XsivT8UdizO7IlfXAXXne8FQhRkVY9/OYRwOD936MVa2eYxOJSwEx9bbxXOo18IL5vean/ 7rQPZ8qoeKKr95FfYgedaMpm1EWtwfep5wzuEUuVmrgpPJr26v+cZxmXrNG0jmhs0Qxy/l 7mZRBa+Onh56DBzFHGK1wMUtLc2By3hxgUSb1A/iFNoc+Hh2fhlosepT1jqPXQ== 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 4bxfp955Slz17nH; Wed, 06 Aug 2025 06:02:25 +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 57662P1I076672; Wed, 6 Aug 2025 06:02:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57662P0v076669; Wed, 6 Aug 2025 06:02:25 GMT (envelope-from git) Date: Wed, 6 Aug 2025 06:02:25 GMT Message-Id: <202508060602.57662P0v076669@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Andriy Gapon Subject: git: 9d5d9e723c4a - stable/14 - mmc_da: fix garbage in disk->d_attachment 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: avg X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 9d5d9e723c4a73a3d816a5d2b0a1b7956d1cb87e Auto-Submitted: auto-generated The branch stable/14 has been updated by avg: URL: https://cgit.FreeBSD.org/src/commit/?id=9d5d9e723c4a73a3d816a5d2b0a1b7956d1cb87e commit 9d5d9e723c4a73a3d816a5d2b0a1b7956d1cb87e Author: Andriy Gapon AuthorDate: 2025-06-23 21:43:35 +0000 Commit: Andriy Gapon CommitDate: 2025-08-06 06:00:39 +0000 mmc_da: fix garbage in disk->d_attachment The garbage resulted from reading the value from a ccb which was originally populated by XPT_PATH_INQ operation but then overwritten by XPT_GET_TRAN_SETTINGS operation. The problem could probably be fixed by re-ordering the XPT_GET_TRAN_SETTINGS operation, but it seems like the operation was redundant. Besides, the ccb is declared not as union ccb but as struct ccb_pathinq, so using it for XPT_GET_TRAN_SETTINGS was questionable. I opted for replacing a call to sdda_get_max_data (which uses XPT_GET_TRAN_SETTINGS internally) with using maxio provided by the XPT_PATH_INQ operation. This also required fixing mmc_cam_sim_default_action as controllers return maximum I/O size in sectors, but maxio value should be in bytes. (cherry picked from commit 5aedb8b1d4a6c099eaa0a65f8fcbdcc4aba8f75b) --- sys/cam/mmc/mmc_da.c | 4 +--- sys/cam/mmc/mmc_sim.c | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/sys/cam/mmc/mmc_da.c b/sys/cam/mmc/mmc_da.c index de6e89a4da38..594426d288cf 100644 --- a/sys/cam/mmc/mmc_da.c +++ b/sys/cam/mmc/mmc_da.c @@ -1573,9 +1573,7 @@ sdda_add_part(struct cam_periph *periph, u_int type, const char *name, part->disk->d_gone = sddadiskgonecb; part->disk->d_name = part->name; part->disk->d_drv1 = part; - part->disk->d_maxsize = - MIN(maxphys, sdda_get_max_data(periph, - (union ccb *)&cpi) * mmc_get_sector_size(periph)); + part->disk->d_maxsize = MIN(maxphys, cpi.maxio); part->disk->d_unit = cnt; part->disk->d_flags = 0; strlcpy(part->disk->d_descr, sc->card_id_string, diff --git a/sys/cam/mmc/mmc_sim.c b/sys/cam/mmc/mmc_sim.c index 3033e327d0d5..7170ffe397c7 100644 --- a/sys/cam/mmc/mmc_sim.c +++ b/sys/cam/mmc/mmc_sim.c @@ -110,7 +110,7 @@ mmc_cam_sim_default_action(struct cam_sim *sim, union ccb *ccb) ccb->ccb_h.status = CAM_REQ_INVALID; } else { mmc_path_inq(&ccb->cpi, "Deglitch Networks", - sim, mmc.host_max_data); + sim, mmc.host_max_data * MMC_SECTOR_SIZE); } break; case XPT_GET_TRAN_SETTINGS: