From nobody Thu Apr 28 22:30:13 2022 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 50B701991159; Thu, 28 Apr 2022 22:30:13 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Kq9Kx1qCWz4Yhb; Thu, 28 Apr 2022 22:30:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1651185013; 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=9CtY84tdJjPXRUgI/KjthBA0CUa7zwd4s863zpuAVh0=; b=R6BK2ZcENbCMDrXSOj/ayr8Twn+T/a1pS1MzG0gix6dhX2PHL1cRhnYDYI/FBPXzuPM02t NfUUS01QCnNaHVIYe6/mm7+AaPqfCECJt5/aHlQCVNkwrALmHGOPPkF1TzVXrk02z0MENt NYPmGJH4jUm48xog6acyJO8HjyzD2nsl7sfpM1lk55PkeeTReMRJsTyPdND7C2aBae+UIt QG61m8N2SWl40Yrw4r4jQqGA2MW5MpGuNVgU1r2LC8PNJvAuJ2J17k35cAq9mzTiPp4dUc flSle6YYZVkaJ5XczKrwyddH1Urw6+g9KvmKpeSIOGHo4PgMVCxL1XiDVBkYjw== 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 1F5FE21148; Thu, 28 Apr 2022 22:30:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 23SMUDvQ039967; Thu, 28 Apr 2022 22:30:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 23SMUDav039961; Thu, 28 Apr 2022 22:30:13 GMT (envelope-from git) Date: Thu, 28 Apr 2022 22:30:13 GMT Message-Id: <202204282230.23SMUDav039961@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: ca420b4ef2ce - main - mpr/mps: when sending reset on removal, include target in message 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: 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: ca420b4ef2ceac00f6c6905252d553a86100ab6a Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1651185013; 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=9CtY84tdJjPXRUgI/KjthBA0CUa7zwd4s863zpuAVh0=; b=cwLwek0Y++x3gZZEuOLTp83Wk81vcttUgeoJIQ/amcVocsI8Txf72RVLndLKTW3uCn2O45 YbnO53BfhhD3ibw5quc3inhocIlmYtFoW06K/HeqZGPDN4JZYbha/CcT67Db93YqSiHXw+ CfTDNGAii7kdK6hObW9eAeh2LLsF5YCqHawIVg6MagmDPxx+ioRgXsQtqSrJJOth0h1A8R 8Pa3SbcD8l4nqZjvKaHavI8QGt1aQkSJBp9tRtJl9eabKbz5an2tqvFPIbFSY/1P094UK3 +VFUWYWv5QvrM8eByYAyMGizXfL/CPZDsHvbrWmPvCAaxyLISKsKoYq4J7F/Jg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1651185013; a=rsa-sha256; cv=none; b=gaTo9tgAKnOSa56dSetEMO5sexB6R76fwQB9dh/X4ASsUIQEQ06CjdK42GfeBq7wvWHtQn YjEHSFsdfUzNUpwbVVSl30gYaqH12HqDmCj6se6LHkqyb4YR69LPr8oM7IqFULcNhwPgjt m5rtcQK5u4PzqDPJKSVrGIycxY7ekGTfgiCFd8qQyxt5ZIeeXuFzyxOOwxM4J6AZEajiXC YomrnMMeWASjC/5+o6yEZ37MxEOuSgEYX6M2OmNj9AcXKhJE8Kko8NjFsCG9zcBRcfuV6z veU6eF4P6GVQlyUaHOcl80ReBY3A4CUWddYCp6d00pgzPKGJNTefGqYVquWT7g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=ca420b4ef2ceac00f6c6905252d553a86100ab6a commit ca420b4ef2ceac00f6c6905252d553a86100ab6a Author: Warner Losh AuthorDate: 2022-04-28 22:29:28 +0000 Commit: Warner Losh CommitDate: 2022-04-28 22:30:00 +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 --- 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 d40900e03108..dd630d212b7f 100644 --- a/sys/dev/mpr/mpr_sas.c +++ b/sys/dev/mpr/mpr_sas.c @@ -618,7 +618,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 { @@ -2842,7 +2844,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 087988bedc6a..9ac2207bce1d 100644 --- a/sys/dev/mps/mps_sas.c +++ b/sys/dev/mps/mps_sas.c @@ -588,7 +588,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 { @@ -2383,7 +2385,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; }