From nobody Fri Jul 4 07:33:15 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 4bYQNN4DxFz612mJ; Fri, 04 Jul 2025 07:33:24 +0000 (UTC) (envelope-from bzeeb-lists@lists.zabbadoz.net) Received: from mx-01.divo.sbone.de (mx-01.divo.sbone.de [IPv6:2003:a:140a:2200:6:594:fffe:19]) (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 ECDSA (prime256v1) client-digest SHA256) (Client CN "mx-01.divo.sbone.de", Issuer "E5" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bYQNM1hy6z42XH; Fri, 04 Jul 2025 07:33:23 +0000 (UTC) (envelope-from bzeeb-lists@lists.zabbadoz.net) Authentication-Results: mx1.freebsd.org; dkim=pass header.d=zabbadoz.net header.s=20240622 header.b=MxbTmM0c; spf=pass (mx1.freebsd.org: domain of bzeeb-lists@lists.zabbadoz.net designates 2003:a:140a:2200:6:594:fffe:19 as permitted sender) smtp.mailfrom=bzeeb-lists@lists.zabbadoz.net; dmarc=pass (policy=none) header.from=zabbadoz.net Received: from mail.sbone.de (mail.sbone.de [IPv6:fde9:577b:c1a9:4902:0:7404:2:1025]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by mx-01.divo.sbone.de (Postfix) with ESMTPS id B7FD5A64805; Fri, 04 Jul 2025 07:33:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=zabbadoz.net; s=20240622; t=1751614393; bh=tApljUFDb6YPQdwLv34FJwYhIWV2kykKijVEsJPS+TU=; h=Date:From:To:cc:Subject:In-Reply-To:References; b=MxbTmM0c7Hqau3/DM9MH4+IMn50xqmK8BIJn54/YWZXez6ev5Wx225IAsZ1IlLyCb dhsoWByzsh5q8M1SDc4ALS7dZHgW9VPDjRyfO91w/hPG3vpb4VJo8jPrdjUMcHAXYv HxM3r11MCoC2C9hu8fIDYvxXXQoRiXbBJOaYArxpiMkJMAhRnZR0yY7WXaF9Zh8UUL eY+W9WuTEs5eZ7Gl0MN56rnK+8/W2KPA0S50hfD+rCrVsZ6FFjnfD2STie1ax+uyka IMwXoipp/UZtFkliuh/Sb+O3sz9IJB3H0HEL2YREJYfJpVgIS/OrN7F7StMZdGpvlb CFEScDOK2wNBD+sjKXoaX8bM15jGNoi1KDla74tSJc/qMb4oDstEVLtMIPW2R2z8Ia EUvGtPempaXTdf/Wx2OuJJ6Atk7g5HbYLpfDTKh4q+o3HaB/0TL9mqFGJF/KmPfIfb usPqX4mBJXytv3b86pttY41mPr2DlH0tZVnvdS3NYDl74IQZEwpFzm/KQixSTAFs8+ 02x/304qz1tecgGG+XRR523fb2N/iOW7gCGT0uEFr0bl0xpud4r8gftP0DN/OHJQ1d Y3SAh1+dTNjBt6m+RJ2g2PjLqpfkBAaqn/cVxoqBqr6+GBo2bK+GLrUfyaglPT2VFV 4z29z73fOJM4XABw/w5ShEQA= Received: from content-filter.t4-02.sbone.de (content-filter.t4-02.sbone.de [IPv6:fde9:577b:c1a9:4902:0:7404:2:2742]) (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 mail.sbone.de (Postfix) with ESMTPS id B03432D029E0; Fri, 4 Jul 2025 07:33:16 +0000 (UTC) X-Virus-Scanned: amavisd-new at sbone.de Received: from mail.sbone.de ([IPv6:fde9:577b:c1a9:4902:0:7404:2:1025]) by content-filter.t4-02.sbone.de (content-filter.t4-02.sbone.de [IPv6:fde9:577b:c1a9:4902:0:7404:2:2742]) (amavisd-new, port 10024) with ESMTP id amTDDNvdmW6y; Fri, 4 Jul 2025 07:33:15 +0000 (UTC) Received: from strong-rtwn0.sbone.de (strong-rtwn0.sbone.de [IPv6:fde9:577b:c1a9:4902:3e64:cfff:fe55:bc80]) (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 mail.sbone.de (Postfix) with ESMTPSA id 456B82D029D8; Fri, 4 Jul 2025 07:33:15 +0000 (UTC) Date: Fri, 4 Jul 2025 07:33:15 +0000 (UTC) From: "Bjoern A. Zeeb" To: Andriy Gapon cc: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: Re: git: 5aedb8b1d4a6 - main - mmc_da: fix garbage in disk->d_attachment In-Reply-To: <202506270721.55R7LmtP067254@gitrepo.freebsd.org> Message-ID: <49qns615-158p-0n85-332r-986r65rs4rr0@yvfgf.mnoonqbm.arg> References: <202506270721.55R7LmtP067254@gitrepo.freebsd.org> X-OpenPGP-Key-Id: 0x14003F198FEFA3E77207EE8D2B58B8F83CCF1842 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=US-ASCII; format=flowed X-Spamd-Result: default: False [-3.77 / 15.00]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_MEDIUM(-0.98)[-0.975]; NEURAL_HAM_SHORT(-0.79)[-0.791]; DMARC_POLICY_ALLOW(-0.50)[zabbadoz.net,none]; R_DKIM_ALLOW(-0.20)[zabbadoz.net:s=20240622]; R_SPF_ALLOW(-0.20)[+ip6:2003:a:140a:2200:6:594:fffe:19]; MIME_GOOD(-0.10)[text/plain]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MISSING_XM_UA(0.00)[]; MIME_TRACE(0.00)[0:+]; TO_DN_SOME(0.00)[]; FROM_HAS_DN(0.00)[]; ASN(0.00)[asn:3320, ipnet:2003::/19, country:DE]; ARC_NA(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; RCPT_COUNT_THREE(0.00)[4]; RCVD_TLS_LAST(0.00)[]; FROM_EQ_ENVFROM(0.00)[]; RCVD_COUNT_THREE(0.00)[4]; MLMMJ_DEST(0.00)[dev-commits-src-all@FreeBSD.org,dev-commits-src-main@FreeBSD.org]; DKIM_TRACE(0.00)[zabbadoz.net:+] X-Rspamd-Queue-Id: 4bYQNM1hy6z42XH X-Spamd-Bar: --- On Fri, 27 Jun 2025, Andriy Gapon wrote: > 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)); This now results in: sys/cam/mmc/mmc_da.c:1202:1: warning: unused function 'sdda_get_max_data' [-Wunused-function] 1202 | sdda_get_max_data(struct cam_periph *periph, union ccb *ccb) | ^~~~~~~~~~~~~~~~~ 1 warning generated. Can the function be garbage collected? > + 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: > -- Bjoern A. Zeeb r15:7