X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Futils%2Fobd.c;h=382573019f7faae6a2405c31efee60621116f41a;hp=9bac5238606e0b0a681f5e934488f86ba4ba1179;hb=63f310a5c9f799e7ce99badf410853d3275380d2;hpb=7ad24ad7978051c942381f66e04fd52bb9967dea;ds=sidebyside diff --git a/lustre/utils/obd.c b/lustre/utils/obd.c index 9bac523..3825730 100644 --- a/lustre/utils/obd.c +++ b/lustre/utils/obd.c @@ -15,11 +15,7 @@ * * You should have received a copy of the GNU General Public License * version 2 along with this program; If not, see - * http://www.sun.com/software/products/lustre/docs/GPLv2.pdf - * - * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, - * CA 95054 USA or visit www.sun.com if you need additional information or - * have any questions. + * http://www.gnu.org/licenses/gpl-2.0.html * * GPL HEADER END */ @@ -27,7 +23,7 @@ * Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved. * Use is subject to license terms. * - * Copyright (c) 2011, 2013, Intel Corporation. + * Copyright (c) 2011, 2017, Intel Corporation. */ /* * This file is part of Lustre, http://www.lustre.org/ @@ -52,7 +48,7 @@ #include #include #include -#include +#include #include #include #include @@ -61,21 +57,28 @@ #include #include #include +#include #include "obdctl.h" -#include -#include -#include -#include -#include -#include - -#include -#include +#include "lustreapi_internal.h" +#include +#include +#include +#include +#include + +#include +#include +#include +#include +#include +#include +#include +#include + #include #define MAX_STRING_SIZE 128 -#define DEVICES_LIST "/proc/fs/lustre/devices" #if HAVE_LIBPTHREAD #include @@ -86,8 +89,8 @@ #define MAX_BASE_ID 0xffffffff #define NIDSTRING_LENGTH 64 struct shared_data { - l_mutex_t mutex; - l_cond_t cond; + pthread_mutex_t mutex; + pthread_cond_t cond; int stopping; struct { __u64 counters[MAX_THREADS]; @@ -131,7 +134,7 @@ int lcfg_ioctl(char * func, int dev_id, struct lustre_cfg *lcfg) lcfg->lcfg_buflens); data.ioc_pbuf1 = (void *)lcfg; memset(buf, 0, sizeof(rawbuf)); - rc = obd_ioctl_pack(&data, &buf, sizeof(rawbuf)); + rc = llapi_ioctl_pack(&data, &buf, sizeof(rawbuf)); if (rc) { fprintf(stderr, "error: %s: invalid ioctl\n", jt_cmdname(func)); @@ -181,7 +184,7 @@ int lcfg_mgs_ioctl(char *func, int dev_id, struct lustre_cfg *lcfg) lcfg->lcfg_buflens); data.ioc_pbuf1 = (void *)lcfg; memset(buf, 0, sizeof(rawbuf)); - rc = obd_ioctl_pack(&data, &buf, sizeof(rawbuf)); + rc = llapi_ioctl_pack(&data, &buf, sizeof(rawbuf)); if (rc) { fprintf(stderr, "error: %s: invalid ioctl\n", jt_cmdname(func)); @@ -201,15 +204,17 @@ char *obdo_print(struct obdo *obd) { char buf[1024]; - 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" - "misc: %x\nnlink: %d,\nvalid "LPX64"\n", - ostid_id(&obd->o_oi), ostid_seq(&obd->o_oi), 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_misc, - obd->o_nlink, obd->o_valid); + snprintf(buf, sizeof(buf), "id: %#jx\ngrp: %#jx\natime: %ju\n" + "mtime: %ju\nctime: %ju\nsize: %ju\nblocks: %ju" + "\nblksize: %u\nmode: %o\nuid: %d\ngid: %d\nflags: %x\n" + "misc: %x\nnlink: %d,\nvalid %#jx\n", + (uintmax_t)ostid_id(&obd->o_oi), + (uintmax_t)ostid_seq(&obd->o_oi), + (uintmax_t)obd->o_atime, (uintmax_t)obd->o_mtime, + (uintmax_t)obd->o_ctime, (uintmax_t)obd->o_size, + (uintmax_t)obd->o_blocks, obd->o_blksize, obd->o_mode, + obd->o_uid, obd->o_gid, obd->o_flags, obd->o_misc, + obd->o_nlink, (uintmax_t)obd->o_valid); return strdup(buf); } @@ -230,7 +235,7 @@ static int do_name2dev(char *func, char *name) data.ioc_inlbuf1 = name; memset(buf, 0, sizeof(rawbuf)); - rc = obd_ioctl_pack(&data, &buf, sizeof(rawbuf)); + rc = llapi_ioctl_pack(&data, &buf, sizeof(rawbuf)); if (rc < 0) { fprintf(stderr, "error: %s: invalid ioctl\n", jt_cmdname(func)); @@ -239,7 +244,7 @@ static int do_name2dev(char *func, char *name) rc = l2_ioctl(OBD_DEV_ID, OBD_IOC_NAME2DEV, buf); if (rc < 0) return errno; - rc = obd_ioctl_unpack(&data, buf, sizeof(rawbuf)); + rc = llapi_ioctl_unpack(&data, buf, sizeof(rawbuf)); if (rc) { fprintf(stderr, "error: %s: invalid reply\n", jt_cmdname(func)); @@ -255,25 +260,27 @@ static int do_name2dev(char *func, char *name) */ int parse_devname(char *func, char *name) { - int rc; - int ret = -1; + int rc; + int ret = -1; + int try_digit; + + if (!name) + return ret; + + try_digit = isdigit(name[0]); + + if (name[0] == '$' || name[0] == '%') + name++; + + rc = do_name2dev(func, name); + if (rc >= N2D_OFF) + return rc - N2D_OFF; - if (!name) - return ret; - if (isdigit(name[0])) { + if (try_digit) ret = strtoul(name, NULL, 0); - } else { - if (name[0] == '$' || name[0] == '%') - name++; - rc = do_name2dev(func, name); - if (rc >= N2D_OFF) { - ret = rc - N2D_OFF; - // printf("Name %s is device %d\n", name, ret); - } else { - fprintf(stderr, "No device found for name %s: %s\n", + else + fprintf(stderr, "No device found for name %s: %s\n", name, strerror(rc)); - } - } return ret; } @@ -422,22 +429,22 @@ out: static inline void shmem_lock(void) { - l_mutex_lock(&shared_data->mutex); + pthread_mutex_lock(&shared_data->mutex); } static inline void shmem_unlock(void) { - l_mutex_unlock(&shared_data->mutex); + pthread_mutex_unlock(&shared_data->mutex); } static inline void shmem_wait(void) { - l_cond_wait(&shared_data->cond, &shared_data->mutex); + pthread_cond_wait(&shared_data->cond, &shared_data->mutex); } static inline void shmem_wakeup_all(void) { - l_cond_broadcast(&shared_data->cond); + pthread_cond_broadcast(&shared_data->cond); } static inline void shmem_reset(int total_threads) @@ -486,8 +493,8 @@ static void shmem_total(int total_threads) &shared_data->body.start_time); shmem_unlock(); - printf("Total: total "LPU64" threads %d sec %f %f/second\n", - total, total_threads, secs, total / secs); + printf("Total: total %ju threads %d sec %f %f/second\n", + (uintmax_t)total, total_threads, secs, total / secs); return; } @@ -523,16 +530,21 @@ static void shmem_snap(int total_threads, int live_threads) } secs = difftime(&this_time, &prev_time); - if (prev_valid && secs > 1.0) /* someone screwed with the time? */ - printf("%d/%d Total: %f/second\n", non_zero, total_threads, - total / secs); + if (prev_valid && secs > 1.0) { /* someone screwed with the time? */ + printf("%d/%d Total: %f/second\n", non_zero, total_threads, + total / secs); - memcpy(counter_snapshot[1], counter_snapshot[0], - total_threads * sizeof(counter_snapshot[0][0])); - prev_time = this_time; - if (!prev_valid && - running == total_threads) - prev_valid = 1; + memcpy(counter_snapshot[1], counter_snapshot[0], + total_threads * sizeof(counter_snapshot[0][0])); + prev_time = this_time; + } + if (!prev_valid && running == total_threads) { + prev_valid = 1; + /* drop counters when all threads were started */ + memcpy(counter_snapshot[1], counter_snapshot[0], + total_threads * sizeof(counter_snapshot[0][0])); + prev_time = this_time; + } } static void shmem_stop(void) @@ -851,7 +863,7 @@ int jt_obd_no_transno(int argc, char **argv) return CMD_HELP; memset(buf, 0, sizeof(rawbuf)); - rc = obd_ioctl_pack(&data, &buf, sizeof(rawbuf)); + rc = llapi_ioctl_pack(&data, &buf, sizeof(rawbuf)); if (rc) { fprintf(stderr, "error: %s: invalid ioctl\n", jt_cmdname(argv[0])); @@ -878,7 +890,7 @@ int jt_obd_set_readonly(int argc, char **argv) return CMD_HELP; memset(buf, 0, sizeof(rawbuf)); - rc = obd_ioctl_pack(&data, &buf, sizeof(rawbuf)); + rc = llapi_ioctl_pack(&data, &buf, sizeof(rawbuf)); if (rc) { fprintf(stderr, "error: %s: invalid ioctl\n", jt_cmdname(argv[0])); @@ -905,7 +917,7 @@ int jt_obd_abort_recovery(int argc, char **argv) return CMD_HELP; memset(buf, 0, sizeof(rawbuf)); - rc = obd_ioctl_pack(&data, &buf, sizeof(rawbuf)); + rc = llapi_ioctl_pack(&data, &buf, sizeof(rawbuf)); if (rc) { fprintf(stderr, "error: %s: invalid ioctl\n", jt_cmdname(argv[0])); @@ -921,72 +933,69 @@ int jt_obd_abort_recovery(int argc, char **argv) int jt_get_version(int argc, char **argv) { - int rc; - char rawbuf[MAX_IOC_BUFLEN]; - char *version; + char version[128]; + int rc; - if (argc != 1) - return CMD_HELP; + if (argc != 1) + return CMD_HELP; - rc = llapi_get_version(rawbuf, MAX_IOC_BUFLEN, &version); - if (rc) - fprintf(stderr, "error: %s: %s\n", jt_cmdname(argv[0]), - strerror(-rc)); - else - printf("Lustre version: %s\n", version); + rc = llapi_get_version_string(version, sizeof(version)); + if (rc) + printf("Lustre version: %s\n", LUSTRE_VERSION_STRING); + else + printf("Lustre version: %s\n", version); - printf("lctl version: %s\n", BUILD_VERSION); - return rc; + return 0; } static void print_obd_line(char *s) { - char buf[MAX_STRING_SIZE]; - char obd_name[MAX_OBD_NAME]; - FILE *fp = NULL; - char *ptr; - - snprintf(buf, sizeof(buf), " %%*d %%*s osc %%%zus %%*s %%*d ", - sizeof(obd_name) - 1); + const char *param = "osc/%s/ost_conn_uuid"; + char buf[MAX_STRING_SIZE]; + char obd_name[MAX_OBD_NAME]; + FILE *fp = NULL; + glob_t path; + char *ptr; +retry: + /* obd device type is the first 3 characters of param name */ + snprintf(buf, sizeof(buf), " %%*d %%*s %.3s %%%zus %%*s %%*d ", + param, sizeof(obd_name) - 1); if (sscanf(s, buf, obd_name) == 0) - goto try_mdc; - snprintf(buf, sizeof(buf), - "/proc/fs/lustre/osc/%s/ost_conn_uuid", obd_name); - if ((fp = fopen(buf, "r")) == NULL) - goto try_mdc; - goto got_one; - + goto try_mdc; + if (cfs_get_param_paths(&path, param, obd_name) != 0) + goto try_mdc; + fp = fopen(path.gl_pathv[0], "r"); + if (fp == NULL) { + /* need to free path data before retry */ + cfs_free_param_data(&path); try_mdc: - snprintf(buf, sizeof(buf), " %%*d %%*s mdc %%%zus %%*s %%*d ", - sizeof(obd_name) - 1); - if (sscanf(s, buf, obd_name) == 0) - goto fail; - snprintf(buf, sizeof(buf), - "/proc/fs/lustre/mdc/%s/mds_conn_uuid", obd_name); - if ((fp = fopen(buf, "r")) == NULL) - goto fail; - -got_one: - /* should not ignore fgets(3)'s return value */ - if (!fgets(buf, sizeof(buf), fp)) { - fprintf(stderr, "reading from %s: %s", buf, strerror(errno)); - fclose(fp); - return; - } - fclose(fp); - - /* trim trailing newlines */ - ptr = strrchr(buf, '\n'); - if (ptr) *ptr = '\0'; - ptr = strrchr(s, '\n'); - if (ptr) *ptr = '\0'; + if (param[0] == 'o') { /* failed with osc, try mdc */ + param = "mdc/%s/mds_conn_uuid"; + goto retry; + } + buf[0] = '\0'; + goto fail_print; + } - printf("%s %s\n", s, buf); - return; + /* should not ignore fgets(3)'s return value */ + if (!fgets(buf, sizeof(buf), fp)) { + fprintf(stderr, "reading from %s: %s", buf, strerror(errno)); + goto fail_close; + } -fail: - printf("%s", s); - return; +fail_close: + fclose(fp); + cfs_free_param_data(&path); + + /* trim trailing newlines */ + ptr = strrchr(buf, '\n'); + if (ptr) + *ptr = '\0'; +fail_print: + ptr = strrchr(s, '\n'); + if (ptr) + *ptr = '\0'; + printf("%s%s%s\n", s, buf[0] ? " " : "", buf); } /* get device list by ioctl */ @@ -1006,8 +1015,8 @@ int jt_obd_list_ioctl(int argc, char **argv) memset(buf, 0, sizeof(rawbuf)); data->ioc_version = OBD_IOCTL_VERSION; data->ioc_inllen1 = - sizeof(rawbuf) - cfs_size_round(sizeof(*data)); - data->ioc_inlbuf1 = buf + cfs_size_round(sizeof(*data)); + sizeof(rawbuf) - __ALIGN_KERNEL(sizeof(*data), 8); + data->ioc_inlbuf1 = buf + __ALIGN_KERNEL(sizeof(*data), 8); data->ioc_len = obd_ioctl_packlen(data); data->ioc_count = index; @@ -1029,10 +1038,10 @@ int jt_obd_list_ioctl(int argc, char **argv) int jt_obd_list(int argc, char **argv) { - int rc; - char buf[MAX_STRING_SIZE]; - FILE *fp = NULL; - int print_obd = 0; + char buf[MAX_STRING_SIZE]; + int print_obd = 0; + glob_t path; + FILE *fp; if (argc > 2) return CMD_HELP; @@ -1043,10 +1052,14 @@ int jt_obd_list(int argc, char **argv) return CMD_HELP; } - fp = fopen(DEVICES_LIST, "r"); + if (cfs_get_param_paths(&path, "devices") != 0) + return -errno; + + fp = fopen(path.gl_pathv[0], "r"); if (fp == NULL) { - fprintf(stderr, "error: %s: %s opening "DEVICES_LIST"\n", - jt_cmdname(argv[0]), strerror(rc = errno)); + fprintf(stderr, "error: %s: %s opening %s\n", + jt_cmdname(argv[0]), strerror(errno), path.gl_pathv[0]); + cfs_free_param_data(&path); return jt_obd_list_ioctl(argc, argv); } @@ -1056,14 +1069,15 @@ int jt_obd_list(int argc, char **argv) else printf("%s", buf); + cfs_free_param_data(&path); fclose(fp); return 0; } struct jt_fid_space { - obd_seq jt_seq; - obd_id jt_id; - int jt_width; + __u64 jt_seq; + __u64 jt_id; + int jt_width; }; int jt_obd_alloc_fids(struct jt_fid_space *space, struct lu_fid *fid, @@ -1088,7 +1102,7 @@ int jt_obd_alloc_fids(struct jt_fid_space *space, struct lu_fid *fid, data.ioc_plen2 = sizeof(max_count); memset(buf, 0, sizeof(rawbuf)); - rc = obd_ioctl_pack(&data, &buf, sizeof(rawbuf)); + rc = llapi_ioctl_pack(&data, &buf, sizeof(rawbuf)); if (rc) { fprintf(stderr, "error: invalid ioctl rc = %d\n", rc); return rc; @@ -1108,7 +1122,9 @@ int jt_obd_alloc_fids(struct jt_fid_space *space, struct lu_fid *fid, fid->f_oid = space->jt_id; fid->f_ver = 0; - space->jt_id = min(space->jt_id + *count, space->jt_width); + space->jt_id = space->jt_id + *count; + if (space->jt_id > space->jt_width) + space->jt_id = space->jt_width; *count = space->jt_id - fid->f_oid; return 0; @@ -1141,20 +1157,22 @@ int jt_obd_md_common(int argc, char **argv, int cmd) char *name = NULL; struct jt_fid_space fid_space = {0}; int version = 0; - struct option long_opts[] = { - {"child_base_id", required_argument, 0, 'b'}, - {"stripe_count", required_argument, 0, 'c'}, - {"parent_basedir", required_argument, 0, 'd'}, - {"parent_dircount", required_argument, 0, 'D'}, - {"stripe_index", required_argument, 0, 'i'}, - {"mode", required_argument, 0, 'm'}, - {"count", required_argument, 0, 'n'}, - {"time", required_argument, 0, 't'}, - {"version", no_argument, 0, 'v'}, - {0, 0, 0, 0} - }; - - optind = 0; + struct option long_opts[] = { + { .val = 'b', .name = "child_base_id", + .has_arg = required_argument }, + { .val = 'c', .name = "stripe_count", + .has_arg = required_argument }, + { .val = 'd', .name = "parent_basedir", + .has_arg = required_argument }, + { .val = 'D', .name = "parent_dircount", + .has_arg = required_argument }, + { .val = 'i', .name = "stripe_index", .has_arg = required_argument }, + { .val = 'm', .name = "mode", .has_arg = required_argument }, + { .val = 'n', .name = "count", .has_arg = required_argument }, + { .val = 't', .name = "time", .has_arg = required_argument }, + { .val = 'v', .name = "version", .has_arg = no_argument }, + { .name = NULL } }; + while ((c = getopt_long(argc, argv, "b:c:d:D:m:n:t:v", long_opts, NULL)) >= 0) { switch (c) { @@ -1358,14 +1376,14 @@ int jt_obd_md_common(int argc, char **argv, int cmd) fprintf(stderr, "Allocate fids error %d.\n",rc); return rc; } - fid_to_ostid(&fid, &data.ioc_obdo1.o_oi); + data.ioc_obdo1.o_oi.oi_fid = fid; } child_base_id += data.ioc_count; count += data.ioc_count; memset(buf, 0, sizeof(rawbuf)); - rc = obd_ioctl_pack(&data, &buf, sizeof(rawbuf)); + rc = llapi_ioctl_pack(&data, &buf, sizeof(rawbuf)); if (rc) { fprintf(stderr, "error: %s: invalid ioctl %d\n", jt_cmdname(argv[0]), rc); @@ -1480,29 +1498,35 @@ int jt_obd_create(int argc, char **argv) return CMD_HELP; } - printf("%s: "LPD64" objects\n", jt_cmdname(argv[0]), count); + printf("%s: %jd objects\n", jt_cmdname(argv[0]), (uintmax_t)count); gettimeofday(&next_time, NULL); next_time.tv_sec -= verbose; ostid_set_seq_echo(&data.ioc_obdo1.o_oi); for (i = 1, next_count = verbose; i <= count && shmem_running(); i++) { + /* + * base_id is 1 so we don't need to worry about it being + * greater than OBIF_MAX_OID + */ + data.ioc_obdo1.o_oi.oi_fid.f_oid = base_id; data.ioc_obdo1.o_mode = mode; - ostid_set_id(&data.ioc_obdo1.o_oi, base_id); data.ioc_obdo1.o_uid = 0; data.ioc_obdo1.o_gid = 0; + data.ioc_obdo1.o_projid = 0; data.ioc_obdo1.o_valid = OBD_MD_FLTYPE | OBD_MD_FLMODE | OBD_MD_FLID | OBD_MD_FLUID | - OBD_MD_FLGID | OBD_MD_FLGROUP; + OBD_MD_FLGID | OBD_MD_FLGROUP | + OBD_MD_FLPROJID; memset(buf, 0, sizeof(rawbuf)); - rc = obd_ioctl_pack(&data, &buf, sizeof(rawbuf)); + rc = llapi_ioctl_pack(&data, &buf, sizeof(rawbuf)); if (rc) { fprintf(stderr, "error: %s: invalid ioctl\n", jt_cmdname(argv[0])); return rc; } rc = l2_ioctl(OBD_DEV_ID, OBD_IOC_CREATE, buf); - obd_ioctl_unpack(&data, buf, sizeof(rawbuf)); + llapi_ioctl_unpack(&data, buf, sizeof(rawbuf)); shmem_bump(1); if (rc < 0) { fprintf(stderr, "error: %s: #%d - %s\n", @@ -1510,49 +1534,62 @@ int jt_obd_create(int argc, char **argv) break; } if (!(data.ioc_obdo1.o_valid & OBD_MD_FLID)) { - fprintf(stderr,"error: %s: oid not valid #%d:"LPX64"\n", - jt_cmdname(argv[0]), i, data.ioc_obdo1.o_valid); + fprintf(stderr, "error: %s: oid not valid #%d:%#jx\n", + jt_cmdname(argv[0]), i, + (uintmax_t)data.ioc_obdo1.o_valid); rc = EINVAL; break; } if (be_verbose(verbose, &next_time, i, &next_count, count)) - printf("%s: #%d is object id "LPX64"\n", + printf("%s: #%d is object id %#jx\n", jt_cmdname(argv[0]), i, - ostid_id(&data.ioc_obdo1.o_oi)); + (uintmax_t) ostid_id(&data.ioc_obdo1.o_oi)); } return rc; } int jt_obd_setattr(int argc, char **argv) { - struct obd_ioctl_data data; - char rawbuf[MAX_IOC_BUFLEN], *buf = rawbuf; - char *end; - int rc; + struct obd_ioctl_data data; + char rawbuf[MAX_IOC_BUFLEN], *buf = rawbuf; + __u64 objid; + char *end; + int mode; + int rc; memset(&data, 0, sizeof(data)); data.ioc_dev = cur_device; if (argc != 2) return CMD_HELP; - ostid_set_seq_echo(&data.ioc_obdo1.o_oi); - ostid_set_id(&data.ioc_obdo1.o_oi, strtoull(argv[1], &end, 0)); - if (*end) { + objid = strtoull(argv[1], &end, 0); + if (*end) { + fprintf(stderr, "error: %s: objid '%s' is not a number\n", + jt_cmdname(argv[0]), argv[1]); + return CMD_HELP; + } + + if (objid >= OBIF_MAX_OID) { fprintf(stderr, "error: %s: invalid objid '%s'\n", jt_cmdname(argv[0]), argv[1]); return CMD_HELP; } - data.ioc_obdo1.o_mode = S_IFREG | strtoul(argv[2], &end, 0); + + mode = strtoul(argv[2], &end, 0); if (*end) { fprintf(stderr, "error: %s: invalid mode '%s'\n", jt_cmdname(argv[0]), argv[2]); return CMD_HELP; } - data.ioc_obdo1.o_valid = OBD_MD_FLID | OBD_MD_FLTYPE | OBD_MD_FLMODE; + + ostid_set_seq_echo(&data.ioc_obdo1.o_oi); + data.ioc_obdo1.o_mode = S_IFREG | mode; + data.ioc_obdo1.o_oi.oi_fid.f_oid = objid; + data.ioc_obdo1.o_valid = OBD_MD_FLID | OBD_MD_FLTYPE | OBD_MD_FLMODE; memset(buf, 0, sizeof(rawbuf)); - rc = obd_ioctl_pack(&data, &buf, sizeof(rawbuf)); + rc = llapi_ioctl_pack(&data, &buf, sizeof(rawbuf)); if (rc) { fprintf(stderr, "error: %s: invalid ioctl\n", jt_cmdname(argv[0])); @@ -1570,10 +1607,10 @@ int jt_obd_test_setattr(int argc, char **argv) { struct obd_ioctl_data data; struct timeval start, next_time; - __u64 i, count, next_count; + __u64 i, count, next_count; char rawbuf[MAX_IOC_BUFLEN], *buf = rawbuf; int verbose = 1; - obd_id objid = 3; + __u64 objid = 3; char *end; int rc = 0; @@ -1613,16 +1650,23 @@ int jt_obd_test_setattr(int argc, char **argv) next_time.tv_sec = start.tv_sec - verbose; next_time.tv_usec = start.tv_usec; if (verbose != 0) - printf("%s: setting "LPD64" attrs (objid "LPX64"): %s", - jt_cmdname(argv[0]), count, objid, ctime(&start.tv_sec)); + printf("%s: setting %jd attrs (objid %#jx): %s", + jt_cmdname(argv[0]), (uintmax_t)count, + (uintmax_t)objid, ctime(&start.tv_sec)); ostid_set_seq_echo(&data.ioc_obdo1.o_oi); for (i = 1, next_count = verbose; i <= count && shmem_running(); i++) { - ostid_set_id(&data.ioc_obdo1.o_oi, objid); + if (objid >= OBIF_MAX_OID) { + fprintf(stderr, "errr: %s: invalid objid '%llu'\n", + jt_cmdname(argv[0]), objid); + return -E2BIG; + } + + data.ioc_obdo1.o_oi.oi_fid.f_oid = objid; data.ioc_obdo1.o_mode = S_IFREG; data.ioc_obdo1.o_valid = OBD_MD_FLID | OBD_MD_FLTYPE | OBD_MD_FLMODE; memset(buf, 0, sizeof(rawbuf)); - rc = obd_ioctl_pack(&data, &buf, sizeof(rawbuf)); + rc = llapi_ioctl_pack(&data, &buf, sizeof(rawbuf)); if (rc) { fprintf(stderr, "error: %s: invalid ioctl\n", jt_cmdname(argv[0])); @@ -1631,14 +1675,15 @@ int jt_obd_test_setattr(int argc, char **argv) rc = l2_ioctl(OBD_DEV_ID, OBD_IOC_SETATTR, &data); shmem_bump(1); if (rc < 0) { - fprintf(stderr, "error: %s: #"LPD64" - %d:%s\n", - jt_cmdname(argv[0]), i, errno, strerror(rc = errno)); + fprintf(stderr, "error: %s: #%jd - %d:%s\n", + jt_cmdname(argv[0]), (uintmax_t)i, + errno, strerror(rc = errno)); break; } else { if (be_verbose (verbose, &next_time, i, &next_count, count)) - printf("%s: set attr #"LPD64"\n", - jt_cmdname(argv[0]), i); + printf("%s: set attr #%jd\n", + jt_cmdname(argv[0]), (uintmax_t)i); } } @@ -1652,9 +1697,9 @@ int jt_obd_test_setattr(int argc, char **argv) --i; if (verbose != 0) - printf("%s: "LPD64" attrs in %.3fs (%.3f attr/s): %s", - jt_cmdname(argv[0]), i, diff, i / diff, - ctime(&end.tv_sec)); + printf("%s: %jd attrs in %.3fs (%.3f attr/s): %s", + jt_cmdname(argv[0]), (uintmax_t)i, diff, + i / diff, ctime(&end.tv_sec)); } return rc; } @@ -1675,6 +1720,7 @@ int jt_obd_destroy(int argc, char **argv) if (argc < 2 || argc > 4) return CMD_HELP; + errno = 0; id = strtoull(argv[1], &end, 0); if (*end || id == 0 || errno != 0) { fprintf(stderr, "error: %s: invalid objid '%s'\n", @@ -1697,35 +1743,42 @@ int jt_obd_destroy(int argc, char **argv) return CMD_HELP; } - printf("%s: "LPD64" objects\n", jt_cmdname(argv[0]), count); + printf("%s: %jd objects\n", jt_cmdname(argv[0]), (uintmax_t)count); gettimeofday(&next_time, NULL); next_time.tv_sec -= verbose; ostid_set_seq_echo(&data.ioc_obdo1.o_oi); for (i = 1, next_count = verbose; i <= count && shmem_running(); i++, id++) { - ostid_set_id(&data.ioc_obdo1.o_oi, id); + if (id >= OBIF_MAX_OID) { + fprintf(stderr, "errr: %s: invalid objid '%llu'\n", + jt_cmdname(argv[0]), id); + return -E2BIG; + } + + data.ioc_obdo1.o_oi.oi_fid.f_oid = id; data.ioc_obdo1.o_mode = S_IFREG | 0644; data.ioc_obdo1.o_valid = OBD_MD_FLID | OBD_MD_FLMODE; memset(buf, 0, sizeof(rawbuf)); - rc = obd_ioctl_pack(&data, &buf, sizeof(rawbuf)); + rc = llapi_ioctl_pack(&data, &buf, sizeof(rawbuf)); if (rc) { fprintf(stderr, "error: %s: invalid ioctl\n", jt_cmdname(argv[0])); return rc; } rc = l2_ioctl(OBD_DEV_ID, OBD_IOC_DESTROY, buf); - obd_ioctl_unpack(&data, buf, sizeof(rawbuf)); + llapi_ioctl_unpack(&data, buf, sizeof(rawbuf)); shmem_bump(1); if (rc < 0) { - fprintf(stderr, "error: %s: objid "LPX64": %s\n", - jt_cmdname(argv[0]), id, strerror(rc = errno)); + fprintf(stderr, "error: %s: objid %#jx: %s\n", + jt_cmdname(argv[0]), (uintmax_t)id, + strerror(rc = errno)); break; } if (be_verbose(verbose, &next_time, i, &next_count, count)) - printf("%s: #%d is object id "LPX64"\n", - jt_cmdname(argv[0]), i, id); + printf("%s: #%d is object id %#jx\n", + jt_cmdname(argv[0]), i, (uintmax_t)id); } return rc; @@ -1735,42 +1788,52 @@ int jt_obd_getattr(int argc, char **argv) { struct obd_ioctl_data data; char rawbuf[MAX_IOC_BUFLEN], *buf = rawbuf; + __u64 objid; char *end; int rc; if (argc != 2) return CMD_HELP; - memset(&data, 0, sizeof(data)); - data.ioc_dev = cur_device; - ostid_set_seq_echo(&data.ioc_obdo1.o_oi); - ostid_set_id(&data.ioc_obdo1.o_oi, strtoull(argv[1], &end, 0)); + objid = strtoull(argv[1], &end, 0); if (*end) { + fprintf(stderr, "error: %s: objid '%s' is not a number\n", + jt_cmdname(argv[0]), argv[1]); + return CMD_HELP; + } + + if (objid >= OBIF_MAX_OID) { fprintf(stderr, "error: %s: invalid objid '%s'\n", jt_cmdname(argv[0]), argv[1]); return CMD_HELP; } + + memset(&data, 0, sizeof(data)); + data.ioc_dev = cur_device; + ostid_set_seq_echo(&data.ioc_obdo1.o_oi); + data.ioc_obdo1.o_oi.oi_fid.f_oid = objid; /* to help obd filter */ data.ioc_obdo1.o_mode = 0100644; data.ioc_obdo1.o_valid = 0xffffffff; - printf("%s: object id "LPX64"\n", jt_cmdname(argv[0]), - ostid_id(&data.ioc_obdo1.o_oi)); + printf("%s: object id %#jx\n", jt_cmdname(argv[0]), + (uintmax_t)ostid_id(&data.ioc_obdo1.o_oi)); memset(buf, 0, sizeof(rawbuf)); - rc = obd_ioctl_pack(&data, &buf, sizeof(rawbuf)); + rc = llapi_ioctl_pack(&data, &buf, sizeof(rawbuf)); if (rc) { fprintf(stderr, "error: %s: invalid ioctl\n", jt_cmdname(argv[0])); return rc; } rc = l2_ioctl(OBD_DEV_ID, OBD_IOC_GETATTR, buf); - obd_ioctl_unpack(&data, buf, sizeof(rawbuf)); + llapi_ioctl_unpack(&data, buf, sizeof(rawbuf)); if (rc) { fprintf(stderr, "error: %s: %s\n", jt_cmdname(argv[0]), strerror(rc = errno)); } else { - printf("%s: object id "LPU64", mode %o\n", jt_cmdname(argv[0]), - ostid_id(&data.ioc_obdo1.o_oi), data.ioc_obdo1.o_mode); + printf("%s: object id %ju, mode %o\n", jt_cmdname(argv[0]), + (uintmax_t)ostid_id(&data.ioc_obdo1.o_oi), + data.ioc_obdo1.o_mode); } return rc; } @@ -1780,9 +1843,9 @@ int jt_obd_test_getattr(int argc, char **argv) struct obd_ioctl_data data; struct timeval start, next_time; char rawbuf[MAX_IOC_BUFLEN], *buf = rawbuf; - __u64 i, count, next_count; + __u64 i, count, next_count; int verbose = 1; - obd_id objid = 3; + __u64 objid = 3; char *end; int rc = 0; @@ -1822,16 +1885,23 @@ int jt_obd_test_getattr(int argc, char **argv) next_time.tv_sec = start.tv_sec - verbose; next_time.tv_usec = start.tv_usec; if (verbose != 0) - printf("%s: getting "LPD64" attrs (objid "LPX64"): %s", - jt_cmdname(argv[0]), count, objid, ctime(&start.tv_sec)); + printf("%s: getting %jd attrs (objid %#jx): %s", + jt_cmdname(argv[0]), (uintmax_t) count, + (uintmax_t)objid, ctime(&start.tv_sec)); ostid_set_seq_echo(&data.ioc_obdo1.o_oi); for (i = 1, next_count = verbose; i <= count && shmem_running(); i++) { - ostid_set_id(&data.ioc_obdo1.o_oi, objid); + if (objid >= OBIF_MAX_OID) { + fprintf(stderr, "errr: %s: invalid objid '%llu'\n", + jt_cmdname(argv[0]), objid); + return -E2BIG; + } + + data.ioc_obdo1.o_oi.oi_fid.f_oid = objid; data.ioc_obdo1.o_mode = S_IFREG; data.ioc_obdo1.o_valid = 0xffffffff; memset(buf, 0, sizeof(rawbuf)); - rc = obd_ioctl_pack(&data, &buf, sizeof(rawbuf)); + rc = llapi_ioctl_pack(&data, &buf, sizeof(rawbuf)); if (rc) { fprintf(stderr, "error: %s: invalid ioctl\n", jt_cmdname(argv[0])); @@ -1840,14 +1910,15 @@ int jt_obd_test_getattr(int argc, char **argv) rc = l2_ioctl(OBD_DEV_ID, OBD_IOC_GETATTR, &data); shmem_bump(1); if (rc < 0) { - fprintf(stderr, "error: %s: #"LPD64" - %d:%s\n", - jt_cmdname(argv[0]), i, errno, strerror(rc = errno)); + fprintf(stderr, "error: %s: #%jd - %d:%s\n", + jt_cmdname(argv[0]), (uintmax_t)i, + errno, strerror(rc = errno)); break; } else { if (be_verbose (verbose, &next_time, i, &next_count, count)) - printf("%s: got attr #"LPD64"\n", - jt_cmdname(argv[0]), i); + printf("%s: got attr #%jd\n", + jt_cmdname(argv[0]), (uintmax_t)i); } } @@ -1861,9 +1932,9 @@ int jt_obd_test_getattr(int argc, char **argv) --i; if (verbose != 0) - printf("%s: "LPD64" attrs in %.3fs (%.3f attr/s): %s", - jt_cmdname(argv[0]), i, diff, i / diff, - ctime(&end.tv_sec)); + printf("%s: %jd attrs in %.3fs (%.3f attr/s): %s", + jt_cmdname(argv[0]), (uintmax_t) i, diff, + i / diff, ctime(&end.tv_sec)); } return rc; } @@ -2033,7 +2104,13 @@ int jt_obd_test_brw(int argc, char **argv) #endif ostid_set_seq_echo(&data.ioc_obdo1.o_oi); - ostid_set_id(&data.ioc_obdo1.o_oi, objid); + if (objid >= OBIF_MAX_OID) { + fprintf(stderr, "errr: %s: invalid objid '%llu'\n", + jt_cmdname(argv[0]), objid); + return -E2BIG; + } + + data.ioc_obdo1.o_oi.oi_fid.f_oid = objid; data.ioc_obdo1.o_mode = S_IFREG; data.ioc_obdo1.o_valid = OBD_MD_FLID | OBD_MD_FLTYPE | OBD_MD_FLMODE | OBD_MD_FLFLAGS | OBD_MD_FLGROUP; @@ -2046,15 +2123,16 @@ int jt_obd_test_brw(int argc, char **argv) next_time.tv_usec = start.tv_usec; if (verbose != 0) - printf("%s: %s "LPU64"x%d pages (obj "LPX64", off "LPU64"): %s", - jt_cmdname(argv[0]), write ? "writing" : "reading", count, - pages, objid, data.ioc_offset, ctime(&start.tv_sec)); + printf("%s: %s %jux%d pages (obj %#jx, off %ju): %s", + jt_cmdname(argv[0]), write ? "writing" : "reading", + (uintmax_t)count, pages, (uintmax_t) objid, + (uintmax_t)data.ioc_offset, ctime(&start.tv_sec)); cmd = write ? OBD_IOC_BRW_WRITE : OBD_IOC_BRW_READ; for (i = 1, next_count = verbose; i <= count && shmem_running(); i++) { data.ioc_obdo1.o_valid &= ~(OBD_MD_FLBLOCKS|OBD_MD_FLGRANT); memset(buf, 0, sizeof(rawbuf)); - rc = obd_ioctl_pack(&data, &buf, sizeof(rawbuf)); + rc = llapi_ioctl_pack(&data, &buf, sizeof(rawbuf)); if (rc) { fprintf(stderr, "error: %s: invalid ioctl\n", jt_cmdname(argv[0])); @@ -2069,9 +2147,10 @@ int jt_obd_test_brw(int argc, char **argv) break; } else if (be_verbose(verbose, &next_time,i, &next_count,count)) { shmem_lock (); - printf("%s: %s number %d @ "LPD64":"LPU64" for %d\n", + printf("%s: %s number %d @ %jd:%ju for %d\n", jt_cmdname(argv[0]), write ? "write" : "read", i, - ostid_id(&data.ioc_obdo1.o_oi), data.ioc_offset, + (uintmax_t)ostid_id(&data.ioc_obdo1.o_oi), + (uintmax_t)data.ioc_offset, (int)(pages * getpagesize())); shmem_unlock (); } @@ -2148,7 +2227,7 @@ int jt_obd_lov_getconfig(int argc, char **argv) memset(&desc, 0, sizeof(desc)); obd_str2uuid(&desc.ld_uuid, argv[1]); - desc.ld_tgt_count = ((OBD_MAX_IOCTL_BUFFER-sizeof(data)-sizeof(desc)) / + desc.ld_tgt_count = ((MAX_IOC_BUFLEN-sizeof(data)-sizeof(desc)) / (sizeof(*uuidarray) + sizeof(*obdgens))); repeat: @@ -2175,7 +2254,7 @@ repeat: data.ioc_inllen3 = desc.ld_tgt_count * sizeof(*obdgens); data.ioc_inlbuf3 = (char *)obdgens; - if (obd_ioctl_pack(&data, &buf, sizeof(rawbuf))) { + if (llapi_ioctl_pack(&data, &buf, sizeof(rawbuf))) { fprintf(stderr, "error: %s: invalid ioctl\n", jt_cmdname(argv[0])); rc = -EINVAL; @@ -2194,7 +2273,7 @@ repeat: __u32 *genp; int i; - if (obd_ioctl_unpack(&data, buf, sizeof(rawbuf))) { + if (llapi_ioctl_unpack(&data, buf, sizeof(rawbuf))) { fprintf(stderr, "error: %s: invalid reply\n", jt_cmdname(argv[0])); rc = -EINVAL; @@ -2205,10 +2284,10 @@ repeat: else printf("default_stripe_count: %u\n", desc.ld_default_stripe_count); - printf("default_stripe_size: "LPU64"\n", - desc.ld_default_stripe_size); - printf("default_stripe_offset: "LPU64"\n", - desc.ld_default_stripe_offset); + printf("default_stripe_size: %ju\n", + (uintmax_t)desc.ld_default_stripe_size); + printf("default_stripe_offset: %jd\n", + (uintmax_t)desc.ld_default_stripe_offset); printf("default_stripe_pattern: %u\n", desc.ld_pattern); printf("obd_count: %u\n", desc.ld_tgt_count); printf("OBDS:\tobdidx\t\tobdgen\t\t obduuid\n"); @@ -2241,7 +2320,7 @@ static int do_activate(int argc, char **argv, int flag) data.ioc_offset = flag; memset(buf, 0, sizeof(rawbuf)); - rc = obd_ioctl_pack(&data, &buf, sizeof(rawbuf)); + rc = llapi_ioctl_pack(&data, &buf, sizeof(rawbuf)); if (rc) { fprintf(stderr, "error: %s: invalid ioctl\n", jt_cmdname(argv[0])); @@ -2269,8 +2348,8 @@ static int do_activate(int argc, char **argv, int flag) * are skipped and recorded with new nids and uuid. * * \see mgs_replace_nids - * \see mgs_replace_nids_log - * \see mgs_replace_handler + * \see mgs_replace_log + * \see mgs_replace_nids_handler */ int jt_replace_nids(int argc, char **argv) { @@ -2289,7 +2368,7 @@ int jt_replace_nids(int argc, char **argv) data.ioc_inllen2 = strlen(argv[2]) + 1; data.ioc_inlbuf2 = argv[2]; memset(buf, 0, sizeof(rawbuf)); - rc = obd_ioctl_pack(&data, &buf, sizeof(rawbuf)); + rc = llapi_ioctl_pack(&data, &buf, sizeof(rawbuf)); if (rc) { fprintf(stderr, "error: %s: invalid ioctl\n", jt_cmdname(argv[0])); @@ -2305,6 +2384,52 @@ int jt_replace_nids(int argc, char **argv) return rc; } +/** + * Clear config logs for given device or filesystem. + * lctl clear_conf + * Command has to be run on MGS node having MGS device mounted with -o + * nosvc. + * + * Configuration logs for filesystem or one particular log is + * processed. New log is created, original log is read, its records + * marked SKIP do not get copied to new log. Others are copied as-is. + * Original file is renamed to log.${time}.bak. + * + * \see mgs_clear_configs + * \see mgs_replace_log + * \see mgs_clear_config_handler + **/ +int jt_lcfg_clear(int argc, char **argv) +{ + int rc; + char rawbuf[MAX_IOC_BUFLEN], *buf = rawbuf; + struct obd_ioctl_data data; + + memset(&data, 0, sizeof(data)); + data.ioc_dev = get_mgs_device(); + if (argc != 2) + return CMD_HELP; + + data.ioc_inllen1 = strlen(argv[1]) + 1; + data.ioc_inlbuf1 = argv[1]; + + memset(buf, 0, sizeof(rawbuf)); + rc = llapi_ioctl_pack(&data, &buf, sizeof(rawbuf)); + if (rc) { + fprintf(stderr, "error: %s: invalid ioctl\n", + jt_cmdname(argv[0])); + return rc; + } + + rc = l2_ioctl(OBD_DEV_ID, OBD_IOC_CLEAR_CONFIGS, buf); + if (rc < 0) { + fprintf(stderr, "error: %s: %s\n", jt_cmdname(argv[0]), + strerror(rc = errno)); + } + + return rc; +} + int jt_obd_deactivate(int argc, char **argv) { return do_activate(argc, argv, 0); @@ -2332,7 +2457,7 @@ int jt_obd_recover(int argc, char **argv) } memset(buf, 0, sizeof(rawbuf)); - rc = obd_ioctl_pack(&data, &buf, sizeof(rawbuf)); + rc = llapi_ioctl_pack(&data, &buf, sizeof(rawbuf)); if (rc) { fprintf(stderr, "error: %s: invalid ioctl\n", jt_cmdname(argv[0])); @@ -2369,7 +2494,7 @@ int jt_obd_mdc_lookup(int argc, char **argv) data.ioc_inlbuf1 = child; memset(buf, 0, sizeof(rawbuf)); - rc = obd_ioctl_pack(&data, &buf, sizeof(rawbuf)); + rc = llapi_ioctl_pack(&data, &buf, sizeof(rawbuf)); if (rc) { fprintf(stderr, "error: %s: invalid ioctl\n", jt_cmdname(argv[0])); @@ -2391,7 +2516,7 @@ int jt_obd_mdc_lookup(int argc, char **argv) close(fd); if (verbose) { - rc = obd_ioctl_unpack(&data, buf, sizeof(rawbuf)); + rc = llapi_ioctl_unpack(&data, buf, sizeof(rawbuf)); if (rc) { fprintf(stderr, "error: %s: invalid reply\n", jt_cmdname(argv[0])); @@ -2405,33 +2530,71 @@ int jt_obd_mdc_lookup(int argc, char **argv) return rc; } -int jt_cfg_dump_log(int argc, char **argv) +int jt_lcfg_fork(int argc, char **argv) { - struct obd_ioctl_data data; - char rawbuf[MAX_IOC_BUFLEN], *buf = rawbuf; - int rc; + struct obd_ioctl_data data; + char rawbuf[MAX_IOC_BUFLEN], *buf = rawbuf; + int rc; - if (argc != 2) - return CMD_HELP; + if (argc != 3) + return CMD_HELP; - memset(&data, 0, sizeof(data)); - data.ioc_dev = cur_device; - data.ioc_inllen1 = strlen(argv[1]) + 1; - data.ioc_inlbuf1 = argv[1]; + memset(&data, 0, sizeof(data)); + data.ioc_dev = get_mgs_device(); + data.ioc_inllen1 = strlen(argv[1]) + 1; + data.ioc_inlbuf1 = argv[1]; + data.ioc_inllen2 = strlen(argv[2]) + 1; + data.ioc_inlbuf2 = argv[2]; - memset(buf, 0, sizeof(rawbuf)); - rc = obd_ioctl_pack(&data, &buf, sizeof(rawbuf)); - if (rc) { - fprintf(stderr, "error: %s: invalid ioctl\n", - jt_cmdname(argv[0])); - return rc; - } - rc = l_ioctl(OBD_DEV_ID, OBD_IOC_DUMP_LOG, buf); - if (rc < 0) - fprintf(stderr, "OBD_IOC_DUMP_LOG failed: %s\n", - strerror(errno)); + memset(buf, 0, sizeof(rawbuf)); + rc = llapi_ioctl_pack(&data, &buf, sizeof(rawbuf)); + if (rc) { + fprintf(stderr, "error: %s: invalid ioctl\n", + jt_cmdname(argv[0])); + return rc; + } - return rc; + rc = l_ioctl(OBD_DEV_ID, OBD_IOC_LCFG_FORK, buf); + if (rc < 0) + fprintf(stderr, "error: %s: OBD_IOC_LCFG_FORK failed: %s\n", + jt_cmdname(argv[0]), strerror(errno)); + + return rc; +} + +int jt_lcfg_erase(int argc, char **argv) +{ + struct obd_ioctl_data data; + char rawbuf[MAX_IOC_BUFLEN], *buf = rawbuf; + int rc; + + if (argc == 3) { + if (strncmp(argv[2], "-q", strlen("-q")) != 0 && + strncmp(argv[2], "--quiet", strlen("--quiet")) != 0) + return CMD_HELP; + } else if (argc != 2) { + return CMD_HELP; + } + + memset(&data, 0, sizeof(data)); + data.ioc_dev = get_mgs_device(); + data.ioc_inllen1 = strlen(argv[1]) + 1; + data.ioc_inlbuf1 = argv[1]; + + memset(buf, 0, sizeof(rawbuf)); + rc = llapi_ioctl_pack(&data, &buf, sizeof(rawbuf)); + if (rc) { + fprintf(stderr, "error: %s: invalid ioctl\n", + jt_cmdname(argv[0])); + return rc; + } + + rc = l_ioctl(OBD_DEV_ID, OBD_IOC_LCFG_ERASE, buf); + if (rc < 0) + fprintf(stderr, "error: %s: OBD_IOC_LCFG_ERASE failed: %s\n", + jt_cmdname(argv[0]), strerror(errno)); + + return rc; } int jt_llog_catlist(int argc, char **argv) @@ -2445,9 +2608,9 @@ int jt_llog_catlist(int argc, char **argv) memset(&data, 0, sizeof(data)); data.ioc_dev = cur_device; - data.ioc_inllen1 = sizeof(rawbuf) - cfs_size_round(sizeof(data)); + data.ioc_inllen1 = sizeof(rawbuf) - __ALIGN_KERNEL(sizeof(data), 8); memset(buf, 0, sizeof(rawbuf)); - rc = obd_ioctl_pack(&data, &buf, sizeof(rawbuf)); + rc = llapi_ioctl_pack(&data, &buf, sizeof(rawbuf)); if (rc) { fprintf(stderr, "error: %s: invalid ioctl\n", jt_cmdname(argv[0])); @@ -2465,481 +2628,488 @@ int jt_llog_catlist(int argc, char **argv) int jt_llog_info(int argc, char **argv) { - struct obd_ioctl_data data; - char rawbuf[MAX_IOC_BUFLEN], *buf = rawbuf; - int rc; + const struct option long_opts[] = { + /* Allow optional "--catalog" for compatibility with llog commands. */ + { .val = 'c', .name = "catalog", .has_arg = required_argument }, + { .val = 'h', .name = "help", .has_arg = no_argument }, + { .name = NULL } }; + struct obd_ioctl_data data = { 0 }; + char rawbuf[MAX_IOC_BUFLEN] = "", *buf = rawbuf; + char *cmd = argv[0]; + char *catalog = NULL; + int rc, c; - if (argc != 2) - return CMD_HELP; + while ((c = getopt_long(argc, argv, "c:h", long_opts, NULL)) != -1) { + switch (c) { + case 'c': + catalog = optarg; + break; + case 'h': + default: + return CMD_HELP; + } + } + argc -= optind; + argv += optind; + /* support "logname" positional parameter */ + if (argc == 1) { + if (catalog) { + fprintf(stderr, + "%s: catalog is set, unknown argument '%s'\n", + cmd, optarg); + return CMD_HELP; + } + catalog = argv[0]; + } else if (!catalog || argc > 1) { + return CMD_HELP; + } - memset(&data, 0, sizeof(data)); - data.ioc_dev = cur_device; - data.ioc_inllen1 = strlen(argv[1]) + 1; - data.ioc_inlbuf1 = argv[1]; - data.ioc_inllen2 = sizeof(rawbuf) - cfs_size_round(sizeof(data)) - - cfs_size_round(data.ioc_inllen1); - memset(buf, 0, sizeof(rawbuf)); - rc = obd_ioctl_pack(&data, &buf, sizeof(rawbuf)); - if (rc) { - fprintf(stderr, "error: %s: invalid ioctl\n", - jt_cmdname(argv[0])); - return rc; - } + data.ioc_dev = cur_device; + data.ioc_inllen1 = strlen(catalog) + 1; + data.ioc_inlbuf1 = catalog; + data.ioc_inllen2 = sizeof(rawbuf) - __ALIGN_KERNEL(sizeof(data), 8) - + __ALIGN_KERNEL(data.ioc_inllen1, 8); + rc = llapi_ioctl_pack(&data, &buf, sizeof(rawbuf)); + if (rc) { + fprintf(stderr, "%s: ioctl_pack failed for catalog '%s': %s\n", + jt_cmdname(cmd), catalog, strerror(-rc)); + return rc; + } - rc = l_ioctl(OBD_DEV_ID, OBD_IOC_LLOG_INFO, buf); - if (rc == 0) - fprintf(stdout, "%s", ((struct obd_ioctl_data*)buf)->ioc_bulk); - else - fprintf(stderr, "OBD_IOC_LLOG_INFO failed: %s\n", - strerror(errno)); + rc = l_ioctl(OBD_DEV_ID, OBD_IOC_LLOG_INFO, buf); + if (rc == 0) + fprintf(stdout, "%s", ((struct obd_ioctl_data *)buf)->ioc_bulk); + else + fprintf(stderr, "%s: OBD_IOC_LLOG_INFO failed: %s\n", + jt_cmdname(cmd), strerror(errno)); - return rc; + return rc; } -int jt_llog_print(int argc, char **argv) +int jt_llog_print_cb(const char *record, void *private) { - struct obd_ioctl_data data; - char rawbuf[MAX_IOC_BUFLEN], *buf = rawbuf; - int rc; - - if (argc != 2 && argc != 4) - return CMD_HELP; - - memset(&data, 0, sizeof(data)); - data.ioc_dev = cur_device; - data.ioc_inllen1 = strlen(argv[1]) + 1; - data.ioc_inlbuf1 = argv[1]; - if (argc == 4) { - data.ioc_inllen2 = strlen(argv[2]) + 1; - data.ioc_inlbuf2 = argv[2]; - data.ioc_inllen3 = strlen(argv[3]) + 1; - data.ioc_inlbuf3 = argv[3]; - } else { - char from[2] = "1", to[3] = "-1"; - data.ioc_inllen2 = strlen(from) + 1; - data.ioc_inlbuf2 = from; - data.ioc_inllen3 = strlen(to) + 1; - data.ioc_inlbuf3 = to; - } - data.ioc_inllen4 = sizeof(rawbuf) - cfs_size_round(sizeof(data)) - - cfs_size_round(data.ioc_inllen1) - - cfs_size_round(data.ioc_inllen2) - - cfs_size_round(data.ioc_inllen3); - memset(buf, 0, sizeof(rawbuf)); - rc = obd_ioctl_pack(&data, &buf, sizeof(rawbuf)); - if (rc) { - fprintf(stderr, "error: %s: invalid ioctl\n", - jt_cmdname(argv[0])); - return rc; - } - - rc = l_ioctl(OBD_DEV_ID, OBD_IOC_LLOG_PRINT, buf); - if (rc == 0) - fprintf(stdout, "%s", ((struct obd_ioctl_data*)buf)->ioc_bulk); - else - fprintf(stderr, "OBD_IOC_LLOG_PRINT failed: %s\n", - strerror(errno)); + printf("%s\n", record); - return rc; + return 0; } -static int llog_cancel_parse_optional(int argc, char **argv, - struct obd_ioctl_data *data) +/** + * Iterate over llog records, typically YAML-formatted configuration logs + * + * \param logname[in] name of llog file or FID + * \param start[in] first record to process + * \param end[in] last record to process (inclusive) + * \param cb[in] callback for records. Return -ve error, or +ve abort. + * \param private[in,out] private data passed to the \a record_cb function + */ +int jt_llog_print_iter(char *logname, long start, long end, + int (record_cb)(const char *record, void *private), + void *private) { - int cOpt; - const char *const short_options = "c:l:i:h"; - const struct option long_options[] = { - {"catalog", required_argument, NULL, 'c'}, - {"log_id", required_argument, NULL, 'l'}, - {"log_idx", required_argument, NULL, 'i'}, - {"help", no_argument, NULL, 'h'}, - {NULL, 0, NULL, 0} - }; + struct obd_ioctl_data data = { 0 }; + char rawbuf[MAX_IOC_BUFLEN], *buf = rawbuf; + char startbuf[16], endbuf[16]; + static long inc = sizeof(rawbuf) / 128; + long rec; + int rc = 0; - /* sanity check */ - if (!data || argc <= 1) { - return -1; - } + if (end == -1) + end = 0x7fffffff; - /*now process command line arguments*/ - while ((cOpt = getopt_long(argc, argv, short_options, - long_options, NULL)) != -1) { - switch (cOpt) { - case 'c': - data->ioc_inllen1 = strlen(optarg) + 1; - data->ioc_inlbuf1 = optarg; - break; + data.ioc_dev = cur_device; + data.ioc_inlbuf1 = logname; + data.ioc_inllen1 = strlen(logname) + 1; - case 'l': - data->ioc_inllen2 = strlen(optarg) + 1; - data->ioc_inlbuf2 = optarg; - break; - - case 'i': - data->ioc_inllen3 = strlen(optarg) + 1; - data->ioc_inlbuf3 = optarg; - break; + /* + * Estimate about 128 characters per configuration record. Not all + * records will be printed in any case, so they should easily fit. If + * not, the kernel will return -EOVERFLOW and ask for fewer records. + * + * We don't want to request records from the kernel one-at-a-time, as + * it restarts the config llog iteration from the beginning, so we + * fetch multiple records from the kernel per call and split locally. + */ + for (rec = start; rec < end; rec += inc) { + char *record = ((struct obd_ioctl_data *)buf)->ioc_bulk; + char *ptr; + +retry: + snprintf(startbuf, sizeof(startbuf), "%lu", rec); + snprintf(endbuf, sizeof(endbuf), "%lu", + end < rec + inc - 1 ? end : rec + inc - 1); + + /* start and end record numbers are passed as ASCII digits */ + data.ioc_inlbuf2 = startbuf; + data.ioc_inllen2 = strlen(startbuf) + 1; + data.ioc_inlbuf3 = endbuf; + data.ioc_inllen3 = strlen(endbuf) + 1; + + data.ioc_inllen4 = sizeof(rawbuf) - + __ALIGN_KERNEL(sizeof(data), 8) - + __ALIGN_KERNEL(data.ioc_inllen1, 8) - + __ALIGN_KERNEL(data.ioc_inllen2, 8) - + __ALIGN_KERNEL(data.ioc_inllen3, 8); + memset(buf, 0, sizeof(rawbuf)); + rc = llapi_ioctl_pack(&data, &buf, sizeof(rawbuf)); + if (rc) { + fprintf(stderr, "%s: invalid ioctl data\n", logname); + goto out; + } - case 'h': - default: - return -1; + rc = l_ioctl(OBD_DEV_ID, OBD_IOC_LLOG_PRINT, buf); + if (rc == -EOVERFLOW && inc > 2) { + inc /= 2; + goto retry; + } + if (rc) { + fprintf(stderr, "%s: OBD_IOC_LLOG_PRINT failed: %s\n", + logname, strerror(errno)); + rc = -errno; + goto out; } - } - if ((data->ioc_inlbuf1 == NULL) || (data->ioc_inlbuf3 == NULL)) { - /* missing mandatory parameters */ - return -1; + /* There is no "end of list" marker, record was not modified */ + if (strcmp(record, logname) == 0) + break; + + do { + ptr = strchr(record, '\n'); + if (ptr) + *ptr = '\0'; + rc = record_cb(record, private); + if (rc) { + if (rc > 0) + rc = 0; + goto out; + } + + if (ptr) + record = ptr + 1; + } while (ptr && *(ptr + 1)); } - return 0; +out: + return rc; } -int jt_llog_cancel(int argc, char **argv) +static int llog_parse_catalog_start_end(int *argc, char **argv[], + char **catalog, long *start, long *end) { - struct obd_ioctl_data data; - char rawbuf[MAX_IOC_BUFLEN], *buf = rawbuf; - int rc, i; + const struct option long_opts[] = { + /* the --catalog option is not required, just for consistency */ + { .val = 'c', .name = "catalog", .has_arg = required_argument }, + { .val = 'e', .name = "end", .has_arg = required_argument }, + { .val = 'h', .name = "help", .has_arg = no_argument }, + { .val = 's', .name = "start", .has_arg = required_argument }, + { .name = NULL } }; + char *cmd = (*argv)[0]; + char *endp; + int c; + + if (catalog == NULL || start == NULL || end == NULL) + return -EINVAL; + + /* now process command line arguments*/ + while ((c = getopt_long(*argc, *argv, "c:e:hs:", + long_opts, NULL)) != -1) { + switch (c) { + case 'c': + *catalog = optarg; + break; + case 'e': + *end = strtol(optarg, &endp, 0); + if (*endp != '\0') { + fprintf(stderr, "%s: bad end value '%s'\n", + cmd, optarg); + return CMD_HELP; + } + break; + case 's': + *start = strtol(optarg, &endp, 0); + if (*endp != '\0') { + fprintf(stderr, "%s: bad start value '%s'\n", + cmd, optarg); + return CMD_HELP; + } + break; + case 'h': + default: + return CMD_HELP; + } + } + *argc -= optind; + *argv += optind; - /* check that the arguments provided are either all - * optional or all positional. No mixing allowed - * - * if argc is 4 or 3 then check all arguments to ensure that none - * of them start with a '-'. If so then this is invalid. - * Otherwise if arg is > 4 then assume that this is optional - * arguments, and parse as such ignoring any thing that's not - * optional. The result is that user must use optional arguments - * for all mandatory parameters. Code will ignore all other args - * - * The positional arguments option should eventually be phased out. + /* support old optional positional parameters only if they were + * not already specified with named arguments: logname [start [end]] */ - memset(&data, 0, sizeof(data)); - data.ioc_dev = cur_device; - - if (argc == 3 || argc == 4) { - for (i = 1; i < argc; i++) { - if (argv[i][0] == '-') - return CMD_HELP; + if (*argc >= 1) { + if (*catalog) { + fprintf(stderr, + "%s: catalog is set, unknown argument '%s'\n", + cmd, (*argv)[0]); + return CMD_HELP; } - data.ioc_inllen1 = strlen(argv[1]) + 1; - data.ioc_inlbuf1 = argv[1]; - if (argc == 4) { - data.ioc_inllen2 = strlen(argv[2]) + 1; - data.ioc_inlbuf2 = argv[2]; - data.ioc_inllen3 = strlen(argv[3]) + 1; - data.ioc_inlbuf3 = argv[3]; - } else { - data.ioc_inllen3 = strlen(argv[2]) + 1; - data.ioc_inlbuf3 = argv[2]; + *catalog = (*argv)[0]; + (*argc)--; + (*argv)++; + } + + if (*argc >= 1) { + if (*start != 1) { + fprintf(stderr, + "%s: --start is set, unknown argument '%s'\n", + cmd, (*argv)[0]); + return CMD_HELP; } - } else { - if (llog_cancel_parse_optional(argc, argv, &data) != 0) + + *start = strtol((*argv)[0], &endp, 0); + if (*endp != '\0') { + fprintf(stderr, "%s: bad start value '%s'\n", + cmd, (*argv)[0]); return CMD_HELP; + } + (*argc)--; + (*argv)++; } + if (*argc >= 1) { + if (*end != -1) { + fprintf(stderr, + "%s: --end is set, unknown argument '%s'\n", + cmd, (*argv)[0]); + return CMD_HELP; + } - memset(buf, 0, sizeof(rawbuf)); - rc = obd_ioctl_pack(&data, &buf, sizeof(rawbuf)); - if (rc) { - fprintf(stderr, "error: %s: invalid ioctl\n", - jt_cmdname(argv[0])); - return rc; + *end = strtol((*argv)[0], &endp, 0); + if (*endp != '\0') { + fprintf(stderr, "%s: bad end value '%s'\n", + cmd, (*argv)[0]); + return CMD_HELP; + } + (*argc)--; + (*argv)++; + } + if (*argc > 1) { + fprintf(stderr, "%s: unknown argument '%s'\n", cmd, (*argv)[0]); + return CMD_HELP; } - rc = l_ioctl(OBD_DEV_ID, OBD_IOC_LLOG_CANCEL, buf); - if (rc == 0) - fprintf(stdout, "index %s was canceled.\n", - argc == 4 ? argv[3] : argv[2]); - else - fprintf(stderr, "OBD_IOC_LLOG_CANCEL failed: %s\n", - strerror(errno)); + if (*end != -1 && *end < *start) { + fprintf(stderr, "%s: end '%lu' less than than start '%lu'\n", + cmd, *end, *start); + return CMD_HELP; + } - return rc; + return 0; } -int jt_llog_check(int argc, char **argv) +int jt_llog_print(int argc, char **argv) { - struct obd_ioctl_data data; - char rawbuf[MAX_IOC_BUFLEN], *buf = rawbuf; - int rc; + char *catalog = NULL; + long start = 1, end = -1; + int rc; - if (argc != 2 && argc != 4) - return CMD_HELP; + rc = llog_parse_catalog_start_end(&argc, &argv, &catalog, &start, &end); + if (rc) + return rc; - memset(&data, 0, sizeof(data)); - data.ioc_dev = cur_device; - data.ioc_inllen1 = strlen(argv[1]) + 1; - data.ioc_inlbuf1 = argv[1]; - if (argc == 4) { - data.ioc_inllen2 = strlen(argv[2]) + 1; - data.ioc_inlbuf2 = argv[2]; - data.ioc_inllen3 = strlen(argv[3]) + 1; - data.ioc_inlbuf3 = argv[3]; - } else { - char from[2] = "1", to[3] = "-1"; - data.ioc_inllen2 = strlen(from) + 1; - data.ioc_inlbuf2 = from; - data.ioc_inllen3 = strlen(to) + 1; - data.ioc_inlbuf3 = to; - } - data.ioc_inllen4 = sizeof(rawbuf) - cfs_size_round(sizeof(data)) - - cfs_size_round(data.ioc_inllen1) - - cfs_size_round(data.ioc_inllen2) - - cfs_size_round(data.ioc_inllen3); - memset(buf, 0, sizeof(rawbuf)); - rc = obd_ioctl_pack(&data, &buf, sizeof(rawbuf)); - if (rc) { - fprintf(stderr, "error: %s: invalid ioctl\n", - jt_cmdname(argv[0])); - return rc; - } + rc = jt_llog_print_iter(catalog, start, end, jt_llog_print_cb, NULL); - rc = l_ioctl(OBD_DEV_ID, OBD_IOC_LLOG_CHECK, buf); - if (rc == 0) - fprintf(stdout, "%s", ((struct obd_ioctl_data*)buf)->ioc_bulk); - else - fprintf(stderr, "OBD_IOC_LLOG_CHECK failed: %s\n", - strerror(errno)); - return rc; + return rc; } -int jt_llog_remove(int argc, char **argv) +/* Parse catalog, log ID, and optionally a log index with either optional + * arguments or positional arguments. Only the initial catalog argument + * may be positional with other optional arguments. + * + * The positional arguments option should eventually be phased out. + */ +static int llog_parse_catalog_log_idx(int *argc, char ***argv, const char *opts, + int max_args, struct obd_ioctl_data *data) { - struct obd_ioctl_data data; - char rawbuf[MAX_IOC_BUFLEN], *buf = rawbuf; - int rc; - - if (argc != 3 && argc != 2) - return CMD_HELP; - - memset(&data, 0, sizeof(data)); - data.ioc_dev = cur_device; - data.ioc_inllen1 = strlen(argv[1]) + 1; - data.ioc_inlbuf1 = argv[1]; - if (argc == 3){ - data.ioc_inllen2 = strlen(argv[2]) + 1; - data.ioc_inlbuf2 = argv[2]; - } - memset(buf, 0, sizeof(rawbuf)); - rc = obd_ioctl_pack(&data, &buf, sizeof(rawbuf)); - if (rc) { - fprintf(stderr, "error: %s: invalid ioctl\n", - jt_cmdname(argv[0])); - return rc; - } + const struct option long_opts[] = { + /* the --catalog option is not required, just for consistency */ + { .val = 'c', .name = "catalog", .has_arg = required_argument }, + { .val = 'h', .name = "help", .has_arg = no_argument }, + { .val = 'i', .name = "log_idx", .has_arg = required_argument }, + { .val = 'l', .name = "log_id", .has_arg = required_argument }, + { .name = NULL } }; + int c; - rc = l_ioctl(OBD_DEV_ID, OBD_IOC_LLOG_REMOVE, buf); - if (rc == 0) { - if (argc == 2) - fprintf(stdout, "log %s is removed.\n", argv[1]); - else - fprintf(stdout, "the log in catalog %s is removed. \n", - argv[1]); - } else - fprintf(stderr, "OBD_IOC_LLOG_REMOVE failed: %s\n", - strerror(errno)); + /* sanity check */ + if (!data || *argc <= 1) + return -1; - return rc; -} + data->ioc_dev = cur_device; -/* attach a regular file to virtual block device. - * return vaule: - * -1: fatal error - * 1: error, it always means the command run failed - * 0: success - */ -static int jt_blockdev_run_process(const char *file, char *argv[]) -{ - pid_t pid; - int rc; + /* now process command line arguments*/ + while ((c = getopt_long(*argc, *argv, opts, long_opts, NULL)) != -1) { + switch (c) { + case 'c': + data->ioc_inllen1 = strlen(optarg) + 1; + data->ioc_inlbuf1 = optarg; + break; + case 'i': + data->ioc_inllen3 = strlen(optarg) + 1; + data->ioc_inlbuf3 = optarg; + break; + case 'l': /* The log_id option isn't currently needed for + * cancel as mdt_iocontrol() handles IOC_LLOG_CANCEL, + * but we may as well keep it for now. + */ + data->ioc_inllen2 = strlen(optarg) + 1; + data->ioc_inlbuf2 = optarg; + break; + case 'h': + default: + return CMD_HELP; + } + } - pid = vfork(); - if (pid == 0) { /* child process */ - /* don't print error messages */ - close(1), close(2); - (void)execvp(file, argv); - exit(-1); - } else if (pid > 0) { - int status; - - rc = waitpid(pid, &status, 0); - if (rc < 0 || !WIFEXITED(status)) - return -1; + *argc -= optind; + *argv += optind; - return WEXITSTATUS(status); - } + /* Allow catalog to be specified as first option without --catalog */ + if (data->ioc_inlbuf1 == NULL && *argc > 0) { + data->ioc_inlbuf1 = (*argv)[0]; + data->ioc_inllen1 = strlen((*argv)[0]) + 1; + (*argc)--; + (*argv)++; + } - return -1; + return 0; } -static int jt_blockdev_find_module(const char *module) +int jt_llog_cancel(int argc, char **argv) { - FILE *fp; - int found = 0; - char buf[1024]; - char *ptr; - - fp = fopen("/proc/modules", "r"); - if (fp == NULL) - return -1; + struct obd_ioctl_data data = { 0 }; + char rawbuf[MAX_IOC_BUFLEN] = "", *buf = rawbuf; + char *cmd = argv[0]; + int rc; - while (fgets(buf, 1024, fp) != NULL) { - ptr = strchr(buf, ' '); - if (ptr != NULL) - *ptr = 0; - if (strcmp(module, buf) == 0) { - found = 1; - break; - } - } - fclose(fp); + /* Parse catalog file (in inlbuf1) and named parameters */ + rc = llog_parse_catalog_log_idx(&argc, &argv, "c:hi:l:", 3, &data); - return found; -} + /* Handle old positional parameters if not using named parameters, + * either " " or " ". + * It was "inlbuf3 = log_idx", and "inlbuf2 = log_id" (ignored by + * config log cancel), and shows why I hate positional parameters. + */ + if (argc == 1) { + data.ioc_inllen3 = strlen(argv[0]) + 1; + data.ioc_inlbuf3 = argv[0]; + } else if (argc == 2) { + data.ioc_inllen2 = strlen(argv[0]) + 1; + data.ioc_inlbuf2 = argv[0]; + data.ioc_inllen3 = strlen(argv[1]) + 1; + data.ioc_inlbuf3 = argv[1]; + } -static int jt_blockdev_probe_module(const char *module) -{ - char buf[1024]; - char *argv[10]; - int c, rc; + if (data.ioc_inlbuf1 == NULL || data.ioc_inlbuf3 == NULL) + /* missing mandatory parameters */ + return CMD_HELP; - if (jt_blockdev_find_module(module) == 1) - return 0; + rc = llapi_ioctl_pack(&data, &buf, sizeof(rawbuf)); + if (rc) { + fprintf(stderr, "%s: ioctl_pack for catalog '%s' failed: %s\n", + jt_cmdname(cmd), data.ioc_inlbuf1, strerror(-rc)); + return rc; + } - /* run modprobe first */ - c = 0; - argv[c++] = "/sbin/modprobe"; - argv[c++] = "-q"; - argv[c++] = (char *)module; - argv[c++] = NULL; - rc = jt_blockdev_run_process("modprobe", argv); - if (rc != 1) - return rc; + rc = l_ioctl(OBD_DEV_ID, OBD_IOC_LLOG_CANCEL, buf); + if (rc) + fprintf(stderr, "%s: cancel catalog '%s:%s' failed: %s\n", + jt_cmdname(cmd), data.ioc_inlbuf1, data.ioc_inlbuf3, + strerror(errno)); - /* cannot find the module in default directory ... */ - sprintf(buf, "../llite/%s.ko", module); - c = 0; - argv[c++] = "/sbin/insmod"; - argv[c++] = buf; - argv[c++] = NULL; - rc = jt_blockdev_run_process("insmod", argv); - return rc ? -1 : 0; + return rc; } -int jt_blockdev_attach(int argc, char **argv) +int jt_llog_check(int argc, char **argv) { - int rc, fd; - struct stat st; - char *filename, *devname; - unsigned long dev; - - if (argc != 3) - return CMD_HELP; - - if (jt_blockdev_probe_module("llite_lloop") < 0) { - fprintf(stderr, "error: cannot find module llite_lloop.(k)o\n"); - return ENOENT; - } - - filename = argv[1]; - devname = argv[2]; - - fd = open(filename, O_RDWR); - if (fd < 0) { - fprintf(stderr, "file %s can't be opened(%s)\n\n", - filename, strerror(errno)); - return CMD_HELP; - } + struct obd_ioctl_data data = { 0 }; + char rawbuf[MAX_IOC_BUFLEN] = "", *buf = rawbuf; + char *catalog = NULL; + char startbuf[16], endbuf[16]; + long start = 1, end = -1; + char *cmd = argv[0]; + int rc; - rc = ioctl(fd, LL_IOC_LLOOP_ATTACH, &dev); - if (rc < 0) { - rc = errno; - fprintf(stderr, "attach error(%s)\n", strerror(rc)); - goto out; - } + rc = llog_parse_catalog_start_end(&argc, &argv, &catalog, &start, &end); + if (rc) + return rc; - rc = stat(devname, &st); - if (rc == 0 && (!S_ISBLK(st.st_mode) || st.st_rdev != dev)) { - rc = EEXIST; - } else if (rc < 0) { - if (errno == ENOENT && - !mknod(devname, S_IFBLK|S_IRUSR|S_IWUSR, dev)) - rc = 0; - else - rc = errno; - } + if (end == -1) + end = 0x7fffffff; - if (rc) { - fprintf(stderr, "error: the file %s could be attached to block " - "device %X but creating %s failed: %s\n" - "now detaching the block device..", - filename, (int)dev, devname, strerror(rc)); + data.ioc_dev = cur_device; + data.ioc_inllen1 = strlen(catalog) + 1; + data.ioc_inlbuf1 = catalog; + + snprintf(startbuf, sizeof(startbuf), "%lu", start); + snprintf(endbuf, sizeof(endbuf), "%lu", end); + /* start and end record numbers are passed as ASCII digits */ + data.ioc_inllen2 = strlen(startbuf) + 1; + data.ioc_inlbuf2 = startbuf; + data.ioc_inllen3 = strlen(endbuf) + 1; + data.ioc_inlbuf3 = endbuf; + + data.ioc_inllen4 = sizeof(rawbuf) - __ALIGN_KERNEL(sizeof(data), 8) - + __ALIGN_KERNEL(data.ioc_inllen1, 8) - + __ALIGN_KERNEL(data.ioc_inllen2, 8) - + __ALIGN_KERNEL(data.ioc_inllen3, 8); + rc = llapi_ioctl_pack(&data, &buf, sizeof(rawbuf)); + if (rc) { + fprintf(stderr, "%s: ioctl_pack failed for catalog '%s': %s\n", + jt_cmdname(cmd), data.ioc_inlbuf1, strerror(-rc)); + return rc; + } - (void)ioctl(fd, LL_IOC_LLOOP_DETACH_BYDEV, dev); - fprintf(stderr, "%s\n", strerror(errno)); - } -out: - close(fd); - return -rc; + rc = l_ioctl(OBD_DEV_ID, OBD_IOC_LLOG_CHECK, buf); + if (rc == 0) + fprintf(stdout, "%s", ((struct obd_ioctl_data *)buf)->ioc_bulk); + else + fprintf(stderr, "%s: OBD_IOC_LLOG_CHECK failed: %s\n", + jt_cmdname(cmd), strerror(errno)); + return rc; } -int jt_blockdev_detach(int argc, char **argv) +int jt_llog_remove(int argc, char **argv) { - char *filename; - int rc, fd; - - if (argc != 2) - return CMD_HELP; - - filename = argv[1]; - fd = open(filename, O_RDONLY); - if (fd < 0) { - fprintf(stderr, "cannot open file %s error %s\n", - filename, strerror(errno)); - return CMD_HELP; - } - - rc = ioctl(fd, LL_IOC_LLOOP_DETACH, 0); - if (rc < 0) { - rc = errno; - fprintf(stderr, "detach error(%s)\n", strerror(rc)); - } else { - (void)unlink(filename); - } + struct obd_ioctl_data data = { 0 }; + char rawbuf[MAX_IOC_BUFLEN] = "", *buf = rawbuf; + char *cmd = argv[0]; + int rc; - close(fd); - return -rc; -} + rc = llog_parse_catalog_log_idx(&argc, &argv, "c:hl:", 2, &data); + if (rc) + return rc; -int jt_blockdev_info(int argc, char **argv) -{ - char *filename; - int rc, fd; - struct lu_fid fid; + if (argc == 1) { + if (data.ioc_inlbuf2) { + fprintf(stderr, + "%s: --log_id is set, unknown argument '%s'\n", + jt_cmdname(cmd), argv[0]); + return CMD_HELP; + } - if (argc != 2) - return CMD_HELP; + data.ioc_inllen2 = strlen(argv[0]) + 1; + data.ioc_inlbuf2 = argv[0]; + } + rc = llapi_ioctl_pack(&data, &buf, sizeof(rawbuf)); + if (rc) { + fprintf(stderr, "%s: ioctl_pack for catalog '%s' failed: %s\n", + jt_cmdname(cmd), data.ioc_inlbuf1, strerror(-rc)); + return rc; + } - filename = argv[1]; - fd = open(filename, O_RDONLY); - if (fd < 0) { - fprintf(stderr, "cannot open file %s error: %s\n", - filename, strerror(errno)); - return CMD_HELP; - } + rc = l_ioctl(OBD_DEV_ID, OBD_IOC_LLOG_REMOVE, buf); + if (rc) + fprintf(stderr, "%s: cancel catalog '%s:%s' failed: %s\n", + jt_cmdname(cmd), data.ioc_inlbuf1, data.ioc_inlbuf2, + strerror(-rc)); - rc = ioctl(fd, LL_IOC_LLOOP_INFO, &fid); - if (rc < 0) { - rc = errno; - fprintf(stderr, "error: %s\n", strerror(errno)); - goto out; - } - fprintf(stdout, "lloop device info: "); - if (fid_is_zero(&fid)) - fprintf(stdout, "Not attached\n"); - else - fprintf(stdout, "attached to inode "DFID"\n", PFID(&fid)); -out: - close(fd); - return -rc; + return rc; } static void signal_server(int sig) @@ -2956,8 +3126,7 @@ int obd_initialize(int argc, char **argv) if (shmem_setup() != 0) return -1; - register_ioc_dev(OBD_DEV_ID, OBD_DEV_PATH, - OBD_DEV_MAJOR, OBD_DEV_MINOR); + register_ioc_dev(OBD_DEV_ID, OBD_DEV_PATH); return 0; } @@ -2992,7 +3161,9 @@ static int check_pool_cmd(enum lcfg_command_type cmd, switch (cmd) { case LCFG_POOL_NEW: { - LASSERT(ostname == NULL); + if (ostname != NULL) + return -EINVAL; + if (rc >= 0) { fprintf(stderr, "Pool %s.%s already exists\n", fsname, poolname); @@ -3001,7 +3172,9 @@ static int check_pool_cmd(enum lcfg_command_type cmd, return 0; } case LCFG_POOL_DEL: { - LASSERT(ostname == NULL); + if (ostname != NULL) + return -EINVAL; + if (rc == 1) { fprintf(stderr, "Pool %s.%s not empty, " "please remove all members\n", @@ -3209,9 +3382,11 @@ static int pool_cmd(enum lcfg_command_type cmd, if (ostname != NULL) lustre_cfg_bufs_set_string(&bufs, 2, ostname); - lcfg = lustre_cfg_new(cmd, &bufs); + + lcfg = malloc(lustre_cfg_len(bufs.lcfg_bufcount, bufs.lcfg_buflen)); if (lcfg == NULL) - return rc; + return -ENOMEM; + lustre_cfg_init(lcfg, cmd, &bufs); memset(&data, 0, sizeof(data)); rc = data.ioc_dev = get_mgs_device(); @@ -3224,18 +3399,35 @@ static int pool_cmd(enum lcfg_command_type cmd, data.ioc_pbuf1 = (void *)lcfg; memset(buf, 0, sizeof(rawbuf)); - rc = obd_ioctl_pack(&data, &buf, sizeof(rawbuf)); + rc = llapi_ioctl_pack(&data, &buf, sizeof(rawbuf)); if (rc) { fprintf(stderr, "error: %s: invalid ioctl\n", jt_cmdname(cmdname)); + free(lcfg); return rc; } rc = l_ioctl(OBD_DEV_ID, OBD_IOC_POOL, buf); out: if (rc) rc = -errno; - lustre_cfg_free(lcfg); - return rc; + switch (rc) { + case -ENAMETOOLONG: + fprintf(stderr, "error: %s: either the pool or file " + "system name is too long (max pool name len " + "is %d and file system name is %d)\n", + jt_cmdname(cmdname), LOV_MAXPOOLNAME, + LUSTRE_MAXFSNAME); + break; + case -EINVAL: + fprintf(stderr, "error: %s can contain only " + "alphanumeric characters, underscores, and " + "dashes besides the required '.'\n", + jt_cmdname(cmdname)); + default: + break; + } + free(lcfg); + return rc; } /** @@ -3274,9 +3466,10 @@ static int nodemap_cmd(enum lcfg_command_type cmd, void *ret_data, } va_end(ap); - lcfg = lustre_cfg_new(cmd, &bufs); + lcfg = malloc(lustre_cfg_len(bufs.lcfg_bufcount, bufs.lcfg_buflen)); if (lcfg == NULL) return -ENOMEM; + lustre_cfg_init(lcfg, cmd, &bufs); memset(&data, 0, sizeof(data)); rc = data.ioc_dev = get_mgs_device(); @@ -3289,7 +3482,7 @@ static int nodemap_cmd(enum lcfg_command_type cmd, void *ret_data, data.ioc_pbuf1 = (void *)lcfg; memset(buf, 0, sizeof(rawbuf)); - rc = obd_ioctl_pack(&data, &buf, sizeof(rawbuf)); + rc = llapi_ioctl_pack(&data, &buf, sizeof(rawbuf)); if (rc != 0) { fprintf(stderr, "error: invalid ioctl: %08x errno: %d with " "rc=%d\n", cmd, errno, rc); @@ -3304,16 +3497,17 @@ static int nodemap_cmd(enum lcfg_command_type cmd, void *ret_data, } if (ret_data != NULL) { - rc = obd_ioctl_unpack(&data, buf, sizeof(rawbuf)); + rc = llapi_ioctl_unpack(&data, buf, sizeof(rawbuf)); if (rc != 0) goto out; - memcpy(ret_data, data.ioc_pbuf1, data.ioc_plen1); - if (ret_data == NULL || sizeof(ret_data) != ret_size) - rc = -errno; + if (ret_size > data.ioc_plen1) + ret_size = data.ioc_plen1; + + memcpy(ret_data, data.ioc_pbuf1, ret_size); } out: - lustre_cfg_free(lcfg); + free(lcfg); return rc; } @@ -3448,32 +3642,15 @@ int jt_nodemap_test_id(int argc, char **argv) int rc = 0; int c; - static struct option long_options[] = { - { - .name = "nid", - .has_arg = required_argument, - .flag = 0, - .val = 'n', - }, - { - .name = "idtype", - .has_arg = required_argument, - .flag = 0, - .val = 't', - }, - { - .name = "id", - .has_arg = required_argument, - .flag = 0, - .val = 'i', - }, - { - NULL - } - }; + static struct option long_opts[] = { + { .val = 'i', .name = "id", .has_arg = required_argument }, + { .val = 'n', .name = "nid", .has_arg = required_argument }, + { .val = 't', .name = "idtype", + .has_arg = required_argument }, + { .name = NULL } }; while ((c = getopt_long(argc, argv, "n:t:i:", - long_options, NULL)) != -1) { + long_opts, NULL)) != -1) { switch (c) { case 'n': nidstr = optarg; @@ -3502,6 +3679,51 @@ int jt_nodemap_test_id(int argc, char **argv) } /** + * parse nid range + * + * \param nodemap_range --range string + * \param nid_range nid range string, min_nid:max_nid + * + * \retval 0 on success + */ +static int parse_nid_range(char *nodemap_range, char *nid_range, int range_len) +{ + char min_nid[LNET_NIDSTR_SIZE + 1]; + char max_nid[LNET_NIDSTR_SIZE + 1]; + struct list_head nidlist; + int rc = 0; + + INIT_LIST_HEAD(&nidlist); + + if (cfs_parse_nidlist(nodemap_range, strlen(nodemap_range), + &nidlist) <= 0) { + fprintf(stderr, + "error: nodemap_xxx_range: can't parse nid range: %s\n", + nodemap_range); + return -1; + } + + rc = cfs_nidrange_find_min_max(&nidlist, &min_nid[0], &max_nid[0], + LNET_NIDSTR_SIZE); + if (rc < 0) { + if (rc == -EINVAL) + fprintf(stderr, + "error: nodemap_xxx_range: nid range uses " + "currently unsupported features\n"); + else if (rc == -ERANGE) + fprintf(stderr, + "error: nodemap_xxx_range: nodemap ranges must " + "be contiguous\n"); + + return rc; + } + + snprintf(nid_range, range_len, "%s:%s", min_nid, max_nid); + + return rc; +} + +/** * add an nid range to a nodemap * * \param argc number of args @@ -3516,35 +3738,17 @@ int jt_nodemap_add_range(int argc, char **argv) { char *nodemap_name = NULL; char *nodemap_range = NULL; - struct list_head nidlist; - char min_nid[LNET_NIDSTR_SIZE + 1]; - char max_nid[LNET_NIDSTR_SIZE + 1]; char nid_range[2 * LNET_NIDSTR_SIZE + 2]; int rc = 0; int c; - static struct option long_options[] = { - { - .name = "name", - .has_arg = required_argument, - .flag = 0, - .val = 'n', - }, - { - .name = "range", - .has_arg = required_argument, - .flag = 0, - .val = 'r', - }, - { - NULL - } - }; - - INIT_LIST_HEAD(&nidlist); + static struct option long_opts[] = { + { .val = 'n', .name = "name", .has_arg = required_argument }, + { .val = 'r', .name = "range", .has_arg = required_argument }, + { .name = NULL } }; while ((c = getopt_long(argc, argv, "n:r:", - long_options, NULL)) != -1) { + long_opts, NULL)) != -1) { switch (c) { case 'n': nodemap_name = optarg; @@ -3561,23 +3765,11 @@ int jt_nodemap_add_range(int argc, char **argv) return -1; } - if (cfs_parse_nidlist(nodemap_range, strlen(nodemap_range), - &nidlist) <= 0) { - fprintf(stderr, "error: %s: can't parse nid range: %s\n", - jt_cmdname(argv[0]), nodemap_range); - return -1; - } - - if (!cfs_nidrange_is_contiguous(&nidlist)) { - fprintf(stderr, "error: %s: nodemap ranges must be " - "contiguous\n", jt_cmdname(argv[0])); - return -1; + rc = parse_nid_range(nodemap_range, nid_range, sizeof(nid_range)); + if (rc) { + errno = -rc; + return rc; } - - cfs_nidrange_find_min_max(&nidlist, &min_nid[0], &max_nid[0], - LNET_NIDSTR_SIZE); - snprintf(nid_range, sizeof(nid_range), "%s:%s", min_nid, max_nid); - rc = nodemap_cmd(LCFG_NODEMAP_ADD_RANGE, NULL, 0, argv[0], nodemap_name, nid_range, NULL); if (rc != 0) { @@ -3605,35 +3797,17 @@ int jt_nodemap_del_range(int argc, char **argv) { char *nodemap_name = NULL; char *nodemap_range = NULL; - struct list_head nidlist; - char min_nid[LNET_NIDSTR_SIZE + 1]; - char max_nid[LNET_NIDSTR_SIZE + 1]; char nid_range[2 * LNET_NIDSTR_SIZE + 2]; int rc = 0; int c; - static struct option long_options[] = { - { - .name = "name", - .has_arg = required_argument, - .flag = 0, - .val = 'n', - }, - { - .name = "range", - .has_arg = required_argument, - .flag = 0, - .val = 'r', - }, - { - NULL - } - }; - - INIT_LIST_HEAD(&nidlist); + static struct option long_opts[] = { + { .val = 'n', .name = "name", .has_arg = required_argument }, + { .val = 'r', .name = "range", .has_arg = required_argument }, + { .name = NULL } }; while ((c = getopt_long(argc, argv, "n:r:", - long_options, NULL)) != -1) { + long_opts, NULL)) != -1) { switch (c) { case 'n': nodemap_name = optarg; @@ -3650,23 +3824,11 @@ int jt_nodemap_del_range(int argc, char **argv) return -1; } - if (cfs_parse_nidlist(nodemap_range, strlen(nodemap_range), - &nidlist) <= 0) { - fprintf(stderr, "error: %s: can't parse nid range: %s\n", - jt_cmdname(argv[0]), nodemap_range); - return -1; - } - - if (!cfs_nidrange_is_contiguous(&nidlist)) { - fprintf(stderr, "error: %s: nodemap ranges must be " - "contiguous\n", jt_cmdname(argv[0])); - return -1; + rc = parse_nid_range(nodemap_range, nid_range, sizeof(nid_range)); + if (rc) { + errno = -rc; + return rc; } - - cfs_nidrange_find_min_max(&nidlist, &min_nid[0], &max_nid[0], - LNET_NIDSTR_SIZE); - snprintf(nid_range, sizeof(nid_range), "%s:%s", min_nid, max_nid); - rc = nodemap_cmd(LCFG_NODEMAP_DEL_RANGE, NULL, 0, argv[0], nodemap_name, nid_range, NULL); if (rc != 0) { @@ -3680,57 +3842,156 @@ int jt_nodemap_del_range(int argc, char **argv) } /** - * modify a nodemap's behavior + * set a fileset on a nodemap * * \param argc number of args * \param argv[] variable string arguments * * --name nodemap name - * --property nodemap property to change - * admin, trusted, squash_uid, squash_gid) - * --value value to set property + * --fileset fileset name * * \retval 0 on success */ -int jt_nodemap_modify(int argc, char **argv) +int jt_nodemap_set_fileset(int argc, char **argv) { - int c; - int rc = 0; - enum lcfg_command_type cmd = 0; - char *nodemap_name = NULL; - char *param = NULL; - char *value = NULL; + char *nodemap_name = NULL; + char *fileset_name = NULL; + int rc = 0; + int c; + + static struct option long_opts[] = { + { .val = 'f', .name = "fileset", .has_arg = required_argument }, + { .val = 'n', .name = "name", .has_arg = required_argument }, + { .name = NULL } }; + + while ((c = getopt_long(argc, argv, "n:f:", + long_opts, NULL)) != -1) { + switch (c) { + case 'n': + nodemap_name = optarg; + break; + case 'f': + fileset_name = optarg; + break; + } + } + + if (nodemap_name == NULL || fileset_name == NULL) { + fprintf(stderr, "usage: nodemap_set_fileset --name " + "--fileset \n"); + return -1; + } + + rc = nodemap_cmd(LCFG_NODEMAP_SET_FILESET, NULL, 0, argv[0], + nodemap_name, fileset_name, NULL); + if (rc != 0) { + errno = -rc; + fprintf(stderr, "error: %s: cannot set fileset '%s' on nodemap " + "'%s': rc = %d\n", + jt_cmdname(argv[0]), fileset_name, nodemap_name, rc); + } + + return rc; +} + +/** + * set SELinux policy info on a nodemap + * + * \param argc number of args + * \param argv[] variable string arguments + * + * --name nodemap name + * --sepol SELinux policy info + * + * \retval 0 on success + */ +int jt_nodemap_set_sepol(int argc, char **argv) +{ + char *nodemap_name = NULL; + char *sepol = NULL; + int rc = 0; + int c; static struct option long_options[] = { { .name = "name", .has_arg = required_argument, - .flag = 0, .val = 'n', }, { - .name = "property", + .name = "sepol", .has_arg = required_argument, - .flag = 0, - .val = 'p', + .val = 's', }, { - .name = "value", - .has_arg = required_argument, - .flag = 0, - .val = 'v', - }, - { - NULL + .name = NULL, } }; - while ((c = getopt_long(argc, argv, "n:p:v:", + while ((c = getopt_long(argc, argv, "n:s:", long_options, NULL)) != -1) { switch (c) { case 'n': nodemap_name = optarg; break; + case 's': + sepol = optarg; + break; + } + } + + if (nodemap_name == NULL || sepol == NULL) { + fprintf(stderr, "usage: nodemap_set_sepol --name " + "--sepol \n"); + return -1; + } + + rc = nodemap_cmd(LCFG_NODEMAP_SET_SEPOL, NULL, 0, argv[0], + nodemap_name, sepol, NULL); + if (rc != 0) { + errno = -rc; + fprintf(stderr, "error: %s: cannot set sepol '%s' on nodemap " + "'%s': rc = %d\n", + jt_cmdname(argv[0]), sepol, nodemap_name, rc); + } + + return rc; +} + +/** + * modify a nodemap's behavior + * + * \param argc number of args + * \param argv[] variable string arguments + * + * --name nodemap name + * --property nodemap property to change + * admin, trusted, squash_uid, squash_gid) + * --value value to set property + * + * \retval 0 on success + */ +int jt_nodemap_modify(int argc, char **argv) +{ + int c; + int rc = 0; + enum lcfg_command_type cmd = 0; + char *nodemap_name = NULL; + char *param = NULL; + char *value = NULL; + + static struct option long_opts[] = { + { .val = 'n', .name = "name", .has_arg = required_argument }, + { .val = 'p', .name = "property", .has_arg = required_argument }, + { .val = 'v', .name = "value", .has_arg = required_argument }, + { .name = NULL } }; + + while ((c = getopt_long(argc, argv, "n:p:v:", + long_opts, NULL)) != -1) { + switch (c) { + case 'n': + nodemap_name = optarg; + break; case 'p': param = optarg; break; @@ -3741,8 +4002,10 @@ int jt_nodemap_modify(int argc, char **argv) } if (nodemap_name == NULL || param == NULL || value == NULL) { - fprintf(stderr, "usage: nodemap_modify --name " - "--property --value \n"); + fprintf(stderr, "usage: nodemap_modify --name " + "--property --value \n"); + fprintf(stderr, "valid properties: admin trusted map_mode " + "squash_uid squash_gid deny_unknown audit_mode\n"); return -1; } @@ -3750,10 +4013,16 @@ int jt_nodemap_modify(int argc, char **argv) cmd = LCFG_NODEMAP_ADMIN; } else if (strcmp("trusted", param) == 0) { cmd = LCFG_NODEMAP_TRUSTED; + } else if (strcmp("deny_unknown", param) == 0) { + cmd = LCFG_NODEMAP_DENY_UNKNOWN; } else if (strcmp("squash_uid", param) == 0) { cmd = LCFG_NODEMAP_SQUASH_UID; } else if (strcmp("squash_gid", param) == 0) { cmd = LCFG_NODEMAP_SQUASH_GID; + } else if (strcmp("map_mode", param) == 0) { + cmd = LCFG_NODEMAP_MAP_MODE; + } else if (strcmp("audit_mode", param) == 0) { + cmd = LCFG_NODEMAP_AUDIT_MODE; } else { fprintf(stderr, "error: %s: nodemap_modify invalid " "subcommand: %s\n", @@ -3782,32 +4051,14 @@ int jt_nodemap_add_idmap(int argc, char **argv) char *idtype = NULL; int rc = 0; - static struct option long_options[] = { - { - .name = "name", - .has_arg = required_argument, - .flag = 0, - .val = 'n', - }, - { - .name = "idmap", - .has_arg = required_argument, - .flag = 0, - .val = 'm', - }, - { - .name = "idtype", - .has_arg = required_argument, - .flag = 0, - .val = 'i', - }, - { - NULL - } - }; + static struct option long_opts[] = { + { .val = 'i', .name = "idtype", .has_arg = required_argument }, + { .val = 'm', .name = "idmap", .has_arg = required_argument }, + { .val = 'n', .name = "name", .has_arg = required_argument }, + { .name = NULL } }; while ((c = getopt_long(argc, argv, "n:m:i:", - long_options, NULL)) != -1) { + long_opts, NULL)) != -1) { switch (c) { case 'n': nodemap_name = optarg; @@ -3856,32 +4107,14 @@ int jt_nodemap_del_idmap(int argc, char **argv) char *idtype = NULL; int rc = 0; - static struct option long_options[] = { - { - .name = "name", - .has_arg = required_argument, - .flag = 0, - .val = 'n', - }, - { - .name = "idmap", - .has_arg = required_argument, - .flag = 0, - .val = 'm', - }, - { - .name = "idtype", - .has_arg = required_argument, - .flag = 0, - .val = 'i', - }, - { - NULL - } - }; + static struct option long_opts[] = { + { .val = 'i', .name = "idtype", .has_arg = required_argument }, + { .val = 'm', .name = "idmap", .has_arg = required_argument }, + { .val = 'n', .name = "name", .has_arg = required_argument }, + { .name = NULL } }; while ((c = getopt_long(argc, argv, "n:m:i:", - long_options, NULL)) != -1) { + long_opts, NULL)) != -1) { switch (c) { case 'n': nodemap_name = optarg; @@ -3909,7 +4142,7 @@ int jt_nodemap_del_idmap(int argc, char **argv) rc = nodemap_cmd(cmd, NULL, 0, argv[0], nodemap_name, idmap, NULL); if (rc != 0) { errno = -rc; - fprintf(stderr, "cannot add %smap '%s' to nodemap '%s'" + fprintf(stderr, "cannot delete %smap '%s' from nodemap '%s'" ": rc = %d\n", idtype, idmap, nodemap_name, rc); } @@ -3959,14 +4192,16 @@ static int get_array_idx(char *rule, char *format, int **array) /* extract the 3 fields */ rc = sscanf(start, "%x-%x/%u", &lo, &hi, &step); switch (rc) { - case 0: { - return 0; - } - case 1: { - array_sz++; - *array = realloc(*array, array_sz * sizeof(int)); - if (*array == NULL) - return 0; + case 0: + goto err; + case 1: { + void *tmp; + + array_sz++; + tmp = realloc(*array, array_sz * sizeof(int)); + if (tmp == NULL) + goto err; + *array = tmp; (*array)[array_idx] = lo; array_idx++; break; @@ -3976,12 +4211,15 @@ static int get_array_idx(char *rule, char *format, int **array) /* do not break to share code with case 3: */ } case 3: { - if ((hi < lo) || (step == 0)) - return 0; - array_sz += (hi - lo) / step + 1; - *array = realloc(*array, sizeof(int) * array_sz); - if (*array == NULL) - return 0; + void *tmp; + + if ((hi < lo) || (step == 0)) + goto err; + array_sz += (hi - lo) / step + 1; + tmp = realloc(*array, array_sz * sizeof(int)); + if (tmp == NULL) + goto err; + *array = tmp; for (i = lo; i <= hi; i+=step, array_idx++) (*array)[array_idx] = i; break; @@ -3993,50 +4231,55 @@ static int get_array_idx(char *rule, char *format, int **array) } while (ptr != NULL); return array_sz; +err: + if (*array != NULL) { + free(*array); + *array = NULL; + } + return 0; } -static int extract_fsname_poolname(char *arg, char *fsname, char *poolname) +static int extract_fsname_poolname(const char *arg, char *fsname, + char *poolname) { - char *ptr; - int len; - int rc; + char *ptr; + int rc; - strcpy(fsname, arg); - ptr = strchr(fsname, '.'); - if (ptr == NULL) { - fprintf(stderr, ". is missing in %s\n", fsname); - rc = -EINVAL; - goto err; - } + snprintf(fsname, PATH_MAX + 1, "%s", arg); + ptr = strchr(fsname, '.'); + if (ptr == NULL) { + fprintf(stderr, ". is missing in %s\n", fsname); + rc = -EINVAL; + goto err; + } - len = ptr - fsname; - if (len == 0) { - fprintf(stderr, "fsname is empty\n"); - rc = -EINVAL; - goto err; - } + if ((ptr - fsname) == 0) { + fprintf(stderr, "fsname is empty\n"); + rc = -EINVAL; + goto err; + } - len = strlen(ptr + 1); - if (len == 0) { - fprintf(stderr, "poolname is empty\n"); - rc = -EINVAL; - goto err; - } - if (len > LOV_MAXPOOLNAME) { - fprintf(stderr, - "poolname %s is too long (length is %d max is %d)\n", - ptr + 1, len, LOV_MAXPOOLNAME); - rc = -ENAMETOOLONG; - goto err; - } - strncpy(poolname, ptr + 1, LOV_MAXPOOLNAME); - poolname[LOV_MAXPOOLNAME] = '\0'; - *ptr = '\0'; - return 0; + *ptr = '\0'; + ++ptr; + + if (strlen(ptr) == 0) { + fprintf(stderr, "poolname is empty\n"); + rc = -EINVAL; + goto err; + } + + strncpy(poolname, ptr, LOV_MAXPOOLNAME); + poolname[LOV_MAXPOOLNAME] = '\0'; + + if (strncmp(poolname, "none", LOV_MAXPOOLNAME) == 0) { + fprintf(stderr, "poolname cannot be 'none'\n"); + return -EINVAL; + } + return 0; err: - fprintf(stderr, "argument %s must be .\n", arg); - return rc; + fprintf(stderr, "argument %s must be .\n", arg); + return rc; } int jt_pool_cmd(int argc, char **argv) @@ -4174,6 +4417,280 @@ out: return rc; } +#ifdef HAVE_SERVER_SUPPORT +static const char *barrier_status2name(enum barrier_status status) +{ + switch (status) { + case BS_INIT: + return "init"; + case BS_FREEZING_P1: + return "freezing_p1"; + case BS_FREEZING_P2: + return "freezing_p2"; + case BS_FROZEN: + return "frozen"; + case BS_THAWING: + return "thawing"; + case BS_THAWED: + return "thawed"; + case BS_FAILED: + return "failed"; + case BS_EXPIRED: + return "expired"; + case BS_RESCAN: + return "rescan"; + default: + return "unknown"; + } +} + +int jt_barrier_freeze(int argc, char **argv) +{ + struct obd_ioctl_data data; + char rawbuf[MAX_IOC_BUFLEN], *buf = rawbuf; + struct barrier_ctl bc; + int rc; + + if (argc < 2 || argc > 3) + return CMD_HELP; + + memset(&data, 0, sizeof(data)); + rc = data.ioc_dev = get_mgs_device(); + if (rc < 0) + return rc; + + memset(&bc, 0, sizeof(bc)); + bc.bc_version = BARRIER_VERSION_V1; + bc.bc_cmd = BC_FREEZE; + if (argc == 3) + bc.bc_timeout = atoi(argv[2]); + if (bc.bc_timeout == 0) + bc.bc_timeout = BARRIER_TIMEOUT_DEFAULT; + + if (strlen(argv[1]) > 8) { + fprintf(stderr, "%s: fsname name %s is too long. " + "It should not exceed 8.\n", argv[0], argv[1]); + return -EINVAL; + } + + strncpy(bc.bc_name, argv[1], sizeof(bc.bc_name)); + data.ioc_inlbuf1 = (char *)&bc; + data.ioc_inllen1 = sizeof(bc); + memset(buf, 0, sizeof(rawbuf)); + rc = llapi_ioctl_pack(&data, &buf, sizeof(rawbuf)); + if (rc) { + fprintf(stderr, "Fail to pack ioctl data: rc = %d.\n", rc); + return rc; + } + + rc = l_ioctl(OBD_DEV_ID, OBD_IOC_BARRIER, buf); + if (rc < 0) + fprintf(stderr, "Fail to freeze barrier for %s: %s\n", + argv[1], strerror(errno)); + + return rc; +} + +int jt_barrier_thaw(int argc, char **argv) +{ + struct obd_ioctl_data data; + char rawbuf[MAX_IOC_BUFLEN], *buf = rawbuf; + struct barrier_ctl bc; + int rc; + + if (argc != 2) + return CMD_HELP; + + memset(&data, 0, sizeof(data)); + rc = data.ioc_dev = get_mgs_device(); + if (rc < 0) + return rc; + + memset(&bc, 0, sizeof(bc)); + bc.bc_version = BARRIER_VERSION_V1; + bc.bc_cmd = BC_THAW; + + if (strlen(argv[1]) > 8) { + fprintf(stderr, "fsname name %s is too long. " + "It should not exceed 8.\n", argv[1]); + return -EINVAL; + } + + strncpy(bc.bc_name, argv[1], sizeof(bc.bc_name)); + data.ioc_inlbuf1 = (char *)&bc; + data.ioc_inllen1 = sizeof(bc); + memset(buf, 0, sizeof(rawbuf)); + rc = llapi_ioctl_pack(&data, &buf, sizeof(rawbuf)); + if (rc) { + fprintf(stderr, "Fail to pack ioctl data: rc = %d.\n", rc); + return rc; + } + + rc = l_ioctl(OBD_DEV_ID, OBD_IOC_BARRIER, buf); + if (rc < 0) + fprintf(stderr, "Fail to thaw barrier for %s: %s\n", + argv[1], strerror(errno)); + + return rc; +} + +int __jt_barrier_stat(const char *fsname, struct barrier_ctl *bc) +{ + struct obd_ioctl_data data; + char rawbuf[MAX_IOC_BUFLEN], *buf = rawbuf; + int rc; + + memset(&data, 0, sizeof(data)); + rc = data.ioc_dev = get_mgs_device(); + if (rc < 0) + return rc; + + memset(bc, 0, sizeof(*bc)); + bc->bc_version = BARRIER_VERSION_V1; + bc->bc_cmd = BC_STAT; + strncpy(bc->bc_name, fsname, sizeof(bc->bc_name)); + data.ioc_inlbuf1 = (char *)bc; + data.ioc_inllen1 = sizeof(*bc); + memset(buf, 0, sizeof(rawbuf)); + rc = llapi_ioctl_pack(&data, &buf, sizeof(rawbuf)); + if (rc) { + fprintf(stderr, "Fail to pack ioctl data: rc = %d.\n", rc); + return rc; + } + + rc = l_ioctl(OBD_DEV_ID, OBD_IOC_BARRIER, buf); + if (rc < 0) + fprintf(stderr, "Fail to query barrier for %s: %s\n", + fsname, strerror(errno)); + else + llapi_ioctl_unpack(&data, buf, sizeof(rawbuf)); + + return rc; +} + +int jt_barrier_stat(int argc, char **argv) +{ + struct barrier_ctl bc; + static struct option long_opt_barrier_stat[] = { + { + .val = 's', + .name = "state", + .has_arg = no_argument, + }, + { .val = 't', + .name = "timeout", + .has_arg = no_argument, + }, + { + NULL + } + }; + const char *name; + int index; + int opt; + int rc; + bool state = false; + bool timeout = false; + + while ((opt = getopt_long(argc, argv, "st", long_opt_barrier_stat, + &index)) != EOF) { + switch (opt) { + case 's': + state = true; + break; + case 't': + timeout = true; + break; + default: + return CMD_HELP; + } + } + + if (optind >= argc) + return CMD_HELP; + + name = argv[optind]; + if (strlen(name) > 8) { + fprintf(stderr, "fsname name %s is too long. " + "It should not exceed 8.\n", name); + return -EINVAL; + } + + rc = __jt_barrier_stat(name, &bc); + if (!rc) { + if (state && !timeout) + printf("%s\n", barrier_status2name(bc.bc_status)); + else if (timeout && !state) + printf("%d\n", + (bc.bc_status == BS_FREEZING_P1 || + bc.bc_status == BS_FREEZING_P2 || + bc.bc_status == BS_FROZEN) ? + bc.bc_timeout : 0); + else + printf("state: %s\ntimeout: %d seconds\n", + barrier_status2name(bc.bc_status), + (bc.bc_status == BS_FREEZING_P1 || + bc.bc_status == BS_FREEZING_P2 || + bc.bc_status == BS_FROZEN) ? + bc.bc_timeout : 0); + } + + return rc; +} + +int jt_barrier_rescan(int argc, char **argv) +{ + struct obd_ioctl_data data; + char rawbuf[MAX_IOC_BUFLEN], *buf = rawbuf; + struct barrier_ctl bc; + int rc; + + if (argc < 2 || argc > 3) + return CMD_HELP; + + memset(&data, 0, sizeof(data)); + rc = data.ioc_dev = get_mgs_device(); + if (rc < 0) + return rc; + + memset(&bc, 0, sizeof(bc)); + bc.bc_version = BARRIER_VERSION_V1; + bc.bc_cmd = BC_RESCAN; + if (argc == 3) + bc.bc_timeout = atoi(argv[2]); + if (bc.bc_timeout == 0) + bc.bc_timeout = BARRIER_TIMEOUT_DEFAULT; + + if (strlen(argv[1]) > 8) { + fprintf(stderr, "fsname name %s is too long. " + "It should not exceed 8.\n", argv[1]); + return -EINVAL; + } + + strncpy(bc.bc_name, argv[1], sizeof(bc.bc_name)); + data.ioc_inlbuf1 = (char *)&bc; + data.ioc_inllen1 = sizeof(bc); + memset(buf, 0, sizeof(rawbuf)); + rc = llapi_ioctl_pack(&data, &buf, sizeof(rawbuf)); + if (rc) { + fprintf(stderr, "Fail to pack ioctl data: rc = %d.\n", rc); + return rc; + } + + rc = l_ioctl(OBD_DEV_ID, OBD_IOC_BARRIER, buf); + if (rc < 0) { + fprintf(stderr, "Fail to rescan barrier bitmap for %s: %s\n", + argv[1], strerror(errno)); + } else { + llapi_ioctl_unpack(&data, buf, sizeof(rawbuf)); + printf("%u of %u MDT(s) in the filesystem %s are inactive\n", + bc.bc_absence, bc.bc_total, argv[1]); + } + + return rc; +} +#endif /* HAVE_SERVER_SUPPORT */ + int jt_get_obj_version(int argc, char **argv) { struct lu_fid fid; @@ -4222,7 +4739,7 @@ int jt_get_obj_version(int argc, char **argv) data.ioc_inllen2 = sizeof version; memset(buf, 0, sizeof *buf); - rc = obd_ioctl_pack(&data, &buf, sizeof rawbuf); + rc = llapi_ioctl_pack(&data, &buf, sizeof rawbuf); if (rc) { fprintf(stderr, "error: %s: packing ioctl arguments: %s\n", jt_cmdname(argv[0]), strerror(-rc)); @@ -4236,132 +4753,111 @@ int jt_get_obj_version(int argc, char **argv) return -errno; } - obd_ioctl_unpack(&data, buf, sizeof rawbuf); - printf(LPX64"\n", version); + llapi_ioctl_unpack(&data, buf, sizeof rawbuf); + printf("%#jx\n", (uintmax_t)version); return 0; } int jt_changelog_register(int argc, char **argv) { - char rawbuf[MAX_IOC_BUFLEN], *buf = rawbuf; - struct obd_ioctl_data data; - char devname[30]; - int rc; + struct obd_ioctl_data data = { 0 }; + char rawbuf[MAX_IOC_BUFLEN] = ""; + char *buf = rawbuf; + char *device = lcfg_get_devname(); + bool print_name_only = false; + int c; + int rc; - if (argc > 2) - return CMD_HELP; - else if (argc == 2 && strcmp(argv[1], "-n") != 0) - return CMD_HELP; - if (cur_device < 0) - return CMD_HELP; + if (argc > 2) + return CMD_HELP; - memset(&data, 0, sizeof(data)); - data.ioc_dev = cur_device; - memset(buf, 0, sizeof(rawbuf)); - rc = obd_ioctl_pack(&data, &buf, sizeof(rawbuf)); - if (rc) { - fprintf(stderr, "error: %s: invalid ioctl\n", - jt_cmdname(argv[0])); - return rc; - } + while ((c = getopt(argc, argv, "hn")) >= 0) { + switch (c) { + case 'n': + print_name_only = true; + break; + case 'h': + default: + return CMD_HELP; + } + } - rc = l2_ioctl(OBD_DEV_ID, OBD_IOC_CHANGELOG_REG, buf); - if (rc < 0) { - fprintf(stderr, "error: %s: %s\n", jt_cmdname(argv[0]), - strerror(rc = errno)); - return rc; - } - obd_ioctl_unpack(&data, buf, sizeof(rawbuf)); + if (cur_device < 0 || device == NULL) + return CMD_HELP; + + data.ioc_dev = cur_device; + + rc = llapi_ioctl_pack(&data, &buf, sizeof(rawbuf)); + if (rc < 0) { + fprintf(stderr, "error: %s: cannot pack ioctl: %s\n", + jt_cmdname(argv[0]), strerror(-rc)); + return rc; + } + + rc = l2_ioctl(OBD_DEV_ID, OBD_IOC_CHANGELOG_REG, buf); + if (rc < 0) { + rc = -errno; + fprintf(stderr, "error: %s: %s\n", jt_cmdname(argv[0]), + strerror(-rc)); + return rc; + } + + llapi_ioctl_unpack(&data, buf, sizeof(rawbuf)); if (data.ioc_u32_1 == 0) { fprintf(stderr, "received invalid userid!\n"); return -EPROTO; } - if (lcfg_get_devname() != NULL) { - if (strlen(lcfg_get_devname()) > sizeof(devname)-1) { - fprintf(stderr, "Dev name too long\n"); - return -E2BIG; - } - strncpy(devname, lcfg_get_devname(), sizeof(devname)); - } else { - if (snprintf(devname, sizeof(devname), "dev %d", cur_device) >= - sizeof(devname)) { - fprintf(stderr, "Dev name too long\n"); - return -E2BIG; - } - } + if (print_name_only) + printf("%s%u\n", CHANGELOG_USER_PREFIX, data.ioc_u32_1); + else + printf("%s: Registered changelog userid '%s%u'\n", + device, CHANGELOG_USER_PREFIX, data.ioc_u32_1); - if (argc == 2) - /* -n means bare name */ - printf(CHANGELOG_USER_PREFIX"%u\n", data.ioc_u32_1); - else - printf("%s: Registered changelog userid '"CHANGELOG_USER_PREFIX - "%u'\n", devname, data.ioc_u32_1); - return 0; + return 0; } int jt_changelog_deregister(int argc, char **argv) { - char rawbuf[MAX_IOC_BUFLEN], *buf = rawbuf; - struct obd_ioctl_data data; - char devname[30]; - int id, rc; - - if (argc != 2 || cur_device < 0) - return CMD_HELP; + struct obd_ioctl_data data = { 0 }; + char rawbuf[MAX_IOC_BUFLEN] = ""; + char *buf = rawbuf; + char *device = lcfg_get_devname(); + int id; + int rc; - id = strtol(argv[1] + strlen(CHANGELOG_USER_PREFIX), NULL, 10); - if ((id == 0) || (strncmp(argv[1], CHANGELOG_USER_PREFIX, - strlen(CHANGELOG_USER_PREFIX)) != 0)) { - fprintf(stderr, "expecting id of the form '" - CHANGELOG_USER_PREFIX"'; got '%s'\n", argv[1]); - return CMD_HELP; - } + if (argc != 2 || cur_device < 0 || device == NULL) + return CMD_HELP; - memset(&data, 0, sizeof(data)); - data.ioc_dev = cur_device; - data.ioc_u32_1 = id; - memset(buf, 0, sizeof(rawbuf)); - rc = obd_ioctl_pack(&data, &buf, sizeof(rawbuf)); - if (rc) { - fprintf(stderr, "error: %s: invalid ioctl\n", - jt_cmdname(argv[0])); - return rc; - } + rc = sscanf(argv[1], CHANGELOG_USER_PREFIX"%d", &id); + if (rc != 1 || id <= 0) { + fprintf(stderr, + "error: %s: expected id of the form %s got '%s'\n", + jt_cmdname(argv[0]), CHANGELOG_USER_PREFIX, argv[1]); + return CMD_HELP; + } - rc = l2_ioctl(OBD_DEV_ID, OBD_IOC_CHANGELOG_DEREG, buf); - if (rc < 0) { - fprintf(stderr, "error: %s: %s\n", jt_cmdname(argv[0]), - strerror(rc = errno)); - return rc; - } - obd_ioctl_unpack(&data, buf, sizeof(rawbuf)); + data.ioc_dev = cur_device; + data.ioc_u32_1 = id; - if (data.ioc_u32_1 != id) { - fprintf(stderr, "No changelog user '%s'. Blocking user" - " is '"CHANGELOG_USER_PREFIX"%d'.\n", argv[1], - data.ioc_u32_1); - return -ENOENT; + rc = llapi_ioctl_pack(&data, &buf, sizeof(rawbuf)); + if (rc < 0) { + fprintf(stderr, "error: %s: invalid ioctl\n", + jt_cmdname(argv[0])); + return rc; } - if (lcfg_get_devname() != NULL) { - if (strlen(lcfg_get_devname()) > sizeof(devname)-1) { - fprintf(stderr, "Dev name too long\n"); - return -E2BIG; - } - strncpy(devname, lcfg_get_devname(), sizeof(devname)); - } else { - if (snprintf(devname, sizeof(devname), "dev %d", cur_device) >= - sizeof(devname)) { - fprintf(stderr, "Dev name too long\n"); - return -E2BIG; - } + rc = l2_ioctl(OBD_DEV_ID, OBD_IOC_CHANGELOG_DEREG, buf); + if (rc < 0) { + fprintf(stderr, "error: %s: %s\n", jt_cmdname(argv[0]), + strerror(rc = errno)); + return rc; } - printf("%s: Deregistered changelog user '"CHANGELOG_USER_PREFIX"%d'\n", - devname, data.ioc_u32_1); - return 0; -} - + llapi_ioctl_unpack(&data, buf, sizeof(rawbuf)); + printf("%s: Deregistered changelog user '%s%u'\n", + device, CHANGELOG_USER_PREFIX, data.ioc_u32_1); + return 0; +}