IB/rxe: Fix sending out loopback packet on netdev interface.

Commit Message

Parav Pandit Sept. 28, 2016, 8:24 p.m. UTC

Bug: prepare4 and prepare6 sets loopback mask in pkt_info structure
instance of skb.
While xmit_packet and other requester side functions use
pkt_info from stack. Due to which loopback mask bit set to wrong
pkt_info structure. This resuilts into sending out packet to actual
netdev and loopback functionality is broken.

Fix: Similar to other requester side functions, prepare() variants to
set loopback mask bit on pkt_info structure used by other functions.
Verified with perftest applications.

Signed-off-by: Parav Pandit <[e-mail]>
---
 drivers/infiniband/sw/rxe/rxe_net.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

Comments

Doug Ledford Oct. 1, 2016, 11:10 p.m. UTC | #1

On 9/28/2016 4:24 PM, Parav Pandit wrote:
> Bug: prepare4 and prepare6 sets loopback mask in pkt_info structure
> instance of skb.
> While xmit_packet and other requester side functions use
> pkt_info from stack. Due to which loopback mask bit set to wrong
> pkt_info structure. This resuilts into sending out packet to actual
> netdev and loopback functionality is broken.
> 
> Fix: Similar to other requester side functions, prepare() variants to
> set loopback mask bit on pkt_info structure used by other functions.
> Verified with perftest applications.
> 
> Signed-off-by: Parav Pandit <[e-mail]>

You're commit message had to be largely rewritten, but the code was applied.

Patch

diff --git a/drivers/infiniband/sw/rxe/rxe_net.c b/drivers/infiniband/sw/rxe/rxe_net.c
index eedf2f1..549aa84 100644
--- a/drivers/infiniband/sw/rxe/rxe_net.c
+++ b/drivers/infiniband/sw/rxe/rxe_net.c
@@ -350,14 +350,14 @@  static void prepare_ipv6_hdr(struct dst_entry *dst, struct sk_buff *skb,
 	ip6h->payload_len = htons(skb->len - sizeof(*ip6h));
 }
 
-static int prepare4(struct rxe_dev *rxe, struct sk_buff *skb, struct rxe_av *av)
+static int prepare4(struct rxe_dev *rxe, struct rxe_pkt_info *pkt,
+		    struct sk_buff *skb, struct rxe_av *av)
 {
 	struct dst_entry *dst;
 	bool xnet = false;
 	__be16 df = htons(IP_DF);
 	struct in_addr *saddr = &av->sgid_addr._sockaddr_in.sin_addr;
 	struct in_addr *daddr = &av->dgid_addr._sockaddr_in.sin_addr;
-	struct rxe_pkt_info *pkt = SKB_TO_PKT(skb);
 
 	dst = rxe_find_route4(rxe->ndev, saddr, daddr);
 	if (!dst) {
@@ -376,12 +376,12 @@  static int prepare4(struct rxe_dev *rxe, struct sk_buff *skb, struct rxe_av *av)
 	return 0;
 }
 
-static int prepare6(struct rxe_dev *rxe, struct sk_buff *skb, struct rxe_av *av)
+static int prepare6(struct rxe_dev *rxe, struct rxe_pkt_info *pkt,
+		    struct sk_buff *skb, struct rxe_av *av)
 {
 	struct dst_entry *dst;
 	struct in6_addr *saddr = &av->sgid_addr._sockaddr_in6.sin6_addr;
 	struct in6_addr *daddr = &av->dgid_addr._sockaddr_in6.sin6_addr;
-	struct rxe_pkt_info *pkt = SKB_TO_PKT(skb);
 
 	dst = rxe_find_route6(rxe->ndev, saddr, daddr);
 	if (!dst) {
@@ -408,9 +408,9 @@  static int prepare(struct rxe_dev *rxe, struct rxe_pkt_info *pkt,
 	struct rxe_av *av = rxe_get_av(pkt);
 
 	if (av->network_type == RDMA_NETWORK_IPV4)
-		err = prepare4(rxe, skb, av);
+		err = prepare4(rxe, pkt, skb, av);
 	else if (av->network_type == RDMA_NETWORK_IPV6)
-		err = prepare6(rxe, skb, av);
+		err = prepare6(rxe, pkt, skb, av);
 
 	*crc = rxe_icrc_hdr(pkt, skb);