Revert "net/rds: Restrict use of RDS/IB to the initial network namespace"

This reverts commit b1fba694da4336e03af7147e4b14ea947f5c3e04.

Orabug: 35811116

Signed-off-by: Greg Jumper <[email protected]>
Reviewed-by: Sharath Srinivasan <[email protected]>

Author: Greg Jumper

net/rds/af_rds.c

@@ -640,8 +640,8 @@ static int rds6_user_reset(struct rds_sock *rs, sockptr_t optval, int optlen)
 }
 #endif
 
-static int rds_set_transport(struct net *net, struct rds_sock *rs,
-			     sockptr_t optval, int optlen)
+static int rds_set_transport(struct rds_sock *rs, sockptr_t optval,
+			     int optlen)
 {
 	int t_type;
 
@@ -657,10 +657,6 @@ static int rds_set_transport(struct net *net, struct rds_sock *rs,
 	if (t_type < 0 || t_type >= RDS_TRANS_COUNT)
 		return -EINVAL;
 
-	/* Only RDS/TCP supports non-initial network namespaces */
-	if (t_type != RDS_TRANS_TCP && !net_eq(net, &init_net))
-		return -EPROTOTYPE;
-
 	rs->rs_transport = rds_trans_get(t_type);
 
 	return rs->rs_transport ? 0 : -ENOPROTOOPT;
@@ -763,7 +759,7 @@ static int rds_setsockopt(struct socket *sock, int level, int optname,
 #endif
 	case SO_RDS_TRANSPORT:
 		lock_sock(sock->sk);
-		ret = rds_set_transport(net, rs, optval, optlen);
+		ret = rds_set_transport(rs, optval, optlen);
 		release_sock(sock->sk);
 		break;
 	case SO_TIMESTAMP_OLD:

net/rds/ib.c

@@ -1161,13 +1161,8 @@ static int rds_ib_laddr_check_cm(struct net *net, const struct in6_addr *addr,
 static int rds_ib_laddr_check(struct net *net, const struct in6_addr *addr,
 			      __u32 scope_id)
 {
-	struct rds_ib_device *rds_ibdev;
-
-	/* RDS/IB is only supported in the initial network namespace */
-	if (!net_eq(net, &init_net))
-		return -EPROTOTYPE;
+	struct rds_ib_device *rds_ibdev = rds_ib_get_device(addr);
 
-	rds_ibdev = rds_ib_get_device(addr);
 	if (rds_ibdev) {
 		rds_ib_dev_put(rds_ibdev);