From nobody Tue Jul 22 04:00:54 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 4bmNpv1K8tz62NN2; Tue, 22 Jul 2025 04:00:55 +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 4bmNpt3RCnz3cYj; Tue, 22 Jul 2025 04:00:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1753156854; 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=mXxrwpgOC9wsx6p0nbpyXgLniEAUzXXzxUVoZbOknlc=; b=LbdbwKPX1qObosO4uXNjfRw+hWvwB/Qgyaj47mgaSivI7z7TGe0f5h1CGE9VkNoHcQhiI8 Vh4GCo/mIQm/PZ6tWYiW/eRDLYyqaVdm1ybNKsYhl1st3gPpqMKt2bgWClvJOoG/mZhqb6 cXjpMzghqhBofD8NtpjyB4Uw4OBduYx8OEVtOpOYM/cpg/F+SRGsA8KjCuDOFjSfRDjSXp EvpT2BY2c943x0slCAPCsMmrIIb5sQb/bsTs9c0jl7tPdHvssPhJeLm0885mtHZNnKEK75 EXV/cDTBLJmQvyAz9HErXjU2iDAYxc0w83hKtWbCSrSwQFrd8BY4jXWi8eRUBg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1753156854; 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=mXxrwpgOC9wsx6p0nbpyXgLniEAUzXXzxUVoZbOknlc=; b=Rb/bVo4Wu+SesmLyM0TiBtyfJRFcjB3AwAzmimEW9enVMkAGYLK7lHFVQ/6p8yZKbAZrTn ckPtz9QMy5rb1qr90BiWxN5wHgye5/YfkCm7MIkdU1nz1CMzNUNpQtCbRYLaLXsd/HD+ov AHWtQCsHMmObArxeeTeEU5GVxCobPgW+eAGq6ykF+naRvOOPAEx6HK5eXW++XXyJufK+8a ZJU+m5coQMa0WdP++zhgquTxPK4WzkpkZv718aanvED6pTeI9RcnQr7VwUdBjG2ld5Perw DBWqlZhvMYX4qXJkb4HS+Im+6Taq3of8QV+9v0xy/EhA95/kJUwGSzx6P6+fTg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1753156854; a=rsa-sha256; cv=none; b=veKpDc+AFzr/HcWxDXT9QkJgt6y7YJvGnHz7eFhcsNS7SRj6hniQksePiIjrt5IvQAB/qm 1yARXaH9Eh7PmDbBzxXyrxJiJ7Cbrx+SPzUIJs7WqCiKOkDTbrKMJ4nvrsnTPG0ups+gy/ IVCbNQMOxQl0aIOP09TCU3slTzin0pIU9grai1JXqLJGW9U5sv2R4LTCi6g0SPqB2ii9d8 lD3KJn3iNtlaovuiG8T5PThcBNm9v6c8ISy06tqzR794Q+Ye850nBsNVKM7i7I54ZLQ9BB XcaNab/yIOwVUfL8r5kTe6oTzAhjTAoNRHy19ztOmJlzzt/JfCVet+RJRd1V6Q== 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 4bmNpt2lw7z1QBR; Tue, 22 Jul 2025 04:00:54 +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 56M40sMR032520; Tue, 22 Jul 2025 04:00:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 56M40spS032517; Tue, 22 Jul 2025 04:00:54 GMT (envelope-from git) Date: Tue, 22 Jul 2025 04:00:54 GMT Message-Id: <202507220400.56M40spS032517@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 73e1bd714277 - main - cam/mmc: Remove stray xpt_path_inq 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: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 73e1bd71427794ee5496fdeb2bdaa04b05b0c35b Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=73e1bd71427794ee5496fdeb2bdaa04b05b0c35b commit 73e1bd71427794ee5496fdeb2bdaa04b05b0c35b Author: Warner Losh AuthorDate: 2025-07-22 02:50:50 +0000 Commit: Warner Losh CommitDate: 2025-07-22 04:00:53 +0000 cam/mmc: Remove stray xpt_path_inq Turns out, we don't use the results of xpt_path_inq here at all. And it also causes problems. Since it calls xpt_cam_inq to do this useless XPT_PATH_INQ, it loses the original priority we had for the CCB. This priority should be CAM_PRIORITY_XPT, but was oringially set to CAM_PRIORITY_NORMAL. This worked to enumerate the device because no normal priority CCBs were queued by anything doing the enumeration. However, when I changed xpt_path_inq to use the more proper PRIORITY_NONE, it exposed this bug because queued CCBs with PRIORITY_NONE sometimes won't run. This caused the probe device to stop after its first operation. Removing the xpt_path_inq means we no longer step on the important fields we get from xpt_schedule, allowing probing to work correctly. Noticed by: bz@ Sponsored by: Netflix --- sys/cam/mmc/mmc_xpt.c | 1 - 1 file changed, 1 deletion(-) diff --git a/sys/cam/mmc/mmc_xpt.c b/sys/cam/mmc/mmc_xpt.c index 4fce03004994..f5f66f5214a8 100644 --- a/sys/cam/mmc/mmc_xpt.c +++ b/sys/cam/mmc/mmc_xpt.c @@ -610,7 +610,6 @@ mmcprobe_start(struct cam_periph *periph, union ccb *start_ccb) CAM_DEBUG(start_ccb->ccb_h.path, CAM_DEBUG_PROBE, ("Start with PROBE_RESET\n")); /* FALLTHROUGH */ case PROBE_IDENTIFY: - xpt_path_inq(&start_ccb->cpi, periph->path); CAM_DEBUG(start_ccb->ccb_h.path, CAM_DEBUG_PROBE, ("Start with PROBE_IDENTIFY\n")); init_standard_ccb(start_ccb, XPT_MMC_GET_TRAN_SETTINGS); break;