Skip to contentSkip to conversation

efi/efivars: Create efivars mount point in the registration of efivars abstraction

PATCH In review Lee, Chun-Yi 4 participants 6 messages Sep 24, 2020 – Sep 25, 2020 EFI

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 efi/efivars: Create efivars mount point in the registration of efivars abstraction

This patch moved the logic of creating efivars mount point to the registration of efivars abstraction. It's useful for userland to determine the availability of efivars filesystem by checking the existence of mount point.

The 'efivars' platform device be created on generic EFI runtime services platform, so it can be used to determine the availability of efivarfs. But this approach is not available for google gsmi efivars abstraction.

This patch be tested on Here on qemu-OVMF and qemu-uboot.

Cc Ard Biesheuvel <[email protected]>
Cc Matthias Brugger <[email protected]>
Cc Fabian Vogt <[email protected]>
Cc Ilias Apalodimas <[email protected]>
Cc Greg Kroah-Hartman <[email protected]>
Cc Arthur Heymans <[email protected]>
Cc Patrick Rudolph <[email protected]>
---
 drivers/firmware/efi/efi.c  |  7 -------
 drivers/firmware/efi/vars.c | 17 +++++++++++++++++
 2 files changed, 17 insertions(+), 7 deletions(-)
drivers/firmware/efi/efi.c +0 -7
index 3aa07c3b5136..23c11a2a3f4d 100644
@@ -405,13 +405,6 @@ static int __init efisubsys_init(void)
 	if (error)
 		goto err_remove_group;
 
-	/* and the standard mountpoint for efivarfs */
-	error = sysfs_create_mount_point(efi_kobj, "efivars");
-	if (error) {
-		pr_err("efivars: Subsystem registration failed.\n");
-		goto err_remove_group;
-	}
-
 	if (efi_enabled(EFI_DBG) && efi_enabled(EFI_PRESERVE_BS_REGIONS))
 		efi_debugfs_init();
 
drivers/firmware/efi/vars.c +17 -0
index 973eef234b36..6fa7f288d635 100644
@@ -1179,6 +1179,8 @@ int efivars_register(struct efivars *efivars,
 		     const struct efivar_operations *ops,
 		     struct kobject *kobject)
 {
+	int error;
+
 	if (down_interruptible(&efivars_lock))
 		return -EINTR;
 
@@ -1191,6 +1193,19 @@ int efivars_register(struct efivars *efivars,
 
 	up(&efivars_lock);
 
+	/* and the standard mountpoint for efivarfs */
+	if (efi_kobj) {
+		error = sysfs_create_mount_point(efi_kobj, "efivars");
+		if (error) {
+			if (down_interruptible(&efivars_lock))
+				return -EINTR;
+			__efivars = NULL;
+			up(&efivars_lock);
+			pr_err("efivars: Subsystem registration failed.\n");
+			return error;
+		}
+	}
+
 	return 0;
 }
 EXPORT_SYMBOL_GPL(efivars_register);
@@ -1222,6 +1237,8 @@ int efivars_unregister(struct efivars *efivars)
 
 	pr_info("Unregistered efivars operations\n");
 	__efivars = NULL;
+	if (efi_kobj)
+		sysfs_remove_mount_point(efi_kobj, "efivars");
 
 	rv = 0;
 out:
Signature · 1 line
2.16.4
#1 lore raw
Quoted 4 lines · Chun-Yi

This patch moved the logic of creating efivars mount point to the registration of efivars abstraction. It's useful for userland to determine the availability of efivars filesystem by checking the existence of mount point.

Why not do what all other tools do, and look in /proc/filesystems?

Why is efivars "special" in this way? What tool isn't properly looking for the filesystem in that way today?

Quoted 3 lines

The 'efivars' platform device be created on generic EFI runtime services platform, so it can be used to determine the availability of efivarfs. But this approach is not available for google gsmi efivars abstraction.

I do not understand this last sentence, can you try to explain it better?

Quoted 1 line

This patch be tested on Here on qemu-OVMF and qemu-uboot.

How about real hardware? :)

