kata-containers/s390-tools
1
0
Fork 0
mirror of https://github.com/ibm-s390-linux/s390-tools.git synced 2026-08-05 02:14:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

zdev: Add support for handling auto-configuration data

Browse Source 
Auto-configuration is the name of a new configuration target that is
supported by chzdev and lszdev besides the existing active and
persistent configuration targets. Directives created in this new
configuration are stored as udev rules in the /run/udev/rules.d
directory.

Auto-configuration directives are only in effect if there are no
directives for the same device in the user-provided persistent
configuration. This allows users to override auto-configuration
directives if necessary.

Due to the volatile nature of the /run directory, auto-configuration
directives are cleared on reboot. Therefore mechanisms that generate
auto-configuration directives must recreate them on every boot.

The lszdev tool displays auto-configuration data both in list view
as well as in detail view. Users can specify the new option --auto-conf
to only show data from this configuration target.

Mechanisms that generate automated configuration directives can use
chzdev together with the --auto-conf option to create the corresponding
udev rules.

Note: This change does not include a mechanism that generates
      auto-configuration directives.

Signed-off-by: Peter Oberparleiter <oberpar@linux.vnet.ibm.com>
Signed-off-by: Jan Höppner <hoeppner@linux.ibm.com>
This commit is contained in:
Peter Oberparleiter
2017-09-01 11:05:55 +02:00
committed by Jan Höppner
parent a86fb8b091
commit fe68ec513d
32 changed files with 911 additions and 286 deletions
Download Patch File Download Diff File Expand all files Collapse all files
zdev/src/zfcp_lun.c
+44 -7
View File
@@ -467,7 +467,14 @@ static exit_code_t zfcp_lun_st_read_persistent(struct subtype *st,
struct device *dev,
read_scope_t scope)
{
return udev_zfcp_lun_read_device(dev);
return udev_zfcp_lun_read_device(dev, false);
}
static exit_code_t zfcp_lun_st_read_autoconf(struct subtype *st,
struct device *dev,
read_scope_t scope)
{
return udev_zfcp_lun_read_device(dev, true);
}
static exit_code_t zfcp_lun_add(struct device *dev)
@@ -564,7 +571,13 @@ static exit_code_t zfcp_lun_st_configure_active(struct subtype *st,
static exit_code_t zfcp_lun_st_configure_persistent(struct subtype *st,
struct device *dev)
{
return udev_zfcp_lun_write_device(dev);
return udev_zfcp_lun_write_device(dev, false);
}
static exit_code_t zfcp_lun_st_configure_autoconf(struct subtype *st,
struct device *dev)
{
return udev_zfcp_lun_write_device(dev, true);
}
static exit_code_t zfcp_lun_st_deconfigure_active(struct subtype *st,
@@ -578,7 +591,13 @@ static exit_code_t zfcp_lun_st_deconfigure_active(struct subtype *st,
static exit_code_t zfcp_lun_st_deconfigure_persistent(struct subtype *st,
struct device *dev)
{
return udev_zfcp_lun_remove_rule(dev->id);
return udev_zfcp_lun_remove_rule(dev->id, false);
}
static exit_code_t zfcp_lun_st_deconfigure_autoconf(struct subtype *st,
struct device *dev)
{
return udev_zfcp_lun_remove_rule(dev->id, true);
}
static exit_code_t check_npiv(struct subtype *st, struct device *dev,
@@ -606,7 +625,8 @@ static exit_code_t check_npiv(struct subtype *st, struct device *dev,
if (!allow_lun_scan)
goto out;
if (!(dev->active.deconfigured || dev->persistent.deconfigured)) {
if (!(dev->active.deconfigured || dev->persistent.deconfigured ||
dev->autoconf.deconfigured)) {
delayed_info("Note: Auto LUN scan enabled - manual LUN "
"configuration is redundant for %s %s\n",
zfcp_host_subtype.devname, fcp_dev_id);
@@ -643,7 +663,8 @@ static exit_code_t zfcp_lun_st_check_post_configure(struct subtype *st,
/* Don't show note when an attribute was modified. */
if (setting_list_modified(dev->active.settings) ||
setting_list_modified(dev->persistent.settings))
setting_list_modified(dev->persistent.settings) ||
setting_list_modified(dev->autoconf.settings))
return EXIT_OK;
/* Check for NPIV but don't route exit code to caller - we only
@@ -795,7 +816,12 @@ static bool zfcp_lun_st_exists_active(struct subtype *st, const char *id)
static bool zfcp_lun_st_exists_persistent(struct subtype *st, const char *id)
{
return udev_zfcp_lun_exists(id);
return udev_zfcp_lun_exists(id, false);
}
static bool zfcp_lun_st_exists_autoconf(struct subtype *st, const char *id)
{
return udev_zfcp_lun_exists(id, true);
}
static exit_code_t zfcp_lun_st_is_definable(struct subtype *st, const char *id,
@@ -889,7 +915,13 @@ static void zfcp_lun_st_add_active_ids(struct subtype *st,
static void zfcp_lun_st_add_persistent_ids(struct subtype *st,
struct util_list *ids)
{
udev_zfcp_lun_add_device_ids(ids);
udev_zfcp_lun_add_device_ids(ids, false);
}
static void zfcp_lun_st_add_autoconf_ids(struct subtype *st,
struct util_list *ids)
{
udev_zfcp_lun_add_device_ids(ids, true);
}
static exit_code_t add_sg_cb(const char *path, const char *filename, void *data)
@@ -1072,18 +1104,23 @@ struct subtype zfcp_lun_subtype = {
.exists_active = &zfcp_lun_st_exists_active,
.exists_persistent = &zfcp_lun_st_exists_persistent,
.exists_autoconf = &zfcp_lun_st_exists_autoconf,
.add_active_ids = &zfcp_lun_st_add_active_ids,
.add_persistent_ids = &zfcp_lun_st_add_persistent_ids,
.add_autoconf_ids = &zfcp_lun_st_add_autoconf_ids,
.read_active = &zfcp_lun_st_read_active,
.read_persistent = &zfcp_lun_st_read_persistent,
.read_autoconf = &zfcp_lun_st_read_autoconf,
.configure_active = &zfcp_lun_st_configure_active,
.configure_persistent = &zfcp_lun_st_configure_persistent,
.configure_autoconf = &zfcp_lun_st_configure_autoconf,
.deconfigure_active = &zfcp_lun_st_deconfigure_active,
.deconfigure_persistent = &zfcp_lun_st_deconfigure_persistent,
.deconfigure_autoconf = &zfcp_lun_st_deconfigure_autoconf,
.check_pre_configure = &zfcp_lun_st_check_pre_configure,
.check_post_configure = &zfcp_lun_st_check_post_configure,