From nobody Sat Feb 7 21:15:38 2026 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 132114EB51; Fri, 7 Feb 2025 03:23:35 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738898616; cv=none; b=c2fIKctJ65O4m1+Tl8GLmltXqbe5UKlaYfulo83vJQFg3dSjTBDIdM2REzZMuUd63FMiMkYDtcZcC3kFbbYP+hlMFcigBhjmQzXHxGSnjC9fMyP6i+S8W+TBKmNq04Tl8+O6FvmmktN/8c56aUg1Q+sAFh6RhxFjSppu7OmI4Zk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738898616; c=relaxed/simple; bh=euI3YZNU6xicwIwPlTxb3DXtjOX2Mc/jVC9DzKaYl6w=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=gUM07G90iOHNUau8JpmRL5PMwdAafozsAqjjOWWzdbPgry1gr8E81OO3AKquF96Dgskr1kHW3NU4a/SnWh/szCNoHFJy4BVAjrFvkKqX53S5zYDwiSp0nZzn7GY9j88qmC+SOwY0aJNin+b7B7Y/gKoAFx0l8M6z4pSV7acwu4w= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=RKqPIkCT; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="RKqPIkCT" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 59474C4CED1; Fri, 7 Feb 2025 03:23:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1738898615; bh=euI3YZNU6xicwIwPlTxb3DXtjOX2Mc/jVC9DzKaYl6w=; h=From:To:Cc:Subject:Date:From; b=RKqPIkCTwHYoJ+WQEX5owjO7K7iGvvXF4bY/t7yx5zyMvX+7PkJAtKaqtp/sIjGGV /XwmPTsco6Hmq/vsNIl/EFvVllZxXubX10sXRVqui0QkZfCi2JxbtajuCaWBsJZwKC 4QiiasPv42t0RqgC2ABLC5jk1CfeDaGglCYxuiBNrhYoE9fVa7cdPrwqTVk2AYcUg9 Senm11AuegCfsMavc0Ss9c9zQG/Z+/7idk2nIVtHWNDKZLLZ4siEG1MreE2IB9ZyE4 Km/Ji3bMaQQpE7JWw84nvxnma0bwYAQ5zfvdw9u94D9u7B2m6lnv8eMpGxnhICJpr4 yu1vxR/sg89RA== From: Eric Biggers To: Zhu Yanjun , Jason Gunthorpe , Leon Romanovsky , linux-rdma@vger.kernel.org Cc: linux-kernel@vger.kernel.org Subject: [PATCH v2] RDMA/rxe: switch to using the crc32 library Date: Thu, 6 Feb 2025 19:23:16 -0800 Message-ID: <20250207032316.53941-1-ebiggers@kernel.org> X-Mailer: git-send-email 2.48.1 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: 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 use crc32_le(). This is much simpler, and it improves performance due to eliminating the crypto API overhead. Signed-off-by: Eric Biggers Reviewed-by: Zhu Yanjun --- 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(-) diff --git a/drivers/infiniband/sw/rxe/Kconfig b/drivers/infiniband/sw/rxe/= Kconfig index 06b8dc5093f77..c180e7ebcfc5b 100644 --- a/drivers/infiniband/sw/rxe/Kconfig +++ b/drivers/infiniband/sw/rxe/Kconfig @@ -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. diff --git a/drivers/infiniband/sw/rxe/rxe.c b/drivers/infiniband/sw/rxe/rx= e.c index 1ba4a0c8726ae..f8ac79ef70143 100644 --- a/drivers/infiniband/sw/rxe/rxe.c +++ b/drivers/infiniband/sw/rxe/rxe.c @@ -29,13 +29,10 @@ void rxe_dealloc(struct ib_device *ib_dev) rxe_pool_cleanup(&rxe->mr_pool); rxe_pool_cleanup(&rxe->mw_pool); =20 WARN_ON(!RB_EMPTY_ROOT(&rxe->mcg_tree)); =20 - if (rxe->tfm) - crypto_free_shash(rxe->tfm); - mutex_destroy(&rxe->usdev_lock); } =20 /* initialize rxe device parameters */ static void rxe_init_device_param(struct rxe_dev *rxe) diff --git a/drivers/infiniband/sw/rxe/rxe.h b/drivers/infiniband/sw/rxe/rx= e.h index fe7f970667325..8db65731499d0 100644 --- a/drivers/infiniband/sw/rxe/rxe.h +++ b/drivers/infiniband/sw/rxe/rxe.h @@ -19,11 +19,10 @@ #include #include #include #include #include -#include =20 #include "rxe_net.h" #include "rxe_opcode.h" #include "rxe_hdr.h" #include "rxe_param.h" diff --git a/drivers/infiniband/sw/rxe/rxe_icrc.c b/drivers/infiniband/sw/r= xe/rxe_icrc.c index fdf5f08cd8f17..76d760fbe7ea5 100644 --- a/drivers/infiniband/sw/rxe/rxe_icrc.c +++ b/drivers/infiniband/sw/rxe/rxe_icrc.c @@ -7,32 +7,10 @@ #include =20 #include "rxe.h" #include "rxe_loc.h" =20 -/** - * 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 =3D 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 =3D 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 =3D rxe->tfm; - *(__be32 *)shash_desc_ctx(shash) =3D crc; - err =3D 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 =3D *(__be32 *)shash_desc_ctx(shash); - barrier_data(shash_desc_ctx(shash)); - - return icrc; + return (__force __be32)crc32_le((__force u32)crc, next, len); } =20 /** * rxe_icrc_hdr() - Compute the partial ICRC for the network and transport * headers of a packet. diff --git a/drivers/infiniband/sw/rxe/rxe_loc.h b/drivers/infiniband/sw/rx= e/rxe_loc.h index ded46119151bb..c57ab8975c5d1 100644 --- a/drivers/infiniband/sw/rxe/rxe_loc.h +++ b/drivers/infiniband/sw/rxe/rxe_loc.h @@ -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); =20 /* 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); =20 void rxe_resp_queue_pkt(struct rxe_qp *qp, struct sk_buff *skb); =20 diff --git a/drivers/infiniband/sw/rxe/rxe_req.c b/drivers/infiniband/sw/rx= e/rxe_req.c index 87a02f0deb000..9d0392df8a92f 100644 --- a/drivers/infiniband/sw/rxe/rxe_req.c +++ b/drivers/infiniband/sw/rxe/rxe_req.c @@ -3,11 +3,10 @@ * Copyright (c) 2016 Mellanox Technologies Ltd. All rights reserved. * Copyright (c) 2015 System Fabric Works, Inc. All rights reserved. */ =20 #include -#include =20 #include "rxe.h" #include "rxe_loc.h" #include "rxe_queue.h" =20 diff --git a/drivers/infiniband/sw/rxe/rxe_verbs.c b/drivers/infiniband/sw/= rxe/rxe_verbs.c index 6152a0fdfc8ca..c05379f8b4f57 100644 --- a/drivers/infiniband/sw/rxe/rxe_verbs.c +++ b/drivers/infiniband/sw/rxe/rxe_verbs.c @@ -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 =3D ib_device_set_netdev(&rxe->ib_dev, ndev, 1); if (err) return err; =20 - err =3D rxe_icrc_init(rxe); - if (err) - return err; - err =3D ib_register_device(dev, ibdev_name, NULL); if (err) rxe_dbg_dev(rxe, "failed with error %d\n", err); =20 /* diff --git a/drivers/infiniband/sw/rxe/rxe_verbs.h b/drivers/infiniband/sw/= rxe/rxe_verbs.h index 6573ceec0ef58..6e31134a5fa5b 100644 --- a/drivers/infiniband/sw/rxe/rxe_verbs.h +++ b/drivers/infiniband/sw/rxe/rxe_verbs.h @@ -400,11 +400,10 @@ struct rxe_dev { u64 mmap_offset; =20 atomic64_t stats_counters[RXE_NUM_OF_COUNTERS]; =20 struct rxe_port port; - struct crypto_shash *tfm; }; =20 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 --=20 2.48.1