From: Joshua Watt <jpewhacker@gmail.com>
To: NeilBrown <neilb@suse.com>, Jeff Layton <jlayton@redhat.com>,
Trond Myklebust <trond.myklebust@primarydata.com>
Cc: linux-nfs@vger.kernel.org, Al Viro <viro@zeniv.linux.org.uk>,
"J . Bruce Fields" <bfields@fieldses.org>,
David Howells <dhowells@redhat.com>,
Joshua Watt <JPEWhacker@gmail.com>
Subject: [RFC 2/4] SUNRPC: Kill client tasks from debugfs
Date: Wed, 8 Nov 2017 08:59:40 -0600 [thread overview]
Message-ID: <20171108145942.5127-3-JPEWhacker@gmail.com> (raw)
In-Reply-To: <20171108145942.5127-1-JPEWhacker@gmail.com>
The "kill" client entry in debugfs can be used to kill client tasks.
Writing "0" causes only the currently pending tasks to be killed, while
writing "1" all currently pending, and any future pending tasks to be
killed.
Signed-off-by: Joshua Watt <JPEWhacker@gmail.com>
---
net/sunrpc/debugfs.c | 48 ++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 48 insertions(+)
diff --git a/net/sunrpc/debugfs.c b/net/sunrpc/debugfs.c
index e980d2a493de..a2f33d168873 100644
--- a/net/sunrpc/debugfs.c
+++ b/net/sunrpc/debugfs.c
@@ -118,6 +118,50 @@ static const struct file_operations tasks_fops = {
.release = tasks_release,
};
+static int
+kill_set(void *data, u64 val)
+{
+ struct rpc_clnt *clnt = data;
+
+ rpc_killall_tasks(clnt, (int)val);
+ return 0;
+}
+
+static int
+kill_open(struct inode *inode, struct file *filp)
+{
+ int ret = simple_attr_open(inode, filp, NULL, kill_set, "%i");
+
+ if (!ret) {
+ struct rpc_clnt *clnt = inode->i_private;
+
+ if (!atomic_inc_not_zero(&clnt->cl_count)) {
+ simple_attr_release(inode, filp);
+ ret = -EINVAL;
+ }
+ }
+
+ return ret;
+}
+
+static int
+kill_release(struct inode *inode, struct file *filp)
+{
+ struct rpc_clnt *clnt = inode->i_private;
+
+ rpc_release_client(clnt);
+
+ return simple_attr_release(inode, filp);
+}
+
+static const struct file_operations kill_fops = {
+ .owner = THIS_MODULE,
+ .open = kill_open,
+ .release = kill_release,
+ .write = debugfs_attr_write,
+ .llseek = no_llseek,
+};
+
void
rpc_clnt_debugfs_register(struct rpc_clnt *clnt)
{
@@ -160,6 +204,10 @@ rpc_clnt_debugfs_register(struct rpc_clnt *clnt)
if (!debugfs_create_symlink("xprt", clnt->cl_debugfs, name))
goto out_err;
+ if (!debugfs_create_file("kill", S_IFREG | 0200, clnt->cl_debugfs,
+ clnt, &kill_fops))
+ goto out_err;
+
return;
out_err:
debugfs_remove_recursive(clnt->cl_debugfs);
--
2.13.6
next prev parent reply other threads:[~2017-11-08 15:00 UTC|newest]
Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-10-25 17:11 NFS Force Unmounting Joshua Watt
2017-10-30 20:20 ` J. Bruce Fields
2017-10-30 21:04 ` Joshua Watt
2017-10-30 21:09 ` NeilBrown
2017-10-31 14:41 ` Jeff Layton
2017-10-31 14:55 ` Chuck Lever
2017-10-31 17:04 ` Joshua Watt
2017-10-31 19:46 ` Chuck Lever
2017-11-01 0:53 ` NeilBrown
2017-11-01 2:22 ` Chuck Lever
2017-11-01 14:38 ` Joshua Watt
2017-11-02 0:15 ` NeilBrown
2017-11-02 19:46 ` Chuck Lever
2017-11-02 21:51 ` NeilBrown
2017-11-01 17:24 ` Jeff Layton
2017-11-01 23:13 ` NeilBrown
2017-11-02 12:09 ` Jeff Layton
2017-11-02 14:54 ` Joshua Watt
2017-11-08 3:30 ` NeilBrown
2017-11-08 12:08 ` Jeff Layton
2017-11-08 15:52 ` J. Bruce Fields
2017-11-08 22:34 ` NeilBrown
2017-11-08 23:52 ` Trond Myklebust
2017-11-09 19:48 ` Joshua Watt
2017-11-10 0:16 ` NeilBrown
2017-11-08 14:59 ` [RFC 0/4] " Joshua Watt
2017-11-08 14:59 ` [RFC 1/4] SUNRPC: Add flag to kill new tasks Joshua Watt
2017-11-10 1:39 ` NeilBrown
2017-11-08 14:59 ` Joshua Watt [this message]
2017-11-10 1:47 ` [RFC 2/4] SUNRPC: Kill client tasks from debugfs NeilBrown
2017-11-10 14:13 ` Joshua Watt
2017-11-08 14:59 ` [RFC 3/4] SUNRPC: Simplify client shutdown Joshua Watt
2017-11-10 1:50 ` NeilBrown
2017-11-08 14:59 ` [RFC 4/4] NFS: Add forcekill mount option Joshua Watt
2017-11-10 2:01 ` NeilBrown
2017-11-10 14:16 ` Joshua Watt
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20171108145942.5127-3-JPEWhacker@gmail.com \
--to=jpewhacker@gmail.com \
--cc=bfields@fieldses.org \
--cc=dhowells@redhat.com \
--cc=jlayton@redhat.com \
--cc=linux-nfs@vger.kernel.org \
--cc=neilb@suse.com \
--cc=trond.myklebust@primarydata.com \
--cc=viro@zeniv.linux.org.uk \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).