RDMA/rxe: Cleanup ICRC
Subsystems (2)
cover RDMA/rxe: Cleanup ICRC
This series of patches cleans up the code in the rdma_rxe driver that handles computing and checking of the ICRC checksum in RoCE packets. All the ICRC related code is isolated in the file rxe_icrc.c. The overall performance is modestly improved. (ib_write_bw loopback performance is increased from 2.7GB/sec to 2.8GB/sec.) There is no change required to the user space provider.
Bob Pearson (5):
RDMA/rxe: Move ICRC checking to a subroutine
RDMA/rxe: Move rxe_xmit_packet to a subroutine
RDMA/rxe: Move ICRC generation to a subroutine
RDMA/rxe: Move rxe_crc32 to a subroutine
RDMA/rxe: Move crc32 init code to rxe_icrc.c
drivers/infiniband/sw/rxe/rxe.h | 22 ----- drivers/infiniband/sw/rxe/rxe_comp.c | 4 +- drivers/infiniband/sw/rxe/rxe_icrc.c | 136 +++++++++++++++++++++++--- drivers/infiniband/sw/rxe/rxe_loc.h | 61 ++---------- drivers/infiniband/sw/rxe/rxe_mr.c | 47 ++++----- drivers/infiniband/sw/rxe/rxe_net.c | 62 ++++++++++-- drivers/infiniband/sw/rxe/rxe_recv.c | 23 +---- drivers/infiniband/sw/rxe/rxe_req.c | 13 +-- drivers/infiniband/sw/rxe/rxe_resp.c | 33 ++----- drivers/infiniband/sw/rxe/rxe_verbs.c | 11 +-- 10 files changed, 225 insertions(+), 187 deletions(-)
Signature · 1 line
2.30.2
PATCH 1/5 RDMA/rxe: Move ICRC checking to a subroutine
Move the code in rxe_recv that checks the ICRC on incoming packets to a subroutine rxe_check_icrc() and move it to rxe_icrc.c.
--- drivers/infiniband/sw/rxe/rxe_icrc.c | 38 ++++++++++++++++++++++++++++ drivers/infiniband/sw/rxe/rxe_loc.h | 2 ++ drivers/infiniband/sw/rxe/rxe_recv.c | 23 ++--------------- 3 files changed, 42 insertions(+), 21 deletions(-)
drivers/infiniband/sw/rxe/rxe_icrc.c +38 -0
@@ -67,3 +67,41 @@ u32 rxe_icrc_hdr(struct rxe_pkt_info *pkt, struct sk_buff *skb) rxe_opcode[pkt->opcode].length - RXE_BTH_BYTES);return crc; } + +/** +* rxe_icrc_check - Compute ICRC for a packet and compare to the ICRC +* delivered in the packet. +* @skb: The packet buffer with packet info in skb->cb[] (receive path) +* +* Returns 0 on success or an error on failure +*/ +int rxe_icrc_check (struct sk_buff *skb) +{ +struct rxe_pkt_info *pkt =SKB_TO_PKT (skb); +__be32 *icrcp; +u32 pkt_icrc; +u32 icrc; + + icrcp = (__be32 *)(pkt->hdr + pkt->paylen -RXE_ICRC_SIZE ); + pkt_icrc =be32_to_cpu (*icrcp); + + icrc =rxe_icrc_hdr (pkt, skb); + icrc =rxe_crc32 (pkt->rxe, icrc, (u8 *)payload_addr (pkt), +payload_size (pkt) +bth_pad (pkt)); + icrc = (__force u32 )cpu_to_be32 (~icrc); + +if (unlikely (icrc != pkt_icrc)) { +if (skb->protocol ==htons (ETH_P_IPV6 )) +pr_warn_ratelimited ("bad ICRC from %pI6c\n" , + &ipv6_hdr (skb)->saddr); +else if (skb->protocol ==htons (ETH_P_IP )) +pr_warn_ratelimited ("bad ICRC from %pI4\n" , + &ip_hdr (skb)->saddr); +else +pr_warn_ratelimited ("bad ICRC from unknown\n" ); + +return -EINVAL ; + } + +return 0 ; +}
drivers/infiniband/sw/rxe/rxe_loc.h +2 -0
@@ -193,7 +193,9 @@ int rxe_completer(void *arg);int rxe_requester (void *arg);int rxe_responder (void *arg); +/* rxe_icrc.c */ u32 rxe_icrc_hdr (struct rxe_pkt_info *pkt,struct sk_buff *skb); +int rxe_icrc_check (struct sk_buff *skb);void rxe_resp_queue_pkt (struct rxe_qp *qp,struct sk_buff *skb);
drivers/infiniband/sw/rxe/rxe_recv.c +2 -21
@@ -361,8 +361,6 @@ void rxe_rcv(struct sk_buff *skb)int err;struct rxe_pkt_info *pkt =SKB_TO_PKT (skb);struct rxe_dev *rxe = pkt->rxe; -__be32 *icrcp; -u32 calc_icrc, pack_icrc;if (unlikely (skb->len <RXE_BTH_BYTES )) goto drop;
@@ -384,26 +382,9 @@ void rxe_rcv(struct sk_buff *skb)if (unlikely (err)) goto drop; -/* Verify ICRC */ - icrcp = (__be32 *)(pkt->hdr + pkt->paylen -RXE_ICRC_SIZE ); - pack_icrc =be32_to_cpu (*icrcp); - - calc_icrc =rxe_icrc_hdr (pkt, skb); - calc_icrc =rxe_crc32 (rxe, calc_icrc, (u8 *)payload_addr (pkt), -payload_size (pkt) +bth_pad (pkt)); - calc_icrc = (__force u32 )cpu_to_be32 (~calc_icrc); -if (unlikely (calc_icrc != pack_icrc)) { -if (skb->protocol ==htons (ETH_P_IPV6 )) -pr_warn_ratelimited ("bad ICRC from %pI6c\n" , - &ipv6_hdr (skb)->saddr); -else if (skb->protocol ==htons (ETH_P_IP )) -pr_warn_ratelimited ("bad ICRC from %pI4\n" , - &ip_hdr (skb)->saddr); -else -pr_warn_ratelimited ("bad ICRC from unknown\n" ); - + err =rxe_icrc_check (skb); +if (unlikely (err)) goto drop; - }rxe_counter_inc (rxe,RXE_CNT_RCVD_PKTS );
Signature · 1 line
2.30.2
PATCH 2/5 RDMA/rxe: Move rxe_xmit_packet to a subroutine
In reply to Bob Pearsonrxe_xmit_packet() was an overlong inline subroutine. Move it into rxe_net.c as an ordinary subroutine. Change rxe_loopback() and rxe_send() to static subroutines since they are no longer shared. Allow rxe_loopback to return an error.
--- drivers/infiniband/sw/rxe/rxe_loc.h | 47 ++----------------------- drivers/infiniband/sw/rxe/rxe_net.c | 54 ++++++++++++++++++++++++++--- 2 files changed, 51 insertions(+), 50 deletions(-)
drivers/infiniband/sw/rxe/rxe_loc.h +2 -45
@@ -99,11 +99,11 @@ struct rxe_mw *rxe_lookup_mw(struct rxe_qp *qp, int access, u32 rkey);void rxe_mw_cleanup (struct rxe_pool_entry *arg);/* rxe_net.c */ -void rxe_loopback (struct sk_buff *skb); -int rxe_send (struct rxe_pkt_info *pkt,struct sk_buff *skb);struct sk_buff *rxe_init_packet (struct rxe_dev *rxe,struct rxe_av *av,int paylen,struct rxe_pkt_info *pkt);int rxe_prepare (struct rxe_pkt_info *pkt,struct sk_buff *skb,u32 *crc); +int rxe_xmit_packet (struct rxe_qp *qp,struct rxe_pkt_info *pkt, +struct sk_buff *skb);const char *rxe_parent_name (struct rxe_dev *rxe,unsigned int port_num);int rxe_mcast_add (struct rxe_dev *rxe,union ib_gid *mgid);int rxe_mcast_delete (struct rxe_dev *rxe,union ib_gid *mgid);
@@ -206,47 +206,4 @@ static inline unsigned int wr_opcode_mask(int opcode, struct rxe_qp *qp) return rxe_wr_opcode_info[opcode].mask[qp->ibqp.qp_type]; } -static inline int rxe_xmit_packet (struct rxe_qp *qp,struct rxe_pkt_info *pkt, -struct sk_buff *skb) -{ -int err; -int is_request = pkt->mask &RXE_REQ_MASK ; -struct rxe_dev *rxe =to_rdev (qp->ibqp.device); - -if ((is_request && (qp->req.state !=QP_STATE_READY )) || - (!is_request && (qp->resp.state !=QP_STATE_READY ))) { -pr_info ("Packet dropped. QP is not in ready state\n" ); - goto drop; - } - -if (pkt->mask &RXE_LOOPBACK_MASK ) { -memcpy (SKB_TO_PKT (skb), pkt,sizeof (*pkt)); -rxe_loopback (skb); - err =0 ; - }else { - err =rxe_send (pkt, skb); - } - -if (err) { - rxe->xmit_errors++; -rxe_counter_inc (rxe,RXE_CNT_SEND_ERR ); -return err; - } - -if ((qp_type (qp) !=IB_QPT_RC ) && - (pkt->mask &RXE_END_MASK )) { - pkt->wqe->state = wqe_state_done; -rxe_run_task (&qp->comp.task,1 ); - } - -rxe_counter_inc (rxe,RXE_CNT_SENT_PKTS ); - goto done; - -drop: -kfree_skb (skb); - err =0 ; -done: -return err; -} -#endif /* RXE_LOC_H */
drivers/infiniband/sw/rxe/rxe_net.c +49 -5
75 lines not on this page · raw message
Signature · 1 line
2.30.2
PATCH 3/5 RDMA/rxe: Move ICRC generation to a subroutine
In reply to Bob PearsonIsolate ICRC generation into a single subroutine named rxe_generate_icrc() in rxe_icrc.c. Remove scattered crc generation code from elsewhere.
--- drivers/infiniband/sw/rxe/rxe_comp.c | 4 +-- drivers/infiniband/sw/rxe/rxe_icrc.c | 13 ++++++++ drivers/infiniband/sw/rxe/rxe_loc.h | 10 +++--- drivers/infiniband/sw/rxe/rxe_mr.c | 47 ++++++++++++---------------- drivers/infiniband/sw/rxe/rxe_net.c | 8 ++--- drivers/infiniband/sw/rxe/rxe_req.c | 13 ++------ drivers/infiniband/sw/rxe/rxe_resp.c | 33 +++++-------------- 7 files changed, 54 insertions(+), 74 deletions(-)
drivers/infiniband/sw/rxe/rxe_comp.c +2 -2
@@ -349,7 +349,7 @@ static inline enum comp_state do_read(struct rxe_qp *qp, ret =copy_data (qp->pd,IB_ACCESS_LOCAL_WRITE , &wqe->dma,payload_addr (pkt), -payload_size (pkt),RXE_TO_MR_OBJ ,NULL ); +payload_size (pkt),RXE_TO_MR_OBJ );if (ret) { wqe->status =IB_WC_LOC_PROT_ERR ;return COMPST_ERROR ;
@@ -371,7 +371,7 @@ static inline enum comp_state do_atomic(struct rxe_qp *qp, ret =copy_data (qp->pd,IB_ACCESS_LOCAL_WRITE , &wqe->dma, &atomic_orig, -sizeof (u64),RXE_TO_MR_OBJ ,NULL ); +sizeof (u64),RXE_TO_MR_OBJ );if (ret) { wqe->status =IB_WC_LOC_PROT_ERR ;return COMPST_ERROR ;
drivers/infiniband/sw/rxe/rxe_icrc.c +13 -0
@@ -105,3 +105,16 @@ int rxe_icrc_check(struct sk_buff *skb)return 0 ; } + +/* rxe_icrc_generate- compute ICRC for a packet. */ +void rxe_icrc_generate (struct rxe_pkt_info *pkt,struct sk_buff *skb) +{ +__be32 *icrcp; +u32 icrc; + + icrcp = (__be32 *)(pkt->hdr + pkt->paylen -RXE_ICRC_SIZE ); + icrc =rxe_icrc_hdr (pkt, skb); + icrc =rxe_crc32 (pkt->rxe, icrc, (u8 *)payload_addr (pkt), +payload_size (pkt) +bth_pad (pkt)); + *icrcp = ~icrc; +}
drivers/infiniband/sw/rxe/rxe_loc.h +5 -5
@@ -77,10 +77,9 @@ int rxe_mr_init_user(struct rxe_pd *pd, u64 start, u64 length, u64 iova, int access, struct rxe_mr *mr);int rxe_mr_init_fast (struct rxe_pd *pd,int max_pages,struct rxe_mr *mr);int rxe_mr_copy (struct rxe_mr *mr,u64 iova,void *addr,int length, -enum rxe_mr_copy_dir dir,u32 *crcp); -int copy_data (struct rxe_pd *pd,int access, -struct rxe_dma_info *dma,void *addr,int length, -enum rxe_mr_copy_dir dir,u32 *crcp); +enum rxe_mr_copy_dir dir); +int copy_data (struct rxe_pd *pd,int access,struct rxe_dma_info *dma, +void *addr,int length,enum rxe_mr_copy_dir dir);void *iova_to_vaddr (struct rxe_mr *mr,u64 iova,int length);struct rxe_mr *lookup_mr (struct rxe_pd *pd,int access,u32 key,enum rxe_mr_lookup_type type);
@@ -101,7 +100,7 @@ void rxe_mw_cleanup(struct rxe_pool_entry *arg);/* rxe_net.c */ struct sk_buff *rxe_init_packet (struct rxe_dev *rxe,struct rxe_av *av,int paylen,struct rxe_pkt_info *pkt); -int rxe_prepare (struct rxe_pkt_info *pkt,struct sk_buff *skb,u32 *crc); +int rxe_prepare (struct rxe_pkt_info *pkt,struct sk_buff *skb);int rxe_xmit_packet (struct rxe_qp *qp,struct rxe_pkt_info *pkt,struct sk_buff *skb);const char *rxe_parent_name (struct rxe_dev *rxe,unsigned int port_num);
@@ -196,6 +195,7 @@ int rxe_responder(void *arg);/* rxe_icrc.c */ u32 rxe_icrc_hdr (struct rxe_pkt_info *pkt,struct sk_buff *skb);int rxe_icrc_check (struct sk_buff *skb); +void rxe_icrc_generate (struct rxe_pkt_info *pkt,struct sk_buff *skb);void rxe_resp_queue_pkt (struct rxe_qp *qp,struct sk_buff *skb);
drivers/infiniband/sw/rxe/rxe_mr.c +20 -27
100 lines not on this page · raw message
drivers/infiniband/sw/rxe/rxe_net.c +4 -4
@@ -343,7 +343,7 @@ static int prepare6(struct rxe_pkt_info *pkt, struct sk_buff *skb)return 0 ; } -int rxe_prepare (struct rxe_pkt_info *pkt,struct sk_buff *skb,u32 *crc) +int rxe_prepare (struct rxe_pkt_info *pkt,struct sk_buff *skb) {int err =0 ;
@@ -352,8 +352,6 @@ int rxe_prepare(struct rxe_pkt_info *pkt, struct sk_buff *skb, u32 *crc)else if (skb->protocol ==htons (ETH_P_IPV6 )) err =prepare6 (pkt, skb); - *crc =rxe_icrc_hdr (pkt, skb); -if (ether_addr_equal (skb->dev->dev_addr,rxe_get_av (pkt)->dmac)) pkt->mask |=RXE_LOOPBACK_MASK ;
@@ -396,7 +394,7 @@ static int rxe_send(struct rxe_pkt_info *pkt, struct sk_buff *skb) }if (unlikely (net_xmit_eval (err))) { -pr_debug ("error sending packet: %d\n" , err); +pr_info ("error sending packet: %d\n" , err);return -EAGAIN ; }
@@ -438,6 +436,8 @@ int rxe_xmit_packet(struct rxe_qp *qp, struct rxe_pkt_info *pkt, goto drop; } +rxe_icrc_generate (pkt, skb); +if (pkt->mask &RXE_LOOPBACK_MASK ) err =rxe_loopback (pkt, skb);else
drivers/infiniband/sw/rxe/rxe_req.c +2 -11
@@ -466,12 +466,9 @@ static int finish_packet(struct rxe_qp *qp, struct rxe_send_wqe *wqe, struct rxe_pkt_info *pkt, struct sk_buff *skb, int paylen) { - struct rxe_dev *rxe = to_rdev(qp->ibqp.device); -u32 crc =0 ; -u32 *p; int err; - err =rxe_prepare (pkt, skb, &crc); + err =rxe_prepare (pkt, skb);if (err)return err;
@@ -479,7 +476,6 @@ static int finish_packet(struct rxe_qp *qp, struct rxe_send_wqe *wqe,if (wqe->wr.send_flags &IB_SEND_INLINE ) {u8 *tmp = &wqe->dma.inline_data[wqe->dma.sge_offset]; - crc =rxe_crc32 (rxe, crc, tmp, paylen);memcpy (payload_addr (pkt), tmp, paylen); wqe->dma.resid -= paylen;
@@ -487,8 +483,7 @@ static int finish_packet(struct rxe_qp *qp, struct rxe_send_wqe *wqe, }else { err =copy_data (qp->pd,0 , &wqe->dma,payload_addr (pkt), paylen, -RXE_FROM_MR_OBJ , - &crc); +RXE_FROM_MR_OBJ );if (err)return err; }
@@ -496,12 +491,8 @@ static int finish_packet(struct rxe_qp *qp, struct rxe_send_wqe *wqe,u8 *pad =payload_addr (pkt) + paylen;memset (pad,0 ,bth_pad (pkt)); - crc =rxe_crc32 (rxe, crc, pad,bth_pad (pkt)); } } - p =payload_addr (pkt) + paylen +bth_pad (pkt); - - *p = ~crc;return 0 ; }
drivers/infiniband/sw/rxe/rxe_resp.c +8 -25
@@ -536,7 +536,7 @@ static enum resp_states send_data_in(struct rxe_qp *qp, void *data_addr,int err; err =copy_data (qp->pd,IB_ACCESS_LOCAL_WRITE , &qp->resp.wqe->dma, - data_addr, data_len,RXE_TO_MR_OBJ ,NULL ); + data_addr, data_len,RXE_TO_MR_OBJ );if (unlikely (err))return (err == -ENOSPC ) ?RESPST_ERR_LENGTH :RESPST_ERR_MALFORMED_WQE ;
@@ -552,7 +552,7 @@ static enum resp_states write_data_in(struct rxe_qp *qp,int data_len =payload_size (pkt); err =rxe_mr_copy (qp->resp.mr, qp->resp.va + qp->resp.offset, -payload_addr (pkt), data_len,RXE_TO_MR_OBJ ,NULL ); +payload_addr (pkt), data_len,RXE_TO_MR_OBJ );if (err) { rc =RESPST_ERR_RKEY_VIOLATION ; goto out;
@@ -613,13 +613,10 @@ static struct sk_buff *prepare_ack_packet(struct rxe_qp *qp,int opcode, int payload, u32 psn, - u8 syndrome, - u32 *crcp) + u8 syndrome) { struct rxe_dev *rxe = to_rdev(qp->ibqp.device);struct sk_buff *skb; -u32 crc =0 ; -u32 *p;int paylen;int pad;int err;
@@ -651,20 +648,12 @@ static struct sk_buff *prepare_ack_packet(struct rxe_qp *qp,if (ack->mask &RXE_ATMACK_MASK )atmack_set_orig (ack, qp->resp.atomic_orig); - err =rxe_prepare (ack, skb, &crc); + err =rxe_prepare (ack, skb);if (err) {kfree_skb (skb);return NULL ; } -if (crcp) { -/* CRC computation will be continued by the caller */ - *crcp = crc; - }else { - p =payload_addr (ack) + payload +bth_pad (ack); - *p = ~crc; - } -return skb; }
@@ -682,8 +671,6 @@ static enum resp_states read_reply(struct rxe_qp *qp,int opcode;int err;struct resp_res *res = qp->resp.res; -u32 icrc; -u32 *p;if (!res) {/* This is the first time we process that request. Get a
@@ -742,24 +729,20 @@ static enum resp_states read_reply(struct rxe_qp *qp, payload =min_t (int, res->read.resid, mtu); skb =prepare_ack_packet (qp, req_pkt, &ack_pkt, opcode, payload, - res->cur_psn,AETH_ACK_UNLIMITED , &icrc); + res->cur_psn,AETH_ACK_UNLIMITED );if (!skb)return RESPST_ERR_RNR ; err =rxe_mr_copy (res->read.mr, res->read.va,payload_addr (&ack_pkt), - payload,RXE_FROM_MR_OBJ , &icrc); + payload,RXE_FROM_MR_OBJ );if (err)pr_err ("Failed copying memory\n" );if (bth_pad (&ack_pkt)) { -struct rxe_dev *rxe =to_rdev (qp->ibqp.device);u8 *pad =payload_addr (&ack_pkt) + payload;memset (pad,0 ,bth_pad (&ack_pkt)); - icrc =rxe_crc32 (rxe, icrc, pad,bth_pad (&ack_pkt)); } - p =payload_addr (&ack_pkt) + payload +bth_pad (&ack_pkt); - *p = ~icrc; err =rxe_xmit_packet (qp, &ack_pkt, skb);if (err) {
@@ -984,7 +967,7 @@ static int send_ack(struct rxe_qp *qp, struct rxe_pkt_info *pkt,struct sk_buff *skb; skb =prepare_ack_packet (qp, pkt, &ack_pkt,IB_OPCODE_RC_ACKNOWLEDGE , -0 , psn, syndrome,NULL ); +0 , psn, syndrome);if (!skb) { err = -ENOMEM ; goto err1;
@@ -1008,7 +991,7 @@ static int send_atomic_ack(struct rxe_qp *qp, struct rxe_pkt_info *pkt, skb =prepare_ack_packet (qp, pkt, &ack_pkt,IB_OPCODE_RC_ATOMIC_ACKNOWLEDGE ,0 , pkt->psn, - syndrome,NULL ); + syndrome);if (!skb) { rc = -ENOMEM ; goto out;
Signature · 1 line
2.30.2
PATCH 4/5 RDMA/rxe: Move rxe_crc32 to a subroutine
In reply to Bob PearsonMove rxe_crc32 from rxe.h to rxe_icrc.c as a static local function. Add some comments to rxe_icrc.c
--- drivers/infiniband/sw/rxe/rxe.h | 21 ------------ drivers/infiniband/sw/rxe/rxe_icrc.c | 50 +++++++++++++++++++++++++--- drivers/infiniband/sw/rxe/rxe_loc.h | 1 - 3 files changed, 45 insertions(+), 27 deletions(-)
drivers/infiniband/sw/rxe/rxe.h +0 -21
@@ -42,27 +42,6 @@extern bool rxe_initialized; -static inline u32 rxe_crc32 (struct rxe_dev *rxe, -u32 crc,void *next,size_t len) -{ -u32 retval; -int err; - -SHASH_DESC_ON_STACK (shash, rxe->tfm); - - shash->tfm = rxe->tfm; - *(u32 *)shash_desc_ctx (shash) = crc; - err =crypto_shash_update (shash, next, len); -if (unlikely (err)) { -pr_warn_ratelimited ("failed crc calculation, err: %d\n" , err); -return crc32_le (crc, next, len); - } - - retval = *(u32 *)shash_desc_ctx (shash); -barrier_data (shash_desc_ctx (shash)); -return retval; -} -void rxe_set_mtu (struct rxe_dev *rxe,unsigned int dev_mtu);int rxe_add (struct rxe_dev *rxe,unsigned int mtu,const char *ibdev_name);
drivers/infiniband/sw/rxe/rxe_icrc.c +45 -5
69 lines not on this page · raw message
drivers/infiniband/sw/rxe/rxe_loc.h +0 -1
@@ -193,7 +193,6 @@ int rxe_requester(void *arg);int rxe_responder (void *arg);/* rxe_icrc.c */ -u32 rxe_icrc_hdr (struct rxe_pkt_info *pkt,struct sk_buff *skb);int rxe_icrc_check (struct sk_buff *skb);void rxe_icrc_generate (struct rxe_pkt_info *pkt,struct sk_buff *skb);
Signature · 1 line
2.30.2
PATCH 5/5 RDMA/rxe: Move crc32 init code to rxe_icrc.c
In reply to Bob PearsonThis patch collects the code from rxe_register_device() that sets up the crc32 calculation into a subroutine rxe_icrc_init() in rxe_icrc.c. This completes collecting all the code specific to computing ICRC into one file with a simple set of APIs.
Minor cleanups in rxe_icrc.c to
Comments
byte order types
--- drivers/infiniband/sw/rxe/rxe.h | 1 - drivers/infiniband/sw/rxe/rxe_icrc.c | 75 +++++++++++++++++---------- drivers/infiniband/sw/rxe/rxe_loc.h | 1 + drivers/infiniband/sw/rxe/rxe_verbs.c | 11 ++-- 4 files changed, 53 insertions(+), 35 deletions(-)
drivers/infiniband/sw/rxe/rxe.h +0 -1
@@ -14,7 +14,6 @@#include <linux/module.h> #include <linux/skbuff.h> -#include <linux/crc32.h> #include <rdma/ib_verbs.h> #include <rdma/ib_user_verbs.h>
drivers/infiniband/sw/rxe/rxe_icrc.c +49 -26
151 lines not on this page · raw message
drivers/infiniband/sw/rxe/rxe_loc.h +1 -0
@@ -193,6 +193,7 @@ int rxe_requester(void *arg);int rxe_responder (void *arg);/* rxe_icrc.c */ +int rxe_icrc_init (struct rxe_dev *rxe);int rxe_icrc_check (struct sk_buff *skb);void rxe_icrc_generate (struct rxe_pkt_info *pkt,struct sk_buff *skb);
drivers/infiniband/sw/rxe/rxe_verbs.c +3 -8
@@ -1154,7 +1154,6 @@ int rxe_register_device(struct rxe_dev *rxe, const char *ibdev_name) {int err;struct ib_device *dev = &rxe->ib_dev; -struct crypto_shash *tfm;strscpy (dev->node_desc,"rxe" ,sizeof (dev->node_desc));
@@ -1173,13 +1172,9 @@ int rxe_register_device(struct rxe_dev *rxe, const char *ibdev_name)if (err)return err; - tfm =crypto_alloc_shash ("crc32" ,0 ,0 ); -if (IS_ERR (tfm)) { -pr_err ("failed to allocate crc algorithm err:%ld\n" , -PTR_ERR (tfm)); -return PTR_ERR (tfm); - } - rxe->tfm = tfm; + err =rxe_icrc_init (rxe); +if (err) +return err; err =ib_register_device (dev, ibdev_name,NULL );if (err)
Signature · 1 line
2.30.2