mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-27 19:29:37 +00:00
![Linus Torvalds](/assets/img/avatar_default.png)
Pull nfsd changes from J Bruce Fields: "Miscellaneous bugfixes, plus: - An overhaul of the DRC cache by Jeff Layton. The main effect is just to make it larger. This decreases the chances of intermittent errors especially in the UDP case. But we'll need to watch for any reports of performance regressions. - Containerized nfsd: with some limitations, we now support per-container nfs-service, thanks to extensive work from Stanislav Kinsbursky over the last year." Some notes about conflicts, since there were *two* non-data semantic conflicts here: - idr_remove_all() had been added by a memory leak fix, but has since become deprecated since idr_destroy() does it for us now. - xs_local_connect() had been added by this branch to make AF_LOCAL connections be synchronous, but in the meantime Trond had changed the calling convention in order to avoid a RCU dereference. There were a couple of more obvious actual source-level conflicts due to the hlist traversal changes and one just due to code changes next to each other, but those were trivial. * 'for-3.9' of git://linux-nfs.org/~bfields/linux: (49 commits) SUNRPC: make AF_LOCAL connect synchronous nfsd: fix compiler warning about ambiguous types in nfsd_cache_csum svcrpc: fix rpc server shutdown races svcrpc: make svc_age_temp_xprts enqueue under sv_lock lockd: nlmclnt_reclaim(): avoid stack overflow nfsd: enable NFSv4 state in containers nfsd: disable usermode helper client tracker in container nfsd: use proper net while reading "exports" file nfsd: containerize NFSd filesystem nfsd: fix comments on nfsd_cache_lookup SUNRPC: move cache_detail->cache_request callback call to cache_read() SUNRPC: remove "cache_request" argument in sunrpc_cache_pipe_upcall() function SUNRPC: rework cache upcall logic SUNRPC: introduce cache_detail->cache_request callback NFS: simplify and clean cache library NFS: use SUNRPC cache creation and destruction helper for DNS cache nfsd4: free_stid can be static nfsd: keep a checksum of the first 256 bytes of request sunrpc: trim off trailing checksum before returning decrypted or integrity authenticated buffer sunrpc: fix comment in struct xdr_buf definition ...
175 lines
4.1 KiB
C
175 lines
4.1 KiB
C
/*
|
|
* Copyright (c) 2011 Bryan Schumaker <bjschuma@netapp.com>
|
|
*
|
|
* Uses debugfs to create fault injection points for client testing
|
|
*/
|
|
|
|
#include <linux/types.h>
|
|
#include <linux/fs.h>
|
|
#include <linux/debugfs.h>
|
|
#include <linux/module.h>
|
|
#include <linux/nsproxy.h>
|
|
#include <linux/sunrpc/addr.h>
|
|
#include <asm/uaccess.h>
|
|
|
|
#include "state.h"
|
|
#include "netns.h"
|
|
|
|
struct nfsd_fault_inject_op {
|
|
char *file;
|
|
u64 (*forget)(struct nfs4_client *, u64);
|
|
u64 (*print)(struct nfs4_client *, u64);
|
|
};
|
|
|
|
static struct nfsd_fault_inject_op inject_ops[] = {
|
|
{
|
|
.file = "forget_clients",
|
|
.forget = nfsd_forget_client,
|
|
.print = nfsd_print_client,
|
|
},
|
|
{
|
|
.file = "forget_locks",
|
|
.forget = nfsd_forget_client_locks,
|
|
.print = nfsd_print_client_locks,
|
|
},
|
|
{
|
|
.file = "forget_openowners",
|
|
.forget = nfsd_forget_client_openowners,
|
|
.print = nfsd_print_client_openowners,
|
|
},
|
|
{
|
|
.file = "forget_delegations",
|
|
.forget = nfsd_forget_client_delegations,
|
|
.print = nfsd_print_client_delegations,
|
|
},
|
|
{
|
|
.file = "recall_delegations",
|
|
.forget = nfsd_recall_client_delegations,
|
|
.print = nfsd_print_client_delegations,
|
|
},
|
|
};
|
|
|
|
static long int NUM_INJECT_OPS = sizeof(inject_ops) / sizeof(struct nfsd_fault_inject_op);
|
|
static struct dentry *debug_dir;
|
|
|
|
static void nfsd_inject_set(struct nfsd_fault_inject_op *op, u64 val)
|
|
{
|
|
u64 count = 0;
|
|
|
|
if (val == 0)
|
|
printk(KERN_INFO "NFSD Fault Injection: %s (all)", op->file);
|
|
else
|
|
printk(KERN_INFO "NFSD Fault Injection: %s (n = %llu)", op->file, val);
|
|
|
|
nfs4_lock_state();
|
|
count = nfsd_for_n_state(val, op->forget);
|
|
nfs4_unlock_state();
|
|
printk(KERN_INFO "NFSD: %s: found %llu", op->file, count);
|
|
}
|
|
|
|
static void nfsd_inject_set_client(struct nfsd_fault_inject_op *op,
|
|
struct sockaddr_storage *addr,
|
|
size_t addr_size)
|
|
{
|
|
char buf[INET6_ADDRSTRLEN];
|
|
struct nfs4_client *clp;
|
|
u64 count;
|
|
|
|
nfs4_lock_state();
|
|
clp = nfsd_find_client(addr, addr_size);
|
|
if (clp) {
|
|
count = op->forget(clp, 0);
|
|
rpc_ntop((struct sockaddr *)&clp->cl_addr, buf, sizeof(buf));
|
|
printk(KERN_INFO "NFSD [%s]: Client %s had %llu state object(s)\n", op->file, buf, count);
|
|
}
|
|
nfs4_unlock_state();
|
|
}
|
|
|
|
static void nfsd_inject_get(struct nfsd_fault_inject_op *op, u64 *val)
|
|
{
|
|
nfs4_lock_state();
|
|
*val = nfsd_for_n_state(0, op->print);
|
|
nfs4_unlock_state();
|
|
}
|
|
|
|
static ssize_t fault_inject_read(struct file *file, char __user *buf,
|
|
size_t len, loff_t *ppos)
|
|
{
|
|
static u64 val;
|
|
char read_buf[25];
|
|
size_t size, ret;
|
|
loff_t pos = *ppos;
|
|
|
|
if (!pos)
|
|
nfsd_inject_get(file_inode(file)->i_private, &val);
|
|
size = scnprintf(read_buf, sizeof(read_buf), "%llu\n", val);
|
|
|
|
if (pos < 0)
|
|
return -EINVAL;
|
|
if (pos >= size || !len)
|
|
return 0;
|
|
if (len > size - pos)
|
|
len = size - pos;
|
|
ret = copy_to_user(buf, read_buf + pos, len);
|
|
if (ret == len)
|
|
return -EFAULT;
|
|
len -= ret;
|
|
*ppos = pos + len;
|
|
return len;
|
|
}
|
|
|
|
static ssize_t fault_inject_write(struct file *file, const char __user *buf,
|
|
size_t len, loff_t *ppos)
|
|
{
|
|
char write_buf[INET6_ADDRSTRLEN];
|
|
size_t size = min(sizeof(write_buf) - 1, len);
|
|
struct net *net = current->nsproxy->net_ns;
|
|
struct sockaddr_storage sa;
|
|
u64 val;
|
|
|
|
if (copy_from_user(write_buf, buf, size))
|
|
return -EFAULT;
|
|
write_buf[size] = '\0';
|
|
|
|
size = rpc_pton(net, write_buf, size, (struct sockaddr *)&sa, sizeof(sa));
|
|
if (size > 0)
|
|
nfsd_inject_set_client(file_inode(file)->i_private, &sa, size);
|
|
else {
|
|
val = simple_strtoll(write_buf, NULL, 0);
|
|
nfsd_inject_set(file_inode(file)->i_private, val);
|
|
}
|
|
return len; /* on success, claim we got the whole input */
|
|
}
|
|
|
|
static const struct file_operations fops_nfsd = {
|
|
.owner = THIS_MODULE,
|
|
.read = fault_inject_read,
|
|
.write = fault_inject_write,
|
|
};
|
|
|
|
void nfsd_fault_inject_cleanup(void)
|
|
{
|
|
debugfs_remove_recursive(debug_dir);
|
|
}
|
|
|
|
int nfsd_fault_inject_init(void)
|
|
{
|
|
unsigned int i;
|
|
struct nfsd_fault_inject_op *op;
|
|
umode_t mode = S_IFREG | S_IRUSR | S_IWUSR;
|
|
|
|
debug_dir = debugfs_create_dir("nfsd", NULL);
|
|
if (!debug_dir)
|
|
goto fail;
|
|
|
|
for (i = 0; i < NUM_INJECT_OPS; i++) {
|
|
op = &inject_ops[i];
|
|
if (!debugfs_create_file(op->file, mode, debug_dir, op, &fops_nfsd))
|
|
goto fail;
|
|
}
|
|
return 0;
|
|
|
|
fail:
|
|
nfsd_fault_inject_cleanup();
|
|
return -ENOMEM;
|
|
}
|