diff mbox series

[for-next,12/17] RDMA/rxe: Extend rxe_icrc.c to support frags

Message ID 20221027185510.33808-13-rpearsonhpe@gmail.com (mailing list archive)
State Superseded
Headers show
Series RDMA/rxe: Enable scatter/gather support for skbs | expand

Commit Message

Bob Pearson Oct. 27, 2022, 6:55 p.m. UTC 
Extend the subroutines rxe_icrc_generate() and rxe_icrc_check()
to support skb frags.

This is in preparation for supporting fragmented skbs.

Signed-off-by: Bob Pearson <rpearsonhpe@gmail.com>
---
 drivers/infiniband/sw/rxe/rxe_icrc.c | 65 ++++++++++++++++++++++++----
 drivers/infiniband/sw/rxe/rxe_net.c  | 55 ++++++++++++++++++-----
 drivers/infiniband/sw/rxe/rxe_recv.c |  1 +
 3 files changed, 100 insertions(+), 21 deletions(-)

Comments

kernel test robot Oct. 27, 2022, 8:29 p.m. UTC | #1 
Hi Bob,

Thank you for the patch! Perhaps something to improve:

[auto build test WARNING on c9eeabac5e8d27a3f40280908e089058bab39edb]

url:    https://github.com/intel-lab-lkp/linux/commits/Bob-Pearson/RDMA-rxe-Enable-scatter-gather-support-for-skbs/20221028-025839
base:   c9eeabac5e8d27a3f40280908e089058bab39edb
patch link:    https://lore.kernel.org/r/20221027185510.33808-13-rpearsonhpe%40gmail.com
patch subject: [PATCH for-next 12/17] RDMA/rxe: Extend rxe_icrc.c to support frags
config: ia64-allyesconfig
compiler: ia64-linux-gcc (GCC) 12.1.0
reproduce (this is a W=1 build):
        wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross
        chmod +x ~/bin/make.cross
        # https://github.com/intel-lab-lkp/linux/commit/8771e470c3460298af105ec419d49256a0156b3a
        git remote add linux-review https://github.com/intel-lab-lkp/linux
        git fetch --no-tags linux-review Bob-Pearson/RDMA-rxe-Enable-scatter-gather-support-for-skbs/20221028-025839
        git checkout 8771e470c3460298af105ec419d49256a0156b3a
        # save the config file
        mkdir build_dir && cp config build_dir/.config
        COMPILER_INSTALL_PATH=$HOME/0day COMPILER=gcc-12.1.0 make.cross W=1 O=build_dir ARCH=ia64 SHELL=/bin/bash drivers/infiniband/sw/rxe/

If you fix the issue, kindly add following tag where applicable
| Reported-by: kernel test robot <lkp@intel.com>

All warnings (new ones prefixed by >>):