Quoted 46 lines
Cc Ard Biesheuvel <[email protected]>
Cc Matthias Brugger <[email protected]>
Cc Fabian Vogt <[email protected]>
Cc Ilias Apalodimas <[email protected]>
Cc Greg Kroah-Hartman <[email protected]>
Cc Arthur Heymans <[email protected]>
Cc Patrick Rudolph <[email protected]>
---
 drivers/firmware/efi/efi.c  |  7 -------
 drivers/firmware/efi/vars.c | 17 +++++++++++++++++
 2 files changed, 17 insertions(+), 7 deletions(-)
drivers/firmware/efi/efi.c +0 -7
index 3aa07c3b5136..23c11a2a3f4d 100644
@@ -405,13 +405,6 @@ static int __init efisubsys_init(void)
 	if (error)
 		goto err_remove_group;
 
-	/* and the standard mountpoint for efivarfs */
-	error = sysfs_create_mount_point(efi_kobj, "efivars");
-	if (error) {
-		pr_err("efivars: Subsystem registration failed.\n");
-		goto err_remove_group;
-	}
-
 	if (efi_enabled(EFI_DBG) && efi_enabled(EFI_PRESERVE_BS_REGIONS))
 		efi_debugfs_init();
 
drivers/firmware/efi/vars.c +2 -0
index 973eef234b36..6fa7f288d635 100644
@@ -1179,6 +1179,8 @@ int efivars_register(struct efivars *efivars,
 		     const struct efivar_operations *ops,
 		     struct kobject *kobject)
 {
+	int error;
+
 	if (down_interruptible(&efivars_lock))
 		return -EINTR;
 

drivers/firmware/efi/vars.c int efivars_register(struct efivars *efivars, · line 1197

Quoted 5 lines
drivers/firmware/efi/vars.c +2 -0
@@ -1191,6 +1193,19 @@ int efivars_register(struct efivars *efivars,
 
 	up(&efivars_lock);
 
+	/* and the standard mountpoint for efivarfs */
+	if (efi_kobj) {

Why test for this? Can it race?

thanks,

greg k-h

#2 lore raw

Hi Greg,

Quoted 11 lines · Greg Kroah-Hartman
Quoted 4 lines · Chun-Yi

This patch moved the logic of creating efivars mount point to the registration of efivars abstraction. It's useful for userland to determine the availability of efivars filesystem by checking the existence of mount point.

Why not do what all other tools do, and look in /proc/filesystems?

Why is efivars "special" in this way? What tool isn't properly looking for the filesystem in that way today?

Thanks for your idea. I think that this is good enough for userland tool to check the availability of efivarfs. Ignore my patch please.

Regards
Joey Lee

Quoted 68 lines
Quoted 3 lines

The 'efivars' platform device be created on generic EFI runtime services platform, so it can be used to determine the availability of efivarfs. But this approach is not available for google gsmi efivars abstraction.

I do not understand this last sentence, can you try to explain it better?

Quoted 1 line

This patch be tested on Here on qemu-OVMF and qemu-uboot.

How about real hardware? :)

Quoted 46 lines
Cc Ard Biesheuvel <[email protected]>
Cc Matthias Brugger <[email protected]>
Cc Fabian Vogt <[email protected]>
Cc Ilias Apalodimas <[email protected]>
Cc Greg Kroah-Hartman <[email protected]>
Cc Arthur Heymans <[email protected]>
Cc Patrick Rudolph <[email protected]>
---
 drivers/firmware/efi/efi.c  |  7 -------
 drivers/firmware/efi/vars.c | 17 +++++++++++++++++
 2 files changed, 17 insertions(+), 7 deletions(-)
drivers/firmware/efi/efi.c +0 -7
index 3aa07c3b5136..23c11a2a3f4d 100644
@@ -405,13 +405,6 @@ static int __init efisubsys_init(void)
 	if (error)
 		goto err_remove_group;
 
-	/* and the standard mountpoint for efivarfs */
-	error = sysfs_create_mount_point(efi_kobj, "efivars");
-	if (error) {
-		pr_err("efivars: Subsystem registration failed.\n");
-		goto err_remove_group;
-	}
-
 	if (efi_enabled(EFI_DBG) && efi_enabled(EFI_PRESERVE_BS_REGIONS))
 		efi_debugfs_init();
 
drivers/firmware/efi/vars.c +2 -0
index 973eef234b36..6fa7f288d635 100644
@@ -1179,6 +1179,8 @@ int efivars_register(struct efivars *efivars,
 		     const struct efivar_operations *ops,
 		     struct kobject *kobject)
 {
+	int error;
+
 	if (down_interruptible(&efivars_lock))
 		return -EINTR;
 

drivers/firmware/efi/vars.c int efivars_register(struct efivars *efivars, · line 1197

Quoted 5 lines
drivers/firmware/efi/vars.c +2 -0
@@ -1191,6 +1193,19 @@ int efivars_register(struct efivars *efivars,
 
 	up(&efivars_lock);
 
+	/* and the standard mountpoint for efivarfs */
+	if (efi_kobj) {

Why test for this? Can it race?

thanks,

greg k-h

maintainer
#3 lore raw
In reply to Lee, Chun-Yi
Quoted 20 lines · Chun-Yi

This patch moved the logic of creating efivars mount point to the registration of efivars abstraction. It's useful for userland to determine the availability of efivars filesystem by checking the existence of mount point.

The 'efivars' platform device be created on generic EFI runtime services platform, so it can be used to determine the availability of efivarfs. But this approach is not available for google gsmi efivars abstraction.

This patch be tested on Here on qemu-OVMF and qemu-uboot.

Cc Ard Biesheuvel <[email protected]>
Cc Matthias Brugger <[email protected]>
Cc Fabian Vogt <[email protected]>
Cc Ilias Apalodimas <[email protected]>
Cc Greg Kroah-Hartman <[email protected]>
Cc Arthur Heymans <[email protected]>
Cc Patrick Rudolph <[email protected]>
Quoted 1 line

---

I take it this is v3 of [0]? If so, please explain how it deviates from v2. If it doesn't deviate from v2, it is better to continue the discussion in the other thread.

For the sake of discussion, it helps to clarify the confusing nomenclature:

a) 'efivars abstraction' - an internal kernel API that exposes EFI variables, and can potentially be backed by an implementation that is not EFI based (i.e., Google gsmi)

b) efivars.ko module, built on top of the efivars abstraction, which exposes EFI variables (real ones or gsmi ones) via the deprecated sysfs interface

c) efivarfs filesystem, also built on top of the efivars abstraction, which exposes EFI variables (real ones or gsmi ones) via a special filesystem independently of sysfs.

Of course, the sysfs mount point we create for efivarfs is not called 'efivarfs' but 'efivars'. The sysfs subdirectory we create for efivars.ko is called 'vars'. Sigh.

In this patch, you create the mount point for c) based on whether a) gets registered (which occurs on systems with EFI Get/SetVariable support or GSMI), right? So, to Greg's point, wouldn't it be easier to simply check whether efivarfs is listed in /proc/filesystems?

It also helps if you could clarify what the actual use case is, rather than saying that it is generally useful.

[0] https://lore.kernel.org/linux-efi/[email protected]/

Quoted 67 lines
 drivers/firmware/efi/efi.c  |  7 -------
 drivers/firmware/efi/vars.c | 17 +++++++++++++++++
 2 files changed, 17 insertions(+), 7 deletions(-)
drivers/firmware/efi/efi.c +0 -7
index 3aa07c3b5136..23c11a2a3f4d 100644
@@ -405,13 +405,6 @@ static int __init efisubsys_init(void)
        if (error)
                goto err_remove_group;
 
-       /* and the standard mountpoint for efivarfs */
-       error = sysfs_create_mount_point(efi_kobj, "efivars");
-       if (error) {
-               pr_err("efivars: Subsystem registration failed.\n");
-               goto err_remove_group;
-       }
-
        if (efi_enabled(EFI_DBG) && efi_enabled(EFI_PRESERVE_BS_REGIONS))
                efi_debugfs_init();
 
drivers/firmware/efi/vars.c +17 -1
index 973eef234b36..6fa7f288d635 100644
@@ -1179,6 +1179,8 @@ int efivars_register(struct efivars *efivars,
                     const struct efivar_operations *ops,
                     struct kobject *kobject)
 {
+       int error;
+
        if (down_interruptible(&efivars_lock))
                return -EINTR;
 
@@ -1191,6 +1193,19 @@ int efivars_register(struct efivars *efivars,
 
        up(&efivars_lock);
 
+       /* and the standard mountpoint for efivarfs */
+       if (efi_kobj) {
+               error = sysfs_create_mount_point(efi_kobj, "efivars");
+               if (error) {
+                       if (down_interruptible(&efivars_lock))
+                               return -EINTR;
+                       __efivars = NULL;
+                       up(&efivars_lock);
+                       pr_err("efivars: Subsystem registration failed.\n");
+                       return error;
+               }
+       }
+
        return 0;
 }
 EXPORT_SYMBOL_GPL(efivars_register);
@@ -1222,6 +1237,8 @@ int efivars_unregister(struct efivars *efivars)
 
        pr_info("Unregistered efivars operations\n");
        __efivars = NULL;
+       if (efi_kobj)
+               sysfs_remove_mount_point(efi_kobj, "efivars");
 
        rv = 0;
 out:
--

2.16.4

#4 lore raw

Hi Ard,

Quoted 37 lines · Ard Biesheuvel
Quoted 20 lines · Chun-Yi

This patch moved the logic of creating efivars mount point to the registration of efivars abstraction. It's useful for userland to determine the availability of efivars filesystem by checking the existence of mount point.

The 'efivars' platform device be created on generic EFI runtime services platform, so it can be used to determine the availability of efivarfs. But this approach is not available for google gsmi efivars abstraction.

This patch be tested on Here on qemu-OVMF and qemu-uboot.

Cc Ard Biesheuvel <[email protected]>
Cc Matthias Brugger <[email protected]>
Cc Fabian Vogt <[email protected]>
Cc Ilias Apalodimas <[email protected]>
Cc Greg Kroah-Hartman <[email protected]>
Cc Arthur Heymans <[email protected]>
Cc Patrick Rudolph <[email protected]>
Quoted 1 line

---

I take it this is v3 of [0]? If so, please explain how it deviates from v2. If it doesn't deviate from v2, it is better to continue the discussion in the other thread.

For the sake of discussion, it helps to clarify the confusing nomenclature:

a) 'efivars abstraction' - an internal kernel API that exposes EFI variables, and can potentially be backed by an implementation that is not EFI based (i.e., Google gsmi)

b) efivars.ko module, built on top of the efivars abstraction, which exposes EFI variables (real ones or gsmi ones) via the deprecated sysfs interface

Quoted 8 lines

c) efivarfs filesystem, also built on top of the efivars abstraction, which exposes EFI variables (real ones or gsmi ones) via a special filesystem independently of sysfs.

