X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fobdclass%2Fclass_obd.c;h=2569fb277ef1e49db93c31b6a9e961af1766e29d;hb=400b0681017091fab9cef9bd00e0f536e1793dcc;hp=fe9383e716d30804a9de36a858aacbde4bd7131e;hpb=299797e4fcb045328b36fb928cdffd1241cd1dee;p=fs%2Flustre-release.git diff --git a/lustre/obdclass/class_obd.c b/lustre/obdclass/class_obd.c index fe9383e..2569fb2 100644 --- a/lustre/obdclass/class_obd.c +++ b/lustre/obdclass/class_obd.c @@ -31,6 +31,7 @@ #include #include #include +#include #include #include #include @@ -40,13 +41,19 @@ #include #include +#include #include +#include struct semaphore obd_conf_sem; /* serialize configuration commands */ struct obd_device obd_dev[MAX_OBD_DEVICES]; struct list_head obd_types; -unsigned long obd_memory = 0; -unsigned long obd_fail_loc = 0; +unsigned long obd_memory; + +/* The following are visible and mutable through /proc/sys/lustre/. */ +unsigned long obd_fail_loc; +unsigned long obd_timeout = 100; +char obd_recovery_upcall[128] = "/usr/lib/lustre/ha_assist"; extern struct obd_type *class_nm_to_type(char *nm); @@ -56,6 +63,8 @@ static int obd_class_open(struct inode * inode, struct file * file) ENTRY; file->private_data = NULL; + CDEBUG(D_IOCTL, "MOD_INC_USE for open: count = %d\n", + atomic_read(&(THIS_MODULE)->uc.usecount)); MOD_INC_USE_COUNT; RETURN(0); } @@ -65,9 +74,12 @@ static int obd_class_release(struct inode * inode, struct file * file) { ENTRY; + // XXX drop lsm, connections here if (file->private_data) file->private_data = NULL; + CDEBUG(D_IOCTL, "MOD_DEC_USE for close: count = %d\n", + atomic_read(&(THIS_MODULE)->uc.usecount) - 1); MOD_DEC_USE_COUNT; RETURN(0); } @@ -86,6 +98,28 @@ inline void obd_conn2data(struct obd_ioctl_data *data, struct lustre_handle *con data->ioc_cookie = conn->cookie; } +static void forcibly_detach_exports(struct obd_device *obd) +{ + int rc; + struct list_head *tmp, *n; + struct lustre_handle fake_conn; + + CDEBUG(D_IOCTL, "OBD device %d (%p) has exports, " + "disconnecting them", obd->obd_minor, obd); + list_for_each_safe(tmp, n, &obd->obd_exports) { + struct obd_export *exp = list_entry(tmp, struct obd_export, + exp_obd_chain); + fake_conn.addr = (__u64)(unsigned long)exp; + fake_conn.cookie = exp->exp_cookie; + rc = obd_disconnect(&fake_conn); + if (rc) { + CDEBUG(D_IOCTL, "disconnecting export %p failed: %d\n", + exp, rc); + } else { + CDEBUG(D_IOCTL, "export %p disconnected\n", exp); + } + } +} /* to control /dev/obd */ static int obd_class_ioctl (struct inode * inode, struct file * filp, @@ -95,12 +129,25 @@ static int obd_class_ioctl (struct inode * inode, struct file * filp, int len = 0; struct obd_ioctl_data *data; struct obd_device *obd = filp->private_data; + struct lustre_handle conn; int rw = OBD_BRW_READ; int err = 0; + int serialised = 0; + ENTRY; - down(&obd_conf_sem); + switch (cmd) + { + case OBD_IOC_BRW_WRITE: + case OBD_IOC_BRW_READ: + case OBD_IOC_GETATTR: + break; + default: + down(&obd_conf_sem); + serialised = 1; + break; + } if (!obd && cmd != OBD_IOC_DEVICE && cmd != TCGETS && cmd != OBD_IOC_LIST && @@ -147,12 +194,14 @@ static int obd_class_ioctl (struct inode * inode, struct file * filp, if (!obd->obd_type) continue; if (obd->obd_flags & OBD_SET_UP) - status = "*"; + status = "UP"; + else if (obd->obd_flags & OBD_ATTACHED) + status = "AT"; else - status = " "; - l = snprintf(buf2, remains, "%2d %s %s %s %s\n", + status = "-"; + l = snprintf(buf2, remains, "%2d %s %s %s %s %d\n", i, status, obd->obd_type->typ_name, - obd->obd_name, obd->obd_uuid); + obd->obd_name, obd->obd_uuid, obd->obd_type->typ_refcnt); buf2 +=l; remains -=l; if (remains <= 0) { @@ -161,7 +210,7 @@ static int obd_class_ioctl (struct inode * inode, struct file * filp, } } - err = copy_to_user((int *)arg, data, len); + err = copy_to_user((void *)arg, data, len); GOTO(out, err); } @@ -192,7 +241,7 @@ static int obd_class_ioctl (struct inode * inode, struct file * filp, CDEBUG(D_IOCTL, "device name %s, dev %d\n", data->ioc_inlbuf1, dev); - err = copy_to_user((int *)arg, data, sizeof(*data)); + err = copy_to_user((void *)arg, data, sizeof(*data)); GOTO(out, err); } @@ -222,7 +271,7 @@ static int obd_class_ioctl (struct inode * inode, struct file * filp, CDEBUG(D_IOCTL, "device name %s, dev %d\n", data->ioc_inlbuf1, dev); - err = copy_to_user((int *)arg, data, sizeof(*data)); + err = copy_to_user((void *)arg, data, sizeof(*data)); GOTO(out, err); } @@ -245,15 +294,16 @@ static int obd_class_ioctl (struct inode * inode, struct file * filp, if (dev == -1) GOTO(out, err=-EINVAL); - err = copy_to_user((int *)arg, data, sizeof(*data)); + err = copy_to_user((void *)arg, data, sizeof(*data)); GOTO(out, err); } case OBD_IOC_ATTACH: { struct obd_type *type; + int minor; /* have we attached a type to this device */ - if (obd->obd_flags & OBD_ATTACHED) { + if (obd->obd_flags & OBD_ATTACHED || obd->obd_type) { CERROR("OBD: Device %d already typed as %s.\n", obd->obd_minor, MKSTR(obd->obd_type->typ_name)); GOTO(out, err=-EBUSY); @@ -279,19 +329,14 @@ static int obd_class_ioctl (struct inode * inode, struct file * filp, GOTO(out, err=-EINVAL); } + minor = obd->obd_minor; + memset(obd, 0, sizeof(*obd)); + obd->obd_minor = minor; obd->obd_type = type; INIT_LIST_HEAD(&obd->obd_exports); + INIT_LIST_HEAD(&obd->obd_imports); + spin_lock_init(&obd->obd_dev_lock); - /* do the attach */ - if (OBT(obd) && OBP(obd, attach)) - err = OBP(obd,attach)(obd, sizeof(*data), data); - if (err) { - obd->obd_type = NULL; - } else { - obd->obd_flags |= OBD_ATTACHED; - type->typ_refcnt++; - CDEBUG(D_IOCTL, "OBD: dev %d attached type %s\n", - obd->obd_minor, data->ioc_inlbuf1); if (data->ioc_inlbuf2) { int len = strlen(data->ioc_inlbuf2) + 1; OBD_ALLOC(obd->obd_name, len); @@ -300,26 +345,38 @@ static int obd_class_ioctl (struct inode * inode, struct file * filp, LBUG(); } memcpy(obd->obd_name, data->ioc_inlbuf2, len); - obd->obd_proc_entry = - proc_lustre_register_obd_device(obd); } else { CERROR("WARNING: unnamed obd device\n"); - obd->obd_proc_entry = NULL; } - if (data->ioc_inlbuf3) { int len = strlen(data->ioc_inlbuf3); - if (len > 37) { - CERROR("uuid should be shorter than 37 bytes\n"); + if (len >= sizeof(obd->obd_uuid)) { + CERROR("uuid must be < %d bytes long\n", + sizeof(obd->obd_uuid)); if (obd->obd_name) OBD_FREE(obd->obd_name, strlen(obd->obd_name) + 1); GOTO(out, err=-EINVAL); } - memcpy(obd->obd_uuid, data->ioc_inlbuf3, - sizeof(obd->obd_uuid)); + memcpy(obd->obd_uuid, data->ioc_inlbuf3, len); } + /* do the attach */ + if (OBP(obd, attach)) + err = OBP(obd,attach)(obd, sizeof(*data), data); + if (err) { + if(data->ioc_inlbuf2) + OBD_FREE(obd->obd_name, strlen(obd->obd_name)+1); + obd->obd_type = NULL; + + } else { + obd->obd_flags |= OBD_ATTACHED; + + type->typ_refcnt++; + CDEBUG(D_IOCTL, "OBD: dev %d attached type %s\n", + obd->obd_minor, data->ioc_inlbuf1); + CDEBUG(D_IOCTL, "MOD_INC_USE for attach: count = %d\n", + atomic_read(&(THIS_MODULE)->uc.usecount)); MOD_INC_USE_COUNT; } @@ -332,29 +389,33 @@ static int obd_class_ioctl (struct inode * inode, struct file * filp, CERROR("OBD device %d still set up\n", obd->obd_minor); GOTO(out, err=-EBUSY); } - if (! (obd->obd_flags & OBD_ATTACHED) ) { + if (!(obd->obd_flags & OBD_ATTACHED) ) { CERROR("OBD device %d not attached\n", obd->obd_minor); GOTO(out, err=-ENODEV); } - if ( !list_empty(&obd->obd_exports) ) { - CERROR("OBD device %d has exports\n", - obd->obd_minor); - GOTO(out, err=-EBUSY); + if (!list_empty(&obd->obd_exports)) { + if (!data->ioc_inlbuf1 || data->ioc_inlbuf1[0] != 'F') { + CERROR("OBD device %d (%p) has exports\n", + obd->obd_minor, obd); + GOTO(out, err=-EBUSY); + } + forcibly_detach_exports(obd); } + if (OBP(obd, detach)) + err=OBP(obd,detach)(obd); if (obd->obd_name) { OBD_FREE(obd->obd_name, strlen(obd->obd_name)+1); obd->obd_name = NULL; } - if (obd->obd_proc_entry) - proc_lustre_release_obd_device(obd); - obd->obd_flags &= ~OBD_ATTACHED; obd->obd_type->typ_refcnt--; obd->obd_type = NULL; + CDEBUG(D_IOCTL, "MOD_DEC_USE for detach: count = %d\n", + atomic_read(&(THIS_MODULE)->uc.usecount) - 1); MOD_DEC_USE_COUNT; - GOTO(out, err=0); + GOTO(out, err = 0); } case OBD_IOC_SETUP: { @@ -399,16 +460,18 @@ static int obd_class_ioctl (struct inode * inode, struct file * filp, } case OBD_IOC_CONNECT: { + char * cluuid = "OBD_CLASS_UUID"; obd_data2conn(&conn, data); - err = obd_connect(&conn, obd, NULL); + err = obd_connect(&conn, obd, cluuid, NULL, NULL); - CDEBUG(D_IOCTL, "assigned export %Lx\n", conn.addr); + CDEBUG(D_IOCTL, "assigned export "LPX64"\n", conn.addr); obd_conn2data(data, &conn); if (err) GOTO(out, err); - err = copy_to_user((int *)arg, data, sizeof(*data)); + err = copy_to_user((void *)arg, data, sizeof(*data)); + // XXX save connection data into file handle GOTO(out, err); } @@ -419,20 +482,20 @@ static int obd_class_ioctl (struct inode * inode, struct file * filp, } case OBD_IOC_DEC_USE_COUNT: { + CDEBUG(D_IOCTL, "MOD_DEC_USE for force dec: count = %d\n", + atomic_read(&(THIS_MODULE)->uc.usecount) - 1); MOD_DEC_USE_COUNT; GOTO(out, err=0); } case OBD_IOC_CREATE: { - struct lov_stripe_md *ea; + struct lov_stripe_md *lsm = NULL; obd_data2conn(&conn, data); - - err = obd_create(&conn, &data->ioc_obdo1, &ea); - if (err) - GOTO(out, err); - - err = copy_to_user((int *)arg, data, sizeof(*data)); +#warning FIXME: save lsm into file handle for other ops, release on close + err = obd_create(&conn, &data->ioc_obdo1, &lsm); + if (!err) + err = copy_to_user((void *)arg, data, sizeof(*data)); GOTO(out, err); } @@ -440,20 +503,16 @@ static int obd_class_ioctl (struct inode * inode, struct file * filp, obd_data2conn(&conn, data); err = obd_getattr(&conn, &data->ioc_obdo1, NULL); - if (err) - GOTO(out, err); - - err = copy_to_user((int *)arg, data, sizeof(*data)); + if (!err) + err = copy_to_user((void *)arg, data, sizeof(*data)); GOTO(out, err); } case OBD_IOC_SETATTR: { obd_data2conn(&conn, data); err = obd_setattr(&conn, &data->ioc_obdo1, NULL); - if (err) - GOTO(out, err); - - err = copy_to_user((int *)arg, data, sizeof(*data)); + if (!err) + err = copy_to_user((void *)arg, data, sizeof(*data)); GOTO(out, err); } @@ -462,80 +521,107 @@ static int obd_class_ioctl (struct inode * inode, struct file * filp, obd_data2conn(&conn, data); err = obd_destroy(&conn, &data->ioc_obdo1, NULL); - if (err) - GOTO(out, err); + if (!err) + err = copy_to_user((void *)arg, data, sizeof(*data)); + GOTO(out, err); + } + + case OBD_IOC_OPEN: { + struct lov_stripe_md *lsm = NULL; // XXX fill in from create + + obd_data2conn(&conn, data); + err = obd_open(&conn, &data->ioc_obdo1, lsm); + if (!err) + err = copy_to_user((void *)arg, data, sizeof(*data)); + GOTO(out, err); + } + + case OBD_IOC_CLOSE: { + struct lov_stripe_md *lsm = NULL; // XXX fill in from create - err = copy_to_user((int *)arg, data, sizeof(*data)); + obd_data2conn(&conn, data); + err = obd_close(&conn, &data->ioc_obdo1, lsm); GOTO(out, err); } case OBD_IOC_BRW_WRITE: rw = OBD_BRW_WRITE; case OBD_IOC_BRW_READ: { - struct lov_stripe_md smd; + struct lov_stripe_md tmp_lsm; // XXX fill in from create + struct lov_stripe_md *lsm = &tmp_lsm; // XXX fill in from create + struct io_cb_data *cbd = ll_init_cb(); obd_count pages = 0; - struct page **bufs = NULL; - obd_size *counts = NULL; - obd_off *offsets = NULL; - obd_flag *flags = NULL; - int j; - unsigned long off; - void *from; + struct brw_page *pga, *pgp; + __u64 id = data->ioc_obdo1.o_id; + int gfp_mask = (id & 1) ? GFP_HIGHUSER : GFP_KERNEL; + int verify = (id != 0); + __u64 off; + int j; + + if (!cbd) + GOTO(out, err = -ENOMEM); obd_data2conn(&conn, data); - pages = data->ioc_plen1 / PAGE_SIZE; + pages = data->ioc_count / PAGE_SIZE; + off = data->ioc_offset; - CDEBUG(D_INODE, "BRW %s with %d pages\n", - rw == OBD_BRW_READ ? "read" : "write", pages); - OBD_ALLOC(bufs, pages * sizeof(*bufs)); - OBD_ALLOC(counts, pages * sizeof(*counts)); - OBD_ALLOC(offsets, pages * sizeof(*offsets)); - OBD_ALLOC(flags, pages * sizeof(*flags)); - if (!bufs || !counts || !offsets || !flags) { + CDEBUG(D_INODE, "BRW %s with %d pages @ "LPX64"\n", + rw == OBD_BRW_READ ? "read" : "write", pages, off); + OBD_ALLOC(pga, pages * sizeof(*pga)); + if (!pga) { CERROR("no memory for %d BRW per-page data\n", pages); GOTO(brw_free, err = -ENOMEM); } - memset(&smd, 0, sizeof(smd)); - smd.lmd_object_id = data->ioc_obdo1.o_id; + memset(lsm, 0, sizeof(*lsm)); // XXX don't do this later + lsm->lsm_object_id = id; // ensure id == lsm->lsm_object_id - from = (&data->ioc_pbuf1)[0]; - off = data->ioc_offset; - - for (j = 0; j < pages; - j++, off += PAGE_SIZE, from += PAGE_SIZE) { - unsigned long to; - - to = __get_free_pages(GFP_KERNEL, 0); - if (!to) { - /* || - copy_from_user((void - *)to,from,PAGE_SIZE)) - free_pages(to, 0); - */ + for (j = 0, pgp = pga; j < pages; j++, off += PAGE_SIZE, pgp++){ + pgp->pg = alloc_pages(gfp_mask, 0); + if (!pgp->pg) { CERROR("no memory for brw pages\n"); GOTO(brw_cleanup, err = -ENOMEM); } - bufs[j] = virt_to_page(to); - counts[j] = PAGE_SIZE; - offsets[j] = off; - flags[j] = 0; + pgp->count = PAGE_SIZE; + pgp->off = off; + pgp->flag = 0; + + if (verify) { + void *addr = kmap(pgp->pg); + + if (rw == OBD_BRW_WRITE) + page_debug_setup(addr, pgp->count, + pgp->off, id); + else + page_debug_setup(addr, pgp->count, + 0xdeadbeef00c0ffee, + 0xdeadbeef00c0ffee); + kunmap(pgp->pg); + } } - err = obd_brw(rw, &conn, &smd, j, bufs, counts, offsets, flags, - NULL, NULL); - + err = obd_brw(rw, &conn, lsm, j, pga, ll_sync_io_cb, cbd); + if (err) + CERROR("test_brw: error from obd_brw: err = %d\n", err); EXIT; brw_cleanup: - for (j = 0; j < pages; j++) - if (bufs[j] != NULL) - __free_pages(bufs[j], 0); + for (j = 0, pgp = pga; j < pages; j++, pgp++) { + if (pgp->pg != NULL) { + if (verify && !err) { + void *addr = kmap(pgp->pg); + + err = page_debug_check("test_brw", + addr, + PAGE_SIZE, + pgp->off,id); + kunmap(pgp->pg); + } + __free_pages(pgp->pg, 0); + } + } brw_free: - OBD_FREE(bufs, pages * sizeof(*bufs)); - OBD_FREE(counts, pages * sizeof(*counts)); - OBD_FREE(offsets, pages * sizeof(*offsets)); - OBD_FREE(flags, pages * sizeof(*flags)); + OBD_FREE(pga, pages * sizeof(*pga)); GOTO(out, err); } default: @@ -545,14 +631,15 @@ static int obd_class_ioctl (struct inode * inode, struct file * filp, if (err) GOTO(out, err); - err = copy_to_user((int *)arg, data, len); + err = copy_to_user((void *)arg, data, len); GOTO(out, err); } out: if (buf) OBD_FREE(buf, len); - up(&obd_conf_sem); + if (serialised) + up(&obd_conf_sem); RETURN(err); } /* obd_class_ioctl */ @@ -573,11 +660,15 @@ static struct miscdevice obd_psdev = { &obd_psdev_fops }; +void (*class_signal_connection_failure)(struct ptlrpc_connection *); EXPORT_SYMBOL(obd_dev); EXPORT_SYMBOL(obdo_cachep); EXPORT_SYMBOL(obd_memory); EXPORT_SYMBOL(obd_fail_loc); +EXPORT_SYMBOL(obd_timeout); +EXPORT_SYMBOL(obd_recovery_upcall); +EXPORT_SYMBOL(ptlrpc_put_connection_superhack); EXPORT_SYMBOL(class_register_type); EXPORT_SYMBOL(class_unregister_type); @@ -585,16 +676,27 @@ EXPORT_SYMBOL(class_name2dev); EXPORT_SYMBOL(class_uuid2dev); EXPORT_SYMBOL(class_uuid2obd); EXPORT_SYMBOL(class_new_export); +EXPORT_SYMBOL(class_destroy_export); EXPORT_SYMBOL(class_connect); EXPORT_SYMBOL(class_conn2export); -EXPORT_SYMBOL(class_rconn2export); EXPORT_SYMBOL(class_conn2obd); +EXPORT_SYMBOL(class_conn2cliimp); +EXPORT_SYMBOL(class_conn2ldlmimp); EXPORT_SYMBOL(class_disconnect); +EXPORT_SYMBOL(class_disconnect_all); +//EXPORT_SYMBOL(class_uuid_parse); +EXPORT_SYMBOL(class_uuid_unparse); //EXPORT_SYMBOL(class_multi_setup); //EXPORT_SYMBOL(class_multi_cleanup); +EXPORT_SYMBOL(class_signal_connection_failure); +EXPORT_SYMBOL(ll_sync_io_cb); +EXPORT_SYMBOL(ll_init_cb); +EXPORT_SYMBOL(class_nm_to_type); + static int __init init_obdclass(void) { + struct obd_device *obd; int err; int i; @@ -608,22 +710,24 @@ static int __init init_obdclass(void) return err; } - for (i = 0; i < MAX_OBD_DEVICES; i++) { - memset(&(obd_dev[i]), 0, sizeof(obd_dev[i])); - obd_dev[i].obd_minor = i; - INIT_LIST_HEAD(&obd_dev[i].obd_exports); - } + /* This struct is already zerod for us (static global) */ + for (i = 0, obd = obd_dev; i < MAX_OBD_DEVICES; i++, obd++) + obd->obd_minor = i; err = obd_init_caches(); + if (err) return err; obd_sysctl_init(); + + err=lprocfs_reg_main(); + return 0; } static void __exit cleanup_obdclass(void) { - int i; + int i, err; ENTRY; misc_deregister(&obd_psdev); @@ -638,6 +742,9 @@ static void __exit cleanup_obdclass(void) obd_cleanup_caches(); obd_sysctl_clean(); + + err = lprocfs_dereg_main(); + CERROR("obd memory leaked: %ld bytes\n", obd_memory); EXIT; }