Commit 4e7696d9 authored by Xin Long's avatar Xin Long Committed by David S. Miller
Browse files

sctp: get netns from asoc and ep base 



Commit 31243461 ("sctp: cache netns in sctp_ep_common") set netns
in asoc and ep base since they're created, and it will never change.
It's a better way to get netns from asoc and ep base, comparing to
calling sock_net().

This patch is to replace them.

v1->v2:
  - no change.

Suggested-by: default avatarMarcelo Ricardo Leitner <marcelo.leitner@gmail.com>
Signed-off-by: default avatarXin Long <lucien.xin@gmail.com>
Acked-by: default avatarNeil Horman <nhorman@tuxdriver.com>
Acked-by: default avatarMarcelo Ricardo Leitner <marcelo.leitner@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 26c97a2d

net/sctp/associola.c

+5 −5
Original line number Diff line number Diff line
@@ -584,7 +584,6 @@ struct sctp_transport *sctp_assoc_add_peer(struct sctp_association *asoc, 
					   const gfp_t gfp,

					   const int peer_state)

{

	struct net *net = sock_net(asoc->base.sk);

	struct sctp_transport *peer;

	struct sctp_sock *sp;

	unsigned short port;
@@ -614,7 +613,7 @@ struct sctp_transport *sctp_assoc_add_peer(struct sctp_association *asoc, 
		return peer;

	}



	peer = sctp_transport_new(net, addr, gfp);

	peer = sctp_transport_new(asoc->base.net, addr, gfp);

	if (!peer)

		return NULL;
@@ -974,7 +973,7 @@ static void sctp_assoc_bh_rcv(struct work_struct *work) 
	struct sctp_association *asoc =

		container_of(work, struct sctp_association,

			     base.inqueue.immediate);

	struct net *net = sock_net(asoc->base.sk);

	struct net *net = asoc->base.net;

	union sctp_subtype subtype;

	struct sctp_endpoint *ep;

	struct sctp_chunk *chunk;
@@ -1442,7 +1441,8 @@ void sctp_assoc_sync_pmtu(struct sctp_association *asoc) 
/* Should we send a SACK to update our peer? */

static inline bool sctp_peer_needs_update(struct sctp_association *asoc)

{

	struct net *net = sock_net(asoc->base.sk);

	struct net *net = asoc->base.net;



	switch (asoc->state) {

	case SCTP_STATE_ESTABLISHED:

	case SCTP_STATE_SHUTDOWN_PENDING:
@@ -1576,7 +1576,7 @@ int sctp_assoc_set_bind_addr_from_ep(struct sctp_association *asoc, 
	if (asoc->peer.ipv6_address)

		flags |= SCTP_ADDR6_PEERSUPP;



	return sctp_bind_addr_copy(sock_net(asoc->base.sk),

	return sctp_bind_addr_copy(asoc->base.net,

				   &asoc->base.bind_addr,

				   &asoc->ep->base.bind_addr,

				   scope, gfp, flags);

net/sctp/chunk.c

+1 −1
Original line number Diff line number Diff line
@@ -225,7 +225,7 @@ struct sctp_datamsg *sctp_datamsg_from_user(struct sctp_association *asoc, 
	if (msg_len >= first_len) {

		msg->can_delay = 0;

		if (msg_len > first_len)

			SCTP_INC_STATS(sock_net(asoc->base.sk),

			SCTP_INC_STATS(asoc->base.net,

				       SCTP_MIB_FRAGUSRMSGS);

	} else {

		/* Which may be the only one... */

net/sctp/endpointola.c

+3 −3
Original line number Diff line number Diff line
@@ -244,7 +244,7 @@ struct sctp_endpoint *sctp_endpoint_is_match(struct sctp_endpoint *ep, 
	struct sctp_endpoint *retval = NULL;



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

	    net_eq(sock_net(ep->base.sk), net)) {

	    net_eq(ep->base.net, net)) {

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

					 sctp_sk(ep->base.sk)))

			retval = ep;
@@ -292,8 +292,8 @@ bool sctp_endpoint_is_peeled_off(struct sctp_endpoint *ep, 
				 const union sctp_addr *paddr)

{

	struct sctp_sockaddr_entry *addr;

	struct net *net = ep->base.net;

	struct sctp_bind_addr *bp;

	struct net *net = sock_net(ep->base.sk);



	bp = &ep->base.bind_addr;

	/* This function is called with the socket lock held,
@@ -384,7 +384,7 @@ normal: 
		if (asoc && sctp_chunk_is_data(chunk))

			asoc->peer.last_data_from = chunk->transport;

		else {

			SCTP_INC_STATS(sock_net(ep->base.sk), SCTP_MIB_INCTRLCHUNKS);

			SCTP_INC_STATS(ep->base.net, SCTP_MIB_INCTRLCHUNKS);

			if (asoc)

				asoc->stats.ictrlchunks++;

		}

net/sctp/input.c

+2 −3
Original line number Diff line number Diff line
@@ -937,7 +937,7 @@ int sctp_hash_transport(struct sctp_transport *t) 
	if (t->asoc->temp)

		return 0;



	arg.net   = sock_net(t->asoc->base.sk);

	arg.net   = t->asoc->base.net;

	arg.paddr = &t->ipaddr;

	arg.lport = htons(t->asoc->base.bind_addr.port);
@@ -1004,12 +1004,11 @@ struct sctp_transport *sctp_epaddr_lookup_transport( 
				const struct sctp_endpoint *ep,

				const union sctp_addr *paddr)

{

	struct net *net = sock_net(ep->base.sk);

	struct rhlist_head *tmp, *list;

	struct sctp_transport *t;

	struct sctp_hash_cmp_arg arg = {

		.paddr = paddr,

		.net   = net,

		.net   = ep->base.net,

		.lport = htons(ep->base.bind_addr.port),

	};

net/sctp/output.c

+1 −1
Original line number Diff line number Diff line
@@ -282,7 +282,7 @@ static enum sctp_xmit sctp_packet_bundle_sack(struct sctp_packet *pkt, 
					sctp_chunk_free(sack);

					goto out;

				}

				SCTP_INC_STATS(sock_net(asoc->base.sk),

				SCTP_INC_STATS(asoc->base.net,

					       SCTP_MIB_OUTCTRLCHUNKS);

				asoc->stats.octrlchunks++;

				asoc->peer.sack_needed = 0;

CRA Git | Maintained and supported by SUSTech CRA and CCSE