d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add native FreeBSD support for multicast in ibcore.

Browse Source 
This change adds support for registering multicast addresses,
both IPv4 and IPv6.

MFC after:		1 week
Sponsored by:		Mellanox Technologies
This commit is contained in:
Hans Petter Selasky 2018-07-17 08:59:34 +00:00
parent 7a658d6545
commit f9899e4567
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=336367
2 changed files with 42 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
sys/ofed/drivers/infiniband/core/ib_addr.c
View File

@ -346,9 +346,12 @@ static int addr4_resolve(struct sockaddr_in *src_in,
ifp->if_addrlen, MAX_ADDR_LEN);
error = 0;
} else if (IN_MULTICAST(ntohl(dst_tmp.sin_addr.s_addr))) {
bool is_gw = (rte->rt_flags & RTF_GATEWAY) != 0;
error = addr_resolve_multi(edst, ifp, (struct sockaddr *)&dst_tmp);
if (error != 0)
goto error_put_ifp;
else if (is_gw)
addr->network = RDMA_NETWORK_IPV4;
} else if (ifp->if_flags & IFF_LOOPBACK) {
memset(edst, 0, MAX_ADDR_LEN);
error = 0;
@ -360,7 +363,7 @@ static int addr4_resolve(struct sockaddr_in *src_in,
edst, NULL, NULL);
if (error != 0)
goto error_put_ifp;
else if (is_gw != 0)
else if (is_gw)
addr->network = RDMA_NETWORK_IPV4;
}
@ -515,10 +518,13 @@ static int addr6_resolve(struct sockaddr_in6 *src_in,
* Step 3 - resolve destination MAC address
*/
if (IN6_IS_ADDR_MULTICAST(&dst_tmp.sin6_addr)) {
bool is_gw = (rte->rt_flags & RTF_GATEWAY) != 0;
error = addr_resolve_multi(edst, ifp,
(struct sockaddr *)&dst_tmp);
if (error != 0)
goto error_put_ifp;
else if (is_gw)
addr->network = RDMA_NETWORK_IPV6;
} else if (rte->rt_ifp->if_flags & IFF_LOOPBACK) {
memset(edst, 0, MAX_ADDR_LEN);
error = 0;
@ -530,7 +536,7 @@ static int addr6_resolve(struct sockaddr_in6 *src_in,
edst, NULL, NULL);
if (error != 0)
goto error_put_ifp;
else if (is_gw != 0)
else if (is_gw)
addr->network = RDMA_NETWORK_IPV6;
}

35
sys/ofed/drivers/infiniband/core/ib_cma.c
View File

@ -427,6 +427,30 @@ static inline void cma_set_ip_ver(struct cma_hdr *hdr, u8 ip_ver)
hdr->ip_version = (ip_ver << 4) | (hdr->ip_version & 0xF);
}
static int cma_igmp_send(struct net_device *ndev, const union ib_gid *mgid, bool join)
{
int retval;
if (ndev) {
union {
struct sockaddr sock;
struct sockaddr_storage storage;
} addr;
rdma_gid2ip(&addr.sock, mgid);
CURVNET_SET_QUIET(ndev->if_vnet);
if (join)
retval = -if_addmulti(ndev, &addr.sock, NULL);
else
retval = -if_delmulti(ndev, &addr.sock);
CURVNET_RESTORE();
} else {
retval = -ENODEV;
}
return retval;
}
static void _cma_attach_to_dev(struct rdma_id_private *id_priv,
struct cma_device *cma_dev)
{
@ -1621,6 +1645,9 @@ static void cma_leave_mc_groups(struct rdma_id_private *id_priv)
ndev = dev_get_by_index(dev_addr->net,
dev_addr->bound_dev_if);
if (ndev) {
cma_igmp_send(ndev,
&mc->multicast.ib->rec.mgid,
false);
dev_put(ndev);
}
}
@ -4024,7 +4051,10 @@ static int cma_iboe_join_multicast(struct rdma_id_private *id_priv,
if (gid_type == IB_GID_TYPE_ROCE_UDP_ENCAP) {
mc->multicast.ib->rec.hop_limit = IPV6_DEFAULT_HOPLIMIT;
if (!send_only) {
mc->igmp_joined = true;
err = cma_igmp_send(ndev, &mc->multicast.ib->rec.mgid,
true);
if (!err)
mc->igmp_joined = true;
}
}
} else {
@ -4129,6 +4159,9 @@ void rdma_leave_multicast(struct rdma_cm_id *id, struct sockaddr *addr)
ndev = dev_get_by_index(dev_addr->net,
dev_addr->bound_dev_if);
if (ndev) {
cma_igmp_send(ndev,
&mc->multicast.ib->rec.mgid,
false);
dev_put(ndev);
}
mc->igmp_joined = false;