powerpc/pseries: detect secure and trusted boot state of the system.
PATCH v3 1/1 powerpc/pseries: detect secure and trusted boot state of the system.
The device-tree property to check secure and trusted boot state is different for guests(pseries) compared to baremetal(powernv).
This patch updates the existing is_ppc_secureboot_enabled() and is_ppc_trustedboot_enabled() functions to add support for pseries.
The secureboot and trustedboot state are exposed via device-tree property:/proc/device-tree/ibm,secure-boot and /proc/device-tree/ibm,trusted-boot
The values of ibm,secure-boot under pseries are interpreted as:
0 - Disabled
1 - Enabled in Log-only mode. This patch interprets this value as disabled, since audit mode is currently not supported for Linux. 2 - Enabled and enforced.
3-9 - Enabled and enforcing; requirements are at the discretion of the operating system.
The values of ibm,trusted-boot under pseries are interpreted as:
0 - Disabled
1 - Enabled
---
v3:
* fixed double check. Thanks Daniel for noticing it.
* updated patch description.
v2:
* included Michael Ellerman's feedback.
* added Daniel Axtens's Reviewed-by.
arch/powerpc/kernel/secure_boot.c | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-)
arch/powerpc/kernel/secure_boot.c +17 -2
@@ -6,6 +6,7 @@#include <linux/types.h> #include <linux/of.h> #include <asm/secure_boot.h> +#include <asm/machdep.h> static struct device_node *get_ppc_fw_sb_node (void ) {
@@ -23,12 +24,19 @@ bool is_ppc_secureboot_enabled(void) {struct device_node *node;bool enabled = false; +u32 secureboot; node =get_ppc_fw_sb_node (); enabled =of_property_read_bool (node,"os-secureboot-enforcing" ); -of_node_put (node); +if (enabled) + goto out; + +if (!of_property_read_u32 (of_root,"ibm,secure-boot" , &secureboot)) + enabled = (secureboot >1 ); + +out:pr_info ("Secure boot mode %s\n" , enabled ?"enabled" :"disabled" );return enabled;
@@ -38,12 +46,19 @@ bool is_ppc_trustedboot_enabled(void) {struct device_node *node;bool enabled = false; +u32 trustedboot; node =get_ppc_fw_sb_node (); enabled =of_property_read_bool (node,"trusted-enabled" ); -of_node_put (node); +if (enabled) + goto out; + +if (!of_property_read_u32 (of_root,"ibm,trusted-boot" , &trustedboot)) + enabled = (trustedboot >0 ); + +out:pr_info ("Trusted boot mode %s\n" , enabled ?"enabled" :"disabled" );return enabled;
Signature · 1 line
2.26.2
Quoted 18 lines · Nayna Jain
The device-tree property to check secure and trusted boot state is different for guests(pseries) compared to baremetal(powernv).
This patch updates the existing
is_ppc_secureboot_enabled()andis_ppc_trustedboot_enabled()functions to add support for pseries.The secureboot and trustedboot state are exposed via device-tree property:
/proc/device-tree/ibm,secure-bootand/proc/device-tree/ibm,trusted-bootThe values of ibm,secure-boot under pseries are interpreted as:
0 - Disabled
1 - Enabled in Log-only mode. This patch interprets this value as disabled, since audit mode is currently not supported for Linux. 2 - Enabled and enforced.
3-9 - Enabled and enforcing; requirements are at the discretion of the operating system.
Quoted 6 lines
The values of ibm,trusted-boot under pseries are interpreted as:
0 - Disabled
1 - EnabledSigned-off-by Nayna Jain <[email protected]>Reviewed-by Daniel Axtens <[email protected]>
Thanks for updating the patch description.
Hi Nayna,
Looks good to me.
Sorry for not noticing this before, but I think
Quoted 1 line
+#include <
asm/machdep.h>
is now superfluous (I think it's leftover from the machine_is version?). Maybe mpe will take pity on you and remove it when he picks up your patch.
Kind regards,
Daniel
Quoted 47 lines
static struct
device_node*get_ppc_fw_sb_node(void){arch/powerpc/kernel/secure_boot.c +16
-2@@ -23,12 +24,19 @@ bool is_ppc_secureboot_enabled(void) {struct device_node *node;bool enabled = false; +u32 secureboot; node =get_ppc_fw_sb_node (); enabled =of_property_read_bool (node,"os-secureboot-enforcing" ); -of_node_put (node); +if (enabled) + goto out; + +if (!of_property_read_u32 (of_root,"ibm,secure-boot" , &secureboot)) + enabled = (secureboot >1 ); + +out:pr_info ("Secure boot mode %s\n" , enabled ?"enabled" :"disabled" );return enabled;@@ -38,12 +46,19 @@ bool is_ppc_trustedboot_enabled(void) {struct device_node *node;bool enabled = false; +u32 trustedboot; node =get_ppc_fw_sb_node (); enabled =of_property_read_bool (node,"trusted-enabled" ); -of_node_put (node); +if (enabled) + goto out; + +if (!of_property_read_u32 (of_root,"ibm,trusted-boot" , &trustedboot)) + enabled = (trustedboot >0 ); + +out:pr_info ("Trusted boot mode %s\n" , enabled ?"enabled" :"disabled" );return enabled;Signature · 1 line
2.26.2
Michael Ellerman
reviewerQuoted 10 lines · Daniel Axtens
Hi Nayna,
Looks good to me.
Sorry for not noticing this before, but I think
Quoted 1 line
+#include <
asm/machdep.h>is now superfluous (I think it's leftover from the
machine_isversion?). Maybe mpe will take pity on you and remove it when he picks up your patch.
Yeah I did that.
cheers
Quoted 10 lines · Nayna Jain
The device-tree property to check secure and trusted boot state is different for guests(pseries) compared to baremetal(powernv).
This patch updates the existing
is_ppc_secureboot_enabled()andis_ppc_trustedboot_enabled()functions to add support for pseries.The secureboot and trustedboot state are exposed via device-tree property:
/proc/device-tree/ibm,secure-bootand/proc/device-tree/ibm,trusted-bootThe values of ibm,secure-boot under pseries are interpreted as:
^^^
Quoted 9 lines
0 - Disabled
1 - Enabled in Log-only mode. This patch interprets this value as disabled, since audit mode is currently not supported for Linux. 2 - Enabled and enforced.
3-9 - Enabled and enforcing; requirements are at the discretion of the operating system.The values of ibm,trusted-boot under pseries are interpreted as:
^^^
These two should be different I suppose?
Thanks
Michal
Quoted 74 lines
0 - Disabled
1 - EnabledSigned-off-by Nayna Jain <[email protected]>Reviewed-by Daniel Axtens <[email protected]>---
v3:
* fixed double check. Thanks Daniel for noticing it.
* updated patch description.v2:
* included Michael Ellerman's feedback.
* added Daniel Axtens's Reviewed-by.arch/powerpc/kernel/secure_boot.c | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-)arch/powerpc/kernel/secure_boot.c +17
-2@@ -6,6 +6,7 @@#include <linux/types.h> #include <linux/of.h> #include <asm/secure_boot.h> +#include <asm/machdep.h> static struct device_node *get_ppc_fw_sb_node (void ) {@@ -23,12 +24,19 @@ bool is_ppc_secureboot_enabled(void) {struct device_node *node;bool enabled = false; +u32 secureboot; node =get_ppc_fw_sb_node (); enabled =of_property_read_bool (node,"os-secureboot-enforcing" ); -of_node_put (node); +if (enabled) + goto out; + +if (!of_property_read_u32 (of_root,"ibm,secure-boot" , &secureboot)) + enabled = (secureboot >1 ); + +out:pr_info ("Secure boot mode %s\n" , enabled ?"enabled" :"disabled" );return enabled;@@ -38,12 +46,19 @@ bool is_ppc_trustedboot_enabled(void) {struct device_node *node;bool enabled = false; +u32 trustedboot; node =get_ppc_fw_sb_node (); enabled =of_property_read_bool (node,"trusted-enabled" ); -of_node_put (node); +if (enabled) + goto out; + +if (!of_property_read_u32 (of_root,"ibm,trusted-boot" , &trustedboot)) + enabled = (trustedboot >0 ); + +out:pr_info ("Trusted boot mode %s\n" , enabled ?"enabled" :"disabled" );return enabled;Signature · 1 line
2.26.2
Quoted 20 lines · Michal Suchánek
Quoted 10 lines · Nayna Jain
The device-tree property to check secure and trusted boot state is different for guests(pseries) compared to baremetal(powernv).
This patch updates the existing
is_ppc_secureboot_enabled()andis_ppc_trustedboot_enabled()functions to add support for pseries.The secureboot and trustedboot state are exposed via device-tree property:
/proc/device-tree/ibm,secure-bootand/proc/device-tree/ibm,trusted-bootThe values of ibm,secure-boot under pseries are interpreted as:
^^^Quoted 8 lines
0 - Disabled
1 - Enabled in Log-only mode. This patch interprets this value as disabled, since audit mode is currently not supported for Linux. 2 - Enabled and enforced.
3-9 - Enabled and enforcing; requirements are at the discretion of the operating system.
Quoted 3 lines
Quoted 1 line
The values of ibm,trusted-boot under pseries are interpreted as:
^^^These two should be different I suppose?
I'm not quite sure what you mean? They'll be documented in a future revision of the PAPR, once I get my act together and submit the relevant internal paperwork.
Daniel
Quoted 78 lines
Thanks
Michal
Quoted 74 lines
0 - Disabled
1 - EnabledSigned-off-by Nayna Jain <[email protected]>Reviewed-by Daniel Axtens <[email protected]>---
v3:
* fixed double check. Thanks Daniel for noticing it.
* updated patch description.v2:
* included Michael Ellerman's feedback.
* added Daniel Axtens's Reviewed-by.arch/powerpc/kernel/secure_boot.c | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-)arch/powerpc/kernel/secure_boot.c +17
-2@@ -6,6 +6,7 @@#include <linux/types.h> #include <linux/of.h> #include <asm/secure_boot.h> +#include <asm/machdep.h> static struct device_node *get_ppc_fw_sb_node (void ) {@@ -23,12 +24,19 @@ bool is_ppc_secureboot_enabled(void) {struct device_node *node;bool enabled = false; +u32 secureboot; node =get_ppc_fw_sb_node (); enabled =of_property_read_bool (node,"os-secureboot-enforcing" ); -of_node_put (node); +if (enabled) + goto out; + +if (!of_property_read_u32 (of_root,"ibm,secure-boot" , &secureboot)) + enabled = (secureboot >1 ); + +out:pr_info ("Secure boot mode %s\n" , enabled ?"enabled" :"disabled" );return enabled;@@ -38,12 +46,19 @@ bool is_ppc_trustedboot_enabled(void) {struct device_node *node;bool enabled = false; +u32 trustedboot; node =get_ppc_fw_sb_node (); enabled =of_property_read_bool (node,"trusted-enabled" ); -of_node_put (node); +if (enabled) + goto out; + +if (!of_property_read_u32 (of_root,"ibm,trusted-boot" , &trustedboot)) + enabled = (trustedboot >0 ); + +out:pr_info ("Trusted boot mode %s\n" , enabled ?"enabled" :"disabled" );return enabled;Signature · 1 line
2.26.2
Quoted 22 lines · Daniel Axtens
Quoted 20 lines · Michal Suchánek
Quoted 10 lines · Nayna Jain
The device-tree property to check secure and trusted boot state is different for guests(pseries) compared to baremetal(powernv).
This patch updates the existing
is_ppc_secureboot_enabled()andis_ppc_trustedboot_enabled()functions to add support for pseries.The secureboot and trustedboot state are exposed via device-tree property:
/proc/device-tree/ibm,secure-bootand/proc/device-tree/ibm,trusted-bootThe values of ibm,secure-boot under pseries are interpreted as:
^^^Quoted 8 lines
0 - Disabled
1 - Enabled in Log-only mode. This patch interprets this value as disabled, since audit mode is currently not supported for Linux. 2 - Enabled and enforced.
3-9 - Enabled and enforcing; requirements are at the discretion of the operating system.
Quoted 7 lines
Quoted 3 lines
Quoted 1 line
The values of ibm,trusted-boot under pseries are interpreted as:
^^^These two should be different I suppose?
I'm not quite sure what you mean? They'll be documented in a future revision of the PAPR, once I get my act together and submit the relevant internal paperwork.
Nevermind, one talks about secure boot, the other about trusted boot.
Thanks
Michal
Michael Ellerman
AppliedQuoted 10 lines · Nayna Jain
The device-tree property to check secure and trusted boot state is different for guests(pseries) compared to baremetal(powernv).
This patch updates the existing
is_ppc_secureboot_enabled()andis_ppc_trustedboot_enabled()functions to add support for pseries.The secureboot and trustedboot state are exposed via device-tree property:
/proc/device-tree/ibm,secure-bootand/proc/device-tree/ibm,trusted-boot[...]
Applied to powerpc/next.
[1/1] powerpc/pseries: Detect secure and trusted boot state of the system.
https://git.kernel.org/powerpc/c/61f879d97ce4510dd29d676a20d67692e3b34806
cheers