crypto: qat - fix some timeout tests

Commit Message

Tadeusz Struk Dec. 15, 2015, 8:27 p.m. UTC

On 12/15/2015 02:05 AM, Dan Carpenter wrote:
> We do an "if (!times)" test later to see if we ran the loop too many
> times, but because it is a postop negate that means times is -1 when we
> exit that way.  I have fixed this by changing it from a post op to a
> preop.
> 
> Fixes: b3416fb8a2f5 ('crypto: qat - Intel(R) QAT accelengine part of fw loader')
> Signed-off-by: Dan Carpenter <[e-mail]>
> ---
> This means we only loop 9999 times instead of 10000 like before but I
> figure it probably doesn't matter.
> 
> diff --git a/drivers/crypto/qat/qat_common/qat_hal.c b/drivers/crypto/qat/qat_common/qat_hal.c
> index 45c1739..2b078a6 100644
> --- a/drivers/crypto/qat/qat_common/qat_hal.c
> +++ b/drivers/crypto/qat/qat_common/qat_hal.c
> @@ -171,7 +171,7 @@ static int qat_hal_wait_cycles(struct icp_qat_fw_loader_handle *handle,
>  
>  	qat_hal_rd_ae_csr(handle, ae, PROFILE_COUNT, &base_cnt);
>  	base_cnt &= 0xffff;
> -	while ((int)cycles > elapsed_cycles && times--) {
> +	while ((int)cycles > elapsed_cycles && --times) {
>  		if (chk_inactive)
>  			qat_hal_rd_ae_csr(handle, ae, ACTIVE_CTX_STATUS, &csr);
>  
> 

Since the times var is an signed int I think we should rather change the condition:


Pingchao could you test and send a patch please.
Thanks

Comments

Dan Carpenter Dec. 15, 2015, 11:50 p.m. UTC | #1

On Tue, Dec 15, 2015 at 12:27:23PM -0800, Tadeusz Struk wrote:
> Since the times var is an signed int I think we should rather change the condition:

I don't see what signed int has to do with anything.

> 
> diff --git a/drivers/crypto/qat/qat_common/qat_hal.c b/drivers/crypto/qat/qat_common/qat_hal.c
> index 45c1739..864a5ea 100644
> --- a/drivers/crypto/qat/qat_common/qat_hal.c
> +++ b/drivers/crypto/qat/qat_common/qat_hal.c
> @@ -186,7 +186,7 @@ static int qat_hal_wait_cycles(struct icp_qat_fw_loader_handle *handle,
>  		if (elapsed_cycles >= 8 && !(csr & (1 << ACS_ABO_BITPOS)))
>  			return 0;
>  	}
> -	if (!times) {
> +	if (!(0 < times)) {

Oh, wow that's nasty!  Why would you write it in such an obfuscated way?
Plus it's buggy and wrong...  What on earth.

regards,
dan carpenter


--
To unsubscribe from this list: send the line "unsubscribe linux-crypto" in
the body of a message to [e-mail]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

diff --git a/drivers/crypto/qat/qat_common/qat_hal.c b/drivers/crypto/qat/qat_common/qat_hal.c
index 45c1739..864a5ea 100644
--- a/drivers/crypto/qat/qat_common/qat_hal.c
+++ b/drivers/crypto/qat/qat_common/qat_hal.c
@@ -186,7 +186,7 @@  static int qat_hal_wait_cycles(struct icp_qat_fw_loader_handle *handle,
 		if (elapsed_cycles >= 8 && !(csr & (1 << ACS_ABO_BITPOS)))
 			return 0;
 	}
-	if (!times) {
+	if (!(0 < times)) {
 		pr_err("QAT: wait_num_cycles time out\n");
 		return -EFAULT;
 	}