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
106 lines
2.2 KiB
C
106 lines
2.2 KiB
C
// SPDX-License-Identifier: GPL-2.0
|
|
#include "perf.h"
|
|
#include "util/util.h"
|
|
#include "util/debug.h"
|
|
#include <subcmd/parse-options.h>
|
|
#include "util/parse-branch-options.h"
|
|
|
|
#define BRANCH_OPT(n, m) \
|
|
{ .name = n, .mode = (m) }
|
|
|
|
#define BRANCH_END { .name = NULL }
|
|
|
|
struct branch_mode {
|
|
const char *name;
|
|
int mode;
|
|
};
|
|
|
|
static const struct branch_mode branch_modes[] = {
|
|
BRANCH_OPT("u", PERF_SAMPLE_BRANCH_USER),
|
|
BRANCH_OPT("k", PERF_SAMPLE_BRANCH_KERNEL),
|
|
BRANCH_OPT("hv", PERF_SAMPLE_BRANCH_HV),
|
|
BRANCH_OPT("any", PERF_SAMPLE_BRANCH_ANY),
|
|
BRANCH_OPT("any_call", PERF_SAMPLE_BRANCH_ANY_CALL),
|
|
BRANCH_OPT("any_ret", PERF_SAMPLE_BRANCH_ANY_RETURN),
|
|
BRANCH_OPT("ind_call", PERF_SAMPLE_BRANCH_IND_CALL),
|
|
BRANCH_OPT("abort_tx", PERF_SAMPLE_BRANCH_ABORT_TX),
|
|
BRANCH_OPT("in_tx", PERF_SAMPLE_BRANCH_IN_TX),
|
|
BRANCH_OPT("no_tx", PERF_SAMPLE_BRANCH_NO_TX),
|
|
BRANCH_OPT("cond", PERF_SAMPLE_BRANCH_COND),
|
|
BRANCH_OPT("ind_jmp", PERF_SAMPLE_BRANCH_IND_JUMP),
|
|
BRANCH_OPT("call", PERF_SAMPLE_BRANCH_CALL),
|
|
BRANCH_OPT("save_type", PERF_SAMPLE_BRANCH_TYPE_SAVE),
|
|
BRANCH_END
|
|
};
|
|
|
|
int parse_branch_str(const char *str, __u64 *mode)
|
|
{
|
|
#define ONLY_PLM \
|
|
(PERF_SAMPLE_BRANCH_USER |\
|
|
PERF_SAMPLE_BRANCH_KERNEL |\
|
|
PERF_SAMPLE_BRANCH_HV)
|
|
|
|
int ret = 0;
|
|
char *p, *s;
|
|
char *os = NULL;
|
|
const struct branch_mode *br;
|
|
|
|
if (str == NULL) {
|
|
*mode = PERF_SAMPLE_BRANCH_ANY;
|
|
return 0;
|
|
}
|
|
|
|
/* because str is read-only */
|
|
s = os = strdup(str);
|
|
if (!s)
|
|
return -1;
|
|
|
|
for (;;) {
|
|
p = strchr(s, ',');
|
|
if (p)
|
|
*p = '\0';
|
|
|
|
for (br = branch_modes; br->name; br++) {
|
|
if (!strcasecmp(s, br->name))
|
|
break;
|
|
}
|
|
if (!br->name) {
|
|
ret = -1;
|
|
pr_warning("unknown branch filter %s,"
|
|
" check man page\n", s);
|
|
goto error;
|
|
}
|
|
|
|
*mode |= br->mode;
|
|
|
|
if (!p)
|
|
break;
|
|
|
|
s = p + 1;
|
|
}
|
|
|
|
/* default to any branch */
|
|
if ((*mode & ~ONLY_PLM) == 0) {
|
|
*mode = PERF_SAMPLE_BRANCH_ANY;
|
|
}
|
|
error:
|
|
free(os);
|
|
return ret;
|
|
}
|
|
|
|
int
|
|
parse_branch_stack(const struct option *opt, const char *str, int unset)
|
|
{
|
|
__u64 *mode = (__u64 *)opt->value;
|
|
|
|
if (unset)
|
|
return 0;
|
|
|
|
/*
|
|
* cannot set it twice, -b + --branch-filter for instance
|
|
*/
|
|
if (*mode)
|
|
return -1;
|
|
|
|
return parse_branch_str(str, mode);
|
|
}
|