[rds-devel] [PATCH 08/19] RDS congestions, we have to bind all those stuff except cong_generation to network namespace for statistics purpose. - Bind congestion rbtree/monitor list as well as locks to netns. - Teach rds_cong_wait() aware of struct net. - Make other transports interfaces can be compiled with this change.
Jie Liu
jeff.liu at oracle.com
Sun Oct 7 05:14:07 PDT 2012
Signed-off-by: Jie Liu <jeff.liu at oracle.com>
---
include/net/netns/rds.h | 6 ++
net/rds/af_rds.c | 24 +++++---
net/rds/cong.c | 142 ++++++++++++++++++++++++++---------------------
net/rds/ib_recv.c | 3 +-
net/rds/ib_send.c | 3 +-
net/rds/iw_recv.c | 5 +-
net/rds/loop.c | 2 +-
net/rds/rds.h | 10 ++-
net/rds/recv.c | 5 +-
net/rds/send.c | 5 +-
net/rds/tcp_recv.c | 3 +-
11 files changed, 122 insertions(+), 86 deletions(-)
diff --git a/include/net/netns/rds.h b/include/net/netns/rds.h
index 2b47f43..6712fe3 100644
--- a/include/net/netns/rds.h
+++ b/include/net/netns/rds.h
@@ -13,6 +13,12 @@ struct netns_rds {
/* loopback transport */
struct list_head loop_conns;
spinlock_t loop_conns_lock;
+
+ /* congestions */
+ struct rb_root rds_cong_tree;
+ spinlock_t rds_cong_lock;
+ struct list_head rds_cong_monitor;
+ rwlock_t rds_cong_monitor_lock;
};
#endif
diff --git a/net/rds/af_rds.c b/net/rds/af_rds.c
index 21c0bb4..cde87df 100644
--- a/net/rds/af_rds.c
+++ b/net/rds/af_rds.c
@@ -180,9 +180,11 @@ static unsigned int rds_poll(struct file *file, struct socket *sock,
read_lock_irqsave(&rs->rs_recv_lock, flags);
if (!rs->rs_cong_monitor) {
- /* When a congestion map was updated, we signal POLLIN for
+ /*
+ * When a congestion map was updated, we signal POLLIN for
* "historical" reasons. Applications can also poll for
- * WRBAND instead. */
+ * WRBAND instead.
+ */
if (rds_cong_updated_since(&rs->rs_cong_track))
mask |= (POLLIN | POLLRDNORM | POLLWRBAND);
} else {
@@ -198,7 +200,7 @@ static unsigned int rds_poll(struct file *file, struct socket *sock,
mask |= (POLLOUT | POLLWRNORM);
read_unlock_irqrestore(&rs->rs_recv_lock, flags);
- /* clear state any time we wake a seen-congested socket */
+ /* Clear state any time we wake a seen-congested socket */
if (mask)
rs->rs_seen_congestion = 0;
@@ -216,7 +218,7 @@ static int rds_cancel_sent_to(struct rds_sock *rs, char __user *optval,
struct sockaddr_in sin;
int ret = 0;
- /* racing with another thread binding seems ok here */
+ /* Racing with another thread binding seems ok here */
if (rs->rs_bound_addr == 0) {
ret = -ENOTCONN; /* XXX not a great errno */
goto out;
@@ -530,20 +532,26 @@ out:
}
/*
- * Initialize per network namespace variables and data structures.
- * - rds related list, lock, statistics variables
+ * Initialize per network namespace variables and data structures, includes:
+ * - RDS related list, lock, statistics variables
+ * - Congestions
*/
static int __net_init rds_pernet_init(struct net *net)
{
+ int ret;
+
INIT_LIST_HEAD(&net->rds.rds_sock_list);
spin_lock_init(&net->rds.rds_sock_lock);
net->rds.rds_sock_count = 0;
- return 0;
+ ret = rds_cong_init(net);
+
+ return ret;
}
static void __net_exit rds_pernet_exit(struct net *net)
{
+ rds_cong_exit(net);
}
static struct pernet_operations __net_initdata rds_net_ops = {
@@ -567,7 +575,6 @@ static void rds_exit(void)
proto_unregister(&rds_proto);
rds_loop_exit();
rds_conn_exit();
- rds_cong_exit();
rds_sysctl_exit();
rds_net_exit();
rds_threads_exit();
@@ -631,7 +638,6 @@ out_threads:
rds_threads_exit();
out_conn:
rds_conn_exit();
- rds_cong_exit();
rds_page_exit();
out_loop:
rds_loop_exit();
diff --git a/net/rds/cong.c b/net/rds/cong.c
index e5b65ac..585415e 100644
--- a/net/rds/cong.c
+++ b/net/rds/cong.c
@@ -78,33 +78,13 @@
* finds that the saved generation number is smaller than the global generation
* number, it wakes up the process.
*/
-static atomic_t rds_cong_generation = ATOMIC_INIT(0);
+static atomic_t rds_cong_generation = ATOMIC_INIT(0);
-/*
- * Congestion monitoring
- */
-static LIST_HEAD(rds_cong_monitor);
-static DEFINE_RWLOCK(rds_cong_monitor_lock);
-
-/*
- * Yes, a global lock. It's used so infrequently that it's worth keeping it
- * global to simplify the locking. It's only used in the following
- * circumstances:
- *
- * - on connection buildup to associate a conn with its maps
- * - on map changes to inform conns of a new map to send
- *
- * It's sadly ordered under the socket callback lock and the connection lock.
- * Receive paths can mark ports congested from interrupt context so the
- * lock masks interrupts.
- */
-static DEFINE_SPINLOCK(rds_cong_lock);
-static struct rb_root rds_cong_tree = RB_ROOT;
-
-static struct rds_cong_map *rds_cong_tree_walk(__be32 addr,
+static struct rds_cong_map *rds_cong_tree_walk(struct rb_root *rds_cong_tree,
+ __be32 addr,
struct rds_cong_map *insert)
{
- struct rb_node **p = &rds_cong_tree.rb_node;
+ struct rb_node **p = &rds_cong_tree->rb_node;
struct rb_node *parent = NULL;
struct rds_cong_map *map;
@@ -122,7 +102,7 @@ static struct rds_cong_map *rds_cong_tree_walk(__be32 addr,
if (insert) {
rb_link_node(&insert->m_rb_node, parent, p);
- rb_insert_color(&insert->m_rb_node, &rds_cong_tree);
+ rb_insert_color(&insert->m_rb_node, rds_cong_tree);
}
return NULL;
}
@@ -132,10 +112,10 @@ static struct rds_cong_map *rds_cong_tree_walk(__be32 addr,
* these bitmaps in the process getting pointers to them. The bitmaps are only
* ever freed as the module is removed after all connections have been freed.
*/
-static struct rds_cong_map *rds_cong_from_addr(__be32 addr)
+static struct rds_cong_map *rds_cong_from_addr(struct net *net, __be32 addr)
{
- struct rds_cong_map *map;
struct rds_cong_map *ret = NULL;
+ struct rds_cong_map *map;
unsigned long zp;
unsigned long i;
unsigned long flags;
@@ -155,9 +135,9 @@ static struct rds_cong_map *rds_cong_from_addr(__be32 addr)
map->m_page_addrs[i] = zp;
}
- spin_lock_irqsave(&rds_cong_lock, flags);
- ret = rds_cong_tree_walk(addr, map);
- spin_unlock_irqrestore(&rds_cong_lock, flags);
+ spin_lock_irqsave(&net->rds.rds_cong_lock, flags);
+ ret = rds_cong_tree_walk(&net->rds.rds_cong_tree, addr, map);
+ spin_unlock_irqrestore(&net->rds.rds_cong_lock, flags);
if (!ret) {
ret = map;
@@ -182,28 +162,32 @@ out:
*/
void rds_cong_add_conn(struct rds_connection *conn)
{
+ struct net *net = rds_conn_to_net(conn);
unsigned long flags;
rdsdebug("conn %p now on map %p\n", conn, conn->c_lcong);
- spin_lock_irqsave(&rds_cong_lock, flags);
+ spin_lock_irqsave(&net->rds.rds_cong_lock, flags);
list_add_tail(&conn->c_map_item, &conn->c_lcong->m_conn_list);
- spin_unlock_irqrestore(&rds_cong_lock, flags);
+ spin_unlock_irqrestore(&net->rds.rds_cong_lock, flags);
}
void rds_cong_remove_conn(struct rds_connection *conn)
{
+ struct net *net = rds_conn_to_net(conn);
unsigned long flags;
rdsdebug("removing conn %p from map %p\n", conn, conn->c_lcong);
- spin_lock_irqsave(&rds_cong_lock, flags);
+ spin_lock_irqsave(&net->rds.rds_cong_lock, flags);
list_del_init(&conn->c_map_item);
- spin_unlock_irqrestore(&rds_cong_lock, flags);
+ spin_unlock_irqrestore(&net->rds.rds_cong_lock, flags);
}
int rds_cong_get_maps(struct rds_connection *conn)
{
- conn->c_lcong = rds_cong_from_addr(conn->c_laddr);
- conn->c_fcong = rds_cong_from_addr(conn->c_faddr);
+ struct net *net = rds_conn_to_net(conn);
+
+ conn->c_lcong = rds_cong_from_addr(net, conn->c_laddr);
+ conn->c_fcong = rds_cong_from_addr(net, conn->c_faddr);
if (!(conn->c_lcong && conn->c_fcong))
return -ENOMEM;
@@ -211,12 +195,12 @@ int rds_cong_get_maps(struct rds_connection *conn)
return 0;
}
-void rds_cong_queue_updates(struct rds_cong_map *map)
+void rds_cong_queue_updates(struct net *net, struct rds_cong_map *map)
{
struct rds_connection *conn;
unsigned long flags;
- spin_lock_irqsave(&rds_cong_lock, flags);
+ spin_lock_irqsave(&net->rds.rds_cong_lock, flags);
list_for_each_entry(conn, &map->m_conn_list, c_map_item) {
if (!test_and_set_bit(0, &conn->c_map_queued)) {
@@ -225,26 +209,32 @@ void rds_cong_queue_updates(struct rds_cong_map *map)
}
}
- spin_unlock_irqrestore(&rds_cong_lock, flags);
+ spin_unlock_irqrestore(&net->rds.rds_cong_lock, flags);
}
-void rds_cong_map_updated(struct rds_cong_map *map, uint64_t portmask)
+void rds_cong_map_updated(struct net *net, struct rds_cong_map *map,
+ uint64_t portmask)
{
- rdsdebug("waking map %p for %pI4\n",
- map, &map->m_addr);
+ struct list_head *rds_cong_monitor = &net->rds.rds_cong_monitor;
+
+ rdsdebug("waking map %p for %pI4\n", map, &map->m_addr);
+
rds_stats_inc(s_cong_update_received);
+
atomic_inc(&rds_cong_generation);
+
if (waitqueue_active(&map->m_waitq))
wake_up(&map->m_waitq);
+
if (waitqueue_active(&rds_poll_waitq))
wake_up_all(&rds_poll_waitq);
- if (portmask && !list_empty(&rds_cong_monitor)) {
+ if (portmask && !list_empty(rds_cong_monitor)) {
unsigned long flags;
struct rds_sock *rs;
- read_lock_irqsave(&rds_cong_monitor_lock, flags);
- list_for_each_entry(rs, &rds_cong_monitor, rs_cong_list) {
+ read_lock_irqsave(&net->rds.rds_cong_monitor_lock, flags);
+ list_for_each_entry(rs, rds_cong_monitor, rs_cong_list) {
spin_lock(&rs->rs_lock);
rs->rs_cong_notify |= (rs->rs_cong_mask & portmask);
rs->rs_cong_mask &= ~portmask;
@@ -252,7 +242,7 @@ void rds_cong_map_updated(struct rds_cong_map *map, uint64_t portmask)
if (rs->rs_cong_notify)
rds_wake_sk_sleep(rs);
}
- read_unlock_irqrestore(&rds_cong_monitor_lock, flags);
+ read_unlock_irqrestore(&net->rds.rds_cong_monitor_lock, flags);
}
}
EXPORT_SYMBOL_GPL(rds_cong_map_updated);
@@ -263,6 +253,7 @@ int rds_cong_updated_since(unsigned long *recent)
if (likely(*recent == gen))
return 0;
+
*recent = gen;
return 1;
}
@@ -280,7 +271,7 @@ void rds_cong_set_bit(struct rds_cong_map *map, __be16 port)
unsigned long off;
rdsdebug("setting congestion for %pI4:%u in map %p\n",
- &map->m_addr, ntohs(port), map);
+ &map->m_addr, ntohs(port), map);
i = be16_to_cpu(port) / RDS_CONG_MAP_PAGE_BITS;
off = be16_to_cpu(port) % RDS_CONG_MAP_PAGE_BITS;
@@ -294,7 +285,7 @@ void rds_cong_clear_bit(struct rds_cong_map *map, __be16 port)
unsigned long off;
rdsdebug("clearing congestion for %pI4:%u in map %p\n",
- &map->m_addr, ntohs(port), map);
+ &map->m_addr, ntohs(port), map);
i = be16_to_cpu(port) / RDS_CONG_MAP_PAGE_BITS;
off = be16_to_cpu(port) % RDS_CONG_MAP_PAGE_BITS;
@@ -315,36 +306,39 @@ static int rds_cong_test_bit(struct rds_cong_map *map, __be16 port)
void rds_cong_add_socket(struct rds_sock *rs)
{
+ struct net *net = sock_net(&rs->rs_sk);
unsigned long flags;
- write_lock_irqsave(&rds_cong_monitor_lock, flags);
+ write_lock_irqsave(&net->rds.rds_cong_monitor_lock, flags);
if (list_empty(&rs->rs_cong_list))
- list_add(&rs->rs_cong_list, &rds_cong_monitor);
- write_unlock_irqrestore(&rds_cong_monitor_lock, flags);
+ list_add(&rs->rs_cong_list, &net->rds.rds_cong_monitor);
+ write_unlock_irqrestore(&net->rds.rds_cong_monitor_lock, flags);
}
void rds_cong_remove_socket(struct rds_sock *rs)
{
- unsigned long flags;
+ struct net *net = sock_net(&rs->rs_sk);
+ struct rb_root *rds_cong_tree = &net->rds.rds_cong_tree;
struct rds_cong_map *map;
+ unsigned long flags;
- write_lock_irqsave(&rds_cong_monitor_lock, flags);
+ write_lock_irqsave(&net->rds.rds_cong_monitor_lock, flags);
list_del_init(&rs->rs_cong_list);
- write_unlock_irqrestore(&rds_cong_monitor_lock, flags);
+ write_unlock_irqrestore(&net->rds.rds_cong_monitor_lock, flags);
/* update congestion map for now-closed port */
- spin_lock_irqsave(&rds_cong_lock, flags);
- map = rds_cong_tree_walk(rs->rs_bound_addr, NULL);
- spin_unlock_irqrestore(&rds_cong_lock, flags);
+ spin_lock_irqsave(&net->rds.rds_cong_lock, flags);
+ map = rds_cong_tree_walk(rds_cong_tree, rs->rs_bound_addr, NULL);
+ spin_unlock_irqrestore(&net->rds.rds_cong_lock, flags);
if (map && rds_cong_test_bit(map, rs->rs_bound_port)) {
rds_cong_clear_bit(map, rs->rs_bound_port);
- rds_cong_queue_updates(map);
+ rds_cong_queue_updates(net, map);
}
}
-int rds_cong_wait(struct rds_cong_map *map, __be16 port, int nonblock,
- struct rds_sock *rs)
+int rds_cong_wait(struct net *net, struct rds_cong_map *map,
+ __be16 port, int nonblock, struct rds_sock *rs)
{
if (!rds_cong_test_bit(map, port))
return 0;
@@ -374,16 +368,16 @@ int rds_cong_wait(struct rds_cong_map *map, __be16 port, int nonblock,
!rds_cong_test_bit(map, port));
}
-void rds_cong_exit(void)
+void rds_cong_exit(struct net *net)
{
struct rb_node *node;
struct rds_cong_map *map;
unsigned long i;
- while ((node = rb_first(&rds_cong_tree))) {
+ while ((node = rb_first(&net->rds.rds_cong_tree))) {
map = rb_entry(node, struct rds_cong_map, m_rb_node);
rdsdebug("freeing map %p\n", map);
- rb_erase(&map->m_rb_node, &rds_cong_tree);
+ rb_erase(&map->m_rb_node, &net->rds.rds_cong_tree);
for (i = 0; i < RDS_CONG_MAP_PAGES && map->m_page_addrs[i]; i++)
free_page(map->m_page_addrs[i]);
kfree(map);
@@ -391,6 +385,28 @@ void rds_cong_exit(void)
}
/*
+ * Yes, a global lock per network namespace. It's used so infrequently that
+ * it's worth keeping it global to simplify the locking. It's only used in
+ * the following circumstances:
+ *
+ * - on connection buildup to associate a conn with its maps
+ * - on map changes to inform conns of a new map to send
+ *
+ * It's sadly ordered under the socket callback lock and the connection lock.
+ * Receive paths can mark ports congested from interrupt context so the
+ * lock masks interrupts.
+ */
+int rds_cong_init(struct net *net)
+{
+ spin_lock_init(&net->rds.rds_cong_lock);
+ net->rds.rds_cong_tree = RB_ROOT;
+ rwlock_init(&net->rds.rds_cong_monitor_lock);
+ INIT_LIST_HEAD(&net->rds.rds_cong_monitor);
+
+ return 0;
+}
+
+/*
* Allocate a RDS message containing a congestion update.
*/
struct rds_message *rds_cong_update_alloc(struct rds_connection *conn)
diff --git a/net/rds/ib_recv.c b/net/rds/ib_recv.c
index 8d19491..6053182 100644
--- a/net/rds/ib_recv.c
+++ b/net/rds/ib_recv.c
@@ -733,6 +733,7 @@ u64 rds_ib_piggyb_ack(struct rds_ib_connection *ic)
static void rds_ib_cong_recv(struct rds_connection *conn,
struct rds_ib_incoming *ibinc)
{
+ struct net *net = rds_conn_to_net(conn);
struct rds_cong_map *map;
unsigned int map_off;
unsigned int map_page;
@@ -794,7 +795,7 @@ static void rds_ib_cong_recv(struct rds_connection *conn,
/* the congestion map is in little endian order */
uncongested = le64_to_cpu(uncongested);
- rds_cong_map_updated(map, uncongested);
+ rds_cong_map_updated(net, map, uncongested);
}
/*
diff --git a/net/rds/ib_send.c b/net/rds/ib_send.c
index e590949..94f43e2 100644
--- a/net/rds/ib_send.c
+++ b/net/rds/ib_send.c
@@ -525,6 +525,7 @@ static inline int rds_ib_set_wr_signal_state(struct rds_ib_connection *ic,
int rds_ib_xmit(struct rds_connection *conn, struct rds_message *rm,
unsigned int hdr_off, unsigned int sg, unsigned int off)
{
+ struct net *net = rds_conn_to_net(conn);
struct rds_ib_connection *ic = conn->c_transport_data;
struct ib_device *dev = ic->i_cm_id->device;
struct rds_ib_send_work *send = NULL;
@@ -550,7 +551,7 @@ int rds_ib_xmit(struct rds_connection *conn, struct rds_message *rm,
/* Do not send cong updates to IB loopback */
if (conn->c_loopback
&& rm->m_inc.i_hdr.h_flags & RDS_FLAG_CONG_BITMAP) {
- rds_cong_map_updated(conn->c_fcong, ~(u64) 0);
+ rds_cong_map_updated(net, conn->c_fcong, ~(u64) 0);
scat = &rm->data.op_sg[sg];
ret = sizeof(struct rds_header) + RDS_CONG_MAP_BYTES;
ret = min_t(int, ret, scat->length - conn->c_xmit_data_off);
diff --git a/net/rds/iw_recv.c b/net/rds/iw_recv.c
index 4503335..02b0dca 100644
--- a/net/rds/iw_recv.c
+++ b/net/rds/iw_recv.c
@@ -566,8 +566,9 @@ u64 rds_iw_piggyb_ack(struct rds_iw_connection *ic)
* copy.
*/
static void rds_iw_cong_recv(struct rds_connection *conn,
- struct rds_iw_incoming *iwinc)
+ struct rds_iw_incoming *iwinc)
{
+ struct net *net = rds_conn_to_net(conn);
struct rds_cong_map *map;
unsigned int map_off;
unsigned int map_page;
@@ -629,7 +630,7 @@ static void rds_iw_cong_recv(struct rds_connection *conn,
/* the congestion map is in little endian order */
uncongested = le64_to_cpu(uncongested);
- rds_cong_map_updated(map, uncongested);
+ rds_cong_map_updated(net, map, uncongested);
}
/*
diff --git a/net/rds/loop.c b/net/rds/loop.c
index 95b9c85..3e05a20 100644
--- a/net/rds/loop.c
+++ b/net/rds/loop.c
@@ -65,7 +65,7 @@ static int rds_loop_xmit(struct rds_connection *conn, struct rds_message *rm,
/* Do not send cong updates to loopback */
if (rm->m_inc.i_hdr.h_flags & RDS_FLAG_CONG_BITMAP) {
- rds_cong_map_updated(conn->c_fcong, ~(u64) 0);
+ rds_cong_map_updated(net, conn->c_fcong, ~(u64) 0);
ret = min_t(int, ret, sgp->length - conn->c_xmit_data_off);
goto out;
}
diff --git a/net/rds/rds.h b/net/rds/rds.h
index 9d9e247..bb91d04 100644
--- a/net/rds/rds.h
+++ b/net/rds/rds.h
@@ -607,13 +607,15 @@ void rds_cong_add_conn(struct rds_connection *conn);
void rds_cong_remove_conn(struct rds_connection *conn);
void rds_cong_set_bit(struct rds_cong_map *map, __be16 port);
void rds_cong_clear_bit(struct rds_cong_map *map, __be16 port);
-int rds_cong_wait(struct rds_cong_map *map, __be16 port, int nonblock, struct rds_sock *rs);
-void rds_cong_queue_updates(struct rds_cong_map *map);
-void rds_cong_map_updated(struct rds_cong_map *map, uint64_t);
+int rds_cong_wait(struct net *net, struct rds_cong_map *map, __be16 port,
+ int nonblock, struct rds_sock *rs);
+void rds_cong_queue_updates(struct net *net, struct rds_cong_map *map);
+void rds_cong_map_updated(struct net *net, struct rds_cong_map *map, uint64_t);
int rds_cong_updated_since(unsigned long *recent);
void rds_cong_add_socket(struct rds_sock *);
void rds_cong_remove_socket(struct rds_sock *);
-void rds_cong_exit(void);
+int rds_cong_init(struct net *net);
+void rds_cong_exit(struct net *net);
struct rds_message *rds_cong_update_alloc(struct rds_connection *conn);
/* conn.c */
diff --git a/net/rds/recv.c b/net/rds/recv.c
index 2e1bee2..ad83230 100644
--- a/net/rds/recv.c
+++ b/net/rds/recv.c
@@ -70,6 +70,7 @@ static void rds_recv_rcvbuf_delta(struct rds_sock *rs, struct sock *sk,
struct rds_cong_map *map,
int delta, __be16 port)
{
+ struct net *net = sock_net(sk);
int now_congested;
if (delta == 0)
@@ -88,7 +89,7 @@ static void rds_recv_rcvbuf_delta(struct rds_sock *rs, struct sock *sk,
if (!rs->rs_congested && now_congested) {
rs->rs_congested = 1;
rds_cong_set_bit(map, port);
- rds_cong_queue_updates(map);
+ rds_cong_queue_updates(net, map);
}
/* was -> aren't congested */
/* Require more free space before reporting uncongested to prevent
@@ -96,7 +97,7 @@ static void rds_recv_rcvbuf_delta(struct rds_sock *rs, struct sock *sk,
else if (rs->rs_congested && (rs->rs_rcv_bytes < (rds_sk_rcvbuf(rs)/2))) {
rs->rs_congested = 0;
rds_cong_clear_bit(map, port);
- rds_cong_queue_updates(map);
+ rds_cong_queue_updates(net, map);
}
/* do nothing if no change in cong state */
diff --git a/net/rds/send.c b/net/rds/send.c
index 11852e1..da70396 100644
--- a/net/rds/send.c
+++ b/net/rds/send.c
@@ -1024,7 +1024,7 @@ int rds_sendmsg(struct kiocb *iocb, struct socket *sock, struct msghdr *msg,
rds_conn_connect_if_down(conn);
- ret = rds_cong_wait(conn->c_fcong, dport, nonblock, rs);
+ ret = rds_cong_wait(net, conn->c_fcong, dport, nonblock, rs);
if (ret) {
rs->rs_seen_congestion = 1;
goto out;
@@ -1089,6 +1089,7 @@ out:
int
rds_send_pong(struct rds_connection *conn, __be16 dport)
{
+ struct net *net = rds_conn_to_net(conn);
struct rds_message *rm;
unsigned long flags;
int ret = 0;
@@ -1104,7 +1105,7 @@ rds_send_pong(struct rds_connection *conn, __be16 dport)
rds_conn_connect_if_down(conn);
- ret = rds_cong_wait(conn->c_fcong, dport, 1, NULL);
+ ret = rds_cong_wait(net, conn->c_fcong, dport, 1, NULL);
if (ret)
goto out;
diff --git a/net/rds/tcp_recv.c b/net/rds/tcp_recv.c
index 6243258..7ea92b6 100644
--- a/net/rds/tcp_recv.c
+++ b/net/rds/tcp_recv.c
@@ -125,6 +125,7 @@ out:
static void rds_tcp_cong_recv(struct rds_connection *conn,
struct rds_tcp_incoming *tinc)
{
+ struct net *net = rds_conn_to_net(conn);
struct sk_buff *skb;
unsigned int to_copy, skb_off;
unsigned int map_off;
@@ -163,7 +164,7 @@ static void rds_tcp_cong_recv(struct rds_connection *conn,
}
}
- rds_cong_map_updated(map, ~(u64) 0);
+ rds_cong_map_updated(net, map, ~(u64) 0);
}
struct rds_tcp_desc_arg {
--
1.7.4.1
More information about the rds-devel
mailing list