Commit 1117f26e authored by Bob Pearson's avatar Bob Pearson Committed by Jason Gunthorpe
Browse files

RDMA/rxe: Move ICRC generation to a subroutine 

Isolate ICRC generation into a single subroutine named rxe_generate_icrc()
in rxe_icrc.c. Remove scattered crc generation code from elsewhere.

Link: https://lore.kernel.org/r/20210707040040.15434-5-rpearsonhpe@gmail.com


Signed-off-by: default avatarBob Pearson <rpearsonhpe@gmail.com>
Signed-off-by: default avatarJason Gunthorpe <jgg@nvidia.com>
parent 13050a0b

drivers/infiniband/sw/rxe/rxe_comp.c

+2 −2
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -105,3 +105,16 @@ int rxe_icrc_check(struct sk_buff *skb, struct rxe_pkt_info *pkt) 


	return 0;

}



/* rxe_icrc_generate- compute ICRC for a packet. */

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

{

	__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 = (__force __be32)~icrc;

}

drivers/infiniband/sw/rxe/rxe_loc.h

+5 −5
Original line number Diff line number Diff line
@@ -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, 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_mr.c

+4 −18
Original line number Diff line number Diff line
@@ -278,11 +278,10 @@ void *iova_to_vaddr(struct rxe_mr *mr, u64 iova, int length) 
}



/* copy data from a range (vaddr, vaddr+length-1) to or from

 * a mr object starting at iova. Compute incremental value of

 * crc32 if crcp is not zero. caller must hold a reference to mr

 * a mr object starting at iova.

 */

int rxe_mr_copy(struct rxe_mr *mr, u64 iova, void *addr, int length,

		enum rxe_mr_copy_dir dir, u32 *crcp)

		enum rxe_mr_copy_dir dir)

{

	int			err;

	int			bytes;
@@ -292,7 +291,6 @@ int rxe_mr_copy(struct rxe_mr *mr, u64 iova, void *addr, int length, 
	int			m;

	int			i;

	size_t			offset;

	u32			crc = crcp ? (*crcp) : 0;



	if (length == 0)

		return 0;
@@ -306,10 +304,6 @@ int rxe_mr_copy(struct rxe_mr *mr, u64 iova, void *addr, int length, 


		memcpy(dest, src, length);



		if (crcp)

			*crcp = rxe_crc32(to_rdev(mr->ibmr.device), *crcp, dest,

					  length);



		return 0;

	}
@@ -340,10 +334,6 @@ int rxe_mr_copy(struct rxe_mr *mr, u64 iova, void *addr, int length, 


		memcpy(dest, src, bytes);



		if (crcp)

			crc = rxe_crc32(to_rdev(mr->ibmr.device), crc, dest,

					bytes);



		length	-= bytes;

		addr	+= bytes;
@@ -358,9 +348,6 @@ int rxe_mr_copy(struct rxe_mr *mr, u64 iova, void *addr, int length, 
		}

	}



	if (crcp)

		*crcp = crc;



	return 0;



err1:
@@ -376,8 +363,7 @@ int copy_data( 
	struct rxe_dma_info	*dma,

	void			*addr,

	int			length,

	enum rxe_mr_copy_dir	dir,

	u32			*crcp)

	enum rxe_mr_copy_dir	dir)

{

	int			bytes;

	struct rxe_sge		*sge	= &dma->sge[dma->cur_sge];
@@ -438,7 +424,7 @@ int copy_data( 
		if (bytes > 0) {

			iova = sge->addr + offset;



			err = rxe_mr_copy(mr, iova, addr, bytes, dir, crcp);

			err = rxe_mr_copy(mr, iova, addr, bytes, dir);

			if (err)

				goto err2;

drivers/infiniband/sw/rxe/rxe_net.c

+3 −3
Original line number Diff line number Diff line
@@ -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;
@@ -438,6 +436,8 @@ int rxe_xmit_packet(struct rxe_qp *qp, struct rxe_pkt_info *pkt, 
		goto drop;

	}



	rxe_icrc_generate(skb, pkt);



	if (pkt->mask & RXE_LOOPBACK_MASK)

		err = rxe_loopback(skb, pkt);

	else