[PATCH] arm64: fix endianness annotation for __apply_alternatives()/get_alt_insn()

Luc Van Oostenryck luc.vanoostenryck at gmail.com
Thu Jun 29 06:26:47 PDT 2017


On Thu, Jun 29, 2017 at 11:28:51AM +0100, Will Deacon wrote:
> On Wed, Jun 28, 2017 at 04:55:57PM +0200, Luc Van Oostenryck wrote:
> > get_alt_insn() is used to read and create ARM instructions, which
> > are always stored in memory in little-endian order. These values
> > are thus correctly converted to/from native order when processed
> > but the pointers used to hold the address of these instructions
> > are declared as for native order values.
> > 
> > Fix this by declaring the pointers as __le32* instead of u32* and
> > make the few appropriate needed changes.
> > 
> > +		origptr = (__le32 __force *) ALT_ORIG_PTR(alt);
> > +		replptr = (__le32 __force *) ALT_REPL_PTR(alt);
> 
> Why is the __force needed here?

Because of the cast to u32* in:
	#define ALT_ORIG_PTR(a)         __ALT_PTR(a, orig_offset)
	#define ALT_REPL_PTR(a)         __ALT_PTR(a, alt_offset)
	#define __ALT_PTR(a,f)          (u32 *)((void *)&(a)->f + (a)->f)

Of course, if this (u32*) is not really needed, then the __force
is also not needed.

And since, it seems indeed to be the case, I'll gladly sent a patch:
	-#define __ALT_PTR(a,f)          (u32 *)((void *)&(a)->f + (a)->f)
	+#define __ALT_PTR(a,f)          ((void *)&(a)->f + (a)->f)
if it suits you.

-- Luc



More information about the linux-arm-kernel mailing list