From c2a1b91e47984e477298912ffd55570095d67318 Mon Sep 17 00:00:00 2001

From: Andre Przywara <andre.przywara@arm.com>

Date: Fri, 17 Jun 2022 09:59:44 +0000

Subject: [PATCH] crypto: qat - replace get_current_node() with numa_node_id()

Git-commit: c2a1b91e47984e477298912ffd55570095d67318

Patch-mainline: v6.0-rc1

References: jsc#PED-1073

Currently the QAT driver code uses a self-defined wrapper function

called get_current_node() when it wants to learn the current NUMA node.

This implementation references the topology_physical_package_id[] array,

which more or less coincidentally contains the NUMA node id, at least

on x86.

Because this is not universal, and Linux offers a direct function to

learn the NUMA node ID, replace that function with a call to

numa_node_id(), which would work everywhere.

This fixes the QAT driver operation on arm64 machines.

Reported-by: Yoan Picchi <Yoan.Picchi@arm.com>

Signed-off-by: Andre Przywara <andre.przywara@arm.com>

Signed-off-by: Yoan Picchi <yoan.picchi@arm.com>

Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>

Signed-off-by: Torsten Duwe <duwe@suse.de>

---

 drivers/crypto/qat/qat_common/adf_common_drv.h | 5 -----

 drivers/crypto/qat/qat_common/qat_algs.c       | 4 ++--

 drivers/crypto/qat/qat_common/qat_asym_algs.c  | 4 ++--

 3 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/drivers/crypto/qat/qat_common/adf_common_drv.h b/drivers/crypto/qat/qat_common/adf_common_drv.h

index 0464fa2579295..b364bc06c732a 100644

--- a/drivers/crypto/qat/qat_common/adf_common_drv.h

+++ b/drivers/crypto/qat/qat_common/adf_common_drv.h

@@ -49,11 +49,6 @@ struct service_hndl {

 	struct list_head list;

 };

-static inline int get_current_node(void)

-{

-	return topology_physical_package_id(raw_smp_processor_id());

-}

-

 int adf_service_register(struct service_hndl *service);

 int adf_service_unregister(struct service_hndl *service);

diff --git a/drivers/crypto/qat/qat_common/qat_algs.c b/drivers/crypto/qat/qat_common/qat_algs.c

index 148edbe379e31..fb45fa83841c5 100644

--- a/drivers/crypto/qat/qat_common/qat_algs.c

+++ b/drivers/crypto/qat/qat_common/qat_algs.c

@@ -605,7 +605,7 @@ static int qat_alg_aead_newkey(struct crypto_aead *tfm, const u8 *key,

 {

 	struct qat_alg_aead_ctx *ctx = crypto_aead_ctx(tfm);

 	struct qat_crypto_instance *inst = NULL;

-	int node = get_current_node();

+	int node = numa_node_id();

 	struct device *dev;

 	int ret;

@@ -1065,7 +1065,7 @@ static int qat_alg_skcipher_newkey(struct qat_alg_skcipher_ctx *ctx,

 {

 	struct qat_crypto_instance *inst = NULL;

 	struct device *dev;

-	int node = get_current_node();

+	int node = numa_node_id();

 	int ret;

 	inst = qat_crypto_get_instance_node(node);

diff --git a/drivers/crypto/qat/qat_common/qat_asym_algs.c b/drivers/crypto/qat/qat_common/qat_asym_algs.c

index 16d97db9ea15f..095ed2a404d2f 100644

--- a/drivers/crypto/qat/qat_common/qat_asym_algs.c

+++ b/drivers/crypto/qat/qat_common/qat_asym_algs.c

@@ -489,7 +489,7 @@ static int qat_dh_init_tfm(struct crypto_kpp *tfm)

 {

 	struct qat_dh_ctx *ctx = kpp_tfm_ctx(tfm);

 	struct qat_crypto_instance *inst =

-			qat_crypto_get_instance_node(get_current_node());

+			qat_crypto_get_instance_node(numa_node_id());

 	if (!inst)

 		return -EINVAL;

@@ -1225,7 +1225,7 @@ static int qat_rsa_init_tfm(struct crypto_akcipher *tfm)

 {

 	struct qat_rsa_ctx *ctx = akcipher_tfm_ctx(tfm);

 	struct qat_crypto_instance *inst =

-			qat_crypto_get_instance_node(get_current_node());

+			qat_crypto_get_instance_node(numa_node_id());

 	if (!inst)

 		return -EINVAL;

-- 

2.35.3