LinuxPPC-Dev Archive mirror
 help / color / mirror / Atom feed
* [PATCH] powerpc/ptdump: Fix DEBUG_WX since generic ptdump conversion
@ 2021-12-03 12:41 Michael Ellerman
  2021-12-03 12:55 ` Christophe Leroy
  2021-12-26 21:51 ` Michael Ellerman
  0 siblings, 2 replies; 3+ messages in thread
From: Michael Ellerman @ 2021-12-03 12:41 UTC (permalink / raw
  To: linuxppc-dev

In note_prot_wx() we bail out without reporting anything if
CONFIG_PPC_DEBUG_WX is disabled.

But CONFIG_PPC_DEBUG_WX was removed in the conversion to generic ptdump,
we now need to use CONFIG_DEBUG_WX instead.

Fixes: e084728393a5 ("powerpc/ptdump: Convert powerpc to GENERIC_PTDUMP")
Cc: stable@vger.kernel.org # v5.15+
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
---
 arch/powerpc/mm/ptdump/ptdump.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/powerpc/mm/ptdump/ptdump.c b/arch/powerpc/mm/ptdump/ptdump.c
index 031956d0ee84..be120e09aa3e 100644
--- a/arch/powerpc/mm/ptdump/ptdump.c
+++ b/arch/powerpc/mm/ptdump/ptdump.c
@@ -183,7 +183,7 @@ static void note_prot_wx(struct pg_state *st, unsigned long addr)
 {
 	pte_t pte = __pte(st->current_flags);
 
-	if (!IS_ENABLED(CONFIG_PPC_DEBUG_WX) || !st->check_wx)
+	if (!IS_ENABLED(CONFIG_DEBUG_WX) || !st->check_wx)
 		return;
 
 	if (!pte_write(pte) || !pte_exec(pte))
-- 
2.31.1


^ permalink raw reply related	[flat|nested] 3+ messages in thread

* Re: [PATCH] powerpc/ptdump: Fix DEBUG_WX since generic ptdump conversion
  2021-12-03 12:41 [PATCH] powerpc/ptdump: Fix DEBUG_WX since generic ptdump conversion Michael Ellerman
@ 2021-12-03 12:55 ` Christophe Leroy
  2021-12-26 21:51 ` Michael Ellerman
  1 sibling, 0 replies; 3+ messages in thread
From: Christophe Leroy @ 2021-12-03 12:55 UTC (permalink / raw
  To: Michael Ellerman, linuxppc-dev@lists.ozlabs.org



Le 03/12/2021 à 13:41, Michael Ellerman a écrit :
> In note_prot_wx() we bail out without reporting anything if
> CONFIG_PPC_DEBUG_WX is disabled.
> 
> But CONFIG_PPC_DEBUG_WX was removed in the conversion to generic ptdump,
> we now need to use CONFIG_DEBUG_WX instead.
> 
> Fixes: e084728393a5 ("powerpc/ptdump: Convert powerpc to GENERIC_PTDUMP")
> Cc: stable@vger.kernel.org # v5.15+
> Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
> ---

Oops ... my mistake.

Reviewed-by: Christophe Leroy <christophe.leroy@csgroup.eu>

>   arch/powerpc/mm/ptdump/ptdump.c | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/arch/powerpc/mm/ptdump/ptdump.c b/arch/powerpc/mm/ptdump/ptdump.c
> index 031956d0ee84..be120e09aa3e 100644
> --- a/arch/powerpc/mm/ptdump/ptdump.c
> +++ b/arch/powerpc/mm/ptdump/ptdump.c
> @@ -183,7 +183,7 @@ static void note_prot_wx(struct pg_state *st, unsigned long addr)
>   {
>   	pte_t pte = __pte(st->current_flags);
>   
> -	if (!IS_ENABLED(CONFIG_PPC_DEBUG_WX) || !st->check_wx)
> +	if (!IS_ENABLED(CONFIG_DEBUG_WX) || !st->check_wx)
>   		return;
>   
>   	if (!pte_write(pte) || !pte_exec(pte))
> 

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [PATCH] powerpc/ptdump: Fix DEBUG_WX since generic ptdump conversion
  2021-12-03 12:41 [PATCH] powerpc/ptdump: Fix DEBUG_WX since generic ptdump conversion Michael Ellerman
  2021-12-03 12:55 ` Christophe Leroy
@ 2021-12-26 21:51 ` Michael Ellerman
  1 sibling, 0 replies; 3+ messages in thread
From: Michael Ellerman @ 2021-12-26 21:51 UTC (permalink / raw
  To: linuxppc-dev, Michael Ellerman

On Fri, 3 Dec 2021 23:41:12 +1100, Michael Ellerman wrote:
> In note_prot_wx() we bail out without reporting anything if
> CONFIG_PPC_DEBUG_WX is disabled.
> 
> But CONFIG_PPC_DEBUG_WX was removed in the conversion to generic ptdump,
> we now need to use CONFIG_DEBUG_WX instead.
> 
> 
> [...]

Applied to powerpc/fixes.

[1/1] powerpc/ptdump: Fix DEBUG_WX since generic ptdump conversion
      https://git.kernel.org/powerpc/c/8d84fca4375e3c35dadc16b8c7eee6821b2a575c

cheers

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2021-12-26 21:52 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-12-03 12:41 [PATCH] powerpc/ptdump: Fix DEBUG_WX since generic ptdump conversion Michael Ellerman
2021-12-03 12:55 ` Christophe Leroy
2021-12-26 21:51 ` Michael Ellerman

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).