Of course, the sysfs mount point we create for efivarfs is not called 'efivarfs' but 'efivars'. The sysfs subdirectory we create for efivars.ko is called 'vars'. Sigh.

Thanks for your clarification. It's useful to me!

Quoted 6 lines

In this patch, you create the mount point for c) based on whether a) gets registered (which occurs on systems with EFI Get/SetVariable support or GSMI), right? So, to Greg's point, wouldn't it be easier to simply check whether efivarfs is listed in /proc/filesystems?

Yes, I think that Greg's suggestion is good enough for a userland tool to detect the availability of efivarfs. You can ignore my patch.

Thanks for your help!
Joey Lee

Quoted 76 lines

It also helps if you could clarify what the actual use case is, rather than saying that it is generally useful.

[0] https://lore.kernel.org/linux-efi/[email protected]/

Quoted 67 lines
 drivers/firmware/efi/efi.c  |  7 -------
 drivers/firmware/efi/vars.c | 17 +++++++++++++++++
 2 files changed, 17 insertions(+), 7 deletions(-)
drivers/firmware/efi/efi.c +0 -7
index 3aa07c3b5136..23c11a2a3f4d 100644
@@ -405,13 +405,6 @@ static int __init efisubsys_init(void)
        if (error)
                goto err_remove_group;
 
