| Message ID | 5f4f1bc2ac2177a37432f0afd22f16ddf65e9e9b.1460577841.git.lduncan@suse.com (mailing list archive) |
|---|---|
| State | Not Applicable, archived |
| Headers | show |
On 04/13/2016 10:25 PM, Lee Duncan wrote: > This commit adds the read-write attribute "dbroot", > in the top-level CONFIGFS (core) target directory, > normally /sys/kernel/config/target. This attribute > defaults to "/var/target" but can be changed by > writing a new pathname string to it. Changing this > attribute is only allowed when no fabric drivers > are loaded and the supplied value specifies an > existing directory. > > Target modules that care about the target database > root directory will be modified to use this > attribute in a future commit. > > Signed-off-by: Lee Duncan <lduncan@suse.com> > --- > drivers/target/target_core_configfs.c | 51 +++++++++++++++++++++++++++++++++++ > drivers/target/target_core_internal.h | 6 +++++ > 2 files changed, 57 insertions(+) > > diff --git a/drivers/target/target_core_configfs.c b/drivers/target/target_core_configfs.c > index 713c63d9681b..bfedbd92b77f 100644 > --- a/drivers/target/target_core_configfs.c > +++ b/drivers/target/target_core_configfs.c > @@ -99,6 +99,56 @@ static ssize_t target_core_item_version_show(struct config_item *item, > > CONFIGFS_ATTR_RO(target_core_item_, version); > > +char db_root[DB_ROOT_LEN] = DB_ROOT_DEFAULT; > +static char db_root_stage[DB_ROOT_LEN]; > + > +static ssize_t target_core_item_dbroot_show(struct config_item *item, > + char *page) > +{ > + return sprintf(page, "%s\n", db_root); > +} > + > +static ssize_t target_core_item_dbroot_store(struct config_item *item, > + const char *page, size_t count) > +{ > + ssize_t read_bytes; > + struct file *fp; > + > + if (!list_empty(&g_tf_list)) { > + pr_err("db_root: cannot be changed: target drivers registered"); > + return -EINVAL; > + } Locking? Cheers, Hannes
On 04/13/2016 11:10 PM, Hannes Reinecke wrote: > On 04/13/2016 10:25 PM, Lee Duncan wrote: >> This commit adds the read-write attribute "dbroot", >> in the top-level CONFIGFS (core) target directory, >> normally /sys/kernel/config/target. This attribute >> defaults to "/var/target" but can be changed by >> writing a new pathname string to it. Changing this >> attribute is only allowed when no fabric drivers >> are loaded and the supplied value specifies an >> existing directory. >> >> Target modules that care about the target database >> root directory will be modified to use this >> attribute in a future commit. >> >> Signed-off-by: Lee Duncan <lduncan@suse.com> >> --- >> drivers/target/target_core_configfs.c | 51 +++++++++++++++++++++++++++++++++++ >> drivers/target/target_core_internal.h | 6 +++++ >> 2 files changed, 57 insertions(+) >> >> diff --git a/drivers/target/target_core_configfs.c b/drivers/target/target_core_configfs.c >> index 713c63d9681b..bfedbd92b77f 100644 >> --- a/drivers/target/target_core_configfs.c >> +++ b/drivers/target/target_core_configfs.c >> @@ -99,6 +99,56 @@ static ssize_t target_core_item_version_show(struct config_item *item, >> >> CONFIGFS_ATTR_RO(target_core_item_, version); >> >> +char db_root[DB_ROOT_LEN] = DB_ROOT_DEFAULT; >> +static char db_root_stage[DB_ROOT_LEN]; >> + >> +static ssize_t target_core_item_dbroot_show(struct config_item *item, >> + char *page) >> +{ >> + return sprintf(page, "%s\n", db_root); >> +} >> + >> +static ssize_t target_core_item_dbroot_store(struct config_item *item, >> + const char *page, size_t count) >> +{ >> + ssize_t read_bytes; >> + struct file *fp; >> + >> + if (!list_empty(&g_tf_list)) { >> + pr_err("db_root: cannot be changed: target drivers registered"); >> + return -EINVAL; >> + } > Locking? Doh. I will resubmit with locking shortly. > > Cheers, > > Hannes >
diff --git a/drivers/target/target_core_configfs.c b/drivers/target/target_core_configfs.c index 713c63d9681b..bfedbd92b77f 100644 --- a/drivers/target/target_core_configfs.c +++ b/drivers/target/target_core_configfs.c @@ -99,6 +99,56 @@ static ssize_t target_core_item_version_show(struct config_item *item, CONFIGFS_ATTR_RO(target_core_item_, version); +char db_root[DB_ROOT_LEN] = DB_ROOT_DEFAULT; +static char db_root_stage[DB_ROOT_LEN]; + +static ssize_t target_core_item_dbroot_show(struct config_item *item, + char *page) +{ + return sprintf(page, "%s\n", db_root); +} + +static ssize_t target_core_item_dbroot_store(struct config_item *item, + const char *page, size_t count) +{ + ssize_t read_bytes; + struct file *fp; + + if (!list_empty(&g_tf_list)) { + pr_err("db_root: cannot be changed: target drivers registered"); + return -EINVAL; + } + if (count > (DB_ROOT_LEN - 1)) { + pr_err("db_root: count %d exceeds DB_ROOT_LEN-1: %u\n", + (int)count, DB_ROOT_LEN - 1); + return -EINVAL; + } + + read_bytes = snprintf(db_root_stage, DB_ROOT_LEN, "%s", page); + if (!read_bytes) + return -EINVAL; + if (db_root_stage[read_bytes - 1] == '\n') + db_root_stage[read_bytes - 1] = '\0'; + + /* validate new db root before accepting it */ + fp = filp_open(db_root_stage, O_RDONLY, 0); + if (IS_ERR(fp)) { + pr_err("db_root: cannot open: %s\n", db_root_stage); + return -EINVAL; + } + if (!S_ISDIR(fp->f_inode->i_mode)) { + pr_err("db_root: not a directory: %s\n", db_root_stage); + filp_close(fp, 0); + return -EINVAL; + } + filp_close(fp, 0); + strncpy(db_root, db_root_stage, read_bytes); + + return read_bytes; +} + +CONFIGFS_ATTR(target_core_item_, dbroot); + static struct target_fabric_configfs *target_core_get_fabric( const char *name) { @@ -249,6 +299,7 @@ static struct configfs_group_operations target_core_fabric_group_ops = { */ static struct configfs_attribute *target_core_fabric_item_attrs[] = { &target_core_item_attr_version, + &target_core_item_attr_dbroot, NULL, }; diff --git a/drivers/target/target_core_internal.h b/drivers/target/target_core_internal.h index 040cf5202e54..c2a18b960c5d 100644 --- a/drivers/target/target_core_internal.h +++ b/drivers/target/target_core_internal.h @@ -156,4 +156,10 @@ void target_stat_setup_mappedlun_default_groups(struct se_lun_acl *); /* target_core_xcopy.c */ extern struct se_portal_group xcopy_pt_tpg; +/* target_core_configfs.c */ +#define DB_ROOT_LEN 4096 +#define DB_ROOT_DEFAULT "/var/target" + +extern char db_root[]; + #endif /* TARGET_CORE_INTERNAL_H */
This commit adds the read-write attribute "dbroot", in the top-level CONFIGFS (core) target directory, normally /sys/kernel/config/target. This attribute defaults to "/var/target" but can be changed by writing a new pathname string to it. Changing this attribute is only allowed when no fabric drivers are loaded and the supplied value specifies an existing directory. Target modules that care about the target database root directory will be modified to use this attribute in a future commit. Signed-off-by: Lee Duncan <lduncan@suse.com> --- drivers/target/target_core_configfs.c | 51 +++++++++++++++++++++++++++++++++++ drivers/target/target_core_internal.h | 6 +++++ 2 files changed, 57 insertions(+)