>> drivers/infiniband/sw/rxe/rxe_icrc.c:142:8: warning: no previous prototype for 'rxe_icrc_payload' [-Wmissing-prototypes]
     142 | __be32 rxe_icrc_payload(struct sk_buff *skb, struct rxe_pkt_info *pkt,
         |        ^~~~~~~~~~~~~~~~


vim +/rxe_icrc_payload +142 drivers/infiniband/sw/rxe/rxe_icrc.c

   131	
   132	/**
   133	 * rxe_icrc_payload() - Compute the ICRC for a packet payload and also
   134	 *			compute the address of the icrc in the packet.
   135	 * @skb: packet buffer
   136	 * @pkt: packet information
   137	 * @icrc: current icrc i.e. including headers
   138	 * @icrcp: returned pointer to icrc in skb
   139	 *
   140	 * Return: 0 if the values match else an error
   141	 */
 > 142	__be32 rxe_icrc_payload(struct sk_buff *skb, struct rxe_pkt_info *pkt,
   143				__be32 icrc, __be32 **icrcp)
   144	{
   145		struct skb_shared_info *shinfo = skb_shinfo(skb);
   146		skb_frag_t *frag;
   147		u8 *addr;
   148		int hdr_len;
   149		int len;
   150		int i;
   151	
   152		/* handle any payload left in the linear buffer */
   153		hdr_len = rxe_opcode[pkt->opcode].length;
   154		addr = pkt->hdr + hdr_len;
   155		len = skb_tail_pointer(skb) - skb_transport_header(skb)
   156			- sizeof(struct udphdr) - hdr_len;
   157		if (!shinfo->nr_frags) {
   158			len -= RXE_ICRC_SIZE;
   159			*icrcp = (__be32 *)(addr + len);
   160		}
   161		if (len > 0)
   162			icrc = rxe_crc32(pkt->rxe, icrc, payload_addr(pkt), len);
   163		WARN_ON(len < 0);
   164	
   165		/* handle any payload in frags */
   166		for (i = 0; i < shinfo->nr_frags; i++) {
   167			frag = &shinfo->frags[i];
   168			addr = page_to_virt(frag->bv_page) + frag->bv_offset;
   169			len = frag->bv_len;
   170			if (i == shinfo->nr_frags - 1) {
   171				len -= RXE_ICRC_SIZE;
   172				*icrcp = (__be32 *)(addr + len);
   173			}
   174			if (len > 0)
   175				icrc = rxe_crc32(pkt->rxe, icrc, addr, len);
   176			WARN_ON(len < 0);
   177		}
   178	
   179		return icrc;
   180	}
   181
kernel test robot Oct. 30, 2022, 7:33 p.m. UTC | #2 
Hi Bob,

Thank you for the patch! Perhaps something to improve:

[auto build test WARNING on c9eeabac5e8d27a3f40280908e089058bab39edb]

url:    https://github.com/intel-lab-lkp/linux/commits/Bob-Pearson/RDMA-rxe-Enable-scatter-gather-support-for-skbs/20221028-025839
base:   c9eeabac5e8d27a3f40280908e089058bab39edb
patch link:    https://lore.kernel.org/r/20221027185510.33808-13-rpearsonhpe%40gmail.com
patch subject: [PATCH for-next 12/17] RDMA/rxe: Extend rxe_icrc.c to support frags
config: arm64-allyesconfig
compiler: clang version 16.0.0 (https://github.com/llvm/llvm-project 791a7ae1ba3efd6bca96338e10ffde557ba83920)
reproduce (this is a W=1 build):
        wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross
        chmod +x ~/bin/make.cross
        # install arm64 cross compiling tool for clang build
        # apt-get install binutils-aarch64-linux-gnu
        # https://github.com/intel-lab-lkp/linux/commit/8771e470c3460298af105ec419d49256a0156b3a
        git remote add linux-review https://github.com/intel-lab-lkp/linux
        git fetch --no-tags linux-review Bob-Pearson/RDMA-rxe-Enable-scatter-gather-support-for-skbs/20221028-025839
        git checkout 8771e470c3460298af105ec419d49256a0156b3a
        # save the config file
        mkdir build_dir && cp config build_dir/.config
        COMPILER_INSTALL_PATH=$HOME/0day COMPILER=clang make.cross W=1 O=build_dir ARCH=arm64 SHELL=/bin/bash drivers/infiniband/sw/rxe/

If you fix the issue, kindly add following tag where applicable
| Reported-by: kernel test robot <lkp@intel.com>

All warnings (new ones prefixed by >>):

>> drivers/infiniband/sw/rxe/rxe_icrc.c:142:8: warning: no previous prototype for function 'rxe_icrc_payload' [-Wmissing-prototypes]
   __be32 rxe_icrc_payload(struct sk_buff *skb, struct rxe_pkt_info *pkt,
          ^
   drivers/infiniband/sw/rxe/rxe_icrc.c:142:1: note: declare 'static' if the function is not intended to be used outside of this translation unit
   __be32 rxe_icrc_payload(struct sk_buff *skb, struct rxe_pkt_info *pkt,
   ^
   static 
   1 warning generated.


vim +/rxe_icrc_payload +142 drivers/infiniband/sw/rxe/rxe_icrc.c

   131	
   132	/**
   133	 * rxe_icrc_payload() - Compute the ICRC for a packet payload and also
   134	 *			compute the address of the icrc in the packet.
   135	 * @skb: packet buffer
   136	 * @pkt: packet information
   137	 * @icrc: current icrc i.e. including headers
   138	 * @icrcp: returned pointer to icrc in skb
   139	 *
   140	 * Return: 0 if the values match else an error
   141	 */
 > 142	__be32 rxe_icrc_payload(struct sk_buff *skb, struct rxe_pkt_info *pkt,
   143				__be32 icrc, __be32 **icrcp)
   144	{
   145		struct skb_shared_info *shinfo = skb_shinfo(skb);
   146		skb_frag_t *frag;
   147		u8 *addr;
   148		int hdr_len;
   149		int len;
   150		int i;
   151	
   152		/* handle any payload left in the linear buffer */
   153		hdr_len = rxe_opcode[pkt->opcode].length;
   154		addr = pkt->hdr + hdr_len;
   155		len = skb_tail_pointer(skb) - skb_transport_header(skb)
   156			- sizeof(struct udphdr) - hdr_len;
   157		if (!shinfo->nr_frags) {
   158			len -= RXE_ICRC_SIZE;
   159			*icrcp = (__be32 *)(addr + len);
   160		}
   161		if (len > 0)
   162			icrc = rxe_crc32(pkt->rxe, icrc, payload_addr(pkt), len);
   163		WARN_ON(len < 0);
   164	
   165		/* handle any payload in frags */
   166		for (i = 0; i < shinfo->nr_frags; i++) {
   167			frag = &shinfo->frags[i];
   168			addr = page_to_virt(frag->bv_page) + frag->bv_offset;
   169			len = frag->bv_len;
   170			if (i == shinfo->nr_frags - 1) {
   171				len -= RXE_ICRC_SIZE;
   172				*icrcp = (__be32 *)(addr + len);
   173			}
   174			if (len > 0)
   175				icrc = rxe_crc32(pkt->rxe, icrc, addr, len);
   176			WARN_ON(len < 0);
   177		}
   178	
   179		return icrc;
   180	}
   181
diff mbox series

Patch

diff --git a/drivers/infiniband/sw/rxe/rxe_icrc.c b/drivers/infiniband/sw/rxe/rxe_icrc.c
index 46bb07c5c4df..5f1d24e37c36 100644
--- a/drivers/infiniband/sw/rxe/rxe_icrc.c
+++ b/drivers/infiniband/sw/rxe/rxe_icrc.c
@@ -63,7 +63,7 @@  static __be32 rxe_crc32(struct rxe_dev *rxe, __be32 crc, void *next, size_t len)
 
 /**
  * rxe_icrc_hdr() - Compute the partial ICRC for the network and transport
- *		  headers of a packet.
+ *		    headers of a packet.
  * @skb: packet buffer
  * @pkt: packet information
  *
@@ -129,6 +129,56 @@  static __be32 rxe_icrc_hdr(struct sk_buff *skb, struct rxe_pkt_info *pkt)
 	return crc;
 }
 
+/**
+ * rxe_icrc_payload() - Compute the ICRC for a packet payload and also
+ *			compute the address of the icrc in the packet.
+ * @skb: packet buffer
+ * @pkt: packet information
+ * @icrc: current icrc i.e. including headers
+ * @icrcp: returned pointer to icrc in skb
+ *
+ * Return: 0 if the values match else an error
+ */
+__be32 rxe_icrc_payload(struct sk_buff *skb, struct rxe_pkt_info *pkt,
+			__be32 icrc, __be32 **icrcp)
+{
+	struct skb_shared_info *shinfo = skb_shinfo(skb);
+	skb_frag_t *frag;
+	u8 *addr;
+	int hdr_len;
+	int len;
+	int i;
+
+	/* handle any payload left in the linear buffer */
+	hdr_len = rxe_opcode[pkt->opcode].length;
+	addr = pkt->hdr + hdr_len;
+	len = skb_tail_pointer(skb) - skb_transport_header(skb)
+		- sizeof(struct udphdr) - hdr_len;
+	if (!shinfo->nr_frags) {
+		len -= RXE_ICRC_SIZE;
+		*icrcp = (__be32 *)(addr + len);
+	}
+	if (len > 0)
+		icrc = rxe_crc32(pkt->rxe, icrc, payload_addr(pkt), len);
+	WARN_ON(len < 0);
+
+	/* handle any payload in frags */
+	for (i = 0; i < shinfo->nr_frags; i++) {
+		frag = &shinfo->frags[i];
+		addr = page_to_virt(frag->bv_page) + frag->bv_offset;
+		len = frag->bv_len;
+		if (i == shinfo->nr_frags - 1) {
+			len -= RXE_ICRC_SIZE;
+			*icrcp = (__be32 *)(addr + len);
+		}
+		if (len > 0)
+			icrc = rxe_crc32(pkt->rxe, icrc, addr, len);
+		WARN_ON(len < 0);
+	}
+
+	return icrc;
+}
+
 /**
  * rxe_icrc_check() - Compute ICRC for a packet and compare to the ICRC
  *		      delivered in the packet.
@@ -143,13 +193,11 @@  int rxe_icrc_check(struct sk_buff *skb, struct rxe_pkt_info *pkt)
 	__be32 pkt_icrc;
 	__be32 icrc;
 
-	icrcp = (__be32 *)(pkt->hdr + pkt->paylen - RXE_ICRC_SIZE);
-	pkt_icrc = *icrcp;
-
 	icrc = rxe_icrc_hdr(skb, pkt);
-	icrc = rxe_crc32(pkt->rxe, icrc, (u8 *)payload_addr(pkt),
-				payload_size(pkt) + bth_pad(pkt));
+	icrc = rxe_icrc_payload(skb, pkt, icrc, &icrcp);
+
 	icrc = ~icrc;
+	pkt_icrc = *icrcp;
 
 	if (unlikely(icrc != pkt_icrc))
 		return -EINVAL;
@@ -167,9 +215,8 @@  void rxe_icrc_generate(struct sk_buff *skb, struct rxe_pkt_info *pkt)
 	__be32 *icrcp;
 	__be32 icrc;
 
-	icrcp = (__be32 *)(pkt->hdr + pkt->paylen - RXE_ICRC_SIZE);
 	icrc = rxe_icrc_hdr(skb, pkt);
-	icrc = rxe_crc32(pkt->rxe, icrc, (u8 *)payload_addr(pkt),
-				payload_size(pkt) + bth_pad(pkt));
+	icrc = rxe_icrc_payload(skb, pkt, icrc, &icrcp);
+
 	*icrcp = ~icrc;
 }
diff --git a/drivers/infiniband/sw/rxe/rxe_net.c b/drivers/infiniband/sw/rxe/rxe_net.c
index c6d8f5c80562..395e9d7d81c3 100644
--- a/drivers/infiniband/sw/rxe/rxe_net.c
+++ b/drivers/infiniband/sw/rxe/rxe_net.c
@@ -134,32 +134,51 @@  static int rxe_udp_encap_recv(struct sock *sk, struct sk_buff *skb)
 	struct rxe_dev *rxe;
 	struct net_device *ndev = skb->dev;
 	struct rxe_pkt_info *pkt = SKB_TO_PKT(skb);
+	u8 opcode;
+	u8 buf[1];
+	u8 *p;
 
-	/* takes a reference on rxe->ib_dev
-	 * drop when skb is freed
-	 */
+	/* Takes a reference on rxe->ib_dev. Drop when skb is freed */
 	rxe = rxe_get_dev_from_net(ndev);
 	if (!rxe && is_vlan_dev(ndev))
 		rxe = rxe_get_dev_from_net(vlan_dev_real_dev(ndev));
 	if (!rxe)
-		goto drop;
+		goto err_drop;
 
-	if (skb_linearize(skb)) {
-		ib_device_put(&rxe->ib_dev);
-		goto drop;
+	/* Get bth opcode out of skb */
+	p = skb_header_pointer(skb, sizeof(struct udphdr), 1, buf);
+	if (!p)
+		goto err_device_put;
+	opcode = *p;
+
+	/* If using fragmented skbs make sure roce headers
+	 * are in linear buffer else make skb linear
+	 */
+	if (rxe_use_sg && skb_is_nonlinear(skb)) {
+		int delta = rxe_opcode[opcode].length -
+			(skb_headlen(skb) - sizeof(struct udphdr));
+
+		if (delta > 0 && !__pskb_pull_tail(skb, delta))
+			goto err_device_put;
+	} else {
+		if (skb_linearize(skb))
+			goto err_device_put;
 	}
 
 	udph = udp_hdr(skb);
 	pkt->rxe = rxe;
 	pkt->port_num = 1;
 	pkt->hdr = (u8 *)(udph + 1);
-	pkt->mask = RXE_GRH_MASK;
+	pkt->mask = rxe_opcode[opcode].mask | RXE_GRH_MASK;
 	pkt->paylen = be16_to_cpu(udph->len) - sizeof(*udph);
 
 	rxe_rcv(skb);
 
 	return 0;
-drop:
+
+err_device_put:
+	ib_device_put(&rxe->ib_dev);
+err_drop:
 	kfree_skb(skb);
 
 	return 0;
@@ -385,21 +404,32 @@  static int rxe_send(struct sk_buff *skb, struct rxe_pkt_info *pkt)
  */
 static int rxe_loopback(struct sk_buff *skb, struct rxe_pkt_info *pkt)
 {
-	memcpy(SKB_TO_PKT(skb), pkt, sizeof(*pkt));
+	struct rxe_pkt_info *newpkt;
+	int err;
 
+	/* make loopback line up with rxe_udp_encap_recv */
 	if (skb->protocol == htons(ETH_P_IP))
 		skb_pull(skb, sizeof(struct iphdr));
 	else
 		skb_pull(skb, sizeof(struct ipv6hdr));
+	skb_reset_transport_header(skb);
+
+	newpkt = SKB_TO_PKT(skb);
+	memcpy(newpkt, pkt, sizeof(*newpkt));
+	newpkt->hdr = skb_transport_header(skb) + sizeof(struct udphdr);
 
 	if (WARN_ON(!ib_device_try_get(&pkt->rxe->ib_dev))) {
 		kfree_skb(skb);
-		return -EIO;
+		err = -EINVAL;
+		goto drop;
 	}
 
 	rxe_rcv(skb);
-
 	return 0;
+
+drop:
+	kfree_skb(skb);
+	return err;
 }
 
 int rxe_xmit_packet(struct rxe_qp *qp, struct rxe_pkt_info *pkt,
@@ -415,6 +445,7 @@  int rxe_xmit_packet(struct rxe_qp *qp, struct rxe_pkt_info *pkt,
 		goto drop;
 	}
 
+	/* skb->data points at IP header */
 	rxe_icrc_generate(skb, pkt);
 
 	if (pkt->mask & RXE_LOOPBACK_MASK)
diff --git a/drivers/infiniband/sw/rxe/rxe_recv.c b/drivers/infiniband/sw/rxe/rxe_recv.c
index 434a693cd4a5..ba786e5c6266 100644
--- a/drivers/infiniband/sw/rxe/rxe_recv.c
+++ b/drivers/infiniband/sw/rxe/rxe_recv.c
@@ -329,6 +329,7 @@  void rxe_rcv(struct sk_buff *skb)
 	if (unlikely(err))
 		goto drop;
 
+	/* skb->data points at UDP header */
 	err = rxe_icrc_check(skb, pkt);
 	if (unlikely(err))
 		goto drop;