linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] ARM, xtensa: highmem: avoid clobbering non-page aligned memory reservations
@ 2020-10-31  9:43 Mike Rapoport
  2020-10-31 10:33 ` Russell King - ARM Linux admin
  2020-10-31 16:37 ` Max Filippov
  0 siblings, 2 replies; 12+ messages in thread
From: Mike Rapoport @ 2020-10-31  9:43 UTC (permalink / raw)
  To: linux-arm-kernel, linux-xtensa
  Cc: Ard Biesheuvel, Chris Zankel, Florian Fainelli, Linus Walleij,
	Max Filippov, Mike Rapoport, Mike Rapoport, Russell King,
	linux-kernel

From: Ard Biesheuvel <ardb@kernel.org>

free_highpages() iterates over the free memblock regions in high
memory, and marks each page as available for the memory management
system.

Until commit cddb5ddf2b76 ("arm, xtensa: simplify initialization of
high memory pages") it rounded beginning of each region upwards and end of
each region downwards.

However, after that commit free_highmem() rounds the beginning and end of
each region downwards, and we may end up freeing a page that is
memblock_reserve()d, resulting in memory corruption.

Restore the original rounding of the region boundaries to avoid freeing
reserved pages.

Fixes: cddb5ddf2b76 ("arm, xtensa: simplify initialization of high memory pages")
Link: https://lore.kernel.org/r/20201029110334.4118-1-ardb@kernel.org/
Signed-off-by: Ard Biesheuvel <ardb@kernel.org>
Co-developed-by:  Mike Rapoport <rppt@linux.ibm.com>
Signed-off-by: Mike Rapoport <rppt@linux.ibm.com>
---

Max, Russell,

Please let me know how do you prefer to take it upstream.
If needed this can go via memblock tree.

v2: fix words order in the commit message

 arch/arm/mm/init.c    | 4 ++--
 arch/xtensa/mm/init.c | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/arch/arm/mm/init.c b/arch/arm/mm/init.c
index d57112a276f5..c23dbf8bebee 100644
--- a/arch/arm/mm/init.c
+++ b/arch/arm/mm/init.c
@@ -354,8 +354,8 @@ static void __init free_highpages(void)
 	/* set highmem page free */
 	for_each_free_mem_range(i, NUMA_NO_NODE, MEMBLOCK_NONE,
 				&range_start, &range_end, NULL) {
-		unsigned long start = PHYS_PFN(range_start);
-		unsigned long end = PHYS_PFN(range_end);
+		unsigned long start = PFN_UP(range_start);
+		unsigned long end = PFN_DOWN(range_end);
 
 		/* Ignore complete lowmem entries */
 		if (end <= max_low)
diff --git a/arch/xtensa/mm/init.c b/arch/xtensa/mm/init.c
index c6fc83efee0c..8731b7ad9308 100644
--- a/arch/xtensa/mm/init.c
+++ b/arch/xtensa/mm/init.c
@@ -89,8 +89,8 @@ static void __init free_highpages(void)
 	/* set highmem page free */
 	for_each_free_mem_range(i, NUMA_NO_NODE, MEMBLOCK_NONE,
 				&range_start, &range_end, NULL) {
-		unsigned long start = PHYS_PFN(range_start);
-		unsigned long end = PHYS_PFN(range_end);
+		unsigned long start = PFN_UP(range_start);
+		unsigned long end = PFN_DOWN(range_end);
 
 		/* Ignore complete lowmem entries */
 		if (end <= max_low)
-- 
2.28.0


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

* Re: [PATCH] ARM, xtensa: highmem: avoid clobbering non-page aligned memory reservations
  2020-10-31  9:43 [PATCH] ARM, xtensa: highmem: avoid clobbering non-page aligned memory reservations Mike Rapoport
@ 2020-10-31 10:33 ` Russell King - ARM Linux admin
  2020-10-31 10:47   ` Ard Biesheuvel
  2020-10-31 16:37 ` Max Filippov
  1 sibling, 1 reply; 12+ messages in thread
From: Russell King - ARM Linux admin @ 2020-10-31 10:33 UTC (permalink / raw)
  To: Mike Rapoport
  Cc: linux-arm-kernel, linux-xtensa, Ard Biesheuvel, Chris Zankel,
	Florian Fainelli, Linus Walleij, Max Filippov, Mike Rapoport,
	linux-kernel

On Sat, Oct 31, 2020 at 11:43:45AM +0200, Mike Rapoport wrote:
> From: Ard Biesheuvel <ardb@kernel.org>
> 
> free_highpages() iterates over the free memblock regions in high
> memory, and marks each page as available for the memory management
> system.
> 
> Until commit cddb5ddf2b76 ("arm, xtensa: simplify initialization of
> high memory pages") it rounded beginning of each region upwards and end of
> each region downwards.
> 
> However, after that commit free_highmem() rounds the beginning and end of
> each region downwards, and we may end up freeing a page that is
> memblock_reserve()d, resulting in memory corruption.
> 
> Restore the original rounding of the region boundaries to avoid freeing
> reserved pages.
> 
> Fixes: cddb5ddf2b76 ("arm, xtensa: simplify initialization of high memory pages")
> Link: https://lore.kernel.org/r/20201029110334.4118-1-ardb@kernel.org/
> Signed-off-by: Ard Biesheuvel <ardb@kernel.org>
> Co-developed-by:  Mike Rapoport <rppt@linux.ibm.com>
> Signed-off-by: Mike Rapoport <rppt@linux.ibm.com>
> ---
> 
> Max, Russell,
> 
> Please let me know how do you prefer to take it upstream.
> If needed this can go via memblock tree.
> 
> v2: fix words order in the commit message

I really don't understand what is going on here; there seems to be a
total disconnect of communication between yourself and Ard. Ard has
already submitted a different patch for this to the patch system
already, sent yesterday.

https://www.armlinux.org.uk/developer/patches/viewpatch.php?id=9021/1

Please discuss between yourselves how you want to solve the problem,
and then submit an agreed and tested patch to those of us upstream;
please don't make it for those upstream to pick one of your patches
as you are at present.

Thanks.

> 
>  arch/arm/mm/init.c    | 4 ++--
>  arch/xtensa/mm/init.c | 4 ++--
>  2 files changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/arch/arm/mm/init.c b/arch/arm/mm/init.c
> index d57112a276f5..c23dbf8bebee 100644
> --- a/arch/arm/mm/init.c
> +++ b/arch/arm/mm/init.c
> @@ -354,8 +354,8 @@ static void __init free_highpages(void)
>  	/* set highmem page free */
>  	for_each_free_mem_range(i, NUMA_NO_NODE, MEMBLOCK_NONE,
>  				&range_start, &range_end, NULL) {
> -		unsigned long start = PHYS_PFN(range_start);
> -		unsigned long end = PHYS_PFN(range_end);
> +		unsigned long start = PFN_UP(range_start);
> +		unsigned long end = PFN_DOWN(range_end);
>  
>  		/* Ignore complete lowmem entries */
>  		if (end <= max_low)
> diff --git a/arch/xtensa/mm/init.c b/arch/xtensa/mm/init.c
> index c6fc83efee0c..8731b7ad9308 100644
> --- a/arch/xtensa/mm/init.c
> +++ b/arch/xtensa/mm/init.c
> @@ -89,8 +89,8 @@ static void __init free_highpages(void)
>  	/* set highmem page free */
>  	for_each_free_mem_range(i, NUMA_NO_NODE, MEMBLOCK_NONE,
>  				&range_start, &range_end, NULL) {
> -		unsigned long start = PHYS_PFN(range_start);
> -		unsigned long end = PHYS_PFN(range_end);
> +		unsigned long start = PFN_UP(range_start);
> +		unsigned long end = PFN_DOWN(range_end);
>  
>  		/* Ignore complete lowmem entries */
>  		if (end <= max_low)
> -- 
> 2.28.0
> 
> 

-- 
RMK's Patch system: https://www.armlinux.org.uk/developer/patches/
FTTP is here! 40Mbps down 10Mbps up. Decent connectivity at last!

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

* Re: [PATCH] ARM, xtensa: highmem: avoid clobbering non-page aligned memory reservations
  2020-10-31 10:33 ` Russell King - ARM Linux admin
@ 2020-10-31 10:47   ` Ard Biesheuvel
  2020-10-31 11:03     ` Russell King - ARM Linux admin
  0 siblings, 1 reply; 12+ messages in thread
From: Ard Biesheuvel @ 2020-10-31 10:47 UTC (permalink / raw)
  To: Russell King - ARM Linux admin
  Cc: Mike Rapoport, Linux ARM, linux-xtensa, Chris Zankel,
	Florian Fainelli, Linus Walleij, Max Filippov, Mike Rapoport,
	Linux Kernel Mailing List

On Sat, 31 Oct 2020 at 11:33, Russell King - ARM Linux admin
<linux@armlinux.org.uk> wrote:
>
> On Sat, Oct 31, 2020 at 11:43:45AM +0200, Mike Rapoport wrote:
> > From: Ard Biesheuvel <ardb@kernel.org>
> >
> > free_highpages() iterates over the free memblock regions in high
> > memory, and marks each page as available for the memory management
> > system.
> >
> > Until commit cddb5ddf2b76 ("arm, xtensa: simplify initialization of
> > high memory pages") it rounded beginning of each region upwards and end of
> > each region downwards.
> >
> > However, after that commit free_highmem() rounds the beginning and end of
> > each region downwards, and we may end up freeing a page that is
> > memblock_reserve()d, resulting in memory corruption.
> >
> > Restore the original rounding of the region boundaries to avoid freeing
> > reserved pages.
> >
> > Fixes: cddb5ddf2b76 ("arm, xtensa: simplify initialization of high memory pages")
> > Link: https://lore.kernel.org/r/20201029110334.4118-1-ardb@kernel.org/
> > Signed-off-by: Ard Biesheuvel <ardb@kernel.org>
> > Co-developed-by:  Mike Rapoport <rppt@linux.ibm.com>
> > Signed-off-by: Mike Rapoport <rppt@linux.ibm.com>
> > ---
> >
> > Max, Russell,
> >
> > Please let me know how do you prefer to take it upstream.
> > If needed this can go via memblock tree.
> >
> > v2: fix words order in the commit message
>
> I really don't understand what is going on here; there seems to be a
> total disconnect of communication between yourself and Ard. Ard has
> already submitted a different patch for this to the patch system
> already, sent yesterday.
>
> https://www.armlinux.org.uk/developer/patches/viewpatch.php?id=9021/1
>
> Please discuss between yourselves how you want to solve the problem,
> and then submit an agreed and tested patch to those of us upstream;
> please don't make it for those upstream to pick one of your patches
> as you are at present.
>

Apologies for creating this confusion. I posted a patch and dropped it
into the patch system when I found the bug.

However, only when Florian asked about a 'fixes' tag, I went back to
the history, and realized that the issue was introduced by Mike during
the most recent merge window, and affects xtensa as well.

I don't have a preference which patch gets applied, though, so please
indicate your preference, and we will adapt accordingly.


> >
> >  arch/arm/mm/init.c    | 4 ++--
> >  arch/xtensa/mm/init.c | 4 ++--
> >  2 files changed, 4 insertions(+), 4 deletions(-)
> >
> > diff --git a/arch/arm/mm/init.c b/arch/arm/mm/init.c
> > index d57112a276f5..c23dbf8bebee 100644
> > --- a/arch/arm/mm/init.c
> > +++ b/arch/arm/mm/init.c
> > @@ -354,8 +354,8 @@ static void __init free_highpages(void)
> >       /* set highmem page free */
> >       for_each_free_mem_range(i, NUMA_NO_NODE, MEMBLOCK_NONE,
> >                               &range_start, &range_end, NULL) {
> > -             unsigned long start = PHYS_PFN(range_start);
> > -             unsigned long end = PHYS_PFN(range_end);
> > +             unsigned long start = PFN_UP(range_start);
> > +             unsigned long end = PFN_DOWN(range_end);
> >
> >               /* Ignore complete lowmem entries */
> >               if (end <= max_low)
> > diff --git a/arch/xtensa/mm/init.c b/arch/xtensa/mm/init.c
> > index c6fc83efee0c..8731b7ad9308 100644
> > --- a/arch/xtensa/mm/init.c
> > +++ b/arch/xtensa/mm/init.c
> > @@ -89,8 +89,8 @@ static void __init free_highpages(void)
> >       /* set highmem page free */
> >       for_each_free_mem_range(i, NUMA_NO_NODE, MEMBLOCK_NONE,
> >                               &range_start, &range_end, NULL) {
> > -             unsigned long start = PHYS_PFN(range_start);
> > -             unsigned long end = PHYS_PFN(range_end);
> > +             unsigned long start = PFN_UP(range_start);
> > +             unsigned long end = PFN_DOWN(range_end);
> >
> >               /* Ignore complete lowmem entries */
> >               if (end <= max_low)
> > --
> > 2.28.0
> >
> >
>
> --
> RMK's Patch system: https://www.armlinux.org.uk/developer/patches/
> FTTP is here! 40Mbps down 10Mbps up. Decent connectivity at last!

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

* Re: [PATCH] ARM, xtensa: highmem: avoid clobbering non-page aligned memory reservations
  2020-10-31 10:47   ` Ard Biesheuvel
@ 2020-10-31 11:03     ` Russell King - ARM Linux admin
  2020-10-31 11:21       ` Ard Biesheuvel
  0 siblings, 1 reply; 12+ messages in thread
From: Russell King - ARM Linux admin @ 2020-10-31 11:03 UTC (permalink / raw)
  To: Ard Biesheuvel
  Cc: linux-xtensa, Florian Fainelli, Chris Zankel, Linus Walleij,
	Linux Kernel Mailing List, Mike Rapoport, Max Filippov,
	Mike Rapoport, Linux ARM

On Sat, Oct 31, 2020 at 11:47:42AM +0100, Ard Biesheuvel wrote:
> On Sat, 31 Oct 2020 at 11:33, Russell King - ARM Linux admin
> <linux@armlinux.org.uk> wrote:
> >
> > On Sat, Oct 31, 2020 at 11:43:45AM +0200, Mike Rapoport wrote:
> > > From: Ard Biesheuvel <ardb@kernel.org>
> > >
> > > free_highpages() iterates over the free memblock regions in high
> > > memory, and marks each page as available for the memory management
> > > system.
> > >
> > > Until commit cddb5ddf2b76 ("arm, xtensa: simplify initialization of
> > > high memory pages") it rounded beginning of each region upwards and end of
> > > each region downwards.
> > >
> > > However, after that commit free_highmem() rounds the beginning and end of
> > > each region downwards, and we may end up freeing a page that is
> > > memblock_reserve()d, resulting in memory corruption.
> > >
> > > Restore the original rounding of the region boundaries to avoid freeing
> > > reserved pages.
> > >
> > > Fixes: cddb5ddf2b76 ("arm, xtensa: simplify initialization of high memory pages")
> > > Link: https://lore.kernel.org/r/20201029110334.4118-1-ardb@kernel.org/
> > > Signed-off-by: Ard Biesheuvel <ardb@kernel.org>
> > > Co-developed-by:  Mike Rapoport <rppt@linux.ibm.com>
> > > Signed-off-by: Mike Rapoport <rppt@linux.ibm.com>
> > > ---
> > >
> > > Max, Russell,
> > >
> > > Please let me know how do you prefer to take it upstream.
> > > If needed this can go via memblock tree.
> > >
> > > v2: fix words order in the commit message
> >
> > I really don't understand what is going on here; there seems to be a
> > total disconnect of communication between yourself and Ard. Ard has
> > already submitted a different patch for this to the patch system
> > already, sent yesterday.
> >
> > https://www.armlinux.org.uk/developer/patches/viewpatch.php?id=9021/1
> >
> > Please discuss between yourselves how you want to solve the problem,
> > and then submit an agreed and tested patch to those of us upstream;
> > please don't make it for those upstream to pick one of your patches
> > as you are at present.
> >
> 
> Apologies for creating this confusion. I posted a patch and dropped it
> into the patch system when I found the bug.
> 
> However, only when Florian asked about a 'fixes' tag, I went back to
> the history, and realized that the issue was introduced by Mike during
> the most recent merge window, and affects xtensa as well.

So why does Mike's patch have:

Signed-off-by: Ard Biesheuvel <ardb@kernel.org>

in it? It seems you haven't been directly involved in Mike's patch.

There's something /really/ not right with the process behind this
patch.

> I don't have a preference which patch gets applied, though, so please
> indicate your preference, and we will adapt accordingly.

I asked for you both to come to a concensus about how you want to
proceed, and now you're throwing it back on to me to solve your(pl)
mis-communication issue. We haven't heard from Mike yet.

Clearly, I wasn't blunt and stroppy enough to be properly understood.
Sort it out between yourselves and tell me which patch you want me to
apply.

-- 
RMK's Patch system: https://www.armlinux.org.uk/developer/patches/
FTTP is here! 40Mbps down 10Mbps up. Decent connectivity at last!

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

* Re: [PATCH] ARM, xtensa: highmem: avoid clobbering non-page aligned memory reservations
  2020-10-31 11:03     ` Russell King - ARM Linux admin
@ 2020-10-31 11:21       ` Ard Biesheuvel
  2020-10-31 15:45         ` Mike Rapoport
  0 siblings, 1 reply; 12+ messages in thread
From: Ard Biesheuvel @ 2020-10-31 11:21 UTC (permalink / raw)
  To: Russell King - ARM Linux admin
  Cc: linux-xtensa, Florian Fainelli, Chris Zankel, Linus Walleij,
	Linux Kernel Mailing List, Mike Rapoport, Max Filippov,
	Mike Rapoport, Linux ARM

On Sat, 31 Oct 2020 at 12:04, Russell King - ARM Linux admin
<linux@armlinux.org.uk> wrote:
>
> On Sat, Oct 31, 2020 at 11:47:42AM +0100, Ard Biesheuvel wrote:
> > On Sat, 31 Oct 2020 at 11:33, Russell King - ARM Linux admin
> > <linux@armlinux.org.uk> wrote:
> > >
> > > On Sat, Oct 31, 2020 at 11:43:45AM +0200, Mike Rapoport wrote:
> > > > From: Ard Biesheuvel <ardb@kernel.org>
> > > >
> > > > free_highpages() iterates over the free memblock regions in high
> > > > memory, and marks each page as available for the memory management
> > > > system.
> > > >
> > > > Until commit cddb5ddf2b76 ("arm, xtensa: simplify initialization of
> > > > high memory pages") it rounded beginning of each region upwards and end of
> > > > each region downwards.
> > > >
> > > > However, after that commit free_highmem() rounds the beginning and end of
> > > > each region downwards, and we may end up freeing a page that is
> > > > memblock_reserve()d, resulting in memory corruption.
> > > >
> > > > Restore the original rounding of the region boundaries to avoid freeing
> > > > reserved pages.
> > > >
> > > > Fixes: cddb5ddf2b76 ("arm, xtensa: simplify initialization of high memory pages")
> > > > Link: https://lore.kernel.org/r/20201029110334.4118-1-ardb@kernel.org/
> > > > Signed-off-by: Ard Biesheuvel <ardb@kernel.org>
> > > > Co-developed-by:  Mike Rapoport <rppt@linux.ibm.com>
> > > > Signed-off-by: Mike Rapoport <rppt@linux.ibm.com>
> > > > ---
> > > >
> > > > Max, Russell,
> > > >
> > > > Please let me know how do you prefer to take it upstream.
> > > > If needed this can go via memblock tree.
> > > >
> > > > v2: fix words order in the commit message
> > >
> > > I really don't understand what is going on here; there seems to be a
> > > total disconnect of communication between yourself and Ard. Ard has
> > > already submitted a different patch for this to the patch system
> > > already, sent yesterday.
> > >
> > > https://www.armlinux.org.uk/developer/patches/viewpatch.php?id=9021/1
> > >
> > > Please discuss between yourselves how you want to solve the problem,
> > > and then submit an agreed and tested patch to those of us upstream;
> > > please don't make it for those upstream to pick one of your patches
> > > as you are at present.
> > >
> >
> > Apologies for creating this confusion. I posted a patch and dropped it
> > into the patch system when I found the bug.
> >
> > However, only when Florian asked about a 'fixes' tag, I went back to
> > the history, and realized that the issue was introduced by Mike during
> > the most recent merge window, and affects xtensa as well.
>
> So why does Mike's patch have:
>
> Signed-off-by: Ard Biesheuvel <ardb@kernel.org>
>
> in it? It seems you haven't been directly involved in Mike's patch.
>

Because I cc'ed him on the discussion following the patch that is now
in your patch system. So he took that patch and modified it, but
retained the original S-o-b and authorship.

> There's something /really/ not right with the process behind this
> patch.
>
> > I don't have a preference which patch gets applied, though, so please
> > indicate your preference, and we will adapt accordingly.
>
> I asked for you both to come to a concensus about how you want to
> proceed, and now you're throwing it back on to me to solve your(pl)
> mis-communication issue. We haven't heard from Mike yet.
>

I am not throwing it back to you. I merely indicated that I have no
preference, and since Mike is the one who introduced this issue in the
first place, I am expecting him to drive this. And indeed, we haven't
heard from him yet.

> Clearly, I wasn't blunt and stroppy enough to be properly understood.
> Sort it out between yourselves and tell me which patch you want me to
> apply.
>

I would like you to ack this version of the patch, and disregard the
one in the patch system, so that Mike can take this one through the
memblock tree where the issue originated in the first place.

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

* Re: [PATCH] ARM, xtensa: highmem: avoid clobbering non-page aligned memory reservations
  2020-10-31 11:21       ` Ard Biesheuvel
@ 2020-10-31 15:45         ` Mike Rapoport
  2020-11-04  8:51           ` Mike Rapoport
  0 siblings, 1 reply; 12+ messages in thread
From: Mike Rapoport @ 2020-10-31 15:45 UTC (permalink / raw)
  To: Ard Biesheuvel
  Cc: Russell King - ARM Linux admin, linux-xtensa, Florian Fainelli,
	Chris Zankel, Linus Walleij, Linux Kernel Mailing List,
	Mike Rapoport, Max Filippov, Linux ARM

On Sat, Oct 31, 2020 at 12:21:24PM +0100, Ard Biesheuvel wrote:
> On Sat, 31 Oct 2020 at 12:04, Russell King - ARM Linux admin
> <linux@armlinux.org.uk> wrote:
> >
> > On Sat, Oct 31, 2020 at 11:47:42AM +0100, Ard Biesheuvel wrote:
> > > On Sat, 31 Oct 2020 at 11:33, Russell King - ARM Linux admin
> > > <linux@armlinux.org.uk> wrote:
> > > >
> > > > On Sat, Oct 31, 2020 at 11:43:45AM +0200, Mike Rapoport wrote:
> > > > > From: Ard Biesheuvel <ardb@kernel.org>
> > > > >
> > > > > free_highpages() iterates over the free memblock regions in high
> > > > > memory, and marks each page as available for the memory management
> > > > > system.
> > > > >
> > > > > Until commit cddb5ddf2b76 ("arm, xtensa: simplify initialization of
> > > > > high memory pages") it rounded beginning of each region upwards and end of
> > > > > each region downwards.
> > > > >
> > > > > However, after that commit free_highmem() rounds the beginning and end of
> > > > > each region downwards, and we may end up freeing a page that is
> > > > > memblock_reserve()d, resulting in memory corruption.
> > > > >
> > > > > Restore the original rounding of the region boundaries to avoid freeing
> > > > > reserved pages.
> > > > >
> > > > > Fixes: cddb5ddf2b76 ("arm, xtensa: simplify initialization of high memory pages")
> > > > > Link: https://lore.kernel.org/r/20201029110334.4118-1-ardb@kernel.org/
> > > > > Signed-off-by: Ard Biesheuvel <ardb@kernel.org>
> > > > > Co-developed-by:  Mike Rapoport <rppt@linux.ibm.com>
> > > > > Signed-off-by: Mike Rapoport <rppt@linux.ibm.com>
> > > > > ---
> > > > >
> > > > > Max, Russell,
> > > > >
> > > > > Please let me know how do you prefer to take it upstream.
> > > > > If needed this can go via memblock tree.
> > > > >
> > > > > v2: fix words order in the commit message
> > > >
> > > > I really don't understand what is going on here; there seems to be a
> > > > total disconnect of communication between yourself and Ard. Ard has
> > > > already submitted a different patch for this to the patch system
> > > > already, sent yesterday.
> > > >
> > > > https://www.armlinux.org.uk/developer/patches/viewpatch.php?id=9021/1
> > > >
> > > > Please discuss between yourselves how you want to solve the problem,
> > > > and then submit an agreed and tested patch to those of us upstream;
> > > > please don't make it for those upstream to pick one of your patches
> > > > as you are at present.
> > > >
> > >
> > > Apologies for creating this confusion. I posted a patch and dropped it
> > > into the patch system when I found the bug.
> > >
> > > However, only when Florian asked about a 'fixes' tag, I went back to
> > > the history, and realized that the issue was introduced by Mike during
> > > the most recent merge window, and affects xtensa as well.
> >
> > So why does Mike's patch have:
> >
> > Signed-off-by: Ard Biesheuvel <ardb@kernel.org>
> >
> > in it? It seems you haven't been directly involved in Mike's patch.
> >
> 
> Because I cc'ed him on the discussion following the patch that is now
> in your patch system. So he took that patch and modified it, but
> retained the original S-o-b and authorship.

Right, that's exactly what happened.

> > There's something /really/ not right with the process behind this
> > patch.
> >
> > > I don't have a preference which patch gets applied, though, so please
> > > indicate your preference, and we will adapt accordingly.
> >
> > I asked for you both to come to a concensus about how you want to
> > proceed, and now you're throwing it back on to me to solve your(pl)
> > mis-communication issue. We haven't heard from Mike yet.
> >
> 
> I am not throwing it back to you. I merely indicated that I have no
> preference, and since Mike is the one who introduced this issue in the
> first place, I am expecting him to drive this. And indeed, we haven't
> heard from him yet.

I didn't know that Ard's patch was already in the patch system. I took
the patch from the list, updated it, added a fix for xtensa and resend
while retaining Ard's authourship and s-o-b.

> > Clearly, I wasn't blunt and stroppy enough to be properly understood.
> > Sort it out between yourselves and tell me which patch you want me to
> > apply.
> >
> 
> I would like you to ack this version of the patch, and disregard the
> one in the patch system, so that Mike can take this one through the
> memblock tree where the issue originated in the first place.

Agree.

-- 
Sincerely yours,
Mike.

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

* Re: [PATCH] ARM, xtensa: highmem: avoid clobbering non-page aligned memory reservations
  2020-10-31  9:43 [PATCH] ARM, xtensa: highmem: avoid clobbering non-page aligned memory reservations Mike Rapoport
  2020-10-31 10:33 ` Russell King - ARM Linux admin
@ 2020-10-31 16:37 ` Max Filippov
  2020-10-31 17:16   ` Mike Rapoport
  1 sibling, 1 reply; 12+ messages in thread
From: Max Filippov @ 2020-10-31 16:37 UTC (permalink / raw)
  To: Mike Rapoport
  Cc: linux-arm-kernel, open list:TENSILICA XTENSA PORT (xtensa),
	Ard Biesheuvel, Chris Zankel, Florian Fainelli, Linus Walleij,
	Mike Rapoport, Russell King, LKML

On Sat, Oct 31, 2020 at 2:43 AM Mike Rapoport <rppt@kernel.org> wrote:
> Please let me know how do you prefer to take it upstream.
> If needed this can go via memblock tree.

Going through the memblock tree sounds right to me.

-- 
Thanks.
-- Max

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

* Re: [PATCH] ARM, xtensa: highmem: avoid clobbering non-page aligned memory reservations
  2020-10-31 16:37 ` Max Filippov
@ 2020-10-31 17:16   ` Mike Rapoport
  2020-10-31 17:44     ` Max Filippov
  0 siblings, 1 reply; 12+ messages in thread
From: Mike Rapoport @ 2020-10-31 17:16 UTC (permalink / raw)
  To: Max Filippov
  Cc: linux-arm-kernel, open list:TENSILICA XTENSA PORT (xtensa),
	Ard Biesheuvel, Chris Zankel, Florian Fainelli, Linus Walleij,
	Mike Rapoport, Russell King, LKML

On Sat, Oct 31, 2020 at 09:37:09AM -0700, Max Filippov wrote:
> On Sat, Oct 31, 2020 at 2:43 AM Mike Rapoport <rppt@kernel.org> wrote:
> > Please let me know how do you prefer to take it upstream.
> > If needed this can go via memblock tree.
> 
> Going through the memblock tree sounds right to me.

Can I treat this as Ack?

> -- 
> Thanks.
> -- Max

-- 
Sincerely yours,
Mike.

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

* Re: [PATCH] ARM, xtensa: highmem: avoid clobbering non-page aligned memory reservations
  2020-10-31 17:16   ` Mike Rapoport
@ 2020-10-31 17:44     ` Max Filippov
  2020-11-04  8:35       ` Ard Biesheuvel
  0 siblings, 1 reply; 12+ messages in thread
From: Max Filippov @ 2020-10-31 17:44 UTC (permalink / raw)
  To: Mike Rapoport
  Cc: linux-arm-kernel, open list:TENSILICA XTENSA PORT (xtensa),
	Ard Biesheuvel, Chris Zankel, Florian Fainelli, Linus Walleij,
	Mike Rapoport, Russell King, LKML

On Sat, Oct 31, 2020 at 10:16 AM Mike Rapoport <rppt@kernel.org> wrote:
>
> On Sat, Oct 31, 2020 at 09:37:09AM -0700, Max Filippov wrote:
> > On Sat, Oct 31, 2020 at 2:43 AM Mike Rapoport <rppt@kernel.org> wrote:
> > > Please let me know how do you prefer to take it upstream.
> > > If needed this can go via memblock tree.
> >
> > Going through the memblock tree sounds right to me.
>
> Can I treat this as Ack?

Sure, for the xtensa part:
Acked-by: Max Filippov <jcmvbkbc@gmail.com>

-- 
Thanks.
-- Max

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

* Re: [PATCH] ARM, xtensa: highmem: avoid clobbering non-page aligned memory reservations
  2020-10-31 17:44     ` Max Filippov
@ 2020-11-04  8:35       ` Ard Biesheuvel
  2020-11-04  8:49         ` Mike Rapoport
  0 siblings, 1 reply; 12+ messages in thread
From: Ard Biesheuvel @ 2020-11-04  8:35 UTC (permalink / raw)
  To: Max Filippov
  Cc: Mike Rapoport, Linux ARM,
	open list:TENSILICA XTENSA PORT (xtensa),
	Chris Zankel, Florian Fainelli, Linus Walleij, Mike Rapoport,
	Russell King, LKML

On Sat, 31 Oct 2020 at 18:44, Max Filippov <jcmvbkbc@gmail.com> wrote:
>
> On Sat, Oct 31, 2020 at 10:16 AM Mike Rapoport <rppt@kernel.org> wrote:
> >
> > On Sat, Oct 31, 2020 at 09:37:09AM -0700, Max Filippov wrote:
> > > On Sat, Oct 31, 2020 at 2:43 AM Mike Rapoport <rppt@kernel.org> wrote:
> > > > Please let me know how do you prefer to take it upstream.
> > > > If needed this can go via memblock tree.
> > >
> > > Going through the memblock tree sounds right to me.
> >
> > Can I treat this as Ack?
>
> Sure, for the xtensa part:
> Acked-by: Max Filippov <jcmvbkbc@gmail.com>
>

Could we get this queued up please?

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

* Re: [PATCH] ARM, xtensa: highmem: avoid clobbering non-page aligned memory reservations
  2020-11-04  8:35       ` Ard Biesheuvel
@ 2020-11-04  8:49         ` Mike Rapoport
  0 siblings, 0 replies; 12+ messages in thread
From: Mike Rapoport @ 2020-11-04  8:49 UTC (permalink / raw)
  To: Ard Biesheuvel
  Cc: Max Filippov, Linux ARM, open list:TENSILICA XTENSA PORT (xtensa),
	Chris Zankel, Florian Fainelli, Linus Walleij, Mike Rapoport,
	Russell King, LKML

On Wed, Nov 04, 2020 at 09:35:14AM +0100, Ard Biesheuvel wrote:
> On Sat, 31 Oct 2020 at 18:44, Max Filippov <jcmvbkbc@gmail.com> wrote:
> >
> > On Sat, Oct 31, 2020 at 10:16 AM Mike Rapoport <rppt@kernel.org> wrote:
> > >
> > > On Sat, Oct 31, 2020 at 09:37:09AM -0700, Max Filippov wrote:
> > > > On Sat, Oct 31, 2020 at 2:43 AM Mike Rapoport <rppt@kernel.org> wrote:
> > > > > Please let me know how do you prefer to take it upstream.
> > > > > If needed this can go via memblock tree.
> > > >
> > > > Going through the memblock tree sounds right to me.
> > >
> > > Can I treat this as Ack?
> >
> > Sure, for the xtensa part:
> > Acked-by: Max Filippov <jcmvbkbc@gmail.com>
> >
> 
> Could we get this queued up please?

It's in memblock/fixes now, I'd like to have it in next for day or two.

-- 
Sincerely yours,
Mike.

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

* Re: [PATCH] ARM, xtensa: highmem: avoid clobbering non-page aligned memory reservations
  2020-10-31 15:45         ` Mike Rapoport
@ 2020-11-04  8:51           ` Mike Rapoport
  0 siblings, 0 replies; 12+ messages in thread
From: Mike Rapoport @ 2020-11-04  8:51 UTC (permalink / raw)
  To: Russell King - ARM Linux admin, Ard Biesheuvel
  Cc: linux-xtensa, Florian Fainelli, Chris Zankel, Linus Walleij,
	Linux Kernel Mailing List, Mike Rapoport, Max Filippov,
	Linux ARM

Hi Russell,

On Sat, Oct 31, 2020 at 05:45:35PM +0200, Mike Rapoport wrote:
> On Sat, Oct 31, 2020 at 12:21:24PM +0100, Ard Biesheuvel wrote:
> > On Sat, 31 Oct 2020 at 12:04, Russell King - ARM Linux admin
> > <linux@armlinux.org.uk> wrote:
> > >
> > > Clearly, I wasn't blunt and stroppy enough to be properly understood.
> > > Sort it out between yourselves and tell me which patch you want me to
> > > apply.
> > >
> > 
> > I would like you to ack this version of the patch, and disregard the
> > one in the patch system, so that Mike can take this one through the
> > memblock tree where the issue originated in the first place.
 
Can I please have your ack and move forward with pushing this via
memblock tree?

-- 
Sincerely yours,
Mike.

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

end of thread, other threads:[~2020-11-04  8:51 UTC | newest]

Thread overview: 12+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-10-31  9:43 [PATCH] ARM, xtensa: highmem: avoid clobbering non-page aligned memory reservations Mike Rapoport
2020-10-31 10:33 ` Russell King - ARM Linux admin
2020-10-31 10:47   ` Ard Biesheuvel
2020-10-31 11:03     ` Russell King - ARM Linux admin
2020-10-31 11:21       ` Ard Biesheuvel
2020-10-31 15:45         ` Mike Rapoport
2020-11-04  8:51           ` Mike Rapoport
2020-10-31 16:37 ` Max Filippov
2020-10-31 17:16   ` Mike Rapoport
2020-10-31 17:44     ` Max Filippov
2020-11-04  8:35       ` Ard Biesheuvel
2020-11-04  8:49         ` Mike Rapoport

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 NNTP newsgroup(s).