The Big Kernel Lock must be held while calling rpc_release().
Signed-off-by: Frank Filz <[email protected]>
---
diff --git a/net/sunrpc/clnt.c b/net/sunrpc/clnt.c
index 78696f2..185e093 100644
--- a/net/sunrpc/clnt.c
+++ b/net/sunrpc/clnt.c
@@ -29,6 +29,7 @@ #include <linux/mm.h>
#include <linux/slab.h>
#include <linux/utsname.h>
#include <linux/workqueue.h>
+#include <linux/smp_lock.h>
#include <linux/sunrpc/clnt.h>
#include <linux/sunrpc/rpc_pipe_fs.h>
@@ -529,8 +530,11 @@ rpc_call_async(struct rpc_clnt *clnt, st
rpc_restore_sigmask(&oldset);
return status;
out_release:
- if (tk_ops->rpc_release != NULL)
+ if (tk_ops->rpc_release != NULL) {
+ lock_kernel();
tk_ops->rpc_release(data);
+ unlock_kernel();
+ }
return status;
}
diff --git a/net/sunrpc/sched.c b/net/sunrpc/sched.c
index a1ab4ee..406aae5 100644
--- a/net/sunrpc/sched.c
+++ b/net/sunrpc/sched.c
@@ -884,8 +884,11 @@ #ifdef RPC_DEBUG
#endif
if (task->tk_flags & RPC_TASK_DYNAMIC)
rpc_free_task(task);
- if (tk_ops->rpc_release)
+ if (tk_ops->rpc_release) {
+ lock_kernel();
tk_ops->rpc_release(calldata);
+ unlock_kernel();
+ }
}
/**
@@ -902,8 +905,11 @@ struct rpc_task *rpc_run_task(struct rpc
struct rpc_task *task;
task = rpc_new_task(clnt, flags, ops, data);
if (task == NULL) {
- if (ops->rpc_release != NULL)
+ if (ops->rpc_release != NULL) {
+ lock_kernel();
ops->rpc_release(data);
+ unlock_kernel();
+ }
return ERR_PTR(-ENOMEM);
}
atomic_inc(&task->tk_count);
-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
NFS maillist - [email protected]
https://lists.sourceforge.net/lists/listinfo/nfs
On Tue, 2006-10-17 at 10:24 -0700, Frank Filz wrote:
> The Big Kernel Lock must be held while calling rpc_release().
Could we perhaps use something like the following helper instead? That
ensures that we will not miss it again.
Cheers,
Trond
---------------------------------------------
From: Trond Myklebust <[email protected]>
Date: Wed, 18 Oct 2006 16:01:05 -0400
Subject: SUNRPC: Fix up missing BKL in asynchronous RPC callback functions
Signed-off-by: Trond Myklebust <[email protected]>
---
include/linux/sunrpc/sched.h | 1 +
net/sunrpc/clnt.c | 3 +--
net/sunrpc/sched.c | 15 +++++++++++----
3 files changed, 13 insertions(+), 6 deletions(-)
diff --git a/include/linux/sunrpc/sched.h b/include/linux/sunrpc/sched.h
index f399c13..d8e18ee 100644
--- a/include/linux/sunrpc/sched.h
+++ b/include/linux/sunrpc/sched.h
@@ -256,6 +256,7 @@ void rpc_init_task(struct rpc_task *tas
void *data);
void rpc_release_task(struct rpc_task *);
void rpc_exit_task(struct rpc_task *);
+void rpc_release_calldata(const struct rpc_call_ops *, void *);
void rpc_killall_tasks(struct rpc_clnt *);
int rpc_execute(struct rpc_task *);
void rpc_init_priority_wait_queue(struct rpc_wait_queue *, const char *);
diff --git a/net/sunrpc/clnt.c b/net/sunrpc/clnt.c
index 78696f2..a17cf0e 100644
--- a/net/sunrpc/clnt.c
+++ b/net/sunrpc/clnt.c
@@ -529,8 +529,7 @@ rpc_call_async(struct rpc_clnt *clnt, st
rpc_restore_sigmask(&oldset);
return status;
out_release:
- if (tk_ops->rpc_release != NULL)
- tk_ops->rpc_release(data);
+ rpc_release_calldata(tk_ops, data);
return status;
}
diff --git a/net/sunrpc/sched.c b/net/sunrpc/sched.c
index a1ab4ee..287fe9a 100644
--- a/net/sunrpc/sched.c
+++ b/net/sunrpc/sched.c
@@ -581,6 +581,15 @@ void rpc_exit_task(struct rpc_task *task
}
EXPORT_SYMBOL(rpc_exit_task);
+void rpc_release_calldata(const struct rpc_call_ops *ops, void *calldata)
+{
+ if (ops->rpc_release != NULL) {
+ lock_kernel();
+ ops->rpc_release(calldata);
+ unlock_kernel();
+ }
+}
+
/*
* This is the RPC `scheduler' (or rather, the finite state machine).
*/
@@ -884,8 +893,7 @@ #ifdef RPC_DEBUG
#endif
if (task->tk_flags & RPC_TASK_DYNAMIC)
rpc_free_task(task);
- if (tk_ops->rpc_release)
- tk_ops->rpc_release(calldata);
+ rpc_release_calldata(tk_ops, calldata);
}
/**
@@ -902,8 +910,7 @@ struct rpc_task *rpc_run_task(struct rpc
struct rpc_task *task;
task = rpc_new_task(clnt, flags, ops, data);
if (task == NULL) {
- if (ops->rpc_release != NULL)
- ops->rpc_release(data);
+ rpc_release_calldata(ops, data);
return ERR_PTR(-ENOMEM);
}
atomic_inc(&task->tk_count);
-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
NFS maillist - [email protected]
https://lists.sourceforge.net/lists/listinfo/nfs
On Wed, 2006-10-18 at 18:20 -0400, Trond Myklebust wrote:
> On Tue, 2006-10-17 at 10:24 -0700, Frank Filz wrote:
> > The Big Kernel Lock must be held while calling rpc_release().
>
> Could we perhaps use something like the following helper instead? That
> ensures that we will not miss it again.
Yea, that looks good. Also less scary, only one lock_kernel() call
added. And definitely easier to later remove.
Frank
> ---------------------------------------------
>
> From: Trond Myklebust <[email protected]>
> Date: Wed, 18 Oct 2006 16:01:05 -0400
> Subject: SUNRPC: Fix up missing BKL in asynchronous RPC callback functions
>
> Signed-off-by: Trond Myklebust <[email protected]>
> ---
>
> include/linux/sunrpc/sched.h | 1 +
> net/sunrpc/clnt.c | 3 +--
> net/sunrpc/sched.c | 15 +++++++++++----
> 3 files changed, 13 insertions(+), 6 deletions(-)
>
> diff --git a/include/linux/sunrpc/sched.h b/include/linux/sunrpc/sched.h
> index f399c13..d8e18ee 100644
> --- a/include/linux/sunrpc/sched.h
> +++ b/include/linux/sunrpc/sched.h
> @@ -256,6 +256,7 @@ void rpc_init_task(struct rpc_task *tas
> void *data);
> void rpc_release_task(struct rpc_task *);
> void rpc_exit_task(struct rpc_task *);
> +void rpc_release_calldata(const struct rpc_call_ops *, void *);
> void rpc_killall_tasks(struct rpc_clnt *);
> int rpc_execute(struct rpc_task *);
> void rpc_init_priority_wait_queue(struct rpc_wait_queue *, const char *);
> diff --git a/net/sunrpc/clnt.c b/net/sunrpc/clnt.c
> index 78696f2..a17cf0e 100644
> --- a/net/sunrpc/clnt.c
> +++ b/net/sunrpc/clnt.c
> @@ -529,8 +529,7 @@ rpc_call_async(struct rpc_clnt *clnt, st
> rpc_restore_sigmask(&oldset);
> return status;
> out_release:
> - if (tk_ops->rpc_release != NULL)
> - tk_ops->rpc_release(data);
> + rpc_release_calldata(tk_ops, data);
> return status;
> }
>
> diff --git a/net/sunrpc/sched.c b/net/sunrpc/sched.c
> index a1ab4ee..287fe9a 100644
> --- a/net/sunrpc/sched.c
> +++ b/net/sunrpc/sched.c
> @@ -581,6 +581,15 @@ void rpc_exit_task(struct rpc_task *task
> }
> EXPORT_SYMBOL(rpc_exit_task);
>
> +void rpc_release_calldata(const struct rpc_call_ops *ops, void *calldata)
> +{
> + if (ops->rpc_release != NULL) {
> + lock_kernel();
> + ops->rpc_release(calldata);
> + unlock_kernel();
> + }
> +}
> +
> /*
> * This is the RPC `scheduler' (or rather, the finite state machine).
> */
> @@ -884,8 +893,7 @@ #ifdef RPC_DEBUG
> #endif
> if (task->tk_flags & RPC_TASK_DYNAMIC)
> rpc_free_task(task);
> - if (tk_ops->rpc_release)
> - tk_ops->rpc_release(calldata);
> + rpc_release_calldata(tk_ops, calldata);
> }
>
> /**
> @@ -902,8 +910,7 @@ struct rpc_task *rpc_run_task(struct rpc
> struct rpc_task *task;
> task = rpc_new_task(clnt, flags, ops, data);
> if (task == NULL) {
> - if (ops->rpc_release != NULL)
> - ops->rpc_release(data);
> + rpc_release_calldata(ops, data);
> return ERR_PTR(-ENOMEM);
> }
> atomic_inc(&task->tk_count);
>
>
-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
NFS maillist - [email protected]
https://lists.sourceforge.net/lists/listinfo/nfs