From nobody Fri Jun 27 07:21:48 2025 X-Original-To: dev-commits-src-main@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 4bT6SF4h4jz60PgC; Fri, 27 Jun 2025 07:21: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bT6SF15nNz3qSh; Fri, 27 Jun 2025 07:21:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1751008909; 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=MxMbftQkOxzXocunklIzPPz5gwekGxmq/2pfh0uOXUc=; b=JUzRYPvWHMTZ+xK2b6ZOO8cmQF7RTonh0MFWg35kL8cE+uzH/zLYPMI+jHdz8YAgN9Hv4i mCNJRs9TzSP0p7zbiqZZWT/NugJW6THqegbKIo+OWmLToM2UXQWh0+lVu2bcbv4cOG/pzN cJJHh+ej2rBxNEU5F/J/jynFqdajotauMAUSPeLSgdpZuYtRJu6Eaik289SNFX+F/5COZ6 nUlDAGiTygm518AJiXALAt5PcVgG2afKnGGBaL4MSkpo/u2apedlQ5q/IbTQrNb6LF+7Hf OdDTcDdawi+ZHjMY4F7Ht6NbxqBA30VTgAfU5ZgaWtOxrVIC31/vMkLU3QEQ1g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1751008909; 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=MxMbftQkOxzXocunklIzPPz5gwekGxmq/2pfh0uOXUc=; b=yHwEAJYTJAfrdQIeloe+GPn2QifAvjRGndFPhTPxvYbqukhy03X2tZMZXc5oo+Jz3vWURi +9KDOIwgSW1/nVR9O6gr9j0okgFQfIinZanAf6oTn+InPGt2WhqCtWGWgoZtbQ30OLg2+2 nFqmRp/rUn8iCb4thDMun1bWXdH0Q6TiBLOqoSHLMnqFAaGbVEpqCpd8R3a/UMPqz2Z4+4 JzHwflbdA/urtk0vKqvap5+l8r8aF2E0Q3MllNN7XGT/tqbdjmCKpDXclQ2vGV9ELgwXXb fndajnuR9Tp+ohQfvupGAYnkQVyxfwUecNfYvR1+V2KnzUg9O0FIMNsrz+3iUQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1751008909; a=rsa-sha256; cv=none; b=yeKWUAj9iz03aHhCY3NkU9nhLPc29U+H7zUT0JU1LZEtAQDEklUE1E8Lm99lN8jx3C7bbV nuMIipUmcUSe8s/JIFKLlRGGy+LxjrI5KDcdoGUV4W5pnQ8i1fRGllGBpryoPmwIjO/B+d Hujrpw3vXHCt0a2jgusren5lzmmp0YLKEnOEZEUUlP/e0I/r3ql7JLeb55TVbVMvm1yrx0 IFMVoz5v1raygJjoYsCBV2GkRWnskELrB+Z5aQT6A5FQcg76awafcmtO8VRrVSVIa01mjq yTlPMPglf36mHGItf3nqoHlHkJXzaXWWohNU3QHx7+tMK52BSstC/lb23YlkjQ== 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 4bT6SF0HFtzfPs; Fri, 27 Jun 2025 07:21:49 +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 55R7LmJc067257; Fri, 27 Jun 2025 07:21:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 55R7LmtP067254; Fri, 27 Jun 2025 07:21:48 GMT (envelope-from git) Date: Fri, 27 Jun 2025 07:21:48 GMT Message-Id: <202506270721.55R7LmtP067254@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andriy Gapon Subject: git: 5aedb8b1d4a6 - main - mmc_da: fix garbage in disk->d_attachment List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 5aedb8b1d4a6c099eaa0a65f8fcbdcc4aba8f75b Auto-Submitted: auto-generated The branch main has been updated by avg: URL: https://cgit.FreeBSD.org/src/commit/?id=5aedb8b1d4a6c099eaa0a65f8fcbdcc4aba8f75b commit 5aedb8b1d4a6c099eaa0a65f8fcbdcc4aba8f75b Author: Andriy Gapon AuthorDate: 2025-06-23 21:43:35 +0000 Commit: Andriy Gapon CommitDate: 2025-06-27 07:19:15 +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. MFC after: 2 weeks --- 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 fc29a1925c66..1c455e1951d7 100644 --- a/sys/cam/mmc/mmc_da.c +++ b/sys/cam/mmc/mmc_da.c @@ -1572,9 +1572,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 104916a41782..ab6daffb0995 100644 --- a/sys/cam/mmc/mmc_sim.c +++ b/sys/cam/mmc/mmc_sim.c @@ -109,7 +109,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: