On 11 May 2016 at 07:46, Ard Biesheuvel <[email protected]> wrote: > On 10 May 2016 at 23:07, Mathias Krause <[email protected]> wrote: >> The x86 exception table sorting was changed in commit 29934b0fb8ff >> ("x86/extable: use generic search and sort routines") to use the arch >> independent code in lib/extable.c. However, the patch was mangled >> somehow on its way into the kernel from the last version posted at [1]. >> The committed version kind of attempted to incorporate the changes of >> commit 548acf19234d ("x86/mm: Expand the exception table logic to allow >> new handling options") as in _completely_ _ignoring_ the x86 specific >> 'handler' member of struct exception_table_entry. This effectively broke >> the sorting as entries will only partly be swapped now. >> > > OK, it appears that Tony's patches grew a 'handler' field fairly late > in their review cycle, and I didn't pick up on that. Apologies.
No need to apologize, as your patch *must* have created conflicts for the committer applying it. It's just that those conflicts were resolved wrongly. He/She should have asked you for a new version, but... did not :/ >> Fortunately, the x86 Kconfig selects BUILDTIME_EXTABLE_SORT, so the >> exception table doesn't need to be sorted at runtime. However, in case >> that ever changes, we better not break the exception table sorting just >> because of that. >> > > BUILDTIME_EXTABLE_SORT applies to the core image only, but we still > rely on the sorting routines for modules in that case. So I think this > needs to be fixed right away. Good point! > >> Fix this by providing a swap_ex_entry_fixup() macro that takes care of >> the 'handler' member. >> >> [1] https://lkml.org/lkml/2016/1/27/232 >> >> Signed-off-by: Mathias Krause <[email protected]> >> Cc: Andrew Morton <[email protected]> >> Cc: Andy Lutomirski <[email protected]> >> Cc: Ard Biesheuvel <[email protected]> >> Cc: Borislav Petkov <[email protected]> >> Cc: H. Peter Anvin <[email protected]> >> Cc: Ingo Molnar <[email protected]> >> Cc: Linus Torvalds <[email protected]> >> Cc: Thomas Gleixner <[email protected]> >> Cc: Tony Luck <[email protected]> > > Fixes: 29934b0fb8f ("x86/extable: use generic search and sort routines") > Reviewed-by: Ard Biesheuvel <[email protected]> > > Thanks, > Ard. > Thanks, Mathias
