From nobody Fri Sep 23 12:00:20 2022 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4MYrLr51qYz4cr0r; Fri, 23 Sep 2022 12:00:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4MYrLr4lrhz3xgj; Fri, 23 Sep 2022 12:00:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1663934420; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Y/j/dWc7V4dZtoENbwnDe2YBxNUUA8GoMRyuzq11T1I=; b=JLXE82MfW+JPpJqd1y9JN+R+7L8rZdRcUJJ2z5MWjkwWUKvofMLDqZ7zZBMuTP7XKVGc+W WN6OLT7eiXUWYtXK8u/4hqNFT9OotNN3rBSyo5E/0DL/MVYxyZiCK+jcPOFt3r0Emv0aic zzMXc5vDdXDW1XmorcTYYGXbAeyuLXfLSfMGa8Xz2GnOydJ4cujGjzCM8ioLLMJ1G59BoW iZ50Pr0UtJbIWYSRWCCxTms1TBP1hT3TLG19OcjdekWTlLr0+RLGMuInnk0XWXEE2Xxqxn BLyvsutLHMgbqzJZeb0bhy2XOL8itDwV4WJHeBzIEoj81yMl3IM8r0Y5XC0hTA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4MYrLr3WWKzkLZ; Fri, 23 Sep 2022 12:00:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 28NC0KRR021473; Fri, 23 Sep 2022 12:00:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 28NC0KJt021465; Fri, 23 Sep 2022 12:00:20 GMT (envelope-from git) Date: Fri, 23 Sep 2022 12:00:20 GMT Message-Id: <202209231200.28NC0KJt021465@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Hans Petter Selasky Subject: git: f50274674ebf - main - ibcore: The use of IN_LOOPBACK() now requires a valid VNET context. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: hselasky X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f50274674ebf3a51a77708f569d38a238cbad6ec Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1663934420; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Y/j/dWc7V4dZtoENbwnDe2YBxNUUA8GoMRyuzq11T1I=; b=cRgJWTwZ+hBHcuMY/VY05qnjCWupQOVQ0WnUcn6phZ2WW4Q8fp9g1WQQxzAsJRYS7wNbyI BhgwKf6odQpSoSgYST7iaTDODb2ip3cQcmU4vCJuVd9xA4cqFtEhos3eHZdUmelLDE85u/ CVmlMIsTGaQh5tXA4aq5IgsdgRyvMdb95cDS9rDgGycg62QcEw2BL/wNpBALgwVQLO2uT/ s/N2xI+PYUXozMx66dRyNDTijxFHUCEHtPwror/O0VfcCdJCzT5TtNYR67OwZhxDQxlxD/ f4cLoLPXImp/OCmtK+mwtya61J6CFJVC7jm3gbyA6mJ+qjMcZaSBxhPCQmRo3w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1663934420; a=rsa-sha256; cv=none; b=b+uRaGybT7c6iTralfAfgZuKAa7imqIkUtgj1gPgk9sy0jggnt2hNc+s08FonZLTP+ljVg A2ymgCcUEqVqRYfHToaubO8nuB1DdrkyHQfU5Go6GoH7Moq+1pTn7bJsdBWCz2f0Cy0nTI 89mAvEJjRelukvW/T4NKPaWJJUYP+iTOL2+CuLUkNn/qWOVfBGj8ovrvzxtUT5rDZlejPN Xqr8LcfDLiRfx12zKc2QW49bebuAJPwVjEsXISKPxndGpEKrNaUIOqasDMVp5pyQaKKKkR Mk5Dz42rN2MpVYgTBzYMWkYi39Y1e4OipywUqouNQ0f5UKJZka/PzCc/66QZKw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by hselasky: URL: https://cgit.FreeBSD.org/src/commit/?id=f50274674ebf3a51a77708f569d38a238cbad6ec commit f50274674ebf3a51a77708f569d38a238cbad6ec Author: Hans Petter Selasky AuthorDate: 2022-08-31 10:37:28 +0000 Commit: Hans Petter Selasky CommitDate: 2022-09-23 11:42:03 +0000 ibcore: The use of IN_LOOPBACK() now requires a valid VNET context. Make sure the VNET is set before using this macro. Fixes: efe58855f3ea2cfc24cb705aabce3bc0fe1fb6d5 PR: 266054 MFC after: 1 week Sponsored by: NVIDIA Networking --- sys/dev/irdma/fbsd_kcompat.c | 4 +- sys/dev/irdma/irdma_cm.c | 15 ++++-- sys/dev/irdma/irdma_cm.h | 2 +- sys/dev/irdma/irdma_kcompat.c | 9 ++-- sys/ofed/drivers/infiniband/core/ib_cma.c | 81 ++++++++++++++++++++----------- 5 files changed, 76 insertions(+), 35 deletions(-) diff --git a/sys/dev/irdma/fbsd_kcompat.c b/sys/dev/irdma/fbsd_kcompat.c index 2f6b350ac5b0..cc6dd5c947ae 100644 --- a/sys/dev/irdma/fbsd_kcompat.c +++ b/sys/dev/irdma/fbsd_kcompat.c @@ -467,11 +467,13 @@ int irdma_resolve_neigh_lpb_chk(struct irdma_device *iwdev, struct irdma_cm_node *cm_node, struct irdma_cm_info *cm_info) { + struct rdma_cm_id *rdma_id = (struct rdma_cm_id *)cm_node->cm_id->context; + struct vnet *vnet = rdma_id->route.addr.dev_addr.net; int arpindex; int oldarpindex; if ((cm_node->ipv4 && - irdma_ipv4_is_lpb(cm_node->loc_addr[0], cm_node->rem_addr[0])) || + irdma_ipv4_is_lpb(vnet, cm_node->loc_addr[0], cm_node->rem_addr[0])) || (!cm_node->ipv4 && irdma_ipv6_is_lpb(cm_node->loc_addr, cm_node->rem_addr))) { cm_node->do_lpb = true; diff --git a/sys/dev/irdma/irdma_cm.c b/sys/dev/irdma/irdma_cm.c index e107903efe4d..410774226e78 100644 --- a/sys/dev/irdma/irdma_cm.c +++ b/sys/dev/irdma/irdma_cm.c @@ -2055,9 +2055,15 @@ irdma_add_hte_node(struct irdma_cm_core *cm_core, * @rem_addr: remote address */ bool -irdma_ipv4_is_lpb(u32 loc_addr, u32 rem_addr) +irdma_ipv4_is_lpb(struct vnet *vnet, u32 loc_addr, u32 rem_addr) { - return ipv4_is_loopback(htonl(rem_addr)) || (loc_addr == rem_addr); + bool ret; + + CURVNET_SET_QUIET(vnet); + ret = ipv4_is_loopback(htonl(rem_addr)) || (loc_addr == rem_addr); + CURVNET_RESTORE(); + + return (ret); } /** @@ -2083,6 +2089,8 @@ irdma_ipv6_is_lpb(u32 *loc_addr, u32 *rem_addr) static int irdma_cm_create_ah(struct irdma_cm_node *cm_node, bool wait) { + struct rdma_cm_id *rdma_id = (struct rdma_cm_id *)cm_node->cm_id->context; + struct vnet *vnet = rdma_id->route.addr.dev_addr.net; struct irdma_ah_info ah_info = {0}; struct irdma_device *iwdev = cm_node->iwdev; @@ -2096,7 +2104,8 @@ irdma_cm_create_ah(struct irdma_cm_node *cm_node, bool wait) ah_info.ipv4_valid = true; ah_info.dest_ip_addr[0] = cm_node->rem_addr[0]; ah_info.src_ip_addr[0] = cm_node->loc_addr[0]; - ah_info.do_lpbk = irdma_ipv4_is_lpb(ah_info.src_ip_addr[0], + ah_info.do_lpbk = irdma_ipv4_is_lpb(vnet, + ah_info.src_ip_addr[0], ah_info.dest_ip_addr[0]); } else { memcpy(ah_info.dest_ip_addr, cm_node->rem_addr, diff --git a/sys/dev/irdma/irdma_cm.h b/sys/dev/irdma/irdma_cm.h index e66db15a6fff..d3d55977cf3c 100644 --- a/sys/dev/irdma/irdma_cm.h +++ b/sys/dev/irdma/irdma_cm.h @@ -441,7 +441,7 @@ void irdma_cm_teardown_connections(struct irdma_device *iwdev, u32 *ipaddr, bool disconnect_all); int irdma_cm_start(struct irdma_device *dev); int irdma_cm_stop(struct irdma_device *dev); -bool irdma_ipv4_is_lpb(u32 loc_addr, u32 rem_addr); +bool irdma_ipv4_is_lpb(struct vnet *, u32 loc_addr, u32 rem_addr); bool irdma_ipv6_is_lpb(u32 *loc_addr, u32 *rem_addr); int irdma_arp_table(struct irdma_pci_f *rf, u32 *ip_addr, u8 *mac_addr, u32 action); diff --git a/sys/dev/irdma/irdma_kcompat.c b/sys/dev/irdma/irdma_kcompat.c index beff04f7dc6c..3d88187cb9ae 100644 --- a/sys/dev/irdma/irdma_kcompat.c +++ b/sys/dev/irdma/irdma_kcompat.c @@ -284,7 +284,8 @@ irdma_dealloc_pd(struct ib_pd *ibpd, struct ib_udata *udata) } static void -irdma_fill_ah_info(struct irdma_ah_info *ah_info, +irdma_fill_ah_info(struct vnet *vnet, + struct irdma_ah_info *ah_info, const struct ib_gid_attr *sgid_attr, struct sockaddr *sgid_addr, struct sockaddr *dgid_addr, u8 *dmac, u8 net_type) @@ -295,7 +296,8 @@ irdma_fill_ah_info(struct irdma_ah_info *ah_info, ntohl(((struct sockaddr_in *)dgid_addr)->sin_addr.s_addr); ah_info->src_ip_addr[0] = ntohl(((struct sockaddr_in *)sgid_addr)->sin_addr.s_addr); - ah_info->do_lpbk = irdma_ipv4_is_lpb(ah_info->src_ip_addr[0], + ah_info->do_lpbk = irdma_ipv4_is_lpb(vnet, + ah_info->src_ip_addr[0], ah_info->dest_ip_addr[0]); if (ipv4_is_multicast(((struct sockaddr_in *)dgid_addr)->sin_addr.s_addr)) { irdma_mcast_mac_v4(ah_info->dest_ip_addr, dmac); @@ -440,7 +442,8 @@ irdma_create_ah(struct ib_ah *ib_ah, ether_addr_copy(dmac, attr->dmac); - irdma_fill_ah_info(ah_info, &sgid_attr, &sgid_addr.saddr, &dgid_addr.saddr, + irdma_fill_ah_info(iwdev->netdev->if_vnet, + ah_info, &sgid_attr, &sgid_addr.saddr, &dgid_addr.saddr, dmac, ah->av.net_type); err = irdma_create_ah_vlan_tag(iwdev, ah_info, &sgid_attr, dmac); diff --git a/sys/ofed/drivers/infiniband/core/ib_cma.c b/sys/ofed/drivers/infiniband/core/ib_cma.c index 10dedf96f0e6..85af3330f08a 100644 --- a/sys/ofed/drivers/infiniband/core/ib_cma.c +++ b/sys/ofed/drivers/infiniband/core/ib_cma.c @@ -1070,9 +1070,15 @@ static inline int cma_loopback_addr(struct sockaddr *addr) } } -static inline int cma_any_addr(struct sockaddr *addr) +static inline bool cma_any_addr(struct vnet *vnet, struct sockaddr *addr) { - return cma_zero_addr(addr) || cma_loopback_addr(addr); + bool ret; + + CURVNET_SET_QUIET(vnet); + ret = cma_zero_addr(addr) || cma_loopback_addr(addr); + CURVNET_RESTORE(); + + return (ret); } static int cma_addr_cmp(struct sockaddr *src, struct sockaddr *dst) @@ -1375,6 +1381,21 @@ static int cma_save_req_info(const struct ib_cm_event *ib_event, return 0; } +#ifdef INET +static bool validate_ipv4_net_dev_addr(struct vnet *vnet, + const __be32 saddr, const __be32 daddr) +{ + bool ret; + CURVNET_SET(vnet); + ret = ipv4_is_multicast(saddr) || ipv4_is_lbcast(saddr) || + ipv4_is_lbcast(daddr) || ipv4_is_zeronet(saddr) || + ipv4_is_zeronet(daddr) || ipv4_is_loopback(daddr) || + ipv4_is_loopback(saddr); + CURVNET_RESTORE(); + return (ret); +} +#endif + static bool validate_ipv4_net_dev(struct ifnet *net_dev, const struct sockaddr_in *dst_addr, const struct sockaddr_in *src_addr) @@ -1386,10 +1407,7 @@ static bool validate_ipv4_net_dev(struct ifnet *net_dev, struct nhop_object *nh; bool ret; - if (ipv4_is_multicast(saddr) || ipv4_is_lbcast(saddr) || - ipv4_is_lbcast(daddr) || ipv4_is_zeronet(saddr) || - ipv4_is_zeronet(daddr) || ipv4_is_loopback(daddr) || - ipv4_is_loopback(saddr)) + if (validate_ipv4_net_dev_addr(net_dev->if_vnet, saddr, daddr)) return false; dst_dev = ip_ifp_find(net_dev->if_vnet, daddr); @@ -1565,13 +1583,14 @@ static bool sdp_match_private_data(struct rdma_id_private *id_priv, { __be32 ip4_addr; struct in6_addr ip6_addr; + struct vnet *vnet = id_priv->id.route.addr.dev_addr.net; switch (addr->sa_family) { case AF_INET: ip4_addr = ((struct sockaddr_in *)addr)->sin_addr.s_addr; if (sdp_get_ip_ver(hdr) != 4) return false; - if (!cma_any_addr(addr) && + if (!cma_any_addr(vnet, addr) && hdr->dst_addr.ip4.addr != ip4_addr) return false; break; @@ -1580,7 +1599,7 @@ static bool sdp_match_private_data(struct rdma_id_private *id_priv, if (sdp_get_ip_ver(hdr) != 6) return false; cma_ip6_clear_scope_id(&ip6_addr); - if (!cma_any_addr(addr) && + if (!cma_any_addr(vnet, addr) && memcmp(&hdr->dst_addr.ip6, &ip6_addr, sizeof(ip6_addr))) return false; break; @@ -1598,10 +1617,11 @@ static bool cma_match_private_data(struct rdma_id_private *id_priv, { const struct cma_hdr *hdr = vhdr; struct sockaddr *addr = cma_src_addr(id_priv); + struct vnet *vnet = id_priv->id.route.addr.dev_addr.net; __be32 ip4_addr; struct in6_addr ip6_addr; - if (cma_any_addr(addr) && !id_priv->afonly) + if (cma_any_addr(vnet, addr) && !id_priv->afonly) return true; if (id_priv->id.ps == RDMA_PS_SDP) @@ -1612,7 +1632,7 @@ static bool cma_match_private_data(struct rdma_id_private *id_priv, ip4_addr = ((struct sockaddr_in *)addr)->sin_addr.s_addr; if (cma_get_ip_ver(hdr) != 4) return false; - if (!cma_any_addr(addr) && + if (!cma_any_addr(vnet, addr) && hdr->dst_addr.ip4.addr != ip4_addr) return false; break; @@ -1621,7 +1641,7 @@ static bool cma_match_private_data(struct rdma_id_private *id_priv, if (cma_get_ip_ver(hdr) != 6) return false; cma_ip6_clear_scope_id(&ip6_addr); - if (!cma_any_addr(addr) && + if (!cma_any_addr(vnet, addr) && memcmp(&hdr->dst_addr.ip6, &ip6_addr, sizeof(ip6_addr))) return false; break; @@ -1793,6 +1813,8 @@ static void cma_cancel_listens(struct rdma_id_private *id_priv) static void cma_cancel_operation(struct rdma_id_private *id_priv, enum rdma_cm_state state) { + struct vnet *vnet = id_priv->id.route.addr.dev_addr.net; + switch (state) { case RDMA_CM_ADDR_QUERY: rdma_addr_cancel(&id_priv->id.route.addr.dev_addr); @@ -1801,7 +1823,7 @@ static void cma_cancel_operation(struct rdma_id_private *id_priv, cma_cancel_route(id_priv); break; case RDMA_CM_LISTEN: - if (cma_any_addr(cma_src_addr(id_priv)) && !id_priv->cma_dev) + if (cma_any_addr(vnet, cma_src_addr(id_priv)) && !id_priv->cma_dev) cma_cancel_listens(id_priv); break; default: @@ -2039,9 +2061,10 @@ static struct rdma_id_private *cma_new_conn_id(struct rdma_cm_id *listen_id, const sa_family_t ss_family = listen_id->route.addr.src_addr.ss_family; const __be64 service_id = ib_event->param.req_rcvd.primary_path->service_id; + struct vnet *vnet = listen_id->route.addr.dev_addr.net; int ret; - id = rdma_create_id(listen_id->route.addr.dev_addr.net, + id = rdma_create_id(vnet, listen_id->event_handler, listen_id->context, listen_id->ps, ib_event->param.req_rcvd.qp_type); if (IS_ERR(id)) @@ -2070,11 +2093,11 @@ static struct rdma_id_private *cma_new_conn_id(struct rdma_cm_id *listen_id, goto err; } else { if (!cma_protocol_roce(listen_id) && - cma_any_addr(cma_src_addr(id_priv))) { + cma_any_addr(vnet, cma_src_addr(id_priv))) { rt->addr.dev_addr.dev_type = ARPHRD_INFINIBAND; rdma_addr_set_sgid(&rt->addr.dev_addr, &rt->path_rec[0].sgid); ib_addr_set_pkey(&rt->addr.dev_addr, be16_to_cpu(rt->path_rec[0].pkey)); - } else if (!cma_any_addr(cma_src_addr(id_priv))) { + } else if (!cma_any_addr(vnet, cma_src_addr(id_priv))) { ret = cma_translate_addr(cma_src_addr(id_priv), &rt->addr.dev_addr); if (ret) goto err; @@ -2097,10 +2120,10 @@ static struct rdma_id_private *cma_new_udp_id(struct rdma_cm_id *listen_id, struct rdma_id_private *id_priv; struct rdma_cm_id *id; const sa_family_t ss_family = listen_id->route.addr.src_addr.ss_family; - struct vnet *net = listen_id->route.addr.dev_addr.net; + struct vnet *vnet = listen_id->route.addr.dev_addr.net; int ret; - id = rdma_create_id(net, listen_id->event_handler, listen_id->context, + id = rdma_create_id(vnet, listen_id->event_handler, listen_id->context, listen_id->ps, IB_QPT_UD); if (IS_ERR(id)) return NULL; @@ -2117,7 +2140,7 @@ static struct rdma_id_private *cma_new_udp_id(struct rdma_cm_id *listen_id, if (ret) goto err; } else { - if (!cma_any_addr(cma_src_addr(id_priv))) { + if (!cma_any_addr(vnet, cma_src_addr(id_priv))) { ret = cma_translate_addr(cma_src_addr(id_priv), &id->route.addr.dev_addr); if (ret) @@ -3053,6 +3076,7 @@ int rdma_resolve_addr(struct rdma_cm_id *id, struct sockaddr *src_addr, struct sockaddr *dst_addr, int timeout_ms) { struct rdma_id_private *id_priv; + struct vnet *vnet = id->route.addr.dev_addr.net; int ret; id_priv = container_of(id, struct rdma_id_private, id); @@ -3070,7 +3094,7 @@ int rdma_resolve_addr(struct rdma_cm_id *id, struct sockaddr *src_addr, atomic_inc(&id_priv->refcount); memcpy(cma_dst_addr(id_priv), dst_addr, rdma_addr_size(dst_addr)); - if (cma_any_addr(dst_addr)) { + if (cma_any_addr(vnet, dst_addr)) { ret = cma_resolve_loopback(id_priv); } else { if (dst_addr->sa_family == AF_IB) { @@ -3235,6 +3259,7 @@ static int cma_check_port(struct rdma_bind_list *bind_list, { struct rdma_id_private *cur_id; struct sockaddr *addr, *cur_addr; + struct vnet *vnet; addr = cma_src_addr(id_priv); hlist_for_each_entry(cur_id, &bind_list->owners, node) { @@ -3250,7 +3275,8 @@ static int cma_check_port(struct rdma_bind_list *bind_list, (addr->sa_family != cur_addr->sa_family)) continue; - if (cma_any_addr(addr) || cma_any_addr(cur_addr)) + vnet = cur_id->id.route.addr.dev_addr.net; + if (cma_any_addr(vnet, addr) || cma_any_addr(vnet, cur_addr)) return -EADDRNOTAVAIL; if (!cma_addr_cmp(addr, cur_addr)) @@ -3441,6 +3467,7 @@ EXPORT_SYMBOL(rdma_listen); int rdma_bind_addr(struct rdma_cm_id *id, struct sockaddr *addr) { struct rdma_id_private *id_priv; + struct vnet *vnet = id->route.addr.dev_addr.net; int ret; if (addr->sa_family != AF_INET && addr->sa_family != AF_INET6 && @@ -3456,7 +3483,7 @@ int rdma_bind_addr(struct rdma_cm_id *id, struct sockaddr *addr) goto err1; memcpy(cma_src_addr(id_priv), addr, rdma_addr_size(addr)); - if (!cma_any_addr(addr)) { + if (!cma_any_addr(vnet, addr)) { ret = cma_translate_addr(addr, &id->route.addr.dev_addr); if (ret) goto err1; @@ -3471,7 +3498,7 @@ int rdma_bind_addr(struct rdma_cm_id *id, struct sockaddr *addr) id_priv->afonly = 1; #ifdef INET6 else if (addr->sa_family == AF_INET6) { - CURVNET_SET_QUIET(id_priv->id.route.addr.dev_addr.net); + CURVNET_SET_QUIET(vnet); id_priv->afonly = V_ip6_v6only; CURVNET_RESTORE(); } @@ -4099,7 +4126,7 @@ static void cma_set_mgid(struct rdma_id_private *id_priv, struct sockaddr_in *sin = (struct sockaddr_in *) addr; struct sockaddr_in6 *sin6 = (struct sockaddr_in6 *) addr; - if (cma_any_addr(addr)) { + if (cma_any_addr(dev_addr->net, addr)) { memset(mgid, 0, sizeof *mgid); } else if ((addr->sa_family == AF_INET6) && ((be32_to_cpu(sin6->sin6_addr.s6_addr32[0]) & 0xFFF0FFFF) == @@ -4247,13 +4274,13 @@ static void iboe_mcast_work_handler(struct work_struct *work) kfree(mw); } -static void cma_iboe_set_mgid(struct sockaddr *addr, union ib_gid *mgid, - enum ib_gid_type gid_type) +static void cma_iboe_set_mgid(struct vnet *vnet, struct sockaddr *addr, + union ib_gid *mgid, enum ib_gid_type gid_type) { struct sockaddr_in *sin = (struct sockaddr_in *)addr; struct sockaddr_in6 *sin6 = (struct sockaddr_in6 *)addr; - if (cma_any_addr(addr)) { + if (cma_any_addr(vnet, addr)) { memset(mgid, 0, sizeof *mgid); } else if (addr->sa_family == AF_INET6) { memcpy(mgid, &sin6->sin6_addr, sizeof *mgid); @@ -4304,7 +4331,7 @@ static int cma_iboe_join_multicast(struct rdma_id_private *id_priv, gid_type = id_priv->cma_dev->default_gid_type[id_priv->id.port_num - rdma_start_port(id_priv->cma_dev->device)]; - cma_iboe_set_mgid(addr, &mc->multicast.ib->rec.mgid, gid_type); + cma_iboe_set_mgid(dev_addr->net, addr, &mc->multicast.ib->rec.mgid, gid_type); mc->multicast.ib->rec.pkey = cpu_to_be16(0xffff); if (id_priv->id.ps == RDMA_PS_UDP)