* [PATCH 1/2] xsm: Switch xsm_ops to __alt_call_maybe_initdata
2021-12-01 11:15 [PATCH 0/2] xsm: Further fixes Andrew Cooper
@ 2021-12-01 11:15 ` Andrew Cooper
2021-12-01 11:15 ` [PATCH 2/2] xsm: Drop extern of non-existent variable Andrew Cooper
` (3 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: Andrew Cooper @ 2021-12-01 11:15 UTC (permalink / raw)
To: Xen-devel; +Cc: Andrew Cooper, Daniel De Graaf, Daniel Smith
This should have been done at the point xsm_ops became fully altcall'd. This
puts the xsm_ops structure in .init on architectures where it is no longer
referenced at runtime.
Fixes: d868feb95a8a ("xen/xsm: Complete altcall conversion of xsm interface")
Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
---
CC: Daniel De Graaf <dgdegra@tycho.nsa.gov>
CC: Daniel Smith <dpsmith@apertussolutions.com>
---
xen/xsm/xsm_core.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/xen/xsm/xsm_core.c b/xen/xsm/xsm_core.c
index 21fffbcb41d3..14d98f1f725f 100644
--- a/xen/xsm/xsm_core.c
+++ b/xen/xsm/xsm_core.c
@@ -30,7 +30,7 @@
#define XSM_FRAMEWORK_VERSION "1.0.1"
-struct xsm_ops __read_mostly xsm_ops;
+struct xsm_ops __alt_call_maybe_initdata xsm_ops;
enum xsm_ops_state {
XSM_OPS_UNREGISTERED,
--
2.11.0
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH 2/2] xsm: Drop extern of non-existent variable
2021-12-01 11:15 [PATCH 0/2] xsm: Further fixes Andrew Cooper
2021-12-01 11:15 ` [PATCH 1/2] xsm: Switch xsm_ops to __alt_call_maybe_initdata Andrew Cooper
@ 2021-12-01 11:15 ` Andrew Cooper
2021-12-01 11:23 ` [PATCH 0/2] xsm: Further fixes Jan Beulich
` (2 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: Andrew Cooper @ 2021-12-01 11:15 UTC (permalink / raw)
To: Xen-devel; +Cc: Andrew Cooper, Daniel De Graaf, Daniel Smith
dummy_xsm_ops was dropped as part of organising XSM to be altcall compatible,
but the extern was accidentally left around.
A later change reintroduced dummy_ops which is logically the same thing, but
is private to xsm/dummy.c
Fixes: 164a0b9653f4 ("xsm: refactor xsm_ops handling")
Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
---
CC: Daniel De Graaf <dgdegra@tycho.nsa.gov>
CC: Daniel Smith <dpsmith@apertussolutions.com>
---
xen/include/xsm/xsm.h | 2 --
1 file changed, 2 deletions(-)
diff --git a/xen/include/xsm/xsm.h b/xen/include/xsm/xsm.h
index 5aa4dd588d17..3e2b7fe3dbb3 100644
--- a/xen/include/xsm/xsm.h
+++ b/xen/include/xsm/xsm.h
@@ -789,8 +789,6 @@ int xsm_dt_policy_init(void **policy_buffer, size_t *policy_size);
bool has_xsm_magic(paddr_t);
#endif
-extern struct xsm_ops dummy_xsm_ops;
-
void xsm_fixup_ops(struct xsm_ops *ops);
#ifdef CONFIG_XSM_FLASK
--
2.11.0
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH 0/2] xsm: Further fixes
2021-12-01 11:15 [PATCH 0/2] xsm: Further fixes Andrew Cooper
2021-12-01 11:15 ` [PATCH 1/2] xsm: Switch xsm_ops to __alt_call_maybe_initdata Andrew Cooper
2021-12-01 11:15 ` [PATCH 2/2] xsm: Drop extern of non-existent variable Andrew Cooper
@ 2021-12-01 11:23 ` Jan Beulich
2021-12-02 10:39 ` Bertrand Marquis
2021-12-03 10:47 ` Daniel P. Smith
4 siblings, 0 replies; 6+ messages in thread
From: Jan Beulich @ 2021-12-01 11:23 UTC (permalink / raw)
To: Andrew Cooper; +Cc: Daniel De Graaf, Daniel Smith, Xen-devel
On 01.12.2021 12:15, Andrew Cooper wrote:
> Andrew Cooper (2):
> xsm: Switch xsm_ops to __alt_call_maybe_initdata
> xsm: Drop extern of non-existent variable
Reviewed-by: Jan Beulich <jbeulich@suse.com>
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 0/2] xsm: Further fixes
2021-12-01 11:15 [PATCH 0/2] xsm: Further fixes Andrew Cooper
` (2 preceding siblings ...)
2021-12-01 11:23 ` [PATCH 0/2] xsm: Further fixes Jan Beulich
@ 2021-12-02 10:39 ` Bertrand Marquis
2021-12-03 10:47 ` Daniel P. Smith
4 siblings, 0 replies; 6+ messages in thread
From: Bertrand Marquis @ 2021-12-02 10:39 UTC (permalink / raw)
To: Andrew Cooper; +Cc: Xen-devel, Daniel De Graaf, Daniel Smith
> On 1 Dec 2021, at 11:15, Andrew Cooper <andrew.cooper3@citrix.com> wrote:
>
> Andrew Cooper (2):
> xsm: Switch xsm_ops to __alt_call_maybe_initdata
> xsm: Drop extern of non-existent variable
Reviewed-by: Bertrand Marquis <bertrand.marquis@arm.com>
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH 0/2] xsm: Further fixes
2021-12-01 11:15 [PATCH 0/2] xsm: Further fixes Andrew Cooper
` (3 preceding siblings ...)
2021-12-02 10:39 ` Bertrand Marquis
@ 2021-12-03 10:47 ` Daniel P. Smith
4 siblings, 0 replies; 6+ messages in thread
From: Daniel P. Smith @ 2021-12-03 10:47 UTC (permalink / raw)
To: Andrew Cooper, Xen-devel; +Cc: Daniel De Graaf
On 12/1/21 6:15 AM, Andrew Cooper wrote:
> Andrew Cooper (2):
> xsm: Switch xsm_ops to __alt_call_maybe_initdata
> xsm: Drop extern of non-existent variable
>
> xen/include/xsm/xsm.h | 2 --
> xen/xsm/xsm_core.c | 2 +-
> 2 files changed, 1 insertion(+), 3 deletions(-)
>
Reviewed-by: Daniel P. Smith <dpsmith@apertussolutions.com>
^ permalink raw reply [flat|nested] 6+ messages in thread