From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from 013.lax.mailroute.net (013.lax.mailroute.net [199.89.1.16]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 8E84244D688 for ; Thu, 30 Apr 2026 18:24:08 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=199.89.1.16 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777573449; cv=none; b=KzG4YAPu2jAqAXs9V2PmhJEYFN5yOUIhN84vM1AoFvKaAaGw32f4X5c0MfZFg5WgO1ZYjHmBvvcCxwRkxt3WloAsBrsjnAT/0ID/N7WdheUo43pMsxela4Q0O1YrxkhIhVdbizbfqFl+nuMJ4SmFICRrY8iIsphiM/4EJPrK9C4= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777573449; c=relaxed/simple; bh=6IePl78d76sI58RrA2Ovt9wOP5ayrjbnLnwwZTEf8HU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Puo++k/gjG4zeG1uqO7MQi9BW8iUgdpmmNzzQpnaeXN62rwe3Kavy5jZ31cj3TXP//G+bPmlYrqSgYxWAosESgZ4vvD06XtRWYdtAb4+LD5WMJU+OywPS/A3cDDx3RVVrMf+Bzu/OCvTWuvlJY5DT+RsfexWeghsZaKmpvBvhag= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=acm.org; spf=pass smtp.mailfrom=acm.org; dkim=pass (2048-bit key) header.d=acm.org header.i=@acm.org header.b=k/PzsRtD; arc=none smtp.client-ip=199.89.1.16 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=acm.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=acm.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=acm.org header.i=@acm.org header.b="k/PzsRtD" Received: from localhost (localhost [127.0.0.1]) by 013.lax.mailroute.net (Postfix) with ESMTP id 4g62cl0mMJzlfvq4; Thu, 30 Apr 2026 18:24:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=acm.org; h= content-transfer-encoding:mime-version:references:in-reply-to :x-mailer:message-id:date:date:subject:subject:from:from :received:received; s=mr01; t=1777573440; x=1780165441; bh=nOkHR q6Rz8qGIHw/3UjNDsUounP/J6a2eRMi2Gen0iM=; b=k/PzsRtDON/dzm2KE+PBL kzu4xCV3X2hD1cJ5D97Dc7ftk1g2tP+mxk6tnHLwAZue6mmbvJB5BOJid7uPyVND k0Ciy5V4lYQfhUPUN0oAMzH9l5EU8U6fCeP117HZUpEgkonpNo0uR3Rvmsss3x/3 ts8FhoqPMmbKAHJib1713j3IfWlv2VbN7pu/S7xGAYVMx3lmVBRyokjofGz7l8gF lTzkH71Mf24hs93XqvLnafbW2qXrIfmi76jaVJ5MuFYtotsh1j+jxspngmm5uauJ Da/+mpy6tWhBteRNQY/OVu5shEes/fFb0dJbdL+0jgZAJ2zGjZyVK3t1/31NFN2e g== X-Virus-Scanned: by MailRoute Received: from 013.lax.mailroute.net ([127.0.0.1]) by localhost (013.lax [127.0.0.1]) (mroute_mailscanner, port 10029) with LMTP id b-4-XH1OWn9o; Thu, 30 Apr 2026 18:24:00 +0000 (UTC) Received: from bvanassche.mtv.corp.google.com (unknown [104.135.180.219]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: bvanassche@acm.org) by 013.lax.mailroute.net (Postfix) with ESMTPSA id 4g62cY1nzxzlkMYB; Thu, 30 Apr 2026 18:23:56 +0000 (UTC) From: Bart Van Assche To: "Martin K . Petersen" Cc: linux-scsi@vger.kernel.org, Marco Elver , Bart Van Assche , Lee Duncan , Chris Leech , Mike Christie , "James E.J. Bottomley" Subject: [PATCH v2 35/56] scsi: libiscsi: Prepare for enabling lock context analysis Date: Thu, 30 Apr 2026 11:20:05 -0700 Message-ID: <20260430182130.1978347-36-bvanassche@acm.org> X-Mailer: git-send-email 2.54.0.545.g6539524ca2-goog In-Reply-To: <20260430182130.1978347-1-bvanassche@acm.org> References: <20260430182130.1978347-1-bvanassche@acm.org> Precedence: bulk X-Mailing-List: linux-scsi@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Document locking requirements with __must_hold(). Signed-off-by: Bart Van Assche --- drivers/scsi/libiscsi.c | 19 ++++++++++++++++++- include/scsi/libiscsi.h | 5 +++-- 2 files changed, 21 insertions(+), 3 deletions(-) diff --git a/drivers/scsi/libiscsi.c b/drivers/scsi/libiscsi.c index 25857d6ed6e8..b89c048b4034 100644 --- a/drivers/scsi/libiscsi.c +++ b/drivers/scsi/libiscsi.c @@ -1088,6 +1088,7 @@ static int iscsi_nop_out_rsp(struct iscsi_task *tas= k, =20 static int iscsi_handle_reject(struct iscsi_conn *conn, struct iscsi_hdr= *hdr, char *data, int datalen) + __must_hold(&conn->session->back_lock) { struct iscsi_reject *reject =3D (struct iscsi_reject *)hdr; struct iscsi_hdr rejected_pdu; @@ -1500,6 +1501,7 @@ static int iscsi_check_cmdsn_window_closed(struct i= scsi_conn *conn) =20 static int iscsi_xmit_task(struct iscsi_conn *conn, struct iscsi_task *t= ask, bool was_requeue) + __must_hold(&conn->session->frwd_lock) { int rc; =20 @@ -1915,7 +1917,8 @@ static void iscsi_tmf_timedout(struct timer_list *t= ) static int iscsi_exec_task_mgmt_fn(struct iscsi_conn *conn, struct iscsi_tm *hdr, int age, int timeout) - __must_hold(&session->frwd_lock) + __must_hold(&conn->session->frwd_lock) + __must_hold(&conn->session->eh_mutex) { struct iscsi_session *session =3D conn->session; =20 @@ -1962,6 +1965,7 @@ static int iscsi_exec_task_mgmt_fn(struct iscsi_con= n *conn, * Fail commands. session frwd lock held and xmit thread flushed. */ static void fail_scsi_tasks(struct iscsi_conn *conn, u64 lun, int error) + __must_hold(&conn->session->frwd_lock) { struct iscsi_session *session =3D conn->session; struct iscsi_task *task; @@ -2408,6 +2412,9 @@ int iscsi_eh_abort(struct scsi_cmnd *sc) =20 ISCSI_DBG_EH(session, "aborting [sc %p itt 0x%x]\n", sc, task->itt); conn =3D session->leadconn; + /* Tell the compiler that conn->session =3D=3D session. */ + __assume_ctx_lock(&conn->session->eh_mutex); + __assume_ctx_lock(&conn->session->frwd_lock); iscsi_get_conn(conn->cls_conn); conn->eh_abort_cnt++; age =3D session->age; @@ -2531,6 +2538,9 @@ int iscsi_eh_device_reset(struct scsi_cmnd *sc) if (!session->leadconn || session->state !=3D ISCSI_STATE_LOGGED_IN) goto unlock; conn =3D session->leadconn; + /* Tell the compiler that conn->session =3D=3D session. */ + __assume_ctx_lock(&conn->session->frwd_lock); + __assume_ctx_lock(&conn->session->eh_mutex); =20 /* only have one tmf outstanding at a time */ if (session->tmf_state !=3D TMF_INITIAL) @@ -2564,6 +2574,8 @@ int iscsi_eh_device_reset(struct scsi_cmnd *sc) iscsi_suspend_tx(conn); =20 spin_lock_bh(&session->frwd_lock); + /* Tell the compiler that conn->session =3D=3D session. */ + __assume_ctx_lock(&conn->session->frwd_lock); memset(hdr, 0, sizeof(*hdr)); fail_scsi_tasks(conn, sc->device->lun, DID_ERROR); session->tmf_state =3D TMF_INITIAL; @@ -2693,6 +2705,9 @@ static int iscsi_eh_target_reset(struct scsi_cmnd *= sc) if (!session->leadconn || session->state !=3D ISCSI_STATE_LOGGED_IN) goto unlock; conn =3D session->leadconn; + /* Tell the compiler that conn->session =3D=3D session. */ + __assume_ctx_lock(&conn->session->eh_mutex); + __assume_ctx_lock(&conn->session->frwd_lock); =20 /* only have one tmf outstanding at a time */ if (session->tmf_state !=3D TMF_INITIAL) @@ -2726,6 +2741,8 @@ static int iscsi_eh_target_reset(struct scsi_cmnd *= sc) iscsi_suspend_tx(conn); =20 spin_lock_bh(&session->frwd_lock); + /* Tell the compiler that conn->session =3D=3D session. */ + __assume_ctx_lock(&conn->session->frwd_lock); memset(hdr, 0, sizeof(*hdr)); fail_scsi_tasks(conn, -1, DID_ERROR); session->tmf_state =3D TMF_INITIAL; diff --git a/include/scsi/libiscsi.h b/include/scsi/libiscsi.h index 3d765c77bcd9..d39b5b268e6f 100644 --- a/include/scsi/libiscsi.h +++ b/include/scsi/libiscsi.h @@ -474,8 +474,9 @@ extern int iscsi_conn_send_pdu(struct iscsi_cls_conn = *, struct iscsi_hdr *, char *, uint32_t); extern int iscsi_complete_pdu(struct iscsi_conn *, struct iscsi_hdr *, char *, int); -extern int __iscsi_complete_pdu(struct iscsi_conn *, struct iscsi_hdr *, - char *, int); +extern int __iscsi_complete_pdu(struct iscsi_conn *conn, struct iscsi_hd= r *, + char *, int) + __must_hold(&conn->session->back_lock); extern int iscsi_verify_itt(struct iscsi_conn *, itt_t); extern struct iscsi_task *iscsi_itt_to_ctask(struct iscsi_conn *, itt_t)= ; extern struct iscsi_task *iscsi_itt_to_task(struct iscsi_conn *, itt_t);