X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Futils%2Fobd.c;h=a6ccd29ddbdc8e9bca343f131323a69e78c55772;hb=7312616768bfed768ecc00ba20322c37568138d0;hp=3c6d4ce6234ea2d92d7291c709a7b84534789548;hpb=c0463398bf5942d58ae209cfab76be6b1c0842c9;p=fs%2Flustre-release.git diff --git a/lustre/utils/obd.c b/lustre/utils/obd.c index 3c6d4ce..a6ccd29 100644 --- a/lustre/utils/obd.c +++ b/lustre/utils/obd.c @@ -40,7 +40,9 @@ #include #include #include -#include +#include /* for IOC_LOV_SET_OSC_ACTIVE */ +#include /* for struct lov_stripe_md */ +#include #include #include @@ -79,6 +81,8 @@ char *buf = rawbuf; int max = sizeof(rawbuf); static int thread; +static struct lov_stripe_md saved_lsm; +static char lsm_valid = 0; static int getfd(char *func); static char *cmdname(char *func); @@ -96,25 +100,36 @@ do { \ } \ } while (0) +#define IOC_PACK(func, data) \ +do { \ + if (obd_ioctl_pack(&data, &buf, max)) { \ + fprintf(stderr, "error: %s: invalid ioctl\n", \ + cmdname(func)); \ + return -2; \ + } \ +} while (0) + +#define IOC_UNPACK(func, data) \ +do { \ + if (obd_ioctl_unpack(&data, buf, max)) { \ + fprintf(stderr, "error: %s: invalid reply\n", \ + cmdname(func)); \ + return -2; \ + } \ +} while (0) + char *obdo_print(struct obdo *obd) { char buf[1024]; - sprintf(buf, "id: %Ld\ngrp: %Ld\natime: %Ld\nmtime: %Ld\nctime: %Ld\n" - "size: %Ld\nblocks: %Ld\nblksize: %d\nmode: %o\nuid: %d\n" - "gid: %d\nflags: %x\nobdflags: %x\nnlink: %d,\nvalid %x\n", - obd->o_id, - obd->o_gr, - obd->o_atime, - obd->o_mtime, - obd->o_ctime, - obd->o_size, - obd->o_blocks, - obd->o_blksize, - obd->o_mode, - obd->o_uid, - obd->o_gid, - obd->o_flags, obd->o_obdflags, obd->o_nlink, obd->o_valid); + sprintf(buf, "id: "LPX64"\ngrp: "LPX64"\natime: "LPU64"\nmtime: "LPU64 + "\nctime: "LPU64"\nsize: "LPU64"\nblocks: "LPU64 + "\nblksize: %u\nmode: %o\nuid: %d\ngid: %d\nflags: %x\n" + "obdflags: %x\nnlink: %d,\nvalid %x\n", + obd->o_id, obd->o_gr, obd->o_atime, obd->o_mtime, obd->o_ctime, + obd->o_size, obd->o_blocks, obd->o_blksize, obd->o_mode, + obd->o_uid, obd->o_gid, obd->o_flags, obd->o_obdflags, + obd->o_nlink, obd->o_valid); return strdup(buf); } @@ -136,18 +151,14 @@ static int do_name2dev(char *func, char *name) data.ioc_inllen1 = strlen(name) + 1; data.ioc_inlbuf1 = name; - if (obd_ioctl_pack(&data, &buf, max)) { - fprintf(stderr, "error: %s: invalid ioctl\n", cmdname(func)); - return -2; - } + IOC_PACK(func, data); rc = ioctl(fd, OBD_IOC_NAME2DEV, buf); if (rc < 0) { fprintf(stderr, "error: %s: %s - %s\n", cmdname(func), name, strerror(rc = errno)); return rc; } - - memcpy((char *)(&data), buf, sizeof(data)); + IOC_UNPACK(func, data); return data.ioc_dev + N2D_OFF; } @@ -286,7 +297,7 @@ int do_disconnect(char *func, int verbose) OBD_IOC_DISCONNECT, strerror(errno)); } else { if (verbose) - printf("%s: disconnected conn %Lx\n", cmdname(func), + printf("%s: disconnected conn "LPX64"\n", cmdname(func), conn_addr); conn_addr = -1; } @@ -297,6 +308,7 @@ int do_disconnect(char *func, int verbose) #if SHMEM_STATS static void shmem_setup(void) { + /* Create new segment */ int shmid = shmget(IPC_PRIVATE, sizeof(counter_snapshot[0]), 0600); if (shmid == -1) { @@ -305,6 +317,7 @@ static void shmem_setup(void) return; } + /* Attatch to new segment */ shared_counters = (long long *)shmat(shmid, NULL, 0); if (shared_counters == (long long *)(-1)) { @@ -313,6 +326,14 @@ static void shmem_setup(void) shared_counters = NULL; return; } + + /* Mark segment as destroyed, so it will disappear when we exit. + * Forks will inherit attached segments, so we should be OK. + */ + if (shmctl(shmid, IPC_RMID, NULL) == -1) { + fprintf(stderr, "Can't destroy shared memory counters: %s\n", + strerror(errno)); + } } static inline void shmem_reset(void) @@ -392,11 +413,7 @@ static int do_device(char *func, int dev) if (getfd(func)) return -1; - if (obd_ioctl_pack(&data, &buf, max)) { - fprintf(stderr, "error: %s: invalid ioctl\n", cmdname(func)); - return -2; - } - + IOC_PACK(func, data); return ioctl(fd, OBD_IOC_DEVICE, buf); } @@ -574,18 +591,20 @@ int jt_opt_threads(int argc, char **argv) int jt_obd_detach(int argc, char **argv) { struct obd_ioctl_data data; + char force = 'F'; int rc; IOCINIT(data); - if (argc != 1) + if (argc != 1 && argc != 2) return CMD_HELP; - if (obd_ioctl_pack(&data, &buf, max)) { - fprintf(stderr, "error: %s: invalid ioctl\n", cmdname(argv[0])); - return -2; + if (argc == 2) { + data.ioc_inllen1 = 1; + data.ioc_inlbuf1 = &force; } + IOC_PACK(argv[0], data); rc = ioctl(fd, OBD_IOC_DETACH, buf); if (rc < 0) fprintf(stderr, "error: %s: %s\n", cmdname(argv[0]), @@ -636,6 +655,37 @@ int jt_obd_newdev(int argc, char **argv) return rc; } +int jt_get_version(int argc, char **argv) +{ + int rc; + char buf[8192]; + struct obd_ioctl_data *data = (struct obd_ioctl_data *)buf; + + if (getfd(argv[0])) + return -1; + + memset(buf, 0, sizeof(buf)); + data->ioc_version = OBD_IOCTL_VERSION; + data->ioc_addr = conn_addr; + data->ioc_cookie = conn_addr; + data->ioc_len = sizeof(buf); + data->ioc_inllen1 = sizeof(buf) - size_round(sizeof(*data)); + + if (argc != 1) + return CMD_HELP; + + rc = ioctl(fd, OBD_GET_VERSION, data); + if (rc < 0) + fprintf(stderr, "error: %s: %s\n", cmdname(argv[0]), + strerror(rc = errno)); + else { + printf("Lustre version: %s\n", data->ioc_bulk); + } + + printf("lctl version: %s\n",BUILD_VERSION); + return rc; +} + int jt_obd_list(int argc, char **argv) { int rc; @@ -688,11 +738,7 @@ int jt_obd_attach(int argc, char **argv) data.ioc_inlbuf3 = argv[3]; } - if (obd_ioctl_pack(&data, &buf, max)) { - fprintf(stderr, "error: %s: invalid ioctl\n", cmdname(argv[0])); - return -2; - } - + IOC_PACK(argv[0], data); rc = ioctl(fd, OBD_IOC_ATTACH, buf); if (rc < 0) fprintf(stderr, "error: %s: %x %s\n", cmdname(argv[0]), @@ -753,10 +799,7 @@ int jt_obd_setup(int argc, char **argv) data.ioc_inlbuf2 = argv[2]; } - if (obd_ioctl_pack(&data, &buf, max)) { - fprintf(stderr, "error: %s: invalid ioctl\n", cmdname(argv[0])); - return -2; - } + IOC_PACK(argv[0], data); rc = ioctl(fd, OBD_IOC_SETUP, buf); if (rc < 0) fprintf(stderr, "error: %s: %s\n", cmdname(argv[0]), @@ -765,15 +808,15 @@ int jt_obd_setup(int argc, char **argv) return rc; } - +/* The ioctl API has been extended to provide the LOV stripe metadata to the + * caller when applicable. This utility, however, only saves the LSM for the + * latest CREATE. */ int jt_obd_create(int argc, char **argv) { struct obd_ioctl_data data; struct timeval next_time; __u64 count = 1, next_count; - int verbose = 1; - int mode = 0100644; - int rc = 0, i; + int verbose = 1, mode = 0100644, rc = 0, i; char *end; IOCINIT(data); @@ -816,7 +859,14 @@ int jt_obd_create(int argc, char **argv) data.ioc_obdo1.o_valid = OBD_MD_FLTYPE | OBD_MD_FLMODE | OBD_MD_FLID | OBD_MD_FLUID | OBD_MD_FLGID;; - rc = ioctl(fd, OBD_IOC_CREATE, &data); + data.ioc_inllen1 = sizeof(saved_lsm); + data.ioc_inlbuf1 = (char *)&saved_lsm; + + IOC_PACK(argv[0], data); + rc = ioctl(fd, OBD_IOC_CREATE, buf); + IOC_UNPACK(argv[0], data); + fprintf(stderr, "lsm->lsm_o_id: "LPX64"\n", + saved_lsm.lsm_object_id); SHMEM_BUMP(); if (rc < 0) { fprintf(stderr, "error: %s: #%d - %s\n", @@ -830,9 +880,11 @@ int jt_obd_create(int argc, char **argv) break; } + lsm_valid = 1; + if (be_verbose(verbose, &next_time, i, &next_count, count)) - printf("%s: #%d is object id 0x%Lx\n", cmdname(argv[0]), - i, (long long)data.ioc_obdo1.o_id); + printf("%s: #%d is object id "LPX64"\n", + cmdname(argv[0]), i, data.ioc_obdo1.o_id); } return rc; } @@ -861,7 +913,13 @@ int jt_obd_setattr(int argc, char **argv) } data.ioc_obdo1.o_valid = OBD_MD_FLID | OBD_MD_FLTYPE | OBD_MD_FLMODE; - rc = ioctl(fd, OBD_IOC_SETATTR, &data); + if (lsm_valid == 1) { + data.ioc_inllen1 = sizeof(saved_lsm); + data.ioc_inlbuf1 = (char *)&saved_lsm; + } + + IOC_PACK(argv[0], data); + rc = ioctl(fd, OBD_IOC_SETATTR, buf); if (rc < 0) fprintf(stderr, "error: %s: %s\n", cmdname(argv[0]), strerror(rc = errno)); @@ -872,25 +930,66 @@ int jt_obd_setattr(int argc, char **argv) int jt_obd_destroy(int argc, char **argv) { struct obd_ioctl_data data; + struct timeval next_time; + __u64 count = 1, next_count; + int verbose = 1; + __u64 id; char *end; - int rc; + int rc = 0, i; IOCINIT(data); - if (argc != 2) + if (argc < 2 || argc > 4) return CMD_HELP; - data.ioc_obdo1.o_id = strtoull(argv[1], &end, 0); + id = strtoull(argv[1], &end, 0); if (*end) { fprintf(stderr, "error: %s: invalid objid '%s'\n", cmdname(argv[0]), argv[1]); return CMD_HELP; } - data.ioc_obdo1.o_mode = S_IFREG | 0644; + if (argc > 2) { + count = strtoull(argv[2], &end, 0); + if (*end) { + fprintf(stderr, + "error: %s: invalid iteration count '%s'\n", + cmdname(argv[0]), argv[2]); + return CMD_HELP; + } + } - rc = ioctl(fd, OBD_IOC_DESTROY, &data); - if (rc < 0) - fprintf(stderr, "error: %s: %s\n", cmdname(argv[0]), - strerror(rc = errno)); + if (argc > 3) { + verbose = get_verbose(argv[0], argv[3]); + if (verbose == BAD_VERBOSE) + return CMD_HELP; + } + + printf("%s: "LPD64" objects\n", cmdname(argv[0]), count); + gettimeofday(&next_time, NULL); + next_time.tv_sec -= verbose; + + for (i = 1, next_count = verbose; i <= count; i++, id++) { + data.ioc_obdo1.o_id = id; + data.ioc_obdo1.o_mode = S_IFREG | 0644; + data.ioc_obdo1.o_valid = OBD_MD_FLID | OBD_MD_FLMODE; + + data.ioc_inllen1 = sizeof(saved_lsm); + data.ioc_inlbuf1 = (char *)&saved_lsm; + + IOC_PACK(argv[0], data); + rc = ioctl(fd, OBD_IOC_DESTROY, buf); + IOC_UNPACK(argv[0], data); + SHMEM_BUMP(); + if (rc < 0) { + fprintf(stderr, "error: %s: objid "LPX64": %s\n", + cmdname(argv[0]), id, strerror(rc = errno)); + break; + } + lsm_valid = 0; + + if (be_verbose(verbose, &next_time, i, &next_count, count)) + printf("%s: #%d is object id "LPX64"\n", + cmdname(argv[0]), i, id); + } return rc; } @@ -914,14 +1013,21 @@ int jt_obd_getattr(int argc, char **argv) /* to help obd filter */ data.ioc_obdo1.o_mode = 0100644; data.ioc_obdo1.o_valid = 0xffffffff; - printf("%s: object id %Ld\n", cmdname(argv[0]), data.ioc_obdo1.o_id); + printf("%s: object id "LPX64"\n", cmdname(argv[0]),data.ioc_obdo1.o_id); + + if (lsm_valid == 1) { + data.ioc_inllen1 = sizeof(saved_lsm); + data.ioc_inlbuf1 = (char *)&saved_lsm; + } - rc = ioctl(fd, OBD_IOC_GETATTR, &data); + IOC_PACK(argv[0], data); + rc = ioctl(fd, OBD_IOC_GETATTR, buf); + IOC_UNPACK(argv[0], data); if (rc) { fprintf(stderr, "error: %s: %s\n", cmdname(argv[0]), strerror(rc = errno)); } else { - printf("%s: object id %Ld, mode %o\n", cmdname(argv[0]), + printf("%s: object id "LPX64", mode %o\n", cmdname(argv[0]), data.ioc_obdo1.o_id, data.ioc_obdo1.o_mode); } return rc; @@ -1088,6 +1194,11 @@ int jt_obd_test_brw(int argc, char **argv) data.ioc_count = len; data.ioc_offset = thr_offset * len * count; + if (lsm_valid == 1) { + data.ioc_inllen1 = sizeof(saved_lsm); + data.ioc_inlbuf1 = (char *)&saved_lsm; + } + gettimeofday(&start, NULL); next_time.tv_sec = start.tv_sec - verbose; next_time.tv_usec = start.tv_usec; @@ -1097,7 +1208,9 @@ int jt_obd_test_brw(int argc, char **argv) cmdname(argv[0]), write ? "writing" : "reading", count, pages, objid, data.ioc_offset, ctime(&start.tv_sec)); - rc = ioctl(fd, OBD_IOC_OPEN, &data); + IOC_PACK(argv[0], data); + rc = ioctl(fd, OBD_IOC_OPEN, buf); + IOC_UNPACK(argv[0], data); if (rc) { fprintf(stderr, "error: brw_open: %s\n", strerror(rc = errno)); return rc; @@ -1105,7 +1218,7 @@ int jt_obd_test_brw(int argc, char **argv) rw = write ? OBD_IOC_BRW_WRITE : OBD_IOC_BRW_READ; for (i = 1, next_count = verbose; i <= count; i++) { - rc = ioctl(fd, rw, &data); + rc = ioctl(fd, rw, buf); SHMEM_BUMP(); if (rc) { fprintf(stderr, "error: %s: #%d - %s on %s\n", @@ -1134,7 +1247,7 @@ int jt_obd_test_brw(int argc, char **argv) i, pages, diff, (double)i * pages / diff, ctime(&end.tv_sec)); } - rw = ioctl(fd, OBD_IOC_CLOSE, &data); + rw = ioctl(fd, OBD_IOC_CLOSE, buf); if (rw) { fprintf(stderr, "error: brw_close: %s\n", strerror(rw = errno)); if (!rc) @@ -1245,7 +1358,6 @@ int jt_obd_lov_setconfig(int argc, char **argv) rc = -EINVAL; goto out; } - rc = ioctl(fd, OBD_IOC_LOV_SET_CONFIG, buf); if (rc) fprintf(stderr, "error: %s: ioctl error: %s\n", @@ -1297,7 +1409,6 @@ repeat: rc = -EINVAL; goto out; } - rc = ioctl(fd, OBD_IOC_LOV_GET_CONFIG, buf); if (rc == -ENOSPC) { free(uuidarray); @@ -1387,13 +1498,8 @@ int jt_obd_ldlm_regress_start(int argc, char **argv) data.ioc_inllen1 = strlen(argstring) + 1; } - if (obd_ioctl_pack(&data, &buf, max)) { - fprintf(stderr, "error: %s: invalid ioctl\n", cmdname(argv[0])); - return -2; - } - + IOC_PACK(argv[0], data); rc = ioctl(fd, IOC_LDLM_REGRESS_START, buf); - if (rc) fprintf(stderr, "error: %s: test failed: %s\n", cmdname(argv[0]), strerror(rc = errno)); @@ -1433,13 +1539,8 @@ int jt_obd_lov_set_osc_active(int argc, char **argv) /* reuse offset for 'active' */ data.ioc_offset = atoi(argv[2]); - if (obd_ioctl_pack(&data, &buf, max)) { - fprintf(stderr, "error: %s: invalid ioctl\n", cmdname(argv[0])); - return -2; - } - + IOC_PACK(argv[0], data); rc = ioctl(fd, IOC_LOV_SET_OSC_ACTIVE, buf); - if (rc) fprintf(stderr, "error: %s: failed: %s\n", cmdname(argv[0]), strerror(rc = errno)); @@ -1464,11 +1565,7 @@ int jt_obd_newconn(int argc, char **argv) data.ioc_inlbuf2 = argv[2]; } - if (obd_ioctl_pack(&data, &buf, max)) { - fprintf(stderr, "error: %s: invalid ioctl\n", cmdname(argv[0])); - return -2; - } - + IOC_PACK(argv[0], data); rc = ioctl(fd, OBD_IOC_RECOVD_NEWCONN, buf); if (rc < 0) fprintf(stderr, "error: %s: %s\n", cmdname(argv[0]), @@ -1489,11 +1586,7 @@ int jt_obd_failconn(int argc, char **argv) data.ioc_inllen1 = strlen(argv[1]) + 1; data.ioc_inlbuf1 = argv[1]; - if (obd_ioctl_pack(&data, &buf, max)) { - fprintf(stderr, "error: %s: invalid ioctl\n", cmdname(argv[0])); - return -2; - } - + IOC_PACK(argv[0], data); rc = ioctl(fd, OBD_IOC_RECOVD_FAILCONN, buf); if (rc < 0) fprintf(stderr, "error: %s: %s\n", cmdname(argv[0]),