Skip to contentSkip to conversation

sctp: RCU protection when accessing assoc members for procfs

PATCH In review Thomas Graf 4 participants 8 messages Dec 6, 2012 – Dec 7, 2012

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

v2 cover sctp: RCU protection when accessing assoc members for procfs

@Dave: This is a respin of the following patches:
[PATCH] sctp: proc: protect bind_addr->address_list accesses with rcu_read_lock() [PATCH] sctp: Add RCU protection to assoc->transport_addr_list

Thomas Graf (2):
sctp: proc: protect bind_addr->address_list accesses with

    rcu_read_lock()

sctp: Add RCU protection to assoc->transport_addr_list

 include/net/sctp/structs.h |  2 ++
 net/sctp/associola.c       |  6 +++---
 net/sctp/proc.c            | 21 ++++++++++++++++++---
 net/sctp/transport.c       | 18 +++++++++++++-----
 4 files changed, 36 insertions(+), 11 deletions(-)
Signature · 1 line
1.7.11.7
#1 lore raw

PATCH v2 1/2 sctp: proc: protect bind_addr->address_list accesses with rcu_read_lock()

From: Thomas Graf <[email protected]>

address_list is protected via the socket lock or RCU. Since we don't want to take the socket lock for each assoc we dump in procfs a RCU read-side critical section must be entered.

V2: Skip local addresses marked as dead

Cc Vlad Yasevich <[email protected]>
Cc Neil Horman <[email protected]>
---
 net/sctp/proc.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)
net/sctp/proc.c +6 -1
index 9966e7b..06b05ee 100644
@@ -139,7 +139,11 @@ static void sctp_seq_dump_local_addrs(struct seq_file *seq, struct sctp_ep_commo
 	    primary = &peer->saddr;
 	}
 
