Skip site navigation (1)Skip section navigation (2) 
Date:      Sun, 23 Aug 2015 18:22:21 +0000 (UTC)
From:      "Alexander V. Chernikov" <melifaro@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject:   svn commit: r287057 - in projects/routing/sys: net ofed/drivers/infiniband/core
Message-ID:  <201508231822.t7NIMLkw046717@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help 
Author: melifaro
Date: Sun Aug 23 18:22:20 2015
New Revision: 287057
URL: https://svnweb.freebsd.org/changeset/base/287057

Log:
  Convert ofed to use new routing api. Add fib[46]_source_to_sa_ext() functions
  to export IPv4/IPv6 sources as sockaddresses.

Modified:
  projects/routing/sys/net/rt_nhops.c
  projects/routing/sys/net/rt_nhops.h
  projects/routing/sys/ofed/drivers/infiniband/core/addr.c

Modified: projects/routing/sys/net/rt_nhops.c
==============================================================================
--- projects/routing/sys/net/rt_nhops.c	Sun Aug 23 18:21:43 2015	(r287056)
+++ projects/routing/sys/net/rt_nhops.c	Sun Aug 23 18:22:20 2015	(r287057)
@@ -532,6 +532,15 @@ fib4_free_nh_ext(uint32_t fibnum, struct
 
 }
 
+void
+fib4_source_to_sa_ext(const struct nhopu_extended *pnhu, struct sockaddr_in *sin)
+{
+
+	sin->sin_family = AF_INET;
+	sin->sin_len = sizeof(*sin);
+	sin->sin_addr = pnhu->u.nh4.nh_src;
+}
+
 #endif
 
 #ifdef INET6
@@ -692,6 +701,15 @@ fib6_free_nh_ext(uint32_t fibnum, struct
 
 }
 
+void
+fib6_source_to_sa_ext(const struct nhopu_extended *pnhu,
+    struct sockaddr_in6 *sin6)
+{
+
+	sin6->sin6_family = AF_INET6;
+	sin6->sin6_len = sizeof(*sin6);
+	sin6->sin6_addr = pnhu->u.nh6.nh_src;
+}
 #endif
 
 void

Modified: projects/routing/sys/net/rt_nhops.h
==============================================================================
--- projects/routing/sys/net/rt_nhops.h	Sun Aug 23 18:21:43 2015	(r287056)
+++ projects/routing/sys/net/rt_nhops.h	Sun Aug 23 18:22:20 2015	(r287057)
@@ -203,6 +203,8 @@ int fib4_lookup_nh_ext(uint32_t fibnum, 
     uint32_t flowid, uint32_t flags, struct nhop4_extended *pnh4);
 void fib4_free_nh_ext(uint32_t fibnum, struct nhop4_extended *pnh4);
 #define	NHOP_LOOKUP_REF	0x01
