RDMA/rxe: switch to using the crc32 library
Subsystems (2)
PATCH v2 1/1 RDMA/rxe: switch to using the crc32 library
From: Eric Biggers <[email protected]>
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.
---
v2: Just do a minimal conversion to crc32_le().
drivers/infiniband/sw/rxe/Kconfig | 3 +- drivers/infiniband/sw/rxe/rxe.c | 3 -- drivers/infiniband/sw/rxe/rxe.h | 1 - drivers/infiniband/sw/rxe/rxe_icrc.c | 40 +-------------------------- drivers/infiniband/sw/rxe/rxe_loc.h | 1 - drivers/infiniband/sw/rxe/rxe_req.c | 1 - drivers/infiniband/sw/rxe/rxe_verbs.c | 4 --- drivers/infiniband/sw/rxe/rxe_verbs.h | 1 - 8 files changed, 2 insertions(+), 52 deletions(-)
drivers/infiniband/sw/rxe/Kconfig +1 -2
@@ -2,12 +2,11 @@ config RDMA_RXE tristate "Software RDMA over Ethernet (RoCE) driver" 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 standard Ethernet adapter to interoperate with a RoCE adapter or with another system running the RXE driver.
drivers/infiniband/sw/rxe/rxe.c +0 -3
@@ -29,13 +29,10 @@ void rxe_dealloc(struct ib_device *ib_dev)rxe_pool_cleanup (&rxe->mr_pool);rxe_pool_cleanup (&rxe->mw_pool);WARN_ON (!RB_EMPTY_ROOT (&rxe->mcg_tree)); -if (rxe->tfm) -crypto_free_shash (rxe->tfm); -mutex_destroy (&rxe->usdev_lock); }/* initialize rxe device parameters */ static void rxe_init_device_param (struct rxe_dev *rxe)
drivers/infiniband/sw/rxe/rxe.h +0 -1
@@ -19,11 +19,10 @@#include <rdma/ib_pack.h> #include <rdma/ib_smi.h> #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" #include "rxe_hdr.h" #include "rxe_param.h"
drivers/infiniband/sw/rxe/rxe_icrc.c +1 -39
@@ -7,32 +7,10 @@#include <linux/crc32.h> #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 * @crc: starting crc32 value from previous segments * @next: starting address of current segment
@@ -40,27 +18,11 @@ int rxe_icrc_init(struct rxe_dev *rxe)* * Return: the cumulative crc32 checksum */ 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; +return (__force __be32 )crc32_le ((__force u32 )crc, next, len); }/** * 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
@@ -166,11 +166,10 @@ int rxe_completer(struct rxe_qp *qp);int rxe_requester (struct rxe_qp *qp);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);void rxe_resp_queue_pkt (struct rxe_qp *qp,struct sk_buff *skb);
drivers/infiniband/sw/rxe/rxe_req.c +0 -1
@@ -3,11 +3,10 @@* Copyright (c) 2016 Mellanox Technologies Ltd. All rights reserved. * Copyright (c) 2015 System Fabric Works, Inc. All rights reserved. */ #include <linux/skbuff.h> -#include <crypto/hash.h> #include "rxe.h" #include "rxe_loc.h" #include "rxe_queue.h"
drivers/infiniband/sw/rxe/rxe_verbs.c +0 -4
@@ -1531,14 +1531,10 @@ int rxe_register_device(struct rxe_dev *rxe, const char *ibdev_name,ib_set_device_ops (dev, &rxe_dev_ops); err =ib_device_set_netdev (&rxe->ib_dev, ndev,1 );if (err)return err; - err =rxe_icrc_init (rxe); -if (err) -return err; - err =ib_register_device (dev, ibdev_name,NULL );if (err)rxe_dbg_dev (rxe,"failed with error %d\n" , err);/*
drivers/infiniband/sw/rxe/rxe_verbs.h +0 -1
@@ -400,11 +400,10 @@ struct rxe_dev {u64 mmap_offset;atomic64_t stats_counters[RXE_NUM_OF_COUNTERS ];struct rxe_port port; -struct crypto_shash *tfm; };static inline struct net_device *rxe_ib_device_get_netdev (struct ib_device *dev) {return ib_device_get_netdev (dev,RXE_PORT );
base-commit: 2014c95afecee3e76ca4a56956a936e23283f05b
Signature · 1 line
2.48.1
Quoted 11 lines · Eric Biggers
From: Eric Biggers <[email protected]>
Now that the
crc32_le()library function takes advantage of architecture-specific optimizations, it is unnecessary to go through the crypto API. Just usecrc32_le(). This is much simpler, and it improves performance due to eliminating the crypto API overhead.Signed-off-by Eric Biggers <[email protected]>---
v2: Just do a minimal conversion to
crc32_le().
Hi, Eric
Thanks a lot for your commit.
I have made tests with this commit. After this patch is applied, the following scenarios can work well via rping.
RXE <---> RXE
crc32_le RXE <---> RXE with original icrc
RXE <---> MLX5
Thanks,
Zhu Yanjun
Quoted 198 lines
drivers/infiniband/sw/rxe/Kconfig | 3 +- drivers/infiniband/sw/rxe/rxe.c | 3 -- drivers/infiniband/sw/rxe/rxe.h | 1 - drivers/infiniband/sw/rxe/rxe_icrc.c | 40 +-------------------------- drivers/infiniband/sw/rxe/rxe_loc.h | 1 - drivers/infiniband/sw/rxe/rxe_req.c | 1 - drivers/infiniband/sw/rxe/rxe_verbs.c | 4 --- drivers/infiniband/sw/rxe/rxe_verbs.h | 1 - 8 files changed, 2 insertions(+), 52 deletions(-)drivers/infiniband/sw/rxe/Kconfig +1
-2@@ -2,12 +2,11 @@ config RDMA_RXE tristate "Software RDMA over Ethernet (RoCE) driver" 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 standard Ethernet adapter to interoperate with a RoCE adapter or with another system running the RXE driver.drivers/infiniband/sw/rxe/rxe.c +0
-3@@ -29,13 +29,10 @@ void rxe_dealloc(struct ib_device *ib_dev)rxe_pool_cleanup (&rxe->mr_pool);rxe_pool_cleanup (&rxe->mw_pool);WARN_ON (!RB_EMPTY_ROOT (&rxe->mcg_tree)); -if (rxe->tfm) -crypto_free_shash (rxe->tfm); -mutex_destroy (&rxe->usdev_lock); }/* initialize rxe device parameters */ static void rxe_init_device_param (struct rxe_dev *rxe)drivers/infiniband/sw/rxe/rxe.h +0
-1@@ -19,11 +19,10 @@#include <rdma/ib_pack.h> #include <rdma/ib_smi.h> #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" #include "rxe_hdr.h" #include "rxe_param.h" drivers/infiniband/sw/rxe/rxe_icrc.c +1
-39@@ -7,32 +7,10 @@#include <linux/crc32.h> #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 * @crc: starting crc32 value from previous segments * @next: starting address of current segment @@ -40,27 +18,11 @@ int rxe_icrc_init(struct rxe_dev *rxe)* * Return: the cumulative crc32 checksum */ 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; +return (__force __be32 )crc32_le ((__force u32 )crc, next, len); }/** * 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@@ -166,11 +166,10 @@ int rxe_completer(struct rxe_qp *qp);int rxe_requester (struct rxe_qp *qp);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);void rxe_resp_queue_pkt (struct rxe_qp *qp,struct sk_buff *skb);drivers/infiniband/sw/rxe/rxe_req.c +0
-1@@ -3,11 +3,10 @@* Copyright (c) 2016 Mellanox Technologies Ltd. All rights reserved. * Copyright (c) 2015 System Fabric Works, Inc. All rights reserved. */ #include <linux/skbuff.h> -#include <crypto/hash.h> #include "rxe.h" #include "rxe_loc.h" #include "rxe_queue.h" drivers/infiniband/sw/rxe/rxe_verbs.c +0
-4@@ -1531,14 +1531,10 @@ int rxe_register_device(struct rxe_dev *rxe, const char *ibdev_name,ib_set_device_ops (dev, &rxe_dev_ops); err =ib_device_set_netdev (&rxe->ib_dev, ndev,1 );if (err)return err; - err =rxe_icrc_init (rxe); -if (err) -return err; - err =ib_register_device (dev, ibdev_name,NULL );if (err)rxe_dbg_dev (rxe,"failed with error %d\n" , err);/* drivers/infiniband/sw/rxe/rxe_verbs.h +0
-1@@ -400,11 +400,10 @@ struct rxe_dev {u64 mmap_offset;atomic64_t stats_counters[RXE_NUM_OF_COUNTERS ];struct rxe_port port; -struct crypto_shash *tfm; };static inline struct net_device *rxe_ib_device_get_netdev (struct ib_device *dev) {return ib_device_get_netdev (dev,RXE_PORT );base-commit:
2014c95afecee3e76ca4a56956a936e23283f05b
Leon Romanovsky
AppliedQuoted 6 lines · Eric Biggers
Now that the
crc32_le()library function takes advantage of architecture-specific optimizations, it is unnecessary to go through the crypto API. Just usecrc32_le(). This is much simpler, and it improves performance due to eliminating the crypto API overhead.
Applied, thanks!
[1/1] RDMA/rxe: switch to using the crc32 library
https://git.kernel.org/rdma/rdma/c/ccca5e8aa14572
Best regards,
Signature · 1 line
Leon Romanovsky <[email protected]>