Streamline the sysfs generation to make it more extensible.
Add a function to create a sysfs entry in the uv-sysfs dir.
Use this function for the query directory.

Reviewed-by: Christoph Schlameuss <schlameuss@linux.ibm.com>
Signed-off-by: Steffen Eiden <seiden@linux.ibm.com>
---
 arch/s390/kernel/uv.c | 35 ++++++++++++++++++++++++-----------
 1 file changed, 24 insertions(+), 11 deletions(-)

diff --git a/arch/s390/kernel/uv.c b/arch/s390/kernel/uv.c
index 36db065c7cf7..d703ecc9aea5 100644
--- a/arch/s390/kernel/uv.c
+++ b/arch/s390/kernel/uv.c
@@ -752,7 +752,26 @@ static const struct attribute *uv_prot_virt_attrs[] = {
 static struct kset *uv_query_kset;
 static struct kobject *uv_kobj;
 
-static int __init uv_info_init(void)
+static int __init uv_sysfs_dir_init(const struct attribute_group *grp,
+				    struct kset **uv_dir_kset, const char *name)
+{
+	struct kset *kset;
+	int rc = -ENOMEM;
+
+	kset = kset_create_and_add(name, NULL, uv_kobj);
+	if (!kset)
+		return -ENOMEM;
+	*uv_dir_kset = kset;
+
+	rc = sysfs_create_group(&kset->kobj, grp);
+	if (!rc)
+		return 0;
+
+	kset_unregister(kset);
+	return rc;
+}
+
+static int __init uv_sysfs_init(void)
 {
 	int rc = -ENOMEM;
 
@@ -767,17 +786,11 @@ static int __init uv_info_init(void)
 	if (rc)
 		goto out_kobj;
 
-	uv_query_kset = kset_create_and_add("query", NULL, uv_kobj);
-	if (!uv_query_kset) {
-		rc = -ENOMEM;
+	rc = uv_sysfs_dir_init(&uv_query_attr_group, &uv_query_kset, "query");
+	if (rc)
 		goto out_ind_files;
-	}
-
-	rc = sysfs_create_group(&uv_query_kset->kobj, &uv_query_attr_group);
-	if (!rc)
-		return 0;
+	return 0;
 
-	kset_unregister(uv_query_kset);
 out_ind_files:
 	sysfs_remove_files(uv_kobj, uv_prot_virt_attrs);
 out_kobj:
@@ -785,4 +798,4 @@ static int __init uv_info_init(void)
 	kobject_put(uv_kobj);
 	return rc;
 }
-device_initcall(uv_info_init);
+device_initcall(uv_sysfs_init);
-- 
2.43.0

On 9/30/24 3:20 PM, Steffen Eiden wrote:
> Streamline the sysfs generation to make it more extensible.
> Add a function to create a sysfs entry in the uv-sysfs dir.
> Use this function for the query directory.
> 
> Reviewed-by: Christoph Schlameuss <schlameuss@linux.ibm.com>
> Signed-off-by: Steffen Eiden <seiden@linux.ibm.com>

Reviewed-by: Janosch Frank <frankja@linux.ibm.com>


> @@ -767,17 +786,11 @@ static int __init uv_info_init(void)
>   	if (rc)
>   		goto out_kobj;
>   
> -	uv_query_kset = kset_create_and_add("query", NULL, uv_kobj);
> -	if (!uv_query_kset) {
> -		rc = -ENOMEM;
> +	rc = uv_sysfs_dir_init(&uv_query_attr_group, &uv_query_kset, "query");
> +	if (rc)
>   		goto out_ind_files;
> -	}
> -
> -	rc = sysfs_create_group(&uv_query_kset->kobj, &uv_query_attr_group);
> -	if (!rc)
> -		return 0;
> +	return 0;

Could've left a \n before the return so it doesn't look weird if only 
this patch is applied. But that's not important.

>   
> -	kset_unregister(uv_query_kset);
>   out_ind_files:
>   	sysfs_remove_files(uv_kobj, uv_prot_virt_attrs);
>   out_kobj:
> @@ -785,4 +798,4 @@ static int __init uv_info_init(void)
>   	kobject_put(uv_kobj);
>   	return rc;
>   }
> -device_initcall(uv_info_init);
> +device_initcall(uv_sysfs_init);