skd: fix msix error handling
PATCH 1/2 skd: fix msix error handling
As reported by gcc -Wmaybe-uninitialized, the cleanup path for skd_acquire_msix tries to free the already allocated msi-x vectors in reverse order, but the index variable may not have been used yet:
drivers/block/skd_main.c: In function ‘skd_acquire_irq’:drivers/block/skd_main.c:3890:8: error: ‘i’ may be used uninitialized in this function [-Werror=maybe-uninitialized]
This changes the failure path to skip releasing the interrupts if we have not started requesting them yet.
--- drivers/block/skd_main.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/block/skd_main.c +3 -2
@@ -3849,7 +3849,7 @@ static int skd_acquire_msix(struct skd_device *skdev)if (rc <0 ) {pr_err ("(%s): failed to enable MSI-X %d\n" ,skd_name (skdev), rc); - goto msix_out; + goto out; } skdev->msix_entries = kcalloc(SKD_MAX_MSIX_COUNT,
@@ -3858,7 +3858,7 @@ static int skd_acquire_msix(struct skd_device *skdev) rc = -ENOMEM ;pr_err ("(%s): msix table allocation error\n" ,skd_name (skdev)); - goto msix_out; + goto out; }/* Enable MSI-X vectors for the base queue */
@@ -3889,6 +3889,7 @@ static int skd_acquire_msix(struct skd_device *skdev) msix_out:while (--i >=0 )devm_free_irq (&pdev->dev,pci_irq_vector (pdev, i), skdev); +out:kfree (skdev->msix_entries); skdev->msix_entries =NULL ;return rc;
Signature · 1 line
2.9.0
PATCH 2/2 skd: fix function prototype
Building with W=1 shows a harmless warning for the skd driver:
drivers/block/skd_main.c:2959:1: error: ‘static’ is not at beginning of declaration [-Werror=old-style-declaration]
This changes the prototype to the expected formatting.
--- drivers/block/skd_main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/block/skd_main.c +2 -2
@@ -2945,8 +2945,8 @@ static void skd_completion_worker(struct work_struct *work)static void skd_isr_msg_from_dev (struct skd_device *skdev); -irqreturn_t -static skd_isr (int irq,void *ptr) +static irqreturn_t +skd_isr (int irq,void *ptr) {struct skd_device *skdev;u32 intstat;
Signature · 1 line
2.9.0
Re: [PATCH 2/2] skd: fix function prototype
Quoted 8 lines · Arnd Bergmann
Building with W=1 shows a harmless warning for the skd driver:
drivers/block/skd_main.c:2959:1: error: ‘static’ is not at beginning of declaration [-Werror=old-style-declaration]This changes the prototype to the expected formatting.
Signed-off-by Arnd Bergmann <[email protected]>---
Looks good,
Signature · 6 lines
Johannes Thumshirn Storage [email protected] +49 911 74053 689 SUSE LINUX GmbH, Maxfeldstr. 5, 90409 Nürnberg GF: Felix Imendörffer, Jane Smithard, Graham Norton HRB 21284 (AG Nürnberg) Key fingerprint = EC38 9CAB C2C4 F25D 8600 D0D0 0393 969D 2D76 0850
Jens Axboe
AppliedQuoted 10 lines · Arnd Bergmann
As reported by gcc -Wmaybe-uninitialized, the cleanup path for
skd_acquire_msixtries to free the already allocated msi-x vectors in reverse order, but the index variable may not have been used yet:
drivers/block/skd_main.c: In function ‘skd_acquire_irq’:drivers/block/skd_main.c:3890:8: error: ‘i’ may be used uninitialized in this function [-Werror=maybe-uninitialized]This changes the failure path to skip releasing the interrupts if we have not started requesting them yet.
Applied both patches, thanks Arnd.
Signature · 1 line
Jens Axboe