From: Bart Van Assche Date: Thu, 28 May 2026 17:28:59 +0000 (+0200) Subject: ata: Annotate functions in the issuing path with __must_hold() X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=042f5526cf2c44eac17ed2fa57a9a6e8d30d6279;p=thirdparty%2Fkernel%2Flinux.git ata: Annotate functions in the issuing path with __must_hold() Annotate the following functions used in the issuing path: ata_qc_issue(), ata_sas_queuecmd(), ata_scsi_qc_issue(), ata_scsi_translate(), __ata_scsi_queuecmd() These functions are all used in the issuing path, so context analysis will be able to verify that the ap lock is held, from it is taken in sas_queuecommand() or ata_scsi_queuecmd() all the way down to ata_qc_issue(). Commenting out the spin_lock_irqsave() successfully results in a compiler error on Clang 23. Signed-off-by: Bart Van Assche Co-developed-by: Niklas Cassel Reviewed-by: Hannes Reinecke Signed-off-by: Niklas Cassel --- diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c index 938e95138a8f5..3b6243f0f91e7 100644 --- a/drivers/ata/libata-core.c +++ b/drivers/ata/libata-core.c @@ -5162,6 +5162,7 @@ EXPORT_SYMBOL_GPL(ata_qc_get_active); * spin_lock_irqsave(host lock) */ void ata_qc_issue(struct ata_port *ap, struct ata_queued_cmd *qc) + __must_hold(ap->lock) { struct ata_link *link = qc->dev->link; u8 prot = qc->tf.protocol; diff --git a/drivers/ata/libata-sata.c b/drivers/ata/libata-sata.c index 5e5be6bbf32ad..b0706c30da052 100644 --- a/drivers/ata/libata-sata.c +++ b/drivers/ata/libata-sata.c @@ -1377,6 +1377,7 @@ EXPORT_SYMBOL_GPL(ata_sas_sdev_configure); */ int ata_sas_queuecmd(struct scsi_cmnd *cmd, struct ata_port *ap) + __must_hold(ap->lock) { if (likely(ata_dev_enabled(ap->link.device))) return __ata_scsi_queuecmd(cmd, ap->link.device, ap); diff --git a/drivers/ata/libata-scsi.c b/drivers/ata/libata-scsi.c index 0375c5c2d2f33..d54ec1631e9a6 100644 --- a/drivers/ata/libata-scsi.c +++ b/drivers/ata/libata-scsi.c @@ -1769,6 +1769,7 @@ static void ata_scsi_qc_complete(struct ata_queued_cmd *qc) } static int ata_scsi_qc_issue(struct ata_port *ap, struct ata_queued_cmd *qc) + __must_hold(ap->lock) { struct ata_link *link = qc->dev->link; int ret; @@ -1864,6 +1865,7 @@ free_qc: */ static int ata_scsi_translate(struct ata_device *dev, struct scsi_cmnd *cmd, ata_xlat_func_t xlat_func, struct ata_port *ap) + __must_hold(ap->lock) { struct ata_queued_cmd *qc; @@ -4523,6 +4525,7 @@ static void ata_scsi_simulate(struct ata_device *dev, struct scsi_cmnd *cmd) enum scsi_qc_status __ata_scsi_queuecmd(struct scsi_cmnd *scmd, struct ata_device *dev, struct ata_port *ap) + __must_hold(ap->lock) { u8 scsi_op = scmd->cmnd[0]; ata_xlat_func_t xlat_func; diff --git a/drivers/ata/libata.h b/drivers/ata/libata.h index 16d0818b2b16a..0dd735c2e5b55 100644 --- a/drivers/ata/libata.h +++ b/drivers/ata/libata.h @@ -88,7 +88,8 @@ extern int ata_down_xfermask_limit(struct ata_device *dev, unsigned int sel); extern unsigned int ata_dev_set_feature(struct ata_device *dev, u8 subcmd, u8 action); extern void ata_qc_free(struct ata_queued_cmd *qc); -extern void ata_qc_issue(struct ata_port *ap, struct ata_queued_cmd *qc); +extern void ata_qc_issue(struct ata_port *ap, struct ata_queued_cmd *qc) + __must_hold(ap->lock); extern void __ata_qc_complete(struct ata_queued_cmd *qc); extern int atapi_check_dma(struct ata_queued_cmd *qc); extern void swap_buf_le16(u16 *buf, unsigned int buf_words); @@ -167,7 +168,8 @@ int ata_scsi_dev_config(struct scsi_device *sdev, struct queue_limits *lim, struct ata_device *dev); enum scsi_qc_status __ata_scsi_queuecmd(struct scsi_cmnd *scmd, struct ata_device *dev, - struct ata_port *ap); + struct ata_port *ap) + __must_hold(ap->lock); void ata_scsi_deferred_qc_work(struct work_struct *work); void ata_scsi_requeue_deferred_qc(struct ata_port *ap); diff --git a/include/linux/libata.h b/include/linux/libata.h index 7091bc903c05f..96e626d6a7cab 100644 --- a/include/linux/libata.h +++ b/include/linux/libata.h @@ -1315,7 +1315,8 @@ extern int ata_tport_add(struct device *parent, struct ata_port *ap); extern void ata_tport_delete(struct ata_port *ap); int ata_sas_sdev_configure(struct scsi_device *sdev, struct queue_limits *lim, struct ata_port *ap); -extern int ata_sas_queuecmd(struct scsi_cmnd *cmd, struct ata_port *ap); +extern int ata_sas_queuecmd(struct scsi_cmnd *cmd, struct ata_port *ap) + __must_hold(ap->lock); extern void ata_tf_to_fis(const struct ata_taskfile *tf, u8 pmp, int is_cmd, u8 *fis); extern void ata_tf_from_fis(const u8 *fis, struct ata_taskfile *tf);