summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorMartin K. Petersen (Oracle) <mkp@kernel.org>2026-10-14 22:49:45 -0400
committerMartin K. Petersen (Oracle) <mkp@kernel.org>2026-10-14 22:49:45 -0400
commitdb8b4d2bf2d3e02b4ff78bbf69d00e11795840de (patch)
tree8ef41ebe2a95ac0e3a0e4ce7a32f4fa20fe33689 /include
parent92821c2358c78345909889793918af8763808bd4 (diff)
parent782a516e8f432f5ded4adab206bb809e29593c54 (diff)
Merge patch series "scsi: Enable context analysis for most drivers"
Bart Van Assche <bvanassche@acm.org> says: This patch series enables lock context analysis for all SCSI drivers in the drivers/scsi/ directory except scsi_debug. The advantages are as follows: - The compiler (only Clang) verifies whether the lock and unlock calls match what has been declared via __must_hold(), __acquires() or __releases(). This is useful for catching locking bugs in error paths. - Support for __guarded_by() is enabled. If a member variable is annotated with __guarded_by(lock), the compiler will issue a warning if that member variable is accessed without holding 'lock'. Please consider this patch series for the next merge window. Thanks, Bart. [mkp: Left out BusLogic changes and excluded that driver from context analysis] Link: https://patch.msgid.link/cover.1790360262.git.bvanassche@acm.org Signed-off-by: Martin K. Petersen (Oracle) <mkp@kernel.org>
Diffstat (limited to 'include')
-rw-r--r--include/linux/pci.h5
-rw-r--r--include/scsi/libiscsi.h23
2 files changed, 20 insertions, 8 deletions
diff --git a/include/linux/pci.h b/include/linux/pci.h
index d31a8d107b1e..68166c9f8158 100644
--- a/include/linux/pci.h
+++ b/include/linux/pci.h
@@ -611,7 +611,10 @@ static inline struct pci_dev *pci_physfn(struct pci_dev *dev)
struct pci_dev *pci_alloc_dev(struct pci_bus *bus);
-#define to_pci_dev(n) container_of(n, struct pci_dev, dev)
+static inline struct pci_dev *to_pci_dev(const struct device *dev)
+{
+ return container_of(dev, struct pci_dev, dev);
+}
#define for_each_pci_dev(d) while ((d = pci_get_device(PCI_ANY_ID, PCI_ANY_ID, d)) != NULL)
#define for_each_pci_dev_reverse(d) \
while ((d = pci_get_device_reverse(PCI_ANY_ID, PCI_ANY_ID, d)) != NULL)
diff --git a/include/scsi/libiscsi.h b/include/scsi/libiscsi.h
index 3d765c77bcd9..e4ac4ec0ac3e 100644
--- a/include/scsi/libiscsi.h
+++ b/include/scsi/libiscsi.h
@@ -474,17 +474,26 @@ 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_session *session,
+ struct iscsi_conn *conn, struct iscsi_hdr *,
+ char *, int)
+ __must_hold(&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);
+struct iscsi_task *iscsi_itt_to_ctask(struct iscsi_session *session,
+ struct iscsi_conn *conn, itt_t itt)
+ __must_hold(&session->back_lock);
+struct iscsi_task *iscsi_itt_to_task(struct iscsi_session *session,
+ struct iscsi_conn *conn, itt_t itt)
+ __must_hold(&session->back_lock);
extern void iscsi_requeue_task(struct iscsi_task *task);
extern void iscsi_put_task(struct iscsi_task *task);
-extern void __iscsi_put_task(struct iscsi_task *task);
+void __iscsi_put_task(struct iscsi_session *session, struct iscsi_task *task)
+ __must_hold(&session->back_lock);
extern bool iscsi_get_task(struct iscsi_task *task);
-extern void iscsi_complete_scsi_task(struct iscsi_task *task,
- uint32_t exp_cmdsn, uint32_t max_cmdsn);
+void iscsi_complete_scsi_task(struct iscsi_session *session,
+ struct iscsi_task *task,
+ uint32_t exp_cmdsn, uint32_t max_cmdsn)
+ __must_hold(&session->back_lock);
/*
* generic helpers