2021-06-29 15:41:41

by Austin Kim

Subject: [PATCH] smack: mark 'smack_enabled' global variable as __initdata

From: Austin Kim <[email protected]>

Mark 'smack_enabled' as __initdata
since it is only used during initialization code.

Signed-off-by: Austin Kim <[email protected]>
---
security/smack/smack.h | 2 +-
security/smack/smack_lsm.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/security/smack/smack.h b/security/smack/smack.h
index c3cfbdf4944a..99c3422596ab 100644
--- a/security/smack/smack.h
+++ b/security/smack/smack.h
@@ -302,7 +302,7 @@ int smack_populate_secattr(struct smack_known *skp);
/*
* Shared data.
*/
-extern int smack_enabled;
+extern int smack_enabled __initdata;
extern int smack_cipso_direct;
extern int smack_cipso_mapped;
extern struct smack_known *smack_net_ambient;
diff --git a/security/smack/smack_lsm.c b/security/smack/smack_lsm.c
index 223a6da0e6dc..cacbe7518519 100644
--- a/security/smack/smack_lsm.c
+++ b/security/smack/smack_lsm.c
@@ -54,7 +54,7 @@
static DEFINE_MUTEX(smack_ipv6_lock);
static LIST_HEAD(smk_ipv6_port_list);
struct kmem_cache *smack_rule_cache;
-int smack_enabled;
+int smack_enabled __initdata;

#define A(s) {"smack"#s, sizeof("smack"#s) - 1, Opt_##s}
static struct {
--
2.20.1

2021-07-07 10:16:06

by Austin Kim

Subject: Re: [PATCH] smack: mark 'smack_enabled' global variable as __initdata

2021년 6월 29일 (화) 오후 10:41, Austin Kim <[email protected]>님이 작성:
>
> From: Austin Kim <[email protected]>
>
> Mark 'smack_enabled' as __initdata
> since it is only used during initialization code.
>
> Signed-off-by: Austin Kim <[email protected]>
> ---
> security/smack/smack.h | 2 +-
> security/smack/smack_lsm.c | 2 +-
> 2 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/security/smack/smack.h b/security/smack/smack.h
> index c3cfbdf4944a..99c3422596ab 100644
> --- a/security/smack/smack.h
> +++ b/security/smack/smack.h
> @@ -302,7 +302,7 @@ int smack_populate_secattr(struct smack_known *skp);
> /*
> * Shared data.
> */
> -extern int smack_enabled;
> +extern int smack_enabled __initdata;
> extern int smack_cipso_direct;
> extern int smack_cipso_mapped;
> extern struct smack_known *smack_net_ambient;
> diff --git a/security/smack/smack_lsm.c b/security/smack/smack_lsm.c
> index 223a6da0e6dc..cacbe7518519 100644
> --- a/security/smack/smack_lsm.c
> +++ b/security/smack/smack_lsm.c
> @@ -54,7 +54,7 @@
> static DEFINE_MUTEX(smack_ipv6_lock);
> static LIST_HEAD(smk_ipv6_port_list);
> struct kmem_cache *smack_rule_cache;
> -int smack_enabled;
> +int smack_enabled __initdata;
>
> #define A(s) {"smack"#s, sizeof("smack"#s) - 1, Opt_##s}
> static struct {
> --
> 2.20.1
>

Dear Maintainers

Would you please review the above patch if you are available?
It might not take long.

Thanks.
Austin Kim

2021-07-07 14:29:32

by Casey Schaufler

Subject: Re: [PATCH] smack: mark 'smack_enabled' global variable as __initdata

On 7/7/2021 3:14 AM, Austin Kim wrote:
> 2021년 6월 29일 (화) 오후 10:41, Austin Kim <[email protected]>님이 작성:
>> From: Austin Kim <[email protected]>
>>
>> Mark 'smack_enabled' as __initdata
>> since it is only used during initialization code.
>>
>> Signed-off-by: Austin Kim <[email protected]>

I will be taking this patch for 5.15. You should see it in next
shortly after the 5.14 merge window closes.

>> ---
>> security/smack/smack.h | 2 +-
>> security/smack/smack_lsm.c | 2 +-
>> 2 files changed, 2 insertions(+), 2 deletions(-)
>>
>> diff --git a/security/smack/smack.h b/security/smack/smack.h
>> index c3cfbdf4944a..99c3422596ab 100644
>> --- a/security/smack/smack.h
>> +++ b/security/smack/smack.h
>> @@ -302,7 +302,7 @@ int smack_populate_secattr(struct smack_known *skp);
>> /*
>> * Shared data.
>> */
>> -extern int smack_enabled;
>> +extern int smack_enabled __initdata;
>> extern int smack_cipso_direct;
>> extern int smack_cipso_mapped;
>> extern struct smack_known *smack_net_ambient;
>> diff --git a/security/smack/smack_lsm.c b/security/smack/smack_lsm.c
>> index 223a6da0e6dc..cacbe7518519 100644
>> --- a/security/smack/smack_lsm.c
>> +++ b/security/smack/smack_lsm.c
>> @@ -54,7 +54,7 @@
>> static DEFINE_MUTEX(smack_ipv6_lock);
>> static LIST_HEAD(smk_ipv6_port_list);
>> struct kmem_cache *smack_rule_cache;
>> -int smack_enabled;
>> +int smack_enabled __initdata;
>>
>> #define A(s) {"smack"#s, sizeof("smack"#s) - 1, Opt_##s}
>> static struct {
>> --
>> 2.20.1
>>
> Dear Maintainers
>
> Would you please review the above patch if you are available?
> It might not take long.
>
> Thanks.
> Austin Kim

2021-07-20 17:39:18

by Casey Schaufler

Subject: Re: [PATCH] smack: mark 'smack_enabled' global variable as __initdata

On 6/29/2021 6:41 AM, Austin Kim wrote:
> From: Austin Kim <[email protected]>
>
> Mark 'smack_enabled' as __initdata
> since it is only used during initialization code.
>
> Signed-off-by: Austin Kim <[email protected]>

Added to Smack next.

> ---
> security/smack/smack.h | 2 +-
> security/smack/smack_lsm.c | 2 +-
> 2 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/security/smack/smack.h b/security/smack/smack.h
> index c3cfbdf4944a..99c3422596ab 100644
> --- a/security/smack/smack.h
> +++ b/security/smack/smack.h
> @@ -302,7 +302,7 @@ int smack_populate_secattr(struct smack_known *skp);
> /*
> * Shared data.
> */
> -extern int smack_enabled;
> +extern int smack_enabled __initdata;
> extern int smack_cipso_direct;
> extern int smack_cipso_mapped;
> extern struct smack_known *smack_net_ambient;
> diff --git a/security/smack/smack_lsm.c b/security/smack/smack_lsm.c
> index 223a6da0e6dc..cacbe7518519 100644
> --- a/security/smack/smack_lsm.c
> +++ b/security/smack/smack_lsm.c
> @@ -54,7 +54,7 @@
> static DEFINE_MUTEX(smack_ipv6_lock);
> static LIST_HEAD(smk_ipv6_port_list);
> struct kmem_cache *smack_rule_cache;
> -int smack_enabled;
> +int smack_enabled __initdata;
>
> #define A(s) {"smack"#s, sizeof("smack"#s) - 1, Opt_##s}
> static struct {