1 files changed, 102 insertions, 15 deletions

diff --git a/drivers/target/target_core_configfs.c b/drivers/target/target_core_configfs.c
index caf8dc18ee0a..a5f44a6e6e1d 100644
--- a/drivers/target/target_core_configfs.c
+++ b/drivers/target/target_core_configfs.c
@@ -3,8 +3,8 @@
  *
  * This file contains ConfigFS logic for the Generic Target Engine project.
  *
- * Copyright (c) 2008-2010 Rising Tide Systems
- * Copyright (c) 2008-2010 Linux-iSCSI.org
+ * Copyright (c) 2008-2011 Rising Tide Systems
+ * Copyright (c) 2008-2011 Linux-iSCSI.org
  *
  * Nicholas A. Bellinger <nab@kernel.org>
  *
@@ -50,6 +50,7 @@
 #include "target_core_hba.h"
 #include "target_core_pr.h"
 #include "target_core_rd.h"
+#include "target_core_stat.h"
 
 static struct list_head g_tf_list;
 static struct mutex g_tf_lock;
@@ -1451,8 +1452,8 @@ static ssize_t target_core_dev_pr_store_attr_res_aptpl_metadata(
         size_t count)
 {
         struct se_device *dev;
-        unsigned char *i_fabric, *t_fabric, *i_port = NULL, *t_port = NULL;
-        unsigned char *isid = NULL;
+        unsigned char *i_fabric = NULL, *i_port = NULL, *isid = NULL;
+        unsigned char *t_fabric = NULL, *t_port = NULL;
         char *orig, *ptr, *arg_p, *opts;
         substring_t args[MAX_OPT_ARGS];
         unsigned long long tmp_ll;
@@ -1488,9 +1489,17 @@ static ssize_t target_core_dev_pr_store_attr_res_aptpl_metadata(
                 switch (token) {
                 case Opt_initiator_fabric:
                         i_fabric = match_strdup(&args[0]);
+                        if (!i_fabric) {
+                                ret = -ENOMEM;
+                                goto out;
+                        }
                         break;
                 case Opt_initiator_node:
                         i_port = match_strdup(&args[0]);
+                        if (!i_port) {
+                                ret = -ENOMEM;
+                                goto out;
+                        }
                         if (strlen(i_port) > PR_APTPL_MAX_IPORT_LEN) {
                                 printk(KERN_ERR "APTPL metadata initiator_node="
                                         " exceeds PR_APTPL_MAX_IPORT_LEN: %d\n",
@@ -1501,6 +1510,10 @@ static ssize_t target_core_dev_pr_store_attr_res_aptpl_metadata(
                         break;
                 case Opt_initiator_sid:
                         isid = match_strdup(&args[0]);
+                        if (!isid) {
+                                ret = -ENOMEM;
+                                goto out;
+                        }
                         if (strlen(isid) > PR_REG_ISID_LEN) {
                                 printk(KERN_ERR "APTPL metadata initiator_isid"
                                         "= exceeds PR_REG_ISID_LEN: %d\n",
@@ -1511,6 +1524,10 @@ static ssize_t target_core_dev_pr_store_attr_res_aptpl_metadata(
                         break;
                 case Opt_sa_res_key:
                         arg_p = match_strdup(&args[0]);
+                        if (!arg_p) {
+                                ret = -ENOMEM;
+                                goto out;
+                        }
                         ret = strict_strtoull(arg_p, 0, &tmp_ll);
                         if (ret < 0) {
                                 printk(KERN_ERR "strict_strtoull() failed for"
@@ -1547,9 +1564,17 @@ static ssize_t target_core_dev_pr_store_attr_res_aptpl_metadata(
                  */
                 case Opt_target_fabric:
                         t_fabric = match_strdup(&args[0]);
+                        if (!t_fabric) {
+                                ret = -ENOMEM;
+                                goto out;
+                        }
                         break;
                 case Opt_target_node:
                         t_port = match_strdup(&args[0]);
+                        if (!t_port) {
+                                ret = -ENOMEM;
+                                goto out;
+                        }
                         if (strlen(t_port) > PR_APTPL_MAX_TPORT_LEN) {
                                 printk(KERN_ERR "APTPL metadata target_node="
                                         " exceeds PR_APTPL_MAX_TPORT_LEN: %d\n",
@@ -1592,6 +1617,11 @@ static ssize_t target_core_dev_pr_store_attr_res_aptpl_metadata(
                         i_port, isid, mapped_lun, t_port, tpgt, target_lun,
                         res_holder, all_tg_pt, type);
 out:
+        kfree(i_fabric);
+        kfree(i_port);
+        kfree(isid);
+        kfree(t_fabric);
+        kfree(t_port);
         kfree(orig);
         return (ret == 0) ? count : ret;
 }
@@ -1798,7 +1828,9 @@ static ssize_t target_core_store_dev_enable(
                 return -EINVAL;
 
         dev = t->create_virtdevice(hba, se_dev, se_dev->se_dev_su_ptr);
-        if (!(dev) || IS_ERR(dev))
+        if (IS_ERR(dev))
+                return PTR_ERR(dev);
+        else if (!dev)
                 return -EINVAL;
 
         se_dev->se_dev_ptr = dev;
@@ -2678,6 +2710,34 @@ static struct config_item_type target_core_alua_cit = {
 
 /* End functions for struct config_item_type target_core_alua_cit */
 
+/* Start functions for struct config_item_type target_core_stat_cit */
+
+static struct config_group *target_core_stat_mkdir(
+        struct config_group *group,
+        const char *name)
+{
+        return ERR_PTR(-ENOSYS);
+}
+
+static void target_core_stat_rmdir(
+        struct config_group *group,
+        struct config_item *item)
+{
+        return;
+}
+
+static struct configfs_group_operations target_core_stat_group_ops = {
+        .make_group             = &target_core_stat_mkdir,
+        .drop_item              = &target_core_stat_rmdir,
+};
+
+static struct config_item_type target_core_stat_cit = {
+        .ct_group_ops           = &target_core_stat_group_ops,
+        .ct_owner               = THIS_MODULE,
+};
+
+/* End functions for struct config_item_type target_core_stat_cit */
+
 /* Start functions for struct config_item_type target_core_hba_cit */
 
 static struct config_group *target_core_make_subdev(
@@ -2690,10 +2750,12 @@ static struct config_group *target_core_make_subdev(
         struct config_item *hba_ci = &group->cg_item;
         struct se_hba *hba = item_to_hba(hba_ci);
         struct config_group *dev_cg = NULL, *tg_pt_gp_cg = NULL;
+        struct config_group *dev_stat_grp = NULL;
+        int errno = -ENOMEM, ret;
 
-        if (mutex_lock_interruptible(&hba->hba_access_mutex))
-                return NULL;
-
+        ret = mutex_lock_interruptible(&hba->hba_access_mutex);
+        if (ret)
+                return ERR_PTR(ret);
         /*
          * Locate the struct se_subsystem_api from parent's struct se_hba.
          */
@@ -2723,7 +2785,7 @@ static struct config_group *target_core_make_subdev(
         se_dev->se_dev_hba = hba;
         dev_cg = &se_dev->se_dev_group;
 
-        dev_cg->default_groups = kzalloc(sizeof(struct config_group) * 6,
+        dev_cg->default_groups = kzalloc(sizeof(struct config_group) * 7,
                         GFP_KERNEL);
         if (!(dev_cg->default_groups))
                 goto out;
@@ -2755,13 +2817,17 @@ static struct config_group *target_core_make_subdev(
                         &target_core_dev_wwn_cit);
         config_group_init_type_name(&se_dev->t10_alua.alua_tg_pt_gps_group,
                         "alua", &target_core_alua_tg_pt_gps_cit);
+        config_group_init_type_name(&se_dev->dev_stat_grps.stat_group,
+                        "statistics", &target_core_stat_cit);
+
         dev_cg->default_groups[0] = &se_dev->se_dev_attrib.da_group;
         dev_cg->default_groups[1] = &se_dev->se_dev_pr_group;
         dev_cg->default_groups[2] = &se_dev->t10_wwn.t10_wwn_group;
         dev_cg->default_groups[3] = &se_dev->t10_alua.alua_tg_pt_gps_group;
-        dev_cg->default_groups[4] = NULL;
+        dev_cg->default_groups[4] = &se_dev->dev_stat_grps.stat_group;
+        dev_cg->default_groups[5] = NULL;
         /*
-         * Add core/$HBA/$DEV/alua/tg_pt_gps/default_tg_pt_gp
+         * Add core/$HBA/$DEV/alua/default_tg_pt_gp
          */
         tg_pt_gp = core_alua_allocate_tg_pt_gp(se_dev, "default_tg_pt_gp", 1);
         if (!(tg_pt_gp))
@@ -2781,6 +2847,17 @@ static struct config_group *target_core_make_subdev(
         tg_pt_gp_cg->default_groups[0] = &tg_pt_gp->tg_pt_gp_group;
         tg_pt_gp_cg->default_groups[1] = NULL;
         T10_ALUA(se_dev)->default_tg_pt_gp = tg_pt_gp;
+        /*
+         * Add core/$HBA/$DEV/statistics/ default groups
+         */
+        dev_stat_grp = &DEV_STAT_GRP(se_dev)->stat_group;
+        dev_stat_grp->default_groups = kzalloc(sizeof(struct config_group) * 4,
+                                GFP_KERNEL);
+        if (!dev_stat_grp->default_groups) {
+                printk(KERN_ERR "Unable to allocate dev_stat_grp->default_groups\n");
+                goto out;
+        }
+        target_stat_setup_dev_default_groups(se_dev);
 
         printk(KERN_INFO "Target_Core_ConfigFS: Allocated struct se_subsystem_dev:"
                 " %p se_dev_su_ptr: %p\n", se_dev, se_dev->se_dev_su_ptr);
@@ -2792,6 +2869,8 @@ out:
                 core_alua_free_tg_pt_gp(T10_ALUA(se_dev)->default_tg_pt_gp);
                 T10_ALUA(se_dev)->default_tg_pt_gp = NULL;
         }
+        if (dev_stat_grp)
+                kfree(dev_stat_grp->default_groups);
         if (tg_pt_gp_cg)
                 kfree(tg_pt_gp_cg->default_groups);
         if (dev_cg)
@@ -2801,7 +2880,7 @@ out:
         kfree(se_dev);
 unlock:
         mutex_unlock(&hba->hba_access_mutex);
-        return NULL;
+        return ERR_PTR(errno);
 }
 
 static void target_core_drop_subdev(
@@ -2813,7 +2892,7 @@ static void target_core_drop_subdev(
         struct se_hba *hba;
         struct se_subsystem_api *t;
         struct config_item *df_item;
-        struct config_group *dev_cg, *tg_pt_gp_cg;
+        struct config_group *dev_cg, *tg_pt_gp_cg, *dev_stat_grp;
         int i;
 
         hba = item_to_hba(&se_dev->se_dev_hba->hba_group.cg_item);
@@ -2825,6 +2904,14 @@ static void target_core_drop_subdev(
         list_del(&se_dev->g_se_dev_list);
         spin_unlock(&se_global->g_device_lock);
 
+        dev_stat_grp = &DEV_STAT_GRP(se_dev)->stat_group;
+        for (i = 0; dev_stat_grp->default_groups[i]; i++) {
+                df_item = &dev_stat_grp->default_groups[i]->cg_item;
+                dev_stat_grp->default_groups[i] = NULL;
+                config_item_put(df_item);
+        }
+        kfree(dev_stat_grp->default_groups);
+
         tg_pt_gp_cg = &T10_ALUA(se_dev)->alua_tg_pt_gps_group;
         for (i = 0; tg_pt_gp_cg->default_groups[i]; i++) {
                 df_item = &tg_pt_gp_cg->default_groups[i]->cg_item;
@@ -3044,7 +3131,7 @@ static struct config_item_type target_core_cit = {
 
 /* Stop functions for struct config_item_type target_core_hba_cit */
 
-static int target_core_init_configfs(void)
+static int __init target_core_init_configfs(void)
 {
         struct config_group *target_cg, *hba_cg = NULL, *alua_cg = NULL;
         struct config_group *lu_gp_cg = NULL;
@@ -3176,7 +3263,7 @@ out_global:
         return -1;
 }
 
-static void target_core_exit_configfs(void)
+static void __exit target_core_exit_configfs(void)
 {
         struct configfs_subsystem *subsys;
         struct config_group *hba_cg, *alua_cg, *lu_gp_cg;