| Message ID | 20190815045543.16325-1-alastair@au1.ibm.com (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | powerpc: Allow flush_(inval_)dcache_range to work across ranges >4GB | expand |
| Context | Check | Description |
|---|---|---|
| snowpatch_ozlabs/apply_patch | warning | Failed to apply on branch next (da206bd46848568e1aaf35f00e2d78bf9bc94f95) |
| snowpatch_ozlabs/apply_patch | fail | Failed to apply to any branch |
On Thu, Aug 15, 2019 at 02:55:42PM +1000, Alastair D'Silva wrote: > From: Alastair D'Silva <alastair@d-silva.org> > > Heads Up: This patch cannot be submitted to Linus's tree, as the affected > assembler functions have already been converted to C. > > When calling flush_(inval_)dcache_range with a size >4GB, we were masking > off the upper 32 bits, so we would incorrectly flush a range smaller > than intended. > > This patch replaces the 32 bit shifts with 64 bit ones, so that > the full size is accounted for. > > Signed-off-by: Alastair D'Silva <alastair@d-silva.org> > --- > arch/powerpc/kernel/misc_64.S | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) <formletter> This is not the correct way to submit patches for inclusion in the stable kernel tree. Please read: https://www.kernel.org/doc/html/latest/process/stable-kernel-rules.html for how to do this properly. </formletter>
Greg Kroah-Hartman <gregkh@linuxfoundation.org> writes: > On Thu, Aug 15, 2019 at 02:55:42PM +1000, Alastair D'Silva wrote: >> From: Alastair D'Silva <alastair@d-silva.org> >> >> Heads Up: This patch cannot be submitted to Linus's tree, as the affected >> assembler functions have already been converted to C. That was done in upstream commit: 22e9c88d486a ("powerpc/64: reuse PPC32 static inline flush_dcache_range()") Which is a larger change that we don't want to backport. This patch is a minimal fix for stable trees. >> When calling flush_(inval_)dcache_range with a size >4GB, we were masking >> off the upper 32 bits, so we would incorrectly flush a range smaller >> than intended. >> >> This patch replaces the 32 bit shifts with 64 bit ones, so that >> the full size is accounted for. >> >> Signed-off-by: Alastair D'Silva <alastair@d-silva.org> >> --- >> arch/powerpc/kernel/misc_64.S | 4 ++-- >> 1 file changed, 2 insertions(+), 2 deletions(-) Acked-by: Michael Ellerman <mpe@ellerman.id.au> > <formletter> > > This is not the correct way to submit patches for inclusion in the > stable kernel tree. Please read: > https://www.kernel.org/doc/html/latest/process/stable-kernel-rules.html > for how to do this properly. > > </formletter> Hi Greg, This is "option 3", submit the patch directly, and the patch "deviates from the original upstream patch" because the upstream patch was a wholesale conversion from asm to C. This patch applies cleanly to v4.14 and v4.19. The change log should have mentioned which upstream patch it is not a backport of, is there anything else we should have done differently to avoid the formletter bot :) cheers
On Fri, Aug 16, 2019 at 11:42:22AM +1000, Michael Ellerman wrote: > Greg Kroah-Hartman <gregkh@linuxfoundation.org> writes: > > On Thu, Aug 15, 2019 at 02:55:42PM +1000, Alastair D'Silva wrote: > >> From: Alastair D'Silva <alastair@d-silva.org> > >> > >> Heads Up: This patch cannot be submitted to Linus's tree, as the affected > >> assembler functions have already been converted to C. > > That was done in upstream commit: > > 22e9c88d486a ("powerpc/64: reuse PPC32 static inline flush_dcache_range()") > > Which is a larger change that we don't want to backport. This patch is a > minimal fix for stable trees. > > > >> When calling flush_(inval_)dcache_range with a size >4GB, we were masking > >> off the upper 32 bits, so we would incorrectly flush a range smaller > >> than intended. > >> > >> This patch replaces the 32 bit shifts with 64 bit ones, so that > >> the full size is accounted for. > >> > >> Signed-off-by: Alastair D'Silva <alastair@d-silva.org> > >> --- > >> arch/powerpc/kernel/misc_64.S | 4 ++-- > >> 1 file changed, 2 insertions(+), 2 deletions(-) > > Acked-by: Michael Ellerman <mpe@ellerman.id.au> > > > <formletter> > > > > This is not the correct way to submit patches for inclusion in the > > stable kernel tree. Please read: > > https://www.kernel.org/doc/html/latest/process/stable-kernel-rules.html > > for how to do this properly. > > > > </formletter> > > Hi Greg, > > This is "option 3", submit the patch directly, and the patch "deviates > from the original upstream patch" because the upstream patch was a > wholesale conversion from asm to C. > > This patch applies cleanly to v4.14 and v4.19. > > The change log should have mentioned which upstream patch it is not a > backport of, is there anything else we should have done differently to > avoid the formletter bot :) That is exactly what you should have done. It needs to be VERY explicit as to why this is being submitted different from what upstream did, and to what trees it needs to go to and who is going to be responsible for when it breaks. And it will break :) thanks, greg k-h
On Fri, Aug 16, 2019 at 09:14:12AM +0200, Greg Kroah-Hartman wrote: > On Fri, Aug 16, 2019 at 11:42:22AM +1000, Michael Ellerman wrote: > > Greg Kroah-Hartman <gregkh@linuxfoundation.org> writes: > > > On Thu, Aug 15, 2019 at 02:55:42PM +1000, Alastair D'Silva wrote: > > >> From: Alastair D'Silva <alastair@d-silva.org> > > >> > > >> Heads Up: This patch cannot be submitted to Linus's tree, as the affected > > >> assembler functions have already been converted to C. > > > > That was done in upstream commit: > > > > 22e9c88d486a ("powerpc/64: reuse PPC32 static inline flush_dcache_range()") > > > > Which is a larger change that we don't want to backport. This patch is a > > minimal fix for stable trees. > > > > > > >> When calling flush_(inval_)dcache_range with a size >4GB, we were masking > > >> off the upper 32 bits, so we would incorrectly flush a range smaller > > >> than intended. > > >> > > >> This patch replaces the 32 bit shifts with 64 bit ones, so that > > >> the full size is accounted for. > > >> > > >> Signed-off-by: Alastair D'Silva <alastair@d-silva.org> > > >> --- > > >> arch/powerpc/kernel/misc_64.S | 4 ++-- > > >> 1 file changed, 2 insertions(+), 2 deletions(-) > > > > Acked-by: Michael Ellerman <mpe@ellerman.id.au> > > > > > <formletter> > > > > > > This is not the correct way to submit patches for inclusion in the > > > stable kernel tree. Please read: > > > https://www.kernel.org/doc/html/latest/process/stable-kernel-rules.html > > > for how to do this properly. > > > > > > </formletter> > > > > Hi Greg, > > > > This is "option 3", submit the patch directly, and the patch "deviates > > from the original upstream patch" because the upstream patch was a > > wholesale conversion from asm to C. > > > > This patch applies cleanly to v4.14 and v4.19. > > > > The change log should have mentioned which upstream patch it is not a > > backport of, is there anything else we should have done differently to > > avoid the formletter bot :) > > That is exactly what you should have done. It needs to be VERY explicit > as to why this is being submitted different from what upstream did, and > to what trees it needs to go to and who is going to be responsible for > when it breaks. And it will break :) And it needs to be done before I can apply it, I've dropped this thread from my queue now. thanks, greg k-h
diff --git a/arch/powerpc/kernel/misc_64.S b/arch/powerpc/kernel/misc_64.S index 1ad4089dd110..d4d096f80f4b 100644 --- a/arch/powerpc/kernel/misc_64.S +++ b/arch/powerpc/kernel/misc_64.S @@ -130,7 +130,7 @@ _GLOBAL_TOC(flush_dcache_range) subf r8,r6,r4 /* compute length */ add r8,r8,r5 /* ensure we get enough */ lwz r9,DCACHEL1LOGBLOCKSIZE(r10) /* Get log-2 of dcache block size */ - srw. r8,r8,r9 /* compute line count */ + srd. r8,r8,r9 /* compute line count */ beqlr /* nothing to do? */ mtctr r8 0: dcbst 0,r6 @@ -148,7 +148,7 @@ _GLOBAL(flush_inval_dcache_range) subf r8,r6,r4 /* compute length */ add r8,r8,r5 /* ensure we get enough */ lwz r9,DCACHEL1LOGBLOCKSIZE(r10)/* Get log-2 of dcache block size */ - srw. r8,r8,r9 /* compute line count */ + srd. r8,r8,r9 /* compute line count */ beqlr /* nothing to do? */ sync isync