16c00db4bb
Pull AFS fixes from David Howells:
"Here's a set of patches that fix a number of bugs in the in-kernel AFS
client, including:
- Fix directory locking to not use individual page locks for
directory reading/scanning but rather to use a semaphore on the
afs_vnode struct as the directory contents must be read in a single
blob and data from different reads must not be mixed as the entire
contents may be shuffled about between reads.
- Fix address list parsing to handle port specifiers correctly.
- Only give up callback records on a server if we actually talked to
that server (we might not be able to access a server).
- Fix some callback handling bugs, including refcounting,
whole-volume callbacks and when callbacks actually get broken in
response to a CB.CallBack op.
- Fix some server/address rotation bugs, including giving up if we
can't probe a server; giving up if a server says it doesn't have a
volume, but there are more servers to try.
- Fix the decoding of fetched statuses to be OpenAFS compatible.
- Fix the handling of server lookups in Cache Manager ops (such as
CB.InitCallBackState3) to use a UUID if possible and to handle no
server being found.
- Fix a bug in server lookup where not all addresses are compared.
- Fix the non-encryption of calls that prevents some servers from
being accessed (this also requires an AF_RXRPC patch that has
already gone in through the net tree).
There's also a patch that adds tracepoints to log Cache Manager ops
that don't find a matching server, either by UUID or by address"
* tag 'afs-fixes-20180514' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs:
afs: Fix the non-encryption of calls
afs: Fix CB.CallBack handling
afs: Fix whole-volume callback handling
afs: Fix afs_find_server search loop
afs: Fix the handling of an unfound server in CM operations
afs: Add a tracepoint to record callbacks from unlisted servers
afs: Fix the handling of CB.InitCallBackState3 to find the server by UUID
afs: Fix VNOVOL handling in address rotation
afs: Fix AFSFetchStatus decoder to provide OpenAFS compatibility
afs: Fix server rotation's handling of fileserver probe failure
afs: Fix refcounting in callback registration
afs: Fix giving up callbacks on server destruction
afs: Fix address list parsing
afs: Fix directory page locking
129 lines
2.8 KiB
C
129 lines
2.8 KiB
C
// SPDX-License-Identifier: GPL-2.0
|
|
#include <linux/compiler.h>
|
|
#include "builtin.h"
|
|
#include "perf.h"
|
|
#include "debug.h"
|
|
#include <subcmd/parse-options.h>
|
|
#include "data-convert.h"
|
|
#include "data-convert-bt.h"
|
|
|
|
typedef int (*data_cmd_fn_t)(int argc, const char **argv);
|
|
|
|
struct data_cmd {
|
|
const char *name;
|
|
const char *summary;
|
|
data_cmd_fn_t fn;
|
|
};
|
|
|
|
static struct data_cmd data_cmds[];
|
|
|
|
#define for_each_cmd(cmd) \
|
|
for (cmd = data_cmds; cmd && cmd->name; cmd++)
|
|
|
|
static const struct option data_options[] = {
|
|
OPT_END()
|
|
};
|
|
|
|
static const char * const data_subcommands[] = { "convert", NULL };
|
|
|
|
static const char *data_usage[] = {
|
|
"perf data [<common options>] <command> [<options>]",
|
|
NULL
|
|
};
|
|
|
|
static void print_usage(void)
|
|
{
|
|
struct data_cmd *cmd;
|
|
|
|
printf("Usage:\n");
|
|
printf("\t%s\n\n", data_usage[0]);
|
|
printf("\tAvailable commands:\n");
|
|
|
|
for_each_cmd(cmd) {
|
|
printf("\t %s\t- %s\n", cmd->name, cmd->summary);
|
|
}
|
|
|
|
printf("\n");
|
|
}
|
|
|
|
static const char * const data_convert_usage[] = {
|
|
"perf data convert [<options>]",
|
|
NULL
|
|
};
|
|
|
|
static int cmd_data_convert(int argc, const char **argv)
|
|
{
|
|
const char *to_ctf = NULL;
|
|
struct perf_data_convert_opts opts = {
|
|
.force = false,
|
|
.all = false,
|
|
};
|
|
const struct option options[] = {
|
|
OPT_INCR('v', "verbose", &verbose, "be more verbose"),
|
|
OPT_STRING('i', "input", &input_name, "file", "input file name"),
|
|
#ifdef HAVE_LIBBABELTRACE_SUPPORT
|
|
OPT_STRING(0, "to-ctf", &to_ctf, NULL, "Convert to CTF format"),
|
|
#endif
|
|
OPT_BOOLEAN('f', "force", &opts.force, "don't complain, do it"),
|
|
OPT_BOOLEAN(0, "all", &opts.all, "Convert all events"),
|
|
OPT_END()
|
|
};
|
|
|
|
#ifndef HAVE_LIBBABELTRACE_SUPPORT
|
|
pr_err("No conversion support compiled in. perf should be compiled with environment variables LIBBABELTRACE=1 and LIBBABELTRACE_DIR=/path/to/libbabeltrace/\n");
|
|
return -1;
|
|
#endif
|
|
|
|
argc = parse_options(argc, argv, options,
|
|
data_convert_usage, 0);
|
|
if (argc) {
|
|
usage_with_options(data_convert_usage, options);
|
|
return -1;
|
|
}
|
|
|
|
if (to_ctf) {
|
|
#ifdef HAVE_LIBBABELTRACE_SUPPORT
|
|
return bt_convert__perf2ctf(input_name, to_ctf, &opts);
|
|
#else
|
|
pr_err("The libbabeltrace support is not compiled in.\n");
|
|
return -1;
|
|
#endif
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
|
|
static struct data_cmd data_cmds[] = {
|
|
{ "convert", "converts data file between formats", cmd_data_convert },
|
|
{ .name = NULL, },
|
|
};
|
|
|
|
int cmd_data(int argc, const char **argv)
|
|
{
|
|
struct data_cmd *cmd;
|
|
const char *cmdstr;
|
|
|
|
/* No command specified. */
|
|
if (argc < 2)
|
|
goto usage;
|
|
|
|
argc = parse_options_subcommand(argc, argv, data_options, data_subcommands, data_usage,
|
|
PARSE_OPT_STOP_AT_NON_OPTION);
|
|
if (argc < 1)
|
|
goto usage;
|
|
|
|
cmdstr = argv[0];
|
|
|
|
for_each_cmd(cmd) {
|
|
if (strcmp(cmd->name, cmdstr))
|
|
continue;
|
|
|
|
return cmd->fn(argc, argv);
|
|
}
|
|
|
|
pr_err("Unknown command: %s\n", cmdstr);
|
|
usage:
|
|
print_usage();
|
|
return -1;
|
|
}
|