[PATCH 1/2] lib/cryptodev: avoid implicit conversion to 64 bit number

[PATCH 1/2] lib/cryptodev: avoid implicit conversion to 64 bit number

[Andre Muezerie]

MSVC issues the warning below:

../lib/cryptodev/rte_cryptodev.c(623): warning C4334: '<<':
    result of 32-bit shift implicitly converted to 64 bits
    (was 64-bit shift intended?)

The code would be better off by using 64 bit numbers to begin with.
That eliminates the need for a conversion to 64 bits later.

Signed-off-by: Andre Muezerie <andremue@linux.microsoft.com>
---
 lib/cryptodev/rte_cryptodev.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/cryptodev/rte_cryptodev.c b/lib/cryptodev/rte_cryptodev.c
index 85a4b46ac9..a49b0662f3 100644
--- a/lib/cryptodev/rte_cryptodev.c
+++ b/lib/cryptodev/rte_cryptodev.c
@@ -620,7 +620,7 @@ rte_cryptodev_asym_xform_capability_check_hash(
 {
 	bool ret = false;
 
-	if (capability->hash_algos & (1 << hash))
+	if (capability->hash_algos & RTE_BIT64(hash))
 		ret = true;
 
 	rte_cryptodev_trace_asym_xform_capability_check_hash(
-- 
2.47.0.vfs.0.3

[PATCH 2/2] lib/hash: avoid implicit conversion to 64 bit number

[Andre Muezerie]

MSVC issues the warnings below:

1) ../lib/hash/rte_thash_gf2_poly_math.c(128): warning C4334: '<<':
    result of 32-bit shift implicitly converted to 64 bits
    (was 64-bit shift intended?)

The code would be better off by using 64 bit numbers to begin with.
That eliminates the need for a conversion to 64 bits later.

2) ../lib/hash/rte_thash.c(568): warning C4334: '<<':
    result of 32-bit shift implicitly converted to 64 bits
    (was 64-bit shift intended?)

1ULL should be used as the result of the bit shift gets multiplied
by sizeof(uint32_t).

Signed-off-by: Andre Muezerie <andremue@linux.microsoft.com>
---
 lib/hash/rte_thash.c               | 2 +-
 lib/hash/rte_thash_gf2_poly_math.c | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/hash/rte_thash.c b/lib/hash/rte_thash.c
index fa78787143..f076311b57 100644
--- a/lib/hash/rte_thash.c
+++ b/lib/hash/rte_thash.c
@@ -565,7 +565,7 @@ rte_thash_add_helper(struct rte_thash_ctx *ctx, const char *name, uint32_t len,
 		offset;
 
 	ent = rte_zmalloc(NULL, sizeof(struct rte_thash_subtuple_helper) +
-		sizeof(uint32_t) * (1 << ctx->reta_sz_log),
+		sizeof(uint32_t) * (1ULL << ctx->reta_sz_log),
 		RTE_CACHE_LINE_SIZE);
 	if (ent == NULL)
 		return -ENOMEM;
diff --git a/lib/hash/rte_thash_gf2_poly_math.c b/lib/hash/rte_thash_gf2_poly_math.c
index 825da4382f..858884b4d4 100644
--- a/lib/hash/rte_thash_gf2_poly_math.c
+++ b/lib/hash/rte_thash_gf2_poly_math.c
@@ -119,16 +119,16 @@ static uint32_t
 gf2_mul(uint32_t a, uint32_t b, uint32_t r, int degree)
 {
 	uint64_t product = 0;
-	uint64_t r_poly = r|(1ULL << degree);
+	uint64_t r_poly = r | RTE_BIT64(degree);
 
 	for (; b; b &= (b - 1))
 		product ^= (uint64_t)a << (rte_bsf32(b));
 
 	for (int i = degree * 2 - 1; i >= degree; i--)
-		if (product & (1 << i))
+		if (product & RTE_BIT64(i))
 			product ^= r_poly << (i - degree);
 
-	return product;
+	return (uint32_t)product;
 }
 
 static uint32_t
-- 
2.47.0.vfs.0.3

RE: [EXTERNAL] [PATCH 1/2] lib/cryptodev: avoid implicit conversion to 64 bit number

[Akhil Goyal]

> MSVC issues the warning below:
> 
> ../lib/cryptodev/rte_cryptodev.c(623): warning C4334: '<<':
>     result of 32-bit shift implicitly converted to 64 bits
>     (was 64-bit shift intended?)
> 
> The code would be better off by using 64 bit numbers to begin with.
> That eliminates the need for a conversion to 64 bits later.
> 
> Signed-off-by: Andre Muezerie <andremue@linux.microsoft.com>
Acked-by: Akhil Goyal <gakhil@marvell.com>

1/2 patch Applied to dpdk-next-crypto
2/2 patch will be taken via main tree.

Thanks.

Re: [PATCH 2/2] lib/hash: avoid implicit conversion to 64 bit number

[Bruce Richardson]

On Wed, Nov 27, 2024 at 05:53:57PM -0800, Andre Muezerie wrote:
> MSVC issues the warnings below:
> 
> 1) ../lib/hash/rte_thash_gf2_poly_math.c(128): warning C4334: '<<':
>     result of 32-bit shift implicitly converted to 64 bits
>     (was 64-bit shift intended?)
> 
> The code would be better off by using 64 bit numbers to begin with.
> That eliminates the need for a conversion to 64 bits later.
> 
> 2) ../lib/hash/rte_thash.c(568): warning C4334: '<<':
>     result of 32-bit shift implicitly converted to 64 bits
>     (was 64-bit shift intended?)
> 
> 1ULL should be used as the result of the bit shift gets multiplied
> by sizeof(uint32_t).
> 
> Signed-off-by: Andre Muezerie <andremue@linux.microsoft.com>
> ---

