Skip to contentSkip to conversation

crypto: marvell - Remove custom swap function in favor of built-in sort swap

PATCH In review Kuan-Wei Chiu 2 participants 4 messages Aug 11, 2024 – Aug 17, 2024

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

cover crypto: marvell - Remove custom swap function in favor of built-in sort swap

The custom swap function used in octeontx/octeontx2 driver do not perform any special operations and can be replaced with the built-in swap function of sort. This change not only reduces code size but also improves efficiency, especially in scenarios where CONFIG_RETPOLINE is enabled, as it makes indirect function calls more expensive.

By using the built-in swap, we avoid these costly indirect function calls, leading to better performance.

Kuan-Wei Chiu (2):
crypto: octeontx - Remove custom swap function in favor of built-in
sort swap
crypto: octeontx2 - Remove custom swap functions in favor of built-in
sort swap

 drivers/crypto/marvell/octeontx/otx_cptvf_algs.c   | 12 ++----------
 drivers/crypto/marvell/octeontx2/otx2_cptvf_algs.c | 10 +---------
 2 files changed, 3 insertions(+), 19 deletions(-)
Signature · 1 line
2.34.1
#1 lore raw

PATCH 1/2 crypto: octeontx - Remove custom swap function in favor of built-in sort swap

The custom swap function used in octeontx driver do not perform any special operations and can be replaced with the built-in swap function of sort. This change not only reduces code size but also improves efficiency, especially in scenarios where CONFIG_RETPOLINE is enabled, as it makes indirect function calls more expensive.

By using the built-in swap, we avoid these costly indirect function calls, leading to better performance.

---
Note: Build test only.

 drivers/crypto/marvell/octeontx/otx_cptvf_algs.c | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)
drivers/crypto/marvell/octeontx/otx_cptvf_algs.c +2 -10
index 3c5d577d8f0d..e53c79fe6342 100644
@@ -1613,14 +1613,6 @@ static int compare_func(const void *lptr, const void *rptr)
 	return 0;
 }
 
-static void swap_func(void *lptr, void *rptr, int size)
-{
-	struct cpt_device_desc *ldesc = (struct cpt_device_desc *) lptr;
-	struct cpt_device_desc *rdesc = (struct cpt_device_desc *) rptr;
-
-	swap(*ldesc, *rdesc);
-}
-
 int otx_cpt_crypto_init(struct pci_dev *pdev, struct module *mod,
 			enum otx_cptpf_type pf_type,
 			enum otx_cptvf_type engine_type,
@@ -1655,7 +1647,7 @@ int otx_cpt_crypto_init(struct pci_dev *pdev, struct module *mod,
 			is_crypto_registered = true;
 		}
 		sort(se_devices.desc, count, sizeof(struct cpt_device_desc),
-		     compare_func, swap_func);
+		     compare_func, NULL);
 		break;
 
 	case OTX_CPT_AE_TYPES:
@@ -1670,7 +1662,7 @@ int otx_cpt_crypto_init(struct pci_dev *pdev, struct module *mod,
 		ae_devices.desc[count++].dev = pdev;
 		atomic_inc(&ae_devices.count);
 		sort(ae_devices.desc, count, sizeof(struct cpt_device_desc),
-		     compare_func, swap_func);
+		     compare_func, NULL);
 		break;
 
 	default:
Signature · 1 line
2.34.1
#2 lore raw

PATCH 2/2 crypto: octeontx2 - Remove custom swap functions in favor of built-in sort swap

In reply to Kuan-Wei Chiu

The custom swap functions used in octeontx2 driver do not perform any special operations and can be replaced with the built-in swap function of sort. This change not only reduces code size but also improves efficiency, especially in scenarios where CONFIG_RETPOLINE is enabled, as it makes indirect function calls more expensive.

By using the built-in swap, we avoid these costly indirect function calls, leading to better performance.

---
Note: Build test only.

 drivers/crypto/marvell/octeontx2/otx2_cptvf_algs.c | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)
drivers/crypto/marvell/octeontx2/otx2_cptvf_algs.c +1 -9
index 1604fc58dc13..ff7cc8c13e73 100644
@@ -1702,14 +1702,6 @@ static int compare_func(const void *lptr, const void *rptr)
 	return 0;
 }
 
-static void swap_func(void *lptr, void *rptr, int size)
-{
-	struct cpt_device_desc *ldesc = lptr;
-	struct cpt_device_desc *rdesc = rptr;
-
-	swap(*ldesc, *rdesc);
-}
-
 int otx2_cpt_crypto_init(struct pci_dev *pdev, struct module *mod,
 			 int num_queues, int num_devices)
 {
@@ -1739,7 +1731,7 @@ int otx2_cpt_crypto_init(struct pci_dev *pdev, struct module *mod,
 		is_crypto_registered = true;
 	}
 	sort(se_devices.desc, count, sizeof(struct cpt_device_desc),
-	     compare_func, swap_func);
+	     compare_func, NULL);
 
 unlock:
 	mutex_unlock(&mutex);
Signature · 1 line
2.34.1
maintainer
#3 lore raw
In reply to Kuan-Wei Chiu
Quoted 15 lines · Kuan-Wei Chiu

The custom swap function used in octeontx/octeontx2 driver do not perform any special operations and can be replaced with the built-in swap function of sort. This change not only reduces code size but also improves efficiency, especially in scenarios where CONFIG_RETPOLINE is enabled, as it makes indirect function calls more expensive.

By using the built-in swap, we avoid these costly indirect function calls, leading to better performance.

Kuan-Wei Chiu (2):
crypto: octeontx - Remove custom swap function in favor of built-in
sort swap
crypto: octeontx2 - Remove custom swap functions in favor of built-in
sort swap

Quoted 6 lines
 drivers/crypto/marvell/octeontx/otx_cptvf_algs.c   | 12 ++----------
 drivers/crypto/marvell/octeontx2/otx2_cptvf_algs.c | 10 +---------
 2 files changed, 3 insertions(+), 19 deletions(-)
Signature · 1 line
2.34.1

All applied. Thanks.

Signature · 3 lines
Email: Herbert Xu <[email protected]>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt