From 02a3688c53d648e027ca9c27423bf864a189d7c7 Mon Sep 17 00:00:00 2001 From: Hannes Reinecke Date: Mon, 22 Jul 2024 14:02:24 +0200 Subject: nvme-sysfs: add 'tls_keyring' attribute Add a 'tls_keyring' attribute to display the contents of the --keyring option from the connect string. Adding this attribute allows us to recreate the original connect string from sysfs settings. Signed-off-by: Hannes Reinecke Reviewed-by: Sagi Grimberg Signed-off-by: Keith Busch --- drivers/nvme/host/sysfs.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'drivers/nvme') diff --git a/drivers/nvme/host/sysfs.c b/drivers/nvme/host/sysfs.c index 2055dad7bc63..eb345551d6fe 100644 --- a/drivers/nvme/host/sysfs.c +++ b/drivers/nvme/host/sysfs.c @@ -753,9 +753,20 @@ static ssize_t tls_configured_key_show(struct device *dev, } static DEVICE_ATTR_RO(tls_configured_key); +static ssize_t tls_keyring_show(struct device *dev, + struct device_attribute *attr, char *buf) +{ + struct nvme_ctrl *ctrl = dev_get_drvdata(dev); + struct key *keyring = ctrl->opts->keyring; + + return sysfs_emit(buf, "%s\n", keyring->description); +} +static DEVICE_ATTR_RO(tls_keyring); + static struct attribute *nvme_tls_attrs[] = { &dev_attr_tls_key.attr, &dev_attr_tls_configured_key.attr, + &dev_attr_tls_keyring.attr, }; static umode_t nvme_tls_attrs_are_visible(struct kobject *kobj, @@ -773,6 +784,9 @@ static umode_t nvme_tls_attrs_are_visible(struct kobject *kobj, if (a == &dev_attr_tls_configured_key.attr && !ctrl->opts->tls_key) return 0; + if (a == &dev_attr_tls_keyring.attr && + !ctrl->opts->keyring) + return 0; return a->mode; } -- cgit v1.2.3