-       /* and the standard mountpoint for efivarfs */
-       error = sysfs_create_mount_point(efi_kobj, "efivars");
-       if (error) {
-               pr_err("efivars: Subsystem registration failed.\n");
-               goto err_remove_group;
-       }
-
        if (efi_enabled(EFI_DBG) && efi_enabled(EFI_PRESERVE_BS_REGIONS))
                efi_debugfs_init();
 
drivers/firmware/efi/vars.c +17 -1
index 973eef234b36..6fa7f288d635 100644
@@ -1179,6 +1179,8 @@ int efivars_register(struct efivars *efivars,
                     const struct efivar_operations *ops,
                     struct kobject *kobject)
 {
+       int error;
+
        if (down_interruptible(&efivars_lock))
                return -EINTR;
 
@@ -1191,6 +1193,19 @@ int efivars_register(struct efivars *efivars,
 
        up(&efivars_lock);
 
+       /* and the standard mountpoint for efivarfs */
+       if (efi_kobj) {
+               error = sysfs_create_mount_point(efi_kobj, "efivars");
+               if (error) {
+                       if (down_interruptible(&efivars_lock))
+                               return -EINTR;
+                       __efivars = NULL;
+                       up(&efivars_lock);
+                       pr_err("efivars: Subsystem registration failed.\n");
+                       return error;
+               }
+       }
+
        return 0;
 }
 EXPORT_SYMBOL_GPL(efivars_register);
@@ -1222,6 +1237,8 @@ int efivars_unregister(struct efivars *efivars)
 
        pr_info("Unregistered efivars operations\n");
        __efivars = NULL;
+       if (efi_kobj)
+               sysfs_remove_mount_point(efi_kobj, "efivars");
 
        rv = 0;
 out:
--

2.16.4

maintainer
#5 lore raw
Quoted 53 lines · joeyli

Hi Ard,

Quoted 37 lines · Ard Biesheuvel
Quoted 20 lines · Chun-Yi

This patch moved the logic of creating efivars mount point to the registration of efivars abstraction. It's useful for userland to determine the availability of efivars filesystem by checking the existence of mount point.

The 'efivars' platform device be created on generic EFI runtime services platform, so it can be used to determine the availability of efivarfs. But this approach is not available for google gsmi efivars abstraction.

This patch be tested on Here on qemu-OVMF and qemu-uboot.

Cc Ard Biesheuvel <[email protected]>
Cc Matthias Brugger <[email protected]>
Cc Fabian Vogt <[email protected]>
Cc Ilias Apalodimas <[email protected]>
Cc Greg Kroah-Hartman <[email protected]>
Cc Arthur Heymans <[email protected]>
Cc Patrick Rudolph <[email protected]>
Quoted 1 line

---

I take it this is v3 of [0]? If so, please explain how it deviates from v2. If it doesn't deviate from v2, it is better to continue the discussion in the other thread.

For the sake of discussion, it helps to clarify the confusing nomenclature:

a) 'efivars abstraction' - an internal kernel API that exposes EFI variables, and can potentially be backed by an implementation that is not EFI based (i.e., Google gsmi)

b) efivars.ko module, built on top of the efivars abstraction, which exposes EFI variables (real ones or gsmi ones) via the deprecated sysfs interface

Quoted 8 lines

c) efivarfs filesystem, also built on top of the efivars abstraction, which exposes EFI variables (real ones or gsmi ones) via a special filesystem independently of sysfs.

Of course, the sysfs mount point we create for efivarfs is not called 'efivarfs' but 'efivars'. The sysfs subdirectory we create for efivars.ko is called 'vars'. Sigh.

Thanks for your clarification. It's useful to me!

Quoted 1 line
Quoted 9 lines
Quoted 5 lines

In this patch, you create the mount point for c) based on whether a) gets registered (which occurs on systems with EFI Get/SetVariable support or GSMI), right? So, to Greg's point, wouldn't it be easier to simply check whether efivarfs is listed in /proc/filesystems?

Yes, I think that Greg's suggestion is good enough for a userland tool to detect the availability of efivarfs. You can ignore my patch.

Excellent! Thanks for confirming.