Commit 559cf710 authored by Vlad Yasevich's avatar Vlad Yasevich Committed by David S. Miller
Browse files

[SCTP]: Convert bind_addr_list locking to RCU 



Since the sctp_sockaddr_entry is now RCU enabled as part of
the patch to synchronize sctp_localaddr_list, it makes sense to
change all handling of these entries to RCU.  This includes the
sctp_bind_addrs structure and it's list of bound addresses.

This list is currently protected by an external rw_lock and that
looks like an overkill.  There are only 2 writers to the list:
bind()/bindx() calls, and BH processing of ASCONF-ACK chunks.
These are already seriealized via the socket lock, so they will
not step on each other.  These are also relatively rare, so we
should be good with RCU.

The readers are varied and they are easily converted to RCU.

Signed-off-by: default avatarVlad Yasevich <vladislav.yasevich@hp.com>
Acked-by: default avatarPaul E. McKenney <paulmck@linux.vnet.ibm.com>
Acked-by: default avatarSridhar Samdurala <sri@us.ibm.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 29303547

include/net/sctp/structs.h

+3 −4
Original line number Original line Diff line number Diff line
@@ -1155,7 +1155,9 @@ int sctp_bind_addr_copy(struct sctp_bind_addr *dest, 
			int flags);

			int flags);

int sctp_add_bind_addr(struct sctp_bind_addr *, union sctp_addr *,

int sctp_add_bind_addr(struct sctp_bind_addr *, union sctp_addr *,

		       __u8 use_as_src, gfp_t gfp);

		       __u8 use_as_src, gfp_t gfp);

int sctp_del_bind_addr(struct sctp_bind_addr *, union sctp_addr *);

int sctp_del_bind_addr(struct sctp_bind_addr *, union sctp_addr *,

			void (*rcu_call)(struct rcu_head *,

					  void (*func)(struct rcu_head *)));

int sctp_bind_addr_match(struct sctp_bind_addr *, const union sctp_addr *,

int sctp_bind_addr_match(struct sctp_bind_addr *, const union sctp_addr *,

			 struct sctp_sock *);

			 struct sctp_sock *);