Acked-by: Bruce Richardson <bruce.richardson@intel.com>

>  lib/hash/rte_thash.c               | 2 +-
>  lib/hash/rte_thash_gf2_poly_math.c | 6 +++---
>  2 files changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/lib/hash/rte_thash.c b/lib/hash/rte_thash.c
> index fa78787143..f076311b57 100644
> --- a/lib/hash/rte_thash.c
> +++ b/lib/hash/rte_thash.c
> @@ -565,7 +565,7 @@ rte_thash_add_helper(struct rte_thash_ctx *ctx, const char *name, uint32_t len,
>  		offset;
>  
>  	ent = rte_zmalloc(NULL, sizeof(struct rte_thash_subtuple_helper) +
> -		sizeof(uint32_t) * (1 << ctx->reta_sz_log),
> +		sizeof(uint32_t) * (1ULL << ctx->reta_sz_log),
>  		RTE_CACHE_LINE_SIZE);

Is there a reason not to use RTE_BIT64 here too?

Re: [PATCH 2/2] lib/hash: avoid implicit conversion to 64 bit number

[Medvedkin, Vladimir]

Acked-by: Vladimir Medvedkin <vladimir.medvedkin@intel.com>

On 28/11/2024 01:53, Andre Muezerie wrote:
> MSVC issues the warnings below:
>
> 1) ../lib/hash/rte_thash_gf2_poly_math.c(128): warning C4334: '<<':
>      result of 32-bit shift implicitly converted to 64 bits
>      (was 64-bit shift intended?)
>
> The code would be better off by using 64 bit numbers to begin with.
> That eliminates the need for a conversion to 64 bits later.
>
> 2) ../lib/hash/rte_thash.c(568): warning C4334: '<<':
>      result of 32-bit shift implicitly converted to 64 bits
>      (was 64-bit shift intended?)
>
> 1ULL should be used as the result of the bit shift gets multiplied
> by sizeof(uint32_t).
>
> Signed-off-by: Andre Muezerie <andremue@linux.microsoft.com>
> ---
>   lib/hash/rte_thash.c               | 2 +-
>   lib/hash/rte_thash_gf2_poly_math.c | 6 +++---
>   2 files changed, 4 insertions(+), 4 deletions(-)
>
<snip>

-- 
Regards,
Vladimir

Re: [PATCH 2/2] lib/hash: avoid implicit conversion to 64 bit number

[Andre Muezerie]

On Wed, Jan 22, 2025 at 04:12:49PM +0000, Bruce Richardson wrote:
> On Wed, Nov 27, 2024 at 05:53:57PM -0800, Andre Muezerie wrote:
> > MSVC issues the warnings below:
> > 
> > 1) ../lib/hash/rte_thash_gf2_poly_math.c(128): warning C4334: '<<':
> >     result of 32-bit shift implicitly converted to 64 bits
> >     (was 64-bit shift intended?)
> > 
> > The code would be better off by using 64 bit numbers to begin with.
> > That eliminates the need for a conversion to 64 bits later.
> > 
> > 2) ../lib/hash/rte_thash.c(568): warning C4334: '<<':
> >     result of 32-bit shift implicitly converted to 64 bits
> >     (was 64-bit shift intended?)
> > 
> > 1ULL should be used as the result of the bit shift gets multiplied
> > by sizeof(uint32_t).
> > 
> > Signed-off-by: Andre Muezerie <andremue@linux.microsoft.com>
> > ---
> 
> Acked-by: Bruce Richardson <bruce.richardson@intel.com>
> 
> >  lib/hash/rte_thash.c               | 2 +-
> >  lib/hash/rte_thash_gf2_poly_math.c | 6 +++---
> >  2 files changed, 4 insertions(+), 4 deletions(-)
> > 
> > diff --git a/lib/hash/rte_thash.c b/lib/hash/rte_thash.c
> > index fa78787143..f076311b57 100644
> > --- a/lib/hash/rte_thash.c
> > +++ b/lib/hash/rte_thash.c
> > @@ -565,7 +565,7 @@ rte_thash_add_helper(struct rte_thash_ctx *ctx, const char *name, uint32_t len,
> >  		offset;
> >  
> >  	ent = rte_zmalloc(NULL, sizeof(struct rte_thash_subtuple_helper) +
> > -		sizeof(uint32_t) * (1 << ctx->reta_sz_log),
> > +		sizeof(uint32_t) * (1ULL << ctx->reta_sz_log),
> >  		RTE_CACHE_LINE_SIZE);
> 
> Is there a reason not to use RTE_BIT64 here too?

Here we are calculating the size to be passed to the second argument of rte_zmalloc, which is of type size_t. size_t is implementation dependent, typically 4 bytes on 32-bit systems and 8 bytes on 64-bit systems, so using 1ULL seems more appropriate.