* [PATCH 1/2] xtensa: rename context_tracking_user_{enter,exit}
2022-06-19 23:18 [PATCH 0/2] xtensa: context tracking updates Max Filippov
@ 2022-06-19 23:18 ` Max Filippov
2022-06-19 23:18 ` [PATCH 2/2] xtensa: rename CONTEXT_TRACKING to CONTEXT_TRACKING_USER Max Filippov
2022-06-24 14:01 ` [PATCH 0/2] xtensa: context tracking updates Frederic Weisbecker
2 siblings, 0 replies; 5+ messages in thread
From: Max Filippov @ 2022-06-19 23:18 UTC (permalink / raw)
To: linux-xtensa
Cc: Chris Zankel, linux-kernel, Frederic Weisbecker, Max Filippov
This fixes the following build error in the linux-next:
arch/xtensa/kernel/entry.o:(.text+0x4): undefined reference to `context_tracking_user_exit'
arch/xtensa/kernel/entry.o: In function `common_exception':
(.text+0x1ac): undefined reference to `context_tracking_user_exit'
arch/xtensa/kernel/entry.o:(.text+0x14): undefined reference to `context_tracking_user_enter'
arch/xtensa/kernel/entry.o: In function `common_exception_return':
(.text+0x20d): undefined reference to `context_tracking_user_enter'
Fixes: 29765ae224e4 ("context_tracking: Rename context_tracking_user_enter/exit() to user_enter/exit_callable()")
Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
---
arch/xtensa/kernel/entry.S | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/xtensa/kernel/entry.S b/arch/xtensa/kernel/entry.S
index e3eae648ba2e..d72bcafae90c 100644
--- a/arch/xtensa/kernel/entry.S
+++ b/arch/xtensa/kernel/entry.S
@@ -458,7 +458,7 @@ KABI_W or a3, a3, a2
#ifdef CONFIG_CONTEXT_TRACKING
l32i abi_tmp0, a1, PT_PS
bbci.l abi_tmp0, PS_UM_BIT, 1f
- abi_call context_tracking_user_exit
+ abi_call user_exit_callable
1:
#endif
@@ -545,7 +545,7 @@ common_exception_return:
.Lexit_tif_loop_user:
#ifdef CONFIG_CONTEXT_TRACKING
- abi_call context_tracking_user_enter
+ abi_call user_enter_callable
#endif
#ifdef CONFIG_HAVE_HW_BREAKPOINT
_bbci.l abi_saved0, TIF_DB_DISABLED, 1f
--
2.30.2
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH 2/2] xtensa: rename CONTEXT_TRACKING to CONTEXT_TRACKING_USER
2022-06-19 23:18 [PATCH 0/2] xtensa: context tracking updates Max Filippov
2022-06-19 23:18 ` [PATCH 1/2] xtensa: rename context_tracking_user_{enter,exit} Max Filippov
@ 2022-06-19 23:18 ` Max Filippov
2022-06-24 14:01 ` [PATCH 0/2] xtensa: context tracking updates Frederic Weisbecker
2 siblings, 0 replies; 5+ messages in thread
From: Max Filippov @ 2022-06-19 23:18 UTC (permalink / raw)
To: linux-xtensa
Cc: Chris Zankel, linux-kernel, Frederic Weisbecker, Max Filippov
CONFIG_CONTEXT_TRACKING is renamed to CONFIG_CONTEXT_TRACKING_USER, do
it for the xtensa architecture.
Fixes: 2ad9b4c81ea4 ("context_tracking: Split user tracking Kconfig")
Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
---
arch/xtensa/Kconfig | 2 +-
arch/xtensa/kernel/entry.S | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/arch/xtensa/Kconfig b/arch/xtensa/Kconfig
index 0b0f0172cced..7927fed7bc83 100644
--- a/arch/xtensa/Kconfig
+++ b/arch/xtensa/Kconfig
@@ -33,7 +33,7 @@ config XTENSA
select HAVE_ARCH_KCSAN
select HAVE_ARCH_SECCOMP_FILTER
select HAVE_ARCH_TRACEHOOK
- select HAVE_CONTEXT_TRACKING
+ select HAVE_CONTEXT_TRACKING_USER
select HAVE_DEBUG_KMEMLEAK
select HAVE_DMA_CONTIGUOUS
select HAVE_EXIT_THREAD
diff --git a/arch/xtensa/kernel/entry.S b/arch/xtensa/kernel/entry.S
index d72bcafae90c..fb67d85116e4 100644
--- a/arch/xtensa/kernel/entry.S
+++ b/arch/xtensa/kernel/entry.S
@@ -455,7 +455,7 @@ KABI_W or a3, a3, a2
abi_call trace_hardirqs_off
1:
#endif
-#ifdef CONFIG_CONTEXT_TRACKING
+#ifdef CONFIG_CONTEXT_TRACKING_USER
l32i abi_tmp0, a1, PT_PS
bbci.l abi_tmp0, PS_UM_BIT, 1f
abi_call user_exit_callable
@@ -544,7 +544,7 @@ common_exception_return:
j .Lrestore_state
.Lexit_tif_loop_user:
-#ifdef CONFIG_CONTEXT_TRACKING
+#ifdef CONFIG_CONTEXT_TRACKING_USER
abi_call user_enter_callable
#endif
#ifdef CONFIG_HAVE_HW_BREAKPOINT
--
2.30.2
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH 0/2] xtensa: context tracking updates
2022-06-19 23:18 [PATCH 0/2] xtensa: context tracking updates Max Filippov
2022-06-19 23:18 ` [PATCH 1/2] xtensa: rename context_tracking_user_{enter,exit} Max Filippov
2022-06-19 23:18 ` [PATCH 2/2] xtensa: rename CONTEXT_TRACKING to CONTEXT_TRACKING_USER Max Filippov
@ 2022-06-24 14:01 ` Frederic Weisbecker
2022-06-24 14:57 ` Max Filippov
2 siblings, 1 reply; 5+ messages in thread
From: Frederic Weisbecker @ 2022-06-24 14:01 UTC (permalink / raw)
To: Max Filippov; +Cc: linux-xtensa, Chris Zankel, linux-kernel
On Sun, Jun 19, 2022 at 04:18:35PM -0700, Max Filippov wrote:
> Hi Frederic,
>
> your recent conversion of CONTEXT_TRACKING to CONTEXT_TRACKING_USER
> missed the xtensa architexture. These two patches hopefully fix it.
> Please take them to the tree that holds the rest of the conversion.
> (Even better if they could be folded into the corresponding conversion
> patches).
>
> Max Filippov (2):
> xtensa: rename context_tracking_user_{enter,exit}
> xtensa: rename CONTEXT_TRACKING to CONTEXT_TRACKING_USER
>
> arch/xtensa/Kconfig | 2 +-
> arch/xtensa/kernel/entry.S | 8 ++++----
> 2 files changed, 5 insertions(+), 5 deletions(-)
>
> --
> Thanks.
> -- Max
Thanks a lot for these fixes. I'm likely going to reissue this
patchset so I'm going to fold your changes inside if you don't mind
(with your Signed-off-by).
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH 0/2] xtensa: context tracking updates
2022-06-24 14:01 ` [PATCH 0/2] xtensa: context tracking updates Frederic Weisbecker
@ 2022-06-24 14:57 ` Max Filippov
0 siblings, 0 replies; 5+ messages in thread
From: Max Filippov @ 2022-06-24 14:57 UTC (permalink / raw)
To: Frederic Weisbecker
Cc: open list:TENSILICA XTENSA PORT (xtensa), Chris Zankel, LKML
On Fri, Jun 24, 2022 at 7:01 AM Frederic Weisbecker <frederic@kernel.org> wrote:
>
> On Sun, Jun 19, 2022 at 04:18:35PM -0700, Max Filippov wrote:
> > Hi Frederic,
> >
> > your recent conversion of CONTEXT_TRACKING to CONTEXT_TRACKING_USER
> > missed the xtensa architexture. These two patches hopefully fix it.
> > Please take them to the tree that holds the rest of the conversion.
> > (Even better if they could be folded into the corresponding conversion
> > patches).
> >
> > Max Filippov (2):
> > xtensa: rename context_tracking_user_{enter,exit}
> > xtensa: rename CONTEXT_TRACKING to CONTEXT_TRACKING_USER
> >
> > arch/xtensa/Kconfig | 2 +-
> > arch/xtensa/kernel/entry.S | 8 ++++----
> > 2 files changed, 5 insertions(+), 5 deletions(-)
> >
> > --
> > Thanks.
> > -- Max
>
> Thanks a lot for these fixes. I'm likely going to reissue this
> patchset so I'm going to fold your changes inside if you don't mind
> (with your Signed-off-by).
Sure, by all means.
--
Thanks.
-- Max
^ permalink raw reply [flat|nested] 5+ messages in thread