On Thu, Sep 30, 2021 at 08:46:04AM +1000, Michael Ellerman wrote: > Ard Biesheuvel <ardb@xxxxxxxxxx> writes: > > On Tue, 28 Sept 2021 at 02:16, Michael Ellerman <mpe@xxxxxxxxxxxxxx> wrote: > >> > >> Michael Ellerman <mpe@xxxxxxxxxxxxxx> writes: > >> > Ard Biesheuvel <ardb@xxxxxxxxxx> writes: > >> >> On Tue, 14 Sept 2021 at 14:11, Ard Biesheuvel <ardb@xxxxxxxxxx> wrote: > >> >>> > >> >>> The CPU field will be moved back into thread_info even when > >> >>> THREAD_INFO_IN_TASK is enabled, so add it back to powerpc's definition > >> >>> of struct thread_info. > >> >>> > >> >>> Signed-off-by: Ard Biesheuvel <ardb@xxxxxxxxxx> > >> >> > >> >> Michael, > >> >> > >> >> Do you have any objections or issues with this patch or the subsequent > >> >> ones cleaning up the task CPU kludge for ppc32? Christophe indicated > >> >> that he was happy with it. > >> > > >> > No objections, it looks good to me, thanks for cleaning up that horror :) > >> > > >> > It didn't apply cleanly to master so I haven't tested it at all, if you can point me at a > >> > git tree with the dependencies I'd be happy to run some tests over it. > >> > >> Actually I realised I can just drop the last patch. > >> > >> So that looks fine, passes my standard quick build & boot on qemu tests, > >> and builds with/without stack protector enabled. > >> > > > > Thanks. > > > > Do you have any opinion on how this series should be merged? Kees Cook > > is willing to take them via his cross-arch tree, or you could carry > > them if you prefer. Taking it via multiple trees at the same time is > > going to be tricky, or take two cycles, with I'd prefer to avoid. > > I don't really mind. If Kees is happy to take it then that's OK by me. > > If Kees put the series in a topic branch based off rc2 then I could > merge that, and avoid any conflicts. I've created: git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git for-next/thread_info/cpu it includes a --no-ff merge commit, which I'm not sure is desirable? Let me know if I should adjust this, or if Linus will yell about this if I send him a PR containing a merge commit? I'm not sure what's right here. Thanks! -- Kees Cook
