From: Will Deacon <will.deacon@arm.com>
To: mika.penttila@nextfour.com
Cc: linux-kernel@vger.kernel.org, linux-mm@kvack.org,
linux@arm.linux.org.uk, catalin.marinas@arm.com
Subject: Re: [PATCH v2 RESEND 1/2] arm, arm64: change_memory_common with numpages == 0 should be no-op.
Date: Tue, 26 Jan 2016 15:59:20 +0000 [thread overview]
Message-ID: <20160126155919.GA28238@arm.com> (raw)
In-Reply-To: <1453820393-31179-2-git-send-email-mika.penttila@nextfour.com>
Hi Mika,
On Tue, Jan 26, 2016 at 04:59:52PM +0200, mika.penttila@nextfour.com wrote:
> From: Mika Penttila <mika.penttila@nextfour.com>
>
> This makes the caller set_memory_xx() consistent with x86.
>
> arm64 part is rebased on 4.5.0-rc1 with Ard's patch
> lkml.kernel.org/g/<1453125665-26627-1-git-send-email-ard.biesheuvel@linaro.org>
> applied.
>
> Signed-off-by: Mika Penttila mika.penttila@nextfour.com
> Reviewed-by: Laura Abbott <labbott@redhat.com>
> Acked-by: David Rientjes <rientjes@google.com>
>
> ---
> arch/arm/mm/pageattr.c | 3 +++
> arch/arm64/mm/pageattr.c | 3 +++
> 2 files changed, 6 insertions(+)
>
> diff --git a/arch/arm/mm/pageattr.c b/arch/arm/mm/pageattr.c
> index cf30daf..d19b1ad 100644
> --- a/arch/arm/mm/pageattr.c
> +++ b/arch/arm/mm/pageattr.c
> @@ -49,6 +49,9 @@ static int change_memory_common(unsigned long addr, int numpages,
> WARN_ON_ONCE(1);
> }
>
> + if (!numpages)
> + return 0;
> +
> if (start < MODULES_VADDR || start >= MODULES_END)
> return -EINVAL;
>
> diff --git a/arch/arm64/mm/pageattr.c b/arch/arm64/mm/pageattr.c
> index 1360a02..b582fc2 100644
> --- a/arch/arm64/mm/pageattr.c
> +++ b/arch/arm64/mm/pageattr.c
> @@ -53,6 +53,9 @@ static int change_memory_common(unsigned long addr, int numpages,
> WARN_ON_ONCE(1);
> }
>
> + if (!numpages)
> + return 0;
> +
Thanks for this. I can reproduce the failure on my Juno board, so I'd
like to queue this for 4.5 since it fixes a real issue. I've taken the
liberty of rebasing the arm64 part to my fixes branch and writing a
commit message. Does the patch below look ok to you?
Will
--->8
WARNING: multiple messages have this Message-ID (diff)
From: Will Deacon <will.deacon@arm.com>
To: mika.penttila@nextfour.com
Cc: linux-kernel@vger.kernel.org, linux-mm@kvack.org,
linux@arm.linux.org.uk, catalin.marinas@arm.com
Subject: Re: [PATCH v2 RESEND 1/2] arm, arm64: change_memory_common with numpages == 0 should be no-op.
Date: Tue, 26 Jan 2016 15:59:20 +0000 [thread overview]
Message-ID: <20160126155919.GA28238@arm.com> (raw)
In-Reply-To: <1453820393-31179-2-git-send-email-mika.penttila@nextfour.com>
Hi Mika,
On Tue, Jan 26, 2016 at 04:59:52PM +0200, mika.penttila@nextfour.com wrote:
> From: Mika Penttilä <mika.penttila@nextfour.com>
>
> This makes the caller set_memory_xx() consistent with x86.
>
> arm64 part is rebased on 4.5.0-rc1 with Ard's patch
> lkml.kernel.org/g/<1453125665-26627-1-git-send-email-ard.biesheuvel@linaro.org>
> applied.
>
> Signed-off-by: Mika Penttilä mika.penttila@nextfour.com
> Reviewed-by: Laura Abbott <labbott@redhat.com>
> Acked-by: David Rientjes <rientjes@google.com>
>
> ---
> arch/arm/mm/pageattr.c | 3 +++
> arch/arm64/mm/pageattr.c | 3 +++
> 2 files changed, 6 insertions(+)
>
> diff --git a/arch/arm/mm/pageattr.c b/arch/arm/mm/pageattr.c
> index cf30daf..d19b1ad 100644
> --- a/arch/arm/mm/pageattr.c
> +++ b/arch/arm/mm/pageattr.c
> @@ -49,6 +49,9 @@ static int change_memory_common(unsigned long addr, int numpages,
> WARN_ON_ONCE(1);
> }
>
> + if (!numpages)
> + return 0;
> +
> if (start < MODULES_VADDR || start >= MODULES_END)
> return -EINVAL;
>
> diff --git a/arch/arm64/mm/pageattr.c b/arch/arm64/mm/pageattr.c
> index 1360a02..b582fc2 100644
> --- a/arch/arm64/mm/pageattr.c
> +++ b/arch/arm64/mm/pageattr.c
> @@ -53,6 +53,9 @@ static int change_memory_common(unsigned long addr, int numpages,
> WARN_ON_ONCE(1);
> }
>
> + if (!numpages)
> + return 0;
> +
Thanks for this. I can reproduce the failure on my Juno board, so I'd
like to queue this for 4.5 since it fixes a real issue. I've taken the
liberty of rebasing the arm64 part to my fixes branch and writing a
commit message. Does the patch below look ok to you?
Will
--->8
>From 57adec866c0440976c96a4b8f5b59fb411b1cacb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mika=20Penttil=C3=A4?= <mika.penttila@nextfour.com>
Date: Tue, 26 Jan 2016 15:47:25 +0000
Subject: [PATCH] arm64: mm: avoid calling apply_to_page_range on empty range
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Calling apply_to_page_range with an empty range results in a BUG_ON
from the core code. This can be triggered by trying to load the st_drv
module with CONFIG_DEBUG_SET_MODULE_RONX enabled:
kernel BUG at mm/memory.c:1874!
Internal error: Oops - BUG: 0 [#1] PREEMPT SMP
Modules linked in:
CPU: 3 PID: 1764 Comm: insmod Not tainted 4.5.0-rc1+ #2
Hardware name: ARM Juno development board (r0) (DT)
task: ffffffc9763b8000 ti: ffffffc975af8000 task.ti: ffffffc975af8000
PC is at apply_to_page_range+0x2cc/0x2d0
LR is at change_memory_common+0x80/0x108
This patch fixes the issue by making change_memory_common (called by the
set_memory_* functions) a NOP when numpages == 0, therefore avoiding the
erroneous call to apply_to_page_range and bringing us into line with x86
and s390.
Cc: <stable@vger.kernel.org>
Reviewed-by: Laura Abbott <labbott@redhat.com>
Acked-by: David Rientjes <rientjes@google.com>
Signed-off-by: Mika Penttilä <mika.penttila@nextfour.com>
Signed-off-by: Will Deacon <will.deacon@arm.com>
---
arch/arm64/mm/pageattr.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/arch/arm64/mm/pageattr.c b/arch/arm64/mm/pageattr.c
index 3571c7309c5e..cf6240741134 100644
--- a/arch/arm64/mm/pageattr.c
+++ b/arch/arm64/mm/pageattr.c
@@ -57,6 +57,9 @@ static int change_memory_common(unsigned long addr, int numpages,
if (end < MODULES_VADDR || end >= MODULES_END)
return -EINVAL;
+ if (!numpages)
+ return 0;
+
data.set_mask = set_mask;
data.clear_mask = clear_mask;
--
2.1.4
next prev parent reply other threads:[~2016-01-26 15:59 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-01-26 14:59 [PATCH v2 RESEND 0/2] set_memory_xx fixes mika.penttila
2016-01-26 14:59 ` mika.penttila
2016-01-26 14:59 ` [PATCH v2 RESEND 1/2] arm, arm64: change_memory_common with numpages == 0 should be no-op mika.penttila
2016-01-26 14:59 ` mika.penttila
2016-01-26 15:59 ` Will Deacon [this message]
2016-01-26 15:59 ` Will Deacon
2016-01-26 23:14 ` David Rientjes
2016-01-26 23:14 ` David Rientjes
2016-01-27 16:04 ` Mika Penttilä
2016-01-27 16:04 ` Mika Penttilä
2016-01-26 14:59 ` [PATCH V2 RESEND 2/2] make apply_to_page_range() more robust mika.penttila
2016-01-26 14:59 ` mika.penttila
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20160126155919.GA28238@arm.com \
--to=will.deacon@arm.com \
--cc=catalin.marinas@arm.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=linux@arm.linux.org.uk \
--cc=mika.penttila@nextfour.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.