+void fib4_source_to_sa_ext(const struct nhopu_extended *pnhu,
+    struct sockaddr_in *sin);
 
 
 int fib6_lookup_nh_basic(uint32_t fibnum, struct in6_addr dst, uint32_t flowid,
@@ -211,6 +213,8 @@ int fib6_lookup_nh_ext(uint32_t fibnum, 
     uint32_t scopeid, uint32_t flowid, uint32_t flags,
     struct nhop6_extended *pnh6);
 void fib6_free_nh_ext(uint32_t fibnum, struct nhop6_extended *pnh6);
+void fib6_source_to_sa_ext(const struct nhopu_extended *pnhu,
+    struct sockaddr_in6 *sin6);
 
 void fib_free_nh_ext(uint32_t fibnum, struct nhopu_extended *pnhu);
 

Modified: projects/routing/sys/ofed/drivers/infiniband/core/addr.c
==============================================================================
--- projects/routing/sys/ofed/drivers/infiniband/core/addr.c	Sun Aug 23 18:21:43 2015	(r287056)
+++ projects/routing/sys/ofed/drivers/infiniband/core/addr.c	Sun Aug 23 18:22:20 2015	(r287057)
@@ -194,6 +194,21 @@ static void queue_req(struct addr_req *r
 	mutex_unlock(&lock);
 }
 
+static void copy_src_sockaddr(struct sockaddr *src_in,
+			const struct nhopu_extended *pnhu,
+			int family)
+{
+
+#ifdef INET
+	if (family == AF_INET)
+		fib4_source_to_sa_ext(pnhu, (struct sodkaddr_in *)src_in);
+#endif
+#ifdef INET6
+	if (family == AF_INET6)
+		fib6_source_to_sa_ext(pnhu, (struct sodkaddr_in6 *)src_in);
+#endif
+}
+
 static int addr_resolve(struct sockaddr *src_in,
 			struct sockaddr *dst_in,
 			struct rdma_dev_addr *addr)
@@ -202,7 +217,8 @@ static int addr_resolve(struct sockaddr 
 	struct sockaddr_in6 *sin6;
 	struct ifaddr *ifa;
 	struct ifnet *ifp;
-	struct rtentry *rte;
+	struct nhopu_extended nhu;
+	uint32_t fibnum;
 	in_port_t port;
 	u_char edst[MAX_ADDR_LEN];
 	int multi;
@@ -218,7 +234,6 @@ static int addr_resolve(struct sockaddr 
 	sin = NULL;
 	sin6 = NULL;
 	ifp = NULL;
-	rte = NULL;
 	switch (dst_in->sa_family) {
 #ifdef INET
 	case AF_INET:
@@ -255,9 +270,11 @@ static int addr_resolve(struct sockaddr 
 	default:
 		return -EINVAL;
 	}
+	memset(&nhu, 0, sizeof(nhu));
 	/*
 	 * If we have a source address to use look it up first and verify
 	 * that it is a local interface.
+	 * XXX: IPv6 case?
 	 */
 	if (sin->sin_addr.s_addr != INADDR_ANY) {
 		ifa = ifa_ifwithaddr(src_in);
@@ -268,6 +285,12 @@ static int addr_resolve(struct sockaddr 
 		if (ifa == NULL)
 			return -ENETUNREACH;
 		ifp = ifa->ifa_ifp;
+		if (sin)
+			nhu.u.nh4.nh_src =
+			    ((struct sockaddr_in *)ifa->ifa_addr)->sin_addr;
+		if (sin6)
+			nhu.u.nh6.nh_src =
+			    ((struct sockaddr_in6 *)ifa->ifa_addr)->sin6_addr;
 		ifa_free(ifa);
 		if (bcast || multi)
 			goto mcast;
@@ -275,10 +298,26 @@ static int addr_resolve(struct sockaddr 
 	/*
 	 * Make sure the route exists and has a valid link.
 	 */
-	rte = rtalloc1(dst_in, 1, 0);
-	if (rte == NULL || rte->rt_ifp == NULL || !RT_LINK_IS_UP(rte->rt_ifp)) {
-		if (rte) 
-			RTFREE_LOCKED(rte);
+	fibnum = RT_DEFAULT_FIB;
+#ifdef INET
+	if (dst_in->sa_family == AF_INET) {
+		error = fib4_lookup_nh_ext(fibnum,
+		    ((struct sockaddr_in *)dst_in)->sin_addr, 0,
+		    NHOP_LOOKUP_REF, &nhu.u.nh4);
+	} else
+#endif
+#ifdef INET6
+	if (dst_in->sa_family == AF_INET6) {
+		struct sockaddr_in6 *dst6;
+		dst6 = (struct sockaddr_in6 *)dst_in;
+		error = fib6_lookup_nh_ext(fibnum,
+		    dst6->sin6_addr, dst6->sin6_scope_id, 0,
+		    NHOP_LOOKUP_REF, &nhu.u.nh6);
+	}
+#endif
+	if (error != 0 || !RT_LINK_IS_UP(nhu.u.nh4.nh_ifp)) {
+		if (error == 0)
+			fib_free_nh_ext(fibnum, &nhu);
 		return -EHOSTUNREACH;
 	}
 	if (rte->rt_flags & RTF_GATEWAY)
@@ -289,21 +328,15 @@ static int addr_resolve(struct sockaddr 
 	 * correct interface pointer and unlock the route.
 	 */
 	if (multi || bcast) {
-		if (ifp == NULL) {
-			ifp = rte->rt_ifp;
-			/* rt_ifa holds the route answer source address */
-			ifa = rte->rt_ifa;
-		}
-		RTFREE_LOCKED(rte);
-	} else if (ifp && ifp != rte->rt_ifp) {
-		RTFREE_LOCKED(rte);
+		if (ifp == NULL)
+			ifp = nhu.u.nh4.nh_ifp;
+		fib_free_nh_ext(fibnum, &nhu);
+	} else if (ifp && ifp != nhu.u.nh4.nh_ifp) {
+		fib_free_nh_ext(fibnum, &nhu);
 		return -ENETUNREACH;
 	} else {
-		if (ifp == NULL) {
-			ifp = rte->rt_ifp;
-			ifa = rte->rt_ifa;
-		}
-		RT_UNLOCK(rte);
+		if (ifp == NULL)
+			ifp = nhu.u.nh4.nh_ifp;
 	}
 mcast:
 	if (bcast)
@@ -318,7 +351,7 @@ mcast:
 		    LLADDR((struct sockaddr_dl *)llsa));
 		free(llsa, M_IFMADDR);
 		if (error == 0)
-			memcpy(src_in, ifa->ifa_addr, ip_addr_size(ifa->ifa_addr));
+			copy_src_sockaddr(src_in, &nhu, dst_in->sa_family);
 		return error;
 	}
 	/*
@@ -339,9 +372,9 @@ mcast:
 		/* XXX: Shouldn't happen. */
 		error = -EINVAL;
 	}
-	RTFREE(rte);
+	fib_free_nh_ext(fibnum, &nhu);
 	if (error == 0) {
-		memcpy(src_in, ifa->ifa_addr, ip_addr_size(ifa->ifa_addr));
+		copy_src_sockaddr(src_in, &nhu, dst_in->sa_family);
 		return rdma_copy_addr(addr, ifp, edst);
 	}
 	if (error == EWOULDBLOCK)

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201508231822.t7NIMLkw046717>