Skip to content

Commit

Permalink
crypto: qat - don't release uninitialized resources
Browse files Browse the repository at this point in the history
adf_vf_isr_resource_alloc() is not unwinding correctly when error
happens and it want to release uninitialized resources.
To fix this, only release initialized resources.

[    1.792845] Trying to free already-free IRQ 11
[    1.793091] WARNING: CPU: 0 PID: 182 at kernel/irq/manage.c:1821 free_irq+0x202/0x380
[    1.801340] Call Trace:
[    1.801477]  adf_vf_isr_resource_free+0x32/0xb0 [intel_qat]
[    1.801785]  adf_vf_isr_resource_alloc+0x14d/0x150 [intel_qat]
[    1.802105]  adf_dev_init+0xba/0x140 [intel_qat]

Signed-off-by: Tong Zhang <[email protected]>
Reviewed-by: Andy Shevchenko <[email protected]>
Fixes: dd0f368 ("crypto: qat - Add qat dh895xcc VF driver")
Acked-by: Giovanni Cabiddu <[email protected]>
Signed-off-by: Herbert Xu <[email protected]>
  • Loading branch information
lzto authored and herbertx committed Mar 26, 2021
1 parent 5b0ef79 commit b66acca
Showing 1 changed file with 13 additions and 4 deletions.
17 changes: 13 additions & 4 deletions drivers/crypto/qat/qat_common/adf_vf_isr.c
Original file line number Diff line number Diff line change
Expand Up @@ -261,17 +261,26 @@ int adf_vf_isr_resource_alloc(struct adf_accel_dev *accel_dev)
goto err_out;

if (adf_setup_pf2vf_bh(accel_dev))
goto err_out;
goto err_disable_msi;

if (adf_setup_bh(accel_dev))
goto err_out;
goto err_cleanup_pf2vf_bh;

if (adf_request_msi_irq(accel_dev))
goto err_out;
goto err_cleanup_bh;

return 0;

err_cleanup_bh:
adf_cleanup_bh(accel_dev);

err_cleanup_pf2vf_bh:
adf_cleanup_pf2vf_bh(accel_dev);

err_disable_msi:
adf_disable_msi(accel_dev);

err_out:
adf_vf_isr_resource_free(accel_dev);
return -EFAULT;
}
EXPORT_SYMBOL_GPL(adf_vf_isr_resource_alloc);
Expand Down

0 comments on commit b66acca

Please sign in to comment.