union sctp_addr *sctp_find_unmatch_addr(struct sctp_bind_addr	*bp,

union sctp_addr *sctp_find_unmatch_addr(struct sctp_bind_addr	*bp,
@@ -1226,9 +1228,6 @@ struct sctp_ep_common { 
	 * bind_addr.address_list is our set of local IP addresses.

	 * bind_addr.address_list is our set of local IP addresses.

	 */

	 */

	struct sctp_bind_addr bind_addr;

	struct sctp_bind_addr bind_addr;



	/* Protection during address list comparisons. */

	rwlock_t   addr_lock;

};

};

net/sctp/associola.c

+2 −12
Original line number Original line Diff line number Diff line
@@ -99,7 +99,6 @@ static struct sctp_association *sctp_association_init(struct sctp_association *a 




	/* Initialize the bind addr area.  */

	/* Initialize the bind addr area.  */

	sctp_bind_addr_init(&asoc->base.bind_addr, ep->base.bind_addr.port);

	sctp_bind_addr_init(&asoc->base.bind_addr, ep->base.bind_addr.port);

	rwlock_init(&asoc->base.addr_lock);





	asoc->state = SCTP_STATE_CLOSED;

	asoc->state = SCTP_STATE_CLOSED;
@@ -937,8 +936,6 @@ struct sctp_transport *sctp_assoc_is_match(struct sctp_association *asoc, 
{

{

	struct sctp_transport *transport;

	struct sctp_transport *transport;





	sctp_read_lock(&asoc->base.addr_lock);



	if ((htons(asoc->base.bind_addr.port) == laddr->v4.sin_port) &&

	if ((htons(asoc->base.bind_addr.port) == laddr->v4.sin_port) &&

	    (htons(asoc->peer.port) == paddr->v4.sin_port)) {

	    (htons(asoc->peer.port) == paddr->v4.sin_port)) {

		transport = sctp_assoc_lookup_paddr(asoc, paddr);

		transport = sctp_assoc_lookup_paddr(asoc, paddr);
@@ -952,7 +949,6 @@ struct sctp_transport *sctp_assoc_is_match(struct sctp_association *asoc, 
	transport = NULL;

	transport = NULL;





out:

out:

	sctp_read_unlock(&asoc->base.addr_lock);

	return transport;

	return transport;

}

}
@@ -1376,19 +1372,13 @@ int sctp_assoc_set_bind_addr_from_cookie(struct sctp_association *asoc, 
int sctp_assoc_lookup_laddr(struct sctp_association *asoc,

int sctp_assoc_lookup_laddr(struct sctp_association *asoc,

			    const union sctp_addr *laddr)

			    const union sctp_addr *laddr)

{

{

	int found;

	int found = 0;





	sctp_read_lock(&asoc->base.addr_lock);

	if ((asoc->base.bind_addr.port == ntohs(laddr->v4.sin_port)) &&

	if ((asoc->base.bind_addr.port == ntohs(laddr->v4.sin_port)) &&

	    sctp_bind_addr_match(&asoc->base.bind_addr, laddr,

	    sctp_bind_addr_match(&asoc->base.bind_addr, laddr,

				 sctp_sk(asoc->base.sk))) {

				 sctp_sk(asoc->base.sk)))

		found = 1;

		found = 1;

		goto out;

	}





	found = 0;

out:

	sctp_read_unlock(&asoc->base.addr_lock);

	return found;

	return found;

}

}

net/sctp/bind_addr.c

+45 −23
Original line number Original line Diff line number Diff line
@@ -167,7 +167,11 @@ int sctp_add_bind_addr(struct sctp_bind_addr *bp, union sctp_addr *new, 




	INIT_LIST_HEAD(&addr->list);

	INIT_LIST_HEAD(&addr->list);

	INIT_RCU_HEAD(&addr->rcu);

	INIT_RCU_HEAD(&addr->rcu);

	list_add_tail(&addr->list, &bp->address_list);



	/* We always hold a socket lock when calling this function,

	 * and that acts as a writer synchronizing lock.

	 */

	list_add_tail_rcu(&addr->list, &bp->address_list);

	SCTP_DBG_OBJCNT_INC(addr);

	SCTP_DBG_OBJCNT_INC(addr);





	return 0;

	return 0;
@@ -176,23 +180,35 @@ int sctp_add_bind_addr(struct sctp_bind_addr *bp, union sctp_addr *new, 
/* Delete an address from the bind address list in the SCTP_bind_addr

/* Delete an address from the bind address list in the SCTP_bind_addr

 * structure.

 * structure.

 */

 */

int sctp_del_bind_addr(struct sctp_bind_addr *bp, union sctp_addr *del_addr)

int sctp_del_bind_addr(struct sctp_bind_addr *bp, union sctp_addr *del_addr,

			void (*rcu_call)(struct rcu_head *head,

					 void (*func)(struct rcu_head *head)))

{

{

	struct list_head *pos, *temp;

	struct sctp_sockaddr_entry *addr, *temp;

	struct sctp_sockaddr_entry *addr;





	list_for_each_safe(pos, temp, &bp->address_list) {

	/* We hold the socket lock when calling this function,

		addr = list_entry(pos, struct sctp_sockaddr_entry, list);

	 * and that acts as a writer synchronizing lock.

	 */

	list_for_each_entry_safe(addr, temp, &bp->address_list, list) {

		if (sctp_cmp_addr_exact(&addr->a, del_addr)) {

		if (sctp_cmp_addr_exact(&addr->a, del_addr)) {

			/* Found the exact match. */

			/* Found the exact match. */

			list_del(pos);

			addr->valid = 0;

			kfree(addr);

			list_del_rcu(&addr->list);

			SCTP_DBG_OBJCNT_DEC(addr);

			break;



			return 0;

		}

		}

	}

	}





	/* Call the rcu callback provided in the args.  This function is

	 * called by both BH packet processing and user side socket option

	 * processing, but it works on different lists in those 2 contexts.

	 * Each context provides it's own callback, whether call_rcu_bh()

	 * or call_rcu(), to make sure that we wait for an appropriate time.

	 */

	if (addr && !addr->valid) {

		rcu_call(&addr->rcu, sctp_local_addr_free);

		SCTP_DBG_OBJCNT_DEC(addr);

	}



	return -EINVAL;

	return -EINVAL;

}

}
@@ -302,15 +318,20 @@ int sctp_bind_addr_match(struct sctp_bind_addr *bp, 
			 struct sctp_sock *opt)

			 struct sctp_sock *opt)

{

{

	struct sctp_sockaddr_entry *laddr;

	struct sctp_sockaddr_entry *laddr;

	struct list_head *pos;

	int match = 0;





	list_for_each(pos, &bp->address_list) {

	rcu_read_lock();

		laddr = list_entry(pos, struct sctp_sockaddr_entry, list);

	list_for_each_entry_rcu(laddr, &bp->address_list, list) {

		if (opt->pf->cmp_addr(&laddr->a, addr, opt))

		if (!laddr->valid)

			return 1;

			continue;

		if (opt->pf->cmp_addr(&laddr->a, addr, opt)) {

			match = 1;

			break;

		}

	}

	}

	rcu_read_unlock();





	return 0;

	return match;

}

}





/* Find the first address in the bind address list that is not present in

/* Find the first address in the bind address list that is not present in
@@ -325,18 +346,19 @@ union sctp_addr *sctp_find_unmatch_addr(struct sctp_bind_addr *bp, 
	union sctp_addr			*addr;

	union sctp_addr			*addr;

	void 				*addr_buf;

	void 				*addr_buf;

	struct sctp_af			*af;

	struct sctp_af			*af;

	struct list_head		*pos;

	int				i;

	int				i;





	list_for_each(pos, &bp->address_list) {

	/* This is only called sctp_send_asconf_del_ip() and we hold

		laddr = list_entry(pos, struct sctp_sockaddr_entry, list);

	 * the socket lock in that code patch, so that address list



	 * can't change.

	 */

	list_for_each_entry(laddr, &bp->address_list, list) {

		addr_buf = (union sctp_addr *)addrs;

		addr_buf = (union sctp_addr *)addrs;

		for (i = 0; i < addrcnt; i++) {

		for (i = 0; i < addrcnt; i++) {

			addr = (union sctp_addr *)addr_buf;

			addr = (union sctp_addr *)addr_buf;

			af = sctp_get_af_specific(addr->v4.sin_family);

			af = sctp_get_af_specific(addr->v4.sin_family);

			if (!af)

			if (!af)

				return NULL;

				break;





			if (opt->pf->cmp_addr(&laddr->a, addr, opt))

			if (opt->pf->cmp_addr(&laddr->a, addr, opt))

				break;

				break;

net/sctp/endpointola.c

+7 −20
Original line number Original line Diff line number Diff line
@@ -92,7 +92,6 @@ static struct sctp_endpoint *sctp_endpoint_init(struct sctp_endpoint *ep, 




	/* Initialize the bind addr area */

	/* Initialize the bind addr area */

	sctp_bind_addr_init(&ep->base.bind_addr, 0);

	sctp_bind_addr_init(&ep->base.bind_addr, 0);

	rwlock_init(&ep->base.addr_lock);





	/* Remember who we are attached to.  */

	/* Remember who we are attached to.  */

	ep->base.sk = sk;

	ep->base.sk = sk;
@@ -225,21 +224,14 @@ void sctp_endpoint_put(struct sctp_endpoint *ep) 
struct sctp_endpoint *sctp_endpoint_is_match(struct sctp_endpoint *ep,

struct sctp_endpoint *sctp_endpoint_is_match(struct sctp_endpoint *ep,

					       const union sctp_addr *laddr)

					       const union sctp_addr *laddr)

{

{

	struct sctp_endpoint *retval;

	struct sctp_endpoint *retval = NULL;





	sctp_read_lock(&ep->base.addr_lock);

	if (htons(ep->base.bind_addr.port) == laddr->v4.sin_port) {

	if (htons(ep->base.bind_addr.port) == laddr->v4.sin_port) {

		if (sctp_bind_addr_match(&ep->base.bind_addr, laddr,

		if (sctp_bind_addr_match(&ep->base.bind_addr, laddr,

					 sctp_sk(ep->base.sk))) {

					 sctp_sk(ep->base.sk)))

			retval = ep;

			retval = ep;

			goto out;

	}

	}

	}



	retval = NULL;





out:

	sctp_read_unlock(&ep->base.addr_lock);

	return retval;

	return retval;

}

}
@@ -261,9 +253,7 @@ static struct sctp_association *__sctp_endpoint_lookup_assoc( 
	list_for_each(pos, &ep->asocs) {

	list_for_each(pos, &ep->asocs) {

		asoc = list_entry(pos, struct sctp_association, asocs);

		asoc = list_entry(pos, struct sctp_association, asocs);

		if (rport == asoc->peer.port) {

		if (rport == asoc->peer.port) {

			sctp_read_lock(&asoc->base.addr_lock);

			*transport = sctp_assoc_lookup_paddr(asoc, paddr);

			*transport = sctp_assoc_lookup_paddr(asoc, paddr);

			sctp_read_unlock(&asoc->base.addr_lock);





			if (*transport)

			if (*transport)

				return asoc;

				return asoc;
@@ -295,20 +285,17 @@ struct sctp_association *sctp_endpoint_lookup_assoc( 
int sctp_endpoint_is_peeled_off(struct sctp_endpoint *ep,

int sctp_endpoint_is_peeled_off(struct sctp_endpoint *ep,

				const union sctp_addr *paddr)

				const union sctp_addr *paddr)

{

{

	struct list_head *pos;

	struct sctp_sockaddr_entry *addr;

	struct sctp_sockaddr_entry *addr;

	struct sctp_bind_addr *bp;

	struct sctp_bind_addr *bp;





	sctp_read_lock(&ep->base.addr_lock);

	bp = &ep->base.bind_addr;

	bp = &ep->base.bind_addr;

	list_for_each(pos, &bp->address_list) {

	/* This function is called with the socket lock held,

		addr = list_entry(pos, struct sctp_sockaddr_entry, list);

	 * so the address_list can not change.

		if (sctp_has_association(&addr->a, paddr)) {

	 */

			sctp_read_unlock(&ep->base.addr_lock);

	list_for_each_entry(addr, &bp->address_list, list) {

		if (sctp_has_association(&addr->a, paddr))

			return 1;

			return 1;

	}

	}

	}

	sctp_read_unlock(&ep->base.addr_lock);





	return 0;

	return 0;

}

}

net/sctp/ipv6.c

+5 −7
Original line number Original line Diff line number Diff line
@@ -302,9 +302,7 @@ static void sctp_v6_get_saddr(struct sctp_association *asoc, 
			      union sctp_addr *saddr)

			      union sctp_addr *saddr)

{

{

	struct sctp_bind_addr *bp;

	struct sctp_bind_addr *bp;

	rwlock_t *addr_lock;

	struct sctp_sockaddr_entry *laddr;

	struct sctp_sockaddr_entry *laddr;

	struct list_head *pos;

	sctp_scope_t scope;

	sctp_scope_t scope;

	union sctp_addr *baddr = NULL;

	union sctp_addr *baddr = NULL;

	__u8 matchlen = 0;

	__u8 matchlen = 0;
@@ -324,14 +322,14 @@ static void sctp_v6_get_saddr(struct sctp_association *asoc, 
	scope = sctp_scope(daddr);

	scope = sctp_scope(daddr);





	bp = &asoc->base.bind_addr;

	bp = &asoc->base.bind_addr;

	addr_lock = &asoc->base.addr_lock;





	/* Go through the bind address list and find the best source address

	/* Go through the bind address list and find the best source address

	 * that matches the scope of the destination address.

	 * that matches the scope of the destination address.

	 */

	 */

	sctp_read_lock(addr_lock);

	rcu_read_lock();

	list_for_each(pos, &bp->address_list) {

	list_for_each_entry_rcu(laddr, &bp->address_list, list) {

		laddr = list_entry(pos, struct sctp_sockaddr_entry, list);

		if (!laddr->valid)

			continue;

		if ((laddr->use_as_src) &&

		if ((laddr->use_as_src) &&

		    (laddr->a.sa.sa_family == AF_INET6) &&

		    (laddr->a.sa.sa_family == AF_INET6) &&

		    (scope <= sctp_scope(&laddr->a))) {

		    (scope <= sctp_scope(&laddr->a))) {
@@ -353,7 +351,7 @@ static void sctp_v6_get_saddr(struct sctp_association *asoc, 
		       __FUNCTION__, asoc, NIP6(daddr->v6.sin6_addr));

		       __FUNCTION__, asoc, NIP6(daddr->v6.sin6_addr));

	}

	}





	sctp_read_unlock(addr_lock);

	rcu_read_unlock();

}

}





/* Make a copy of all potential local addresses. */

/* Make a copy of all potential local addresses. */

CRA Git | Maintained and supported by SUSTech CRA and CCSE