From nobody Sat Dec 28 18:01:17 2024 X-Original-To: dev-commits-src-branches@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 4YL9Cf5WzXz5hyTy; Sat, 28 Dec 2024 18:01:18 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YL9Cf2yJ6z4sVM; Sat, 28 Dec 2024 18:01:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735408878; 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=ScNUf91IjVSDT5LkngNGFgu1XNxqbGGQjto7uyWh2k0=; b=neDXeGqPFUqXG4U11Zj6yTt08mmeqI8/G3nMKCWJCroQHbY1b13QI9Uv2utF4BdTrz/Otx 5MDHgh+Rtoep8k+jDIpHEp7pPa+EAncgG6bLIG+OpECeSiT2YuVJ+Alm7xGRo2GOOi8FjB gb5Jh1T4GSNsOLsPdGOgGsUm6+3dmd+iw0dAnKshhO6Quy5hZeaSy5MMzIwR43a7ex8i1e UqRJpAtgnbPjlLhMrcY9rfys/LPnEYnlZuJORFt9s0nQ5r4rjzgoj9mbjWnqyc2zX387Hy 2KFcZsdfsP8m5d/MOEUT+2S6HdKloC6cYlA3h9v1SCCsmbMXqulPA7Cov4TOrA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735408878; 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=ScNUf91IjVSDT5LkngNGFgu1XNxqbGGQjto7uyWh2k0=; b=nz6EmKbe1pxZn3XE3KEShnUQOJ9hlonuE0uq3WPmD2fMfNkM2fE3W8cvDTPUJ0JHlS32Lq WTiOcQW247XdoVISSYaoxkq3WQhe/co70KwYPeFbhuTYdmgwV/x2uf3YubuHthiIOu8G13 kjtkyVDr/H29lI/rpBDenU3KQ5lL5vWPwswRjbLRrkn6Hh4KBITtcCqclAMxwvEqSTtPZr ZcdZJeBKMYtakOT41bJSvy++tHkAJhQWkJj3n4qx5GHbCWNAmQIPI/YoZOPaGMOOR2BW+e tskZ8bXCCE4W4c8FXbnm5ZYk/5Z8QOFtVIxPa431Kg4uCd0dj9g7PS3wtbYEuw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735408878; a=rsa-sha256; cv=none; b=qPrspROMAzdEWK5sxF07cqzfIAKU7Z+VquEtfkVWufUPNJ5JTteeJMsxf7sNkg7CCuNXQ8 9Yv2kAgMe42uAGCwMi1yz4aIproeLhmKld9LfOlGCriF73rOtAt5x7pmV59+3JsYNQ61wF PAxLzr9uvBJgk19t2Zwf6tAMvTcspgoc6E1Ge9hMvvVxVtGDHEChHdhBsY8E81zsz56Lpd CX8LqrgV9gjVg5wlU0fx+7R2hN6OgCFO33fkv+E//LNPOeE6KhdC2GKSmYMvpcPOGoWTxa Bn3cnzMBreUrCpKD5QVcb04h8mrah8+vTv1mMpkFatEQp2DNK+U8IwQL0FyXmg== 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 4YL9Cf0RgCzbBW; Sat, 28 Dec 2024 18:01:18 +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 4BSI1Hv5038416; Sat, 28 Dec 2024 18:01:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BSI1Hia038413; Sat, 28 Dec 2024 18:01:17 GMT (envelope-from git) Date: Sat, 28 Dec 2024 18:01:17 GMT Message-Id: <202412281801.4BSI1Hia038413@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Warner Losh Subject: git: aea9f26d8005 - stable/13 - mpr/mps: when sending reset on removal, include target in message List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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/stable/13 X-Git-Reftype: branch X-Git-Commit: aea9f26d8005e32ad840d0490af94866787e2731 Auto-Submitted: auto-generated The branch stable/13 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=aea9f26d8005e32ad840d0490af94866787e2731 commit aea9f26d8005e32ad840d0490af94866787e2731 Author: Warner Losh AuthorDate: 2024-12-28 17:59:59 +0000 Commit: Warner Losh CommitDate: 2024-12-28 18:00:54 +0000 mpr/mps: when sending reset on removal, include target in message It's possible for muliple drives to be departing at the same time (if the common power rail the share goes dark, for example). To understand what's going on better, include target and handle in the messages announcing the reset to allow matching with other corresponding events. MFC After: 3 days Sponsored by: Netflix Reviewed by: mav Differential Revision: https://reviews.freebsd.org/D35092 (cherry picked from commit ca420b4ef2ceac00f6c6905252d553a86100ab6a) --- sys/dev/mpr/mpr_sas.c | 8 ++++++-- sys/dev/mps/mps_sas.c | 8 ++++++-- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/sys/dev/mpr/mpr_sas.c b/sys/dev/mpr/mpr_sas.c index cd6cbe4981c8..a346f69750d8 100644 --- a/sys/dev/mpr/mpr_sas.c +++ b/sys/dev/mpr/mpr_sas.c @@ -616,7 +616,9 @@ mprsas_remove_device(struct mpr_softc *sc, struct mpr_command *tm) * if so. */ if (TAILQ_FIRST(&targ->commands) == NULL) { - mpr_dprint(sc, MPR_INFO, "No pending commands: starting remove_device\n"); + mpr_dprint(sc, MPR_INFO, + "No pending commands: starting remove_device for target %u handle 0x%04x\n", + targ->tid, handle); mpr_map_command(sc, tm); targ->pending_remove_tm = NULL; } else { @@ -2836,7 +2838,9 @@ mprsas_scsiio_complete(struct mpr_softc *sc, struct mpr_command *cm) if (cm->cm_targ->flags & MPRSAS_TARGET_INREMOVAL) { if (TAILQ_FIRST(&cm->cm_targ->commands) == NULL && cm->cm_targ->pending_remove_tm != NULL) { - mpr_dprint(sc, MPR_INFO, "Last pending command complete: starting remove_device\n"); + mpr_dprint(sc, MPR_INFO, + "Last pending command complete: starting remove_device target %u handle 0x%04x\n", + cm->cm_targ->tid, cm->cm_targ->handle); mpr_map_command(sc, cm->cm_targ->pending_remove_tm); cm->cm_targ->pending_remove_tm = NULL; } diff --git a/sys/dev/mps/mps_sas.c b/sys/dev/mps/mps_sas.c index 39423bf3f348..17f9b2ba28ad 100644 --- a/sys/dev/mps/mps_sas.c +++ b/sys/dev/mps/mps_sas.c @@ -587,7 +587,9 @@ mpssas_remove_device(struct mps_softc *sc, struct mps_command *tm) * if so. */ if (TAILQ_FIRST(&targ->commands) == NULL) { - mps_dprint(sc, MPS_INFO, "No pending commands: starting remove_device\n"); + mps_dprint(sc, MPS_INFO, + "No pending commands: starting remove_device target %u handle 0x%04x\n", + targ->tid, handle); mps_map_command(sc, tm); targ->pending_remove_tm = NULL; } else { @@ -2378,7 +2380,9 @@ mpssas_scsiio_complete(struct mps_softc *sc, struct mps_command *cm) if (cm->cm_targ->flags & MPSSAS_TARGET_INREMOVAL) { if (TAILQ_FIRST(&cm->cm_targ->commands) == NULL && cm->cm_targ->pending_remove_tm != NULL) { - mps_dprint(sc, MPS_INFO, "Last pending command complete: starting remove_device\n"); + mps_dprint(sc, MPS_INFO, + "Last pending command complete: starting remove_device target %u handle 0x%04x\n", + cm->cm_targ->tid, cm->cm_targ->handle); mps_map_command(sc, cm->cm_targ->pending_remove_tm); cm->cm_targ->pending_remove_tm = NULL; }