Hi all, After merging the tip tree, today's linux-next build (x86_64 allmodconfig) failed like this:
net/rxrpc/call_object.c: In function 'rxrpc_rcu_destroy_call':
net/rxrpc/call_object.c:661:3: error: implicit declaration of function
'wake_up_atomic_t'; did you mean 'wake_up_bit'?
[-Werror=implicit-function-declaration]
wake_up_atomic_t(&rxnet->nr_calls);
^~~~~~~~~~~~~~~~
wake_up_bit
net/rxrpc/call_object.c: In function 'rxrpc_destroy_all_calls':
net/rxrpc/call_object.c:728:2: error: implicit declaration of function
'wait_on_atomic_t'; did you mean 'wait_on_bit'?
[-Werror=implicit-function-declaration]
wait_on_atomic_t(&rxnet->nr_calls, atomic_t_wait, TASK_UNINTERRUPTIBLE);
^~~~~~~~~~~~~~~~
wait_on_bit
net/rxrpc/call_object.c:728:37: error: 'atomic_t_wait' undeclared (first use in
this function); did you mean 'atomic_long_t'?
wait_on_atomic_t(&rxnet->nr_calls, atomic_t_wait, TASK_UNINTERRUPTIBLE);
^~~~~~~~~~~~~
atomic_long_t
net/rxrpc/call_object.c:728:37: note: each undeclared identifier is reported
only once for each function it appears in
net/rxrpc/call_accept.c: In function 'rxrpc_discard_prealloc':
net/rxrpc/call_accept.c:223:4: error: implicit declaration of function
'wake_up_atomic_t'; did you mean 'wake_up_bit'?
[-Werror=implicit-function-declaration]
wake_up_atomic_t(&rxnet->nr_conns);
^~~~~~~~~~~~~~~~
wake_up_bit
Caused by commit
9b8cce52c4b5 ("sched/wait: Remove the wait_on_atomic_t() API")
interacting with commits
d3be4d244330 ("xrpc: Fix potential call vs socket/net destruction race")
31f5f9a1691e ("rxrpc: Fix apparent leak of rxrpc_local objects")
from the net-next tree.
Haven't we figured out how to remove/change APIs yet? :-(
That tip tree commit is now in Linus' tree (merged since I started this
morning) so the net-next tree will need the below patch (or something
similar when it is merged.
I have applied the following merge fix patch (this may need more work):
From: Stephen Rothwell <s...@canb.auug.org.au>
Date: Tue, 3 Apr 2018 15:34:48 +1000
Subject: [PATCH] sched/wait: merge fix up for wait_on_atomic() API removal
Signed-off-by: Stephen Rothwell <s...@canb.auug.org.au>
---
net/rxrpc/call_accept.c | 2 +-
net/rxrpc/call_object.c | 4 ++--
net/rxrpc/conn_object.c | 4 ++--
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/net/rxrpc/call_accept.c b/net/rxrpc/call_accept.c
index f67017dcb25e..a9a9be5519b9 100644
--- a/net/rxrpc/call_accept.c
+++ b/net/rxrpc/call_accept.c
@@ -220,7 +220,7 @@ void rxrpc_discard_prealloc(struct rxrpc_sock *rx)
write_unlock(&rxnet->conn_lock);
kfree(conn);
if (atomic_dec_and_test(&rxnet->nr_conns))
- wake_up_atomic_t(&rxnet->nr_conns);
+ wake_up_var(&rxnet->nr_conns);
tail = (tail + 1) & (size - 1);
}
diff --git a/net/rxrpc/call_object.c b/net/rxrpc/call_object.c
index f721c2b7e234..f6734d8cb01a 100644
--- a/net/rxrpc/call_object.c
+++ b/net/rxrpc/call_object.c
@@ -658,7 +658,7 @@ static void rxrpc_rcu_destroy_call(struct rcu_head *rcu)
kfree(call->rxtx_annotations);
kmem_cache_free(rxrpc_call_jar, call);
if (atomic_dec_and_test(&rxnet->nr_calls))
- wake_up_atomic_t(&rxnet->nr_calls);
+ wake_up_var(&rxnet->nr_calls);
}
/*
@@ -725,5 +725,5 @@ void rxrpc_destroy_all_calls(struct rxrpc_net *rxnet)
write_unlock(&rxnet->call_lock);
atomic_dec(&rxnet->nr_calls);
- wait_on_atomic_t(&rxnet->nr_calls, atomic_t_wait, TASK_UNINTERRUPTIBLE);
+ wait_var_event(&rxnet->nr_calls, !atomic_read(&rxnet->nr_calls));
}
diff --git a/net/rxrpc/conn_object.c b/net/rxrpc/conn_object.c
index 0950ee3d26f5..4c77a78a252a 100644
--- a/net/rxrpc/conn_object.c
+++ b/net/rxrpc/conn_object.c
@@ -367,7 +367,7 @@ static void rxrpc_destroy_connection(struct rcu_head *rcu)
rxrpc_put_peer(conn->params.peer);
if (atomic_dec_and_test(&conn->params.local->rxnet->nr_conns))
- wake_up_atomic_t(&conn->params.local->rxnet->nr_conns);
+ wake_up_var(&conn->params.local->rxnet->nr_conns);
rxrpc_put_local(conn->params.local);
kfree(conn);
@@ -482,6 +482,6 @@ void rxrpc_destroy_all_connections(struct rxrpc_net *rxnet)
/* We need to wait for the connections to be destroyed by RCU as they
* pin things that we still need to get rid of.
*/
- wait_on_atomic_t(&rxnet->nr_conns, atomic_t_wait, TASK_UNINTERRUPTIBLE);
+ wait_var_event(&rxnet->nr_conns, !atomic_read(&rxnet->nr_conns));
_leave("");
}
--
2.16.1
--
Cheers,
Stephen Rothwell
pgpV_S8PAHTPQ.pgp
Description: OpenPGP digital signature
