2023-12-11 11:42:44

by Gonglei (Arei)

[permalink] [raw]
Subject: [PATCH 2/2] crypto: virtio-crypto: Fix gcc check warnings

From: wangyangxin <[email protected]>

Fix gcc check warnings in W=1 build mode.
Variable cpu not used when CONFIG_SMP not defined.

Fixes: dbaf0624ffa5 ("crypto: add virtio-crypto driver")
Reported-by: kernel test robot <[email protected]>
Closes: https://lore.kernel.org/oe-kbuild-all/202312040315.kPrI1OCE-lkp@int
el.com/
Signed-off-by: wangyangxin <[email protected]>
Signed-off-by: Gonglei <[email protected]>
---
drivers/crypto/virtio/virtio_crypto_common.h | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/drivers/crypto/virtio/virtio_crypto_common.h b/drivers/crypto/virtio/virtio_crypto_common.h
index 7059bbe5a2eb..f0340bb7a10b 100644
--- a/drivers/crypto/virtio/virtio_crypto_common.h
+++ b/drivers/crypto/virtio/virtio_crypto_common.h
@@ -134,10 +134,9 @@ virtcrypto_clear_request(struct virtio_crypto_request *vc_req);

static inline int virtio_crypto_get_current_node(void)
{
- int cpu, node;
+ int node;

- cpu = get_cpu();
- node = topology_physical_package_id(cpu);
+ node = topology_physical_package_id(get_cpu());
put_cpu();

return node;
--
2.33.0



2023-12-22 03:34:02

by Herbert Xu

[permalink] [raw]
Subject: Re: [PATCH 2/2] crypto: virtio-crypto: Fix gcc check warnings

On Mon, Dec 11, 2023 at 07:42:16PM +0800, Gonglei wrote:
>
> static inline int virtio_crypto_get_current_node(void)
> {
> - int cpu, node;
> + int node;
>
> - cpu = get_cpu();
> - node = topology_physical_package_id(cpu);
> + node = topology_physical_package_id(get_cpu());

This looks like a bogus warning. I think we should do something
like this instead:

diff --git a/arch/x86/include/asm/processor.h b/arch/x86/include/asm/processor.h
index ae81a7191c1c..0cb43986061b 100644
--- a/arch/x86/include/asm/processor.h
+++ b/arch/x86/include/asm/processor.h
@@ -191,7 +191,7 @@ DECLARE_PER_CPU_READ_MOSTLY(struct cpuinfo_x86, cpu_info);
#define cpu_data(cpu) per_cpu(cpu_info, cpu)
#else
#define cpu_info boot_cpu_data
-#define cpu_data(cpu) boot_cpu_data
+#define cpu_data(cpu) ((void)cpu, boot_cpu_data)
#endif

extern const struct seq_operations cpuinfo_op;

Please send this patch to the x86 people.

Thanks,
--
Email: Herbert Xu <[email protected]>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt