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
78 lines
1.6 KiB
C
78 lines
1.6 KiB
C
// SPDX-License-Identifier: GPL-2.0
|
|
#include <sys/types.h>
|
|
#include <unistd.h>
|
|
#include <stdio.h>
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
|
|
#include "../../util/header.h"
|
|
|
|
static inline void
|
|
cpuid(unsigned int op, unsigned int *a, unsigned int *b, unsigned int *c,
|
|
unsigned int *d)
|
|
{
|
|
__asm__ __volatile__ (".byte 0x53\n\tcpuid\n\t"
|
|
"movl %%ebx, %%esi\n\t.byte 0x5b"
|
|
: "=a" (*a),
|
|
"=S" (*b),
|
|
"=c" (*c),
|
|
"=d" (*d)
|
|
: "a" (op));
|
|
}
|
|
|
|
static int
|
|
__get_cpuid(char *buffer, size_t sz, const char *fmt)
|
|
{
|
|
unsigned int a, b, c, d, lvl;
|
|
int family = -1, model = -1, step = -1;
|
|
int nb;
|
|
char vendor[16];
|
|
|
|
cpuid(0, &lvl, &b, &c, &d);
|
|
strncpy(&vendor[0], (char *)(&b), 4);
|
|
strncpy(&vendor[4], (char *)(&d), 4);
|
|
strncpy(&vendor[8], (char *)(&c), 4);
|
|
vendor[12] = '\0';
|
|
|
|
if (lvl >= 1) {
|
|
cpuid(1, &a, &b, &c, &d);
|
|
|
|
family = (a >> 8) & 0xf; /* bits 11 - 8 */
|
|
model = (a >> 4) & 0xf; /* Bits 7 - 4 */
|
|
step = a & 0xf;
|
|
|
|
/* extended family */
|
|
if (family == 0xf)
|
|
family += (a >> 20) & 0xff;
|
|
|
|
/* extended model */
|
|
if (family >= 0x6)
|
|
model += ((a >> 16) & 0xf) << 4;
|
|
}
|
|
nb = scnprintf(buffer, sz, fmt, vendor, family, model, step);
|
|
|
|
/* look for end marker to ensure the entire data fit */
|
|
if (strchr(buffer, '$')) {
|
|
buffer[nb-1] = '\0';
|
|
return 0;
|
|
}
|
|
return -1;
|
|
}
|
|
|
|
int
|
|
get_cpuid(char *buffer, size_t sz)
|
|
{
|
|
return __get_cpuid(buffer, sz, "%s,%u,%u,%u$");
|
|
}
|
|
|
|
char *
|
|
get_cpuid_str(struct perf_pmu *pmu __maybe_unused)
|
|
{
|
|
char *buf = malloc(128);
|
|
|
|
if (buf && __get_cpuid(buf, 128, "%s-%u-%X$") < 0) {
|
|
free(buf);
|
|
return NULL;
|
|
}
|
|
return buf;
|
|
}
|