-	list_for_each_entry(laddr, &epb->bind_addr.address_list, list) {
+	rcu_read_lock();
+	list_for_each_entry_rcu(laddr, &epb->bind_addr.address_list, list) {
+		if (!laddr->valid)
+			continue;
+
 		addr = &laddr->a;
 		af = sctp_get_af_specific(addr->sa.sa_family);
 		if (primary && af->cmp_addr(addr, primary)) {
@@ -147,6 +151,7 @@ static void sctp_seq_dump_local_addrs(struct seq_file *seq, struct sctp_ep_commo
 		}
 		af->seq_dump_addr(seq, addr);
 	}
+	rcu_read_unlock();
 }
 
 /* Dump remote addresses of an association. */
Signature · 1 line
1.7.11.7
#4 lore raw

PATCH v2 2/2 sctp: Add RCU protection to assoc->transport_addr_list

In reply to Thomas Graf

peer.transport_addr_list is currently only protected by sk_sock which is inpractical to acquire for procfs dumping purposes.

This patch adds RCU protection allowing for the procfs readers to enter RCU read-side critical sections.

Modification of the list continues to be serialized via sk_lock.

V2: Use list_del_rcu() in sctp_association_free() to be safe
Skip transports marked dead when dumping for procfs

Cc Vlad Yasevich <[email protected]>
Cc Neil Horman <[email protected]>
---
 include/net/sctp/structs.h |  2 ++
 net/sctp/associola.c       |  6 +++---
 net/sctp/proc.c            | 14 ++++++++++++--
 net/sctp/transport.c       | 18 +++++++++++++-----
 4 files changed, 30 insertions(+), 10 deletions(-)
include/net/sctp/structs.h +2 -0
index 64158aa..5d6987b 100644
@@ -948,6 +948,8 @@ struct sctp_transport {
 
 	/* 64-bit random number sent with heartbeat. */
 	__u64 hb_nonce;
+
+	struct rcu_head rcu;
 };
 
 struct sctp_transport *sctp_transport_new(struct net *, const union sctp_addr *,
net/sctp/associola.c +3 -3
index b1ef3bc..81b1236 100644
@@ -445,7 +445,7 @@ void sctp_association_free(struct sctp_association *asoc)
 	/* Release the transport structures. */
 	list_for_each_safe(pos, temp, &asoc->peer.transport_addr_list) {
 		transport = list_entry(pos, struct sctp_transport, transports);
-		list_del(pos);
+		list_del_rcu(pos);
 		sctp_transport_free(transport);
 	}
 
@@ -565,7 +565,7 @@ void sctp_assoc_rm_peer(struct sctp_association *asoc,
 		sctp_assoc_update_retran_path(asoc);
 
 	/* Remove this peer from the list. */
-	list_del(&peer->transports);
+	list_del_rcu(&peer->transports);
 
 	/* Get the first transport of asoc. */
 	pos = asoc->peer.transport_addr_list.next;
@@ -765,7 +765,7 @@ struct sctp_transport *sctp_assoc_add_peer(struct sctp_association *asoc,
 	peer->state = peer_state;
 
 	/* Attach the remote transport to our asoc.  */
-	list_add_tail(&peer->transports, &asoc->peer.transport_addr_list);
+	list_add_tail_rcu(&peer->transports, &asoc->peer.transport_addr_list);
 	asoc->peer.transport_count++;
 
 	/* If we do not yet have a primary path, set one.  */
net/sctp/proc.c +12 -2
index 06b05ee..8c19e97 100644
@@ -162,15 +162,20 @@ static void sctp_seq_dump_remote_addrs(struct seq_file *seq, struct sctp_associa
 	struct sctp_af *af;
 
 	primary = &assoc->peer.primary_addr;
-	list_for_each_entry(transport, &assoc->peer.transport_addr_list,
+	rcu_read_lock();
+	list_for_each_entry_rcu(transport, &assoc->peer.transport_addr_list,
 			transports) {
 		addr = &transport->ipaddr;
+		if (transport->dead)
+			continue;
+
 		af = sctp_get_af_specific(addr->sa.sa_family);
 		if (af->cmp_addr(addr, primary)) {
 			seq_printf(seq, "*");
 		}
 		af->seq_dump_addr(seq, addr);
 	}
+	rcu_read_unlock();
 }
 
 static void * sctp_eps_seq_start(struct seq_file *seq, loff_t *pos)
@@ -441,12 +446,16 @@ static int sctp_remaddr_seq_show(struct seq_file *seq, void *v)
 	head = &sctp_assoc_hashtable[hash];
 	sctp_local_bh_disable();
 	read_lock(&head->lock);
+	rcu_read_lock();
 	sctp_for_each_hentry(epb, node, &head->chain) {
 		if (!net_eq(sock_net(epb->sk), seq_file_net(seq)))
 			continue;
 		assoc = sctp_assoc(epb);
-		list_for_each_entry(tsp, &assoc->peer.transport_addr_list,
+		list_for_each_entry_rcu(tsp, &assoc->peer.transport_addr_list,
 					transports) {
+			if (tsp->dead)
+				continue;
+
 			/*
 			 * The remote address (ADDR)
 			 */
@@ -492,6 +501,7 @@ static int sctp_remaddr_seq_show(struct seq_file *seq, void *v)
 		}
 	}
 
+	rcu_read_unlock();
 	read_unlock(&head->lock);
 	sctp_local_bh_enable();
 
net/sctp/transport.c +13 -5
index 206cf52..1295aec 100644
@@ -163,13 +163,11 @@ void sctp_transport_free(struct sctp_transport *transport)
 	sctp_transport_put(transport);
 }
 
-/* Destroy the transport data structure.
- * Assumes there are no more users of this structure.
- */
-static void sctp_transport_destroy(struct sctp_transport *transport)
+static void sctp_transport_destroy_rcu(struct rcu_head *head)
 {
-	SCTP_ASSERT(transport->dead, "Transport is not dead", return);
+	struct sctp_transport *transport;
 
+	transport = container_of(head, struct sctp_transport, rcu);
 	if (transport->asoc)
 		sctp_association_put(transport->asoc);
 
@@ -180,6 +178,16 @@ static void sctp_transport_destroy(struct sctp_transport *transport)
 	SCTP_DBG_OBJCNT_DEC(transport);
 }
 
+/* Destroy the transport data structure.
+ * Assumes there are no more users of this structure.
+ */
+static void sctp_transport_destroy(struct sctp_transport *transport)
+{
+	SCTP_ASSERT(transport->dead, "Transport is not dead", return);
+
+	call_rcu(&transport->rcu, sctp_transport_destroy_rcu);
+}
+
 /* Start T3_rtx timer if it is not already running and update the heartbeat
  * timer.  This routine is called every time a DATA chunk is sent.
  */
Signature · 1 line
1.7.11.7
Acked-by on v2 1/2
#2 lore raw

Re: [PATCH 1/2] sctp: proc: protect bind_addr->address_list accesses with rcu_read_lock()

In reply to Thomas Graf
Quoted 11 lines · Thomas Graf

From: Thomas Graf <[email protected]>

address_list is protected via the socket lock or RCU. Since we don't want to take the socket lock for each assoc we dump in procfs a RCU read-side critical section must be entered.

V2: Skip local addresses marked as dead

Cc Vlad Yasevich <[email protected]>
Cc Neil Horman <[email protected]>

-vlad

Quoted 30 lines
---
  net/sctp/proc.c | 7 ++++++-
  1 file changed, 6 insertions(+), 1 deletion(-)
net/sctp/proc.c +6 -1
index 9966e7b..06b05ee 100644
@@ -139,7 +139,11 @@ static void sctp_seq_dump_local_addrs(struct seq_file *seq, struct sctp_ep_commo
  	    primary = &peer->saddr;
  	}
 
-	list_for_each_entry(laddr, &epb->bind_addr.address_list, list) {
+	rcu_read_lock();
+	list_for_each_entry_rcu(laddr, &epb->bind_addr.address_list, list) {
+		if (!laddr->valid)
+			continue;
+
  		addr = &laddr->a;
  		af = sctp_get_af_specific(addr->sa.sa_family);
  		if (primary && af->cmp_addr(addr, primary)) {
@@ -147,6 +151,7 @@ static void sctp_seq_dump_local_addrs(struct seq_file *seq, struct sctp_ep_commo
  		}
  		af->seq_dump_addr(seq, addr);
  	}
+	rcu_read_unlock();
  }
 
  /* Dump remote addresses of an association. */
Acked-by on v2 2/2
#5 lore raw

Re: [PATCH 2/2] sctp: Add RCU protection to assoc->transport_addr_list

In reply to Thomas Graf
Quoted 6 lines · Thomas Graf

peer.transport_addr_list is currently only protected by sk_sock which is inpractical to acquire for procfs dumping purposes.

This patch adds RCU protection allowing for the procfs readers to enter RCU read-side critical sections.

Quoted 8 lines

Modification of the list continues to be serialized via sk_lock.

V2: Use list_del_rcu() in sctp_association_free() to be safe
Skip transports marked dead when dumping for procfs

Cc Vlad Yasevich <[email protected]>
Cc Neil Horman <[email protected]>

-vlad

Quoted 142 lines
---
  include/net/sctp/structs.h |  2 ++
  net/sctp/associola.c       |  6 +++---
  net/sctp/proc.c            | 14 ++++++++++++--
  net/sctp/transport.c       | 18 +++++++++++++-----
  4 files changed, 30 insertions(+), 10 deletions(-)
include/net/sctp/structs.h +2 -0
index 64158aa..5d6987b 100644
@@ -948,6 +948,8 @@ struct sctp_transport {
 
  	/* 64-bit random number sent with heartbeat. */
  	__u64 hb_nonce;
+
+	struct rcu_head rcu;
  };
 
  struct sctp_transport *sctp_transport_new(struct net *, const union sctp_addr *,
net/sctp/associola.c +3 -3
index b1ef3bc..81b1236 100644
@@ -445,7 +445,7 @@ void sctp_association_free(struct sctp_association *asoc)
  	/* Release the transport structures. */
  	list_for_each_safe(pos, temp, &asoc->peer.transport_addr_list) {
  		transport = list_entry(pos, struct sctp_transport, transports);
-		list_del(pos);
+		list_del_rcu(pos);
  		sctp_transport_free(transport);
  	}
 
@@ -565,7 +565,7 @@ void sctp_assoc_rm_peer(struct sctp_association *asoc,
  		sctp_assoc_update_retran_path(asoc);
 
  	/* Remove this peer from the list. */
-	list_del(&peer->transports);
+	list_del_rcu(&peer->transports);
 
  	/* Get the first transport of asoc. */
  	pos = asoc->peer.transport_addr_list.next;
@@ -765,7 +765,7 @@ struct sctp_transport *sctp_assoc_add_peer(struct sctp_association *asoc,
  	peer->state = peer_state;
 
  	/* Attach the remote transport to our asoc.  */
-	list_add_tail(&peer->transports, &asoc->peer.transport_addr_list);
+	list_add_tail_rcu(&peer->transports, &asoc->peer.transport_addr_list);
  	asoc->peer.transport_count++;
 
  	/* If we do not yet have a primary path, set one.  */
net/sctp/proc.c +12 -2
index 06b05ee..8c19e97 100644
@@ -162,15 +162,20 @@ static void sctp_seq_dump_remote_addrs(struct seq_file *seq, struct sctp_associa
  	struct sctp_af *af;
 
  	primary = &assoc->peer.primary_addr;
-	list_for_each_entry(transport, &assoc->peer.transport_addr_list,
+	rcu_read_lock();
+	list_for_each_entry_rcu(transport, &assoc->peer.transport_addr_list,
  			transports) {
  		addr = &transport->ipaddr;
+		if (transport->dead)
+			continue;
+
  		af = sctp_get_af_specific(addr->sa.sa_family);
  		if (af->cmp_addr(addr, primary)) {
  			seq_printf(seq, "*");
  		}
  		af->seq_dump_addr(seq, addr);
  	}
+	rcu_read_unlock();
  }
 
  static void * sctp_eps_seq_start(struct seq_file *seq, loff_t *pos)
@@ -441,12 +446,16 @@ static int sctp_remaddr_seq_show(struct seq_file *seq, void *v)
  	head = &sctp_assoc_hashtable[hash];
  	sctp_local_bh_disable();
  	read_lock(&head->lock);
+	rcu_read_lock();
  	sctp_for_each_hentry(epb, node, &head->chain) {
  		if (!net_eq(sock_net(epb->sk), seq_file_net(seq)))
  			continue;
  		assoc = sctp_assoc(epb);
-		list_for_each_entry(tsp, &assoc->peer.transport_addr_list,
+		list_for_each_entry_rcu(tsp, &assoc->peer.transport_addr_list,
  					transports) {
+			if (tsp->dead)
+				continue;
+
  			/*
  			 * The remote address (ADDR)
  			 */
@@ -492,6 +501,7 @@ static int sctp_remaddr_seq_show(struct seq_file *seq, void *v)
  		}
  	}
 
+	rcu_read_unlock();
  	read_unlock(&head->lock);
  	sctp_local_bh_enable();
 
net/sctp/transport.c +13 -5
index 206cf52..1295aec 100644
@@ -163,13 +163,11 @@ void sctp_transport_free(struct sctp_transport *transport)
  	sctp_transport_put(transport);
  }
 
-/* Destroy the transport data structure.
- * Assumes there are no more users of this structure.
- */
-static void sctp_transport_destroy(struct sctp_transport *transport)
+static void sctp_transport_destroy_rcu(struct rcu_head *head)
  {
-	SCTP_ASSERT(transport->dead, "Transport is not dead", return);
+	struct sctp_transport *transport;
 
+	transport = container_of(head, struct sctp_transport, rcu);
  	if (transport->asoc)
  		sctp_association_put(transport->asoc);
 
@@ -180,6 +178,16 @@ static void sctp_transport_destroy(struct sctp_transport *transport)
  	SCTP_DBG_OBJCNT_DEC(transport);
  }
 
+/* Destroy the transport data structure.
+ * Assumes there are no more users of this structure.
+ */
+static void sctp_transport_destroy(struct sctp_transport *transport)
+{
+	SCTP_ASSERT(transport->dead, "Transport is not dead", return);
+
+	call_rcu(&transport->rcu, sctp_transport_destroy_rcu);
+}
+
  /* Start T3_rtx timer if it is not already running and update the heartbeat
   * timer.  This routine is called every time a DATA chunk is sent.
   */
Acked-by
#3 lore raw

Re: [PATCH 1/2] sctp: proc: protect bind_addr->address_list accesses with rcu_read_lock()

In reply to Vlad Yasevich
Quoted 9 lines · Vlad Yasevich
Quoted 8 lines · Thomas Graf

From: Thomas Graf <[email protected]>

address_list is protected via the socket lock or RCU. Since we don't want to take the socket lock for each assoc we dump in procfs a RCU read-side critical section must be entered.

V2: Skip local addresses marked as dead

Quoted 8 lines
Quoted 3 lines
Cc Vlad Yasevich <[email protected]>
Cc Neil Horman <[email protected]>

-vlad

Quoted 32 lines
Quoted 30 lines
---
 net/sctp/proc.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)
net/sctp/proc.c +6 -1
index 9966e7b..06b05ee 100644
@@ -139,7 +139,11 @@ static void sctp_seq_dump_local_addrs(struct seq_file *seq, struct sctp_ep_commo
 	    primary = &peer->saddr;
 	}
 
-	list_for_each_entry(laddr, &epb->bind_addr.address_list, list) {
+	rcu_read_lock();
+	list_for_each_entry_rcu(laddr, &epb->bind_addr.address_list, list) {
+		if (!laddr->valid)
+			continue;
+
 		addr = &laddr->a;
 		af = sctp_get_af_specific(addr->sa.sa_family);
 		if (primary && af->cmp_addr(addr, primary)) {
@@ -147,6 +151,7 @@ static void sctp_seq_dump_local_addrs(struct seq_file *seq, struct sctp_ep_commo
 		}
 		af->seq_dump_addr(seq, addr);
 	}
+	rcu_read_unlock();
 }
 
 /* Dump remote addresses of an association. */
Acked-by
#6 lore raw

Re: [PATCH 2/2] sctp: Add RCU protection to assoc->transport_addr_list

In reply to Vlad Yasevich
Quoted 12 lines · Vlad Yasevich
Quoted 11 lines · Thomas Graf

peer.transport_addr_list is currently only protected by sk_sock which is inpractical to acquire for procfs dumping purposes.

This patch adds RCU protection allowing for the procfs readers to enter RCU read-side critical sections.

Modification of the list continues to be serialized via sk_lock.

V2: Use list_del_rcu() in sctp_association_free() to be safe
Skip transports marked dead when dumping for procfs

Quoted 8 lines
Quoted 3 lines
Cc Vlad Yasevich <[email protected]>
Cc Neil Horman <[email protected]>

-vlad

Quoted 144 lines
Quoted 142 lines
---
 include/net/sctp/structs.h |  2 ++
 net/sctp/associola.c       |  6 +++---
 net/sctp/proc.c            | 14 ++++++++++++--
 net/sctp/transport.c       | 18 +++++++++++++-----
 4 files changed, 30 insertions(+), 10 deletions(-)
include/net/sctp/structs.h +2 -0
index 64158aa..5d6987b 100644
@@ -948,6 +948,8 @@ struct sctp_transport {
 
 	/* 64-bit random number sent with heartbeat. */
 	__u64 hb_nonce;
+
+	struct rcu_head rcu;
 };
 
 struct sctp_transport *sctp_transport_new(struct net *, const union sctp_addr *,
net/sctp/associola.c +3 -3
index b1ef3bc..81b1236 100644
@@ -445,7 +445,7 @@ void sctp_association_free(struct sctp_association *asoc)
 	/* Release the transport structures. */
 	list_for_each_safe(pos, temp, &asoc->peer.transport_addr_list) {
 		transport = list_entry(pos, struct sctp_transport, transports);
-		list_del(pos);
+		list_del_rcu(pos);
 		sctp_transport_free(transport);
 	}
 
@@ -565,7 +565,7 @@ void sctp_assoc_rm_peer(struct sctp_association *asoc,
 		sctp_assoc_update_retran_path(asoc);
 
 	/* Remove this peer from the list. */
-	list_del(&peer->transports);
+	list_del_rcu(&peer->transports);
 
 	/* Get the first transport of asoc. */
 	pos = asoc->peer.transport_addr_list.next;
@@ -765,7 +765,7 @@ struct sctp_transport *sctp_assoc_add_peer(struct sctp_association *asoc,
 	peer->state = peer_state;
 
 	/* Attach the remote transport to our asoc.  */
-	list_add_tail(&peer->transports, &asoc->peer.transport_addr_list);
+	list_add_tail_rcu(&peer->transports, &asoc->peer.transport_addr_list);
 	asoc->peer.transport_count++;
 
 	/* If we do not yet have a primary path, set one.  */
net/sctp/proc.c +12 -2
index 06b05ee..8c19e97 100644
@@ -162,15 +162,20 @@ static void sctp_seq_dump_remote_addrs(struct seq_file *seq, struct sctp_associa
 	struct sctp_af *af;
 
 	primary = &assoc->peer.primary_addr;
-	list_for_each_entry(transport, &assoc->peer.transport_addr_list,
+	rcu_read_lock();
+	list_for_each_entry_rcu(transport, &assoc->peer.transport_addr_list,
 			transports) {
 		addr = &transport->ipaddr;
+		if (transport->dead)
+			continue;
+
 		af = sctp_get_af_specific(addr->sa.sa_family);
 		if (af->cmp_addr(addr, primary)) {
 			seq_printf(seq, "*");
 		}
 		af->seq_dump_addr(seq, addr);
 	}
+	rcu_read_unlock();
 }
 
 static void * sctp_eps_seq_start(struct seq_file *seq, loff_t *pos)
@@ -441,12 +446,16 @@ static int sctp_remaddr_seq_show(struct seq_file *seq, void *v)
 	head = &sctp_assoc_hashtable[hash];
 	sctp_local_bh_disable();
 	read_lock(&head->lock);
+	rcu_read_lock();
 	sctp_for_each_hentry(epb, node, &head->chain) {
 		if (!net_eq(sock_net(epb->sk), seq_file_net(seq)))
 			continue;
 		assoc = sctp_assoc(epb);
-		list_for_each_entry(tsp, &assoc->peer.transport_addr_list,
+		list_for_each_entry_rcu(tsp, &assoc->peer.transport_addr_list,
 					transports) {
+			if (tsp->dead)
+				continue;
+
 			/*
 			 * The remote address (ADDR)
 			 */
@@ -492,6 +501,7 @@ static int sctp_remaddr_seq_show(struct seq_file *seq, void *v)
 		}
 	}
 
+	rcu_read_unlock();
 	read_unlock(&head->lock);
 	sctp_local_bh_enable();
 
net/sctp/transport.c +13 -5
index 206cf52..1295aec 100644
@@ -163,13 +163,11 @@ void sctp_transport_free(struct sctp_transport *transport)
 	sctp_transport_put(transport);
 }
 
-/* Destroy the transport data structure.
- * Assumes there are no more users of this structure.
- */
-static void sctp_transport_destroy(struct sctp_transport *transport)
+static void sctp_transport_destroy_rcu(struct rcu_head *head)
 {
-	SCTP_ASSERT(transport->dead, "Transport is not dead", return);
+	struct sctp_transport *transport;
 
+	transport = container_of(head, struct sctp_transport, rcu);
 	if (transport->asoc)
 		sctp_association_put(transport->asoc);
 
@@ -180,6 +178,16 @@ static void sctp_transport_destroy(struct sctp_transport *transport)
 	SCTP_DBG_OBJCNT_DEC(transport);
 }
 
+/* Destroy the transport data structure.
+ * Assumes there are no more users of this structure.
+ */
+static void sctp_transport_destroy(struct sctp_transport *transport)
+{
+	SCTP_ASSERT(transport->dead, "Transport is not dead", return);
+
+	call_rcu(&transport->rcu, sctp_transport_destroy_rcu);
+}
+
 /* Start T3_rtx timer if it is not already running and update the heartbeat
  * timer.  This routine is called every time a DATA chunk is sent.
  */
maintainer
#7 lore raw
In reply to Thomas Graf

From: Thomas Graf <[email protected]>
Date: Thu, 6 Dec 2012 20:25:03 +0100

Quoted 8 lines

@Dave: This is a respin of the following patches:
[PATCH] sctp: proc: protect bind_addr->address_list accesses with rcu_read_lock() [PATCH] sctp: Add RCU protection to assoc->transport_addr_list

Thomas Graf (2):
sctp: proc: protect bind_addr->address_list accesses with

    rcu_read_lock()

sctp: Add RCU protection to assoc->transport_addr_list

Series applied, thanks.