Commit ccca5e8a authored by Eric Biggers's avatar Eric Biggers Committed by Leon Romanovsky
Browse files

RDMA/rxe: switch to using the crc32 library 



Now that the crc32_le() library function takes advantage of
architecture-specific optimizations, it is unnecessary to go through the
crypto API.  Just use crc32_le().  This is much simpler, and it improves
performance due to eliminating the crypto API overhead.

Signed-off-by: default avatarEric Biggers <ebiggers@google.com>
Link: https://patch.msgid.link/20250207032316.53941-1-ebiggers@kernel.org


Reviewed-by: default avatarZhu Yanjun <yanjun.zhu@linux.dev>
Signed-off-by: default avatarLeon Romanovsky <leon@kernel.org>
parent 79bccd74

drivers/infiniband/sw/rxe/Kconfig

+1 −2
Original line number Diff line number Diff line
@@ -4,8 +4,7 @@ config RDMA_RXE 
	depends on INET && PCI && INFINIBAND

	depends on INFINIBAND_VIRT_DMA

	select NET_UDP_TUNNEL

	select CRYPTO

	select CRYPTO_CRC32

	select CRC32

	help

	This driver implements the InfiniBand RDMA transport over

	the Linux network stack. It enables a system with a

drivers/infiniband/sw/rxe/rxe.c

+0 −3
Original line number Diff line number Diff line
@@ -31,9 +31,6 @@ void rxe_dealloc(struct ib_device *ib_dev) 


	WARN_ON(!RB_EMPTY_ROOT(&rxe->mcg_tree));



	if (rxe->tfm)

		crypto_free_shash(rxe->tfm);



	mutex_destroy(&rxe->usdev_lock);

}

drivers/infiniband/sw/rxe/rxe.h

+0 −1
Original line number Diff line number Diff line
@@ -21,7 +21,6 @@ 
#include <rdma/ib_umem.h>

#include <rdma/ib_cache.h>

#include <rdma/ib_addr.h>

#include <crypto/hash.h>



#include "rxe_net.h"

#include "rxe_opcode.h"

drivers/infiniband/sw/rxe/rxe_icrc.c

+1 −39
Original line number Diff line number Diff line
@@ -9,28 +9,6 @@ 
#include "rxe.h"

#include "rxe_loc.h"



/**

 * rxe_icrc_init() - Initialize crypto function for computing crc32

 * @rxe: rdma_rxe device object

 *

 * Return: 0 on success else an error

 */

int rxe_icrc_init(struct rxe_dev *rxe)

{

	struct crypto_shash *tfm;



	tfm = crypto_alloc_shash("crc32", 0, 0);

	if (IS_ERR(tfm)) {

		rxe_dbg_dev(rxe, "failed to init crc32 algorithm err: %ld\n",

			       PTR_ERR(tfm));

		return PTR_ERR(tfm);

	}



	rxe->tfm = tfm;



	return 0;

}



/**

 * rxe_crc32() - Compute cumulative crc32 for a contiguous segment

 * @rxe: rdma_rxe device object
@@ -42,25 +20,9 @@ int rxe_icrc_init(struct rxe_dev *rxe) 
 */

static __be32 rxe_crc32(struct rxe_dev *rxe, __be32 crc, void *next, size_t len)

{

	__be32 icrc;

	int err;



	SHASH_DESC_ON_STACK(shash, rxe->tfm);



	shash->tfm = rxe->tfm;

	*(__be32 *)shash_desc_ctx(shash) = crc;

	err = crypto_shash_update(shash, next, len);

	if (unlikely(err)) {

		rxe_dbg_dev(rxe, "failed crc calculation, err: %d\n", err);

	return (__force __be32)crc32_le((__force u32)crc, next, len);

}



	icrc = *(__be32 *)shash_desc_ctx(shash);

	barrier_data(shash_desc_ctx(shash));



	return icrc;

}



/**

 * rxe_icrc_hdr() - Compute the partial ICRC for the network and transport

 *		  headers of a packet.

drivers/infiniband/sw/rxe/rxe_loc.h

+0 −1
Original line number Diff line number Diff line
@@ -168,7 +168,6 @@ int rxe_sender(struct rxe_qp *qp); 
int rxe_receiver(struct rxe_qp *qp);



/* rxe_icrc.c */

int rxe_icrc_init(struct rxe_dev *rxe);

int rxe_icrc_check(struct sk_buff *skb, struct rxe_pkt_info *pkt);

void rxe_icrc_generate(struct sk_buff *skb, struct rxe_pkt_info *pkt);