All of lore.kernel.org
 help / color / mirror / Atom feed
From: Catalin Marinas <catalin.marinas@arm.com>
To: Andrew Morton <akpm@linux-foundation.org>
Cc: Peter Xu <peterx@redhat.com>, Mark Brown <broonie@kernel.org>,
	John Hubbard <jhubbard@nvidia.com>,
	linux-arm-kernel@lists.infradead.org, linux-next@vger.kernel.org,
	Will Deacon <will@kernel.org>,
	Steven Price <steven.price@arm.com>
Subject: Re: Build failure in -next with get_user_pages_remote() API change
Date: Thu, 23 Jul 2020 19:10:37 +0100	[thread overview]
Message-ID: <20200723181037.GA29530@gaia> (raw)
In-Reply-To: <20200710152858.73c25ad43921728d4d78f0f8@linux-foundation.org>

On Fri, Jul 10, 2020 at 03:28:58PM -0700, Andrew Morton wrote:
> On Fri, 10 Jul 2020 16:23:58 +0100 Catalin Marinas <catalin.marinas@arm.com> wrote:
> > > --- a/arch/arm64/kernel/mte.c
> > > +++ b/arch/arm64/kernel/mte.c
> > > @@ -221,7 +221,7 @@ static int __access_remote_tags(struct task_struct *tsk, struct mm_struct *mm,
> > >                 void *maddr;
> > >                 struct page *page = NULL;
> > >  
> > > -               ret = get_user_pages_remote(tsk, mm, addr, 1, gup_flags,
> > > +               ret = get_user_pages_remote(mm, addr, 1, gup_flags,
> > >                                             &page, &vma, NULL);
> > >                 if (ret <= 0)
> > >                         break;
> > > 
> > > Seems to be a new caller merged recently, so it got left behind during the
> > > rebases...  Sorry for not noticing that.
> > 
> > The mte code is only in -next but since it's based on 5.8-rc3, we can't
> > change it without breaking it.
> > 
> > Is there a stable branch somewhere with the gup patches? If not, I can
> > provisionally drop the affected MTE patches from -next and push them
> > upstream closer to the -rc1 (it's the ptrace support from MTE).
> 
> Is OK.  I restaged this patch series to come after linux-next's
> material and added Peter's fixup.  I'll merge this series into Linus
> after the ARM tree has merged so everything will land nicely.

Just a heads-up that I'll drop the arm64 MTE series from -next,
postponing the merging until 5.10 (there is an ongoing discussion on the
prctl() aspect and I don't want to be forced to change the user ABI
after upstreaming). You'll get another conflict for Peter's hunk above.

Thanks.

-- 
Catalin

WARNING: multiple messages have this Message-ID (diff)
From: Catalin Marinas <catalin.marinas@arm.com>
To: Andrew Morton <akpm@linux-foundation.org>
Cc: John Hubbard <jhubbard@nvidia.com>,
	Mark Brown <broonie@kernel.org>, Peter Xu <peterx@redhat.com>,
	Steven Price <steven.price@arm.com>,
	linux-next@vger.kernel.org, Will Deacon <will@kernel.org>,
	linux-arm-kernel@lists.infradead.org
Subject: Re: Build failure in -next with get_user_pages_remote() API change
Date: Thu, 23 Jul 2020 19:10:37 +0100	[thread overview]
Message-ID: <20200723181037.GA29530@gaia> (raw)
In-Reply-To: <20200710152858.73c25ad43921728d4d78f0f8@linux-foundation.org>

On Fri, Jul 10, 2020 at 03:28:58PM -0700, Andrew Morton wrote:
> On Fri, 10 Jul 2020 16:23:58 +0100 Catalin Marinas <catalin.marinas@arm.com> wrote:
> > > --- a/arch/arm64/kernel/mte.c
> > > +++ b/arch/arm64/kernel/mte.c
> > > @@ -221,7 +221,7 @@ static int __access_remote_tags(struct task_struct *tsk, struct mm_struct *mm,
> > >                 void *maddr;
> > >                 struct page *page = NULL;
> > >  
> > > -               ret = get_user_pages_remote(tsk, mm, addr, 1, gup_flags,
> > > +               ret = get_user_pages_remote(mm, addr, 1, gup_flags,
> > >                                             &page, &vma, NULL);
> > >                 if (ret <= 0)
> > >                         break;
> > > 
> > > Seems to be a new caller merged recently, so it got left behind during the
> > > rebases...  Sorry for not noticing that.
> > 
> > The mte code is only in -next but since it's based on 5.8-rc3, we can't
> > change it without breaking it.
> > 
> > Is there a stable branch somewhere with the gup patches? If not, I can
> > provisionally drop the affected MTE patches from -next and push them
> > upstream closer to the -rc1 (it's the ptrace support from MTE).
> 
> Is OK.  I restaged this patch series to come after linux-next's
> material and added Peter's fixup.  I'll merge this series into Linus
> after the ARM tree has merged so everything will land nicely.

Just a heads-up that I'll drop the arm64 MTE series from -next,
postponing the merging until 5.10 (there is an ongoing discussion on the
prctl() aspect and I don't want to be forced to change the user ABI
after upstreaming). You'll get another conflict for Peter's hunk above.

Thanks.

-- 
Catalin

_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

  reply	other threads:[~2020-07-23 18:10 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-07-10 11:32 Build failure in -next with get_user_pages_remote() API change Mark Brown
2020-07-10 11:32 ` Mark Brown
2020-07-10 12:24 ` Peter Xu
2020-07-10 12:24   ` Peter Xu
2020-07-10 13:38   ` Peter Xu
2020-07-10 13:38     ` Peter Xu
2020-07-10 15:23   ` Catalin Marinas
2020-07-10 15:23     ` Catalin Marinas
2020-07-10 22:28     ` Andrew Morton
2020-07-10 22:28       ` Andrew Morton
2020-07-23 18:10       ` Catalin Marinas [this message]
2020-07-23 18:10         ` Catalin Marinas

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20200723181037.GA29530@gaia \
    --to=catalin.marinas@arm.com \
    --cc=akpm@linux-foundation.org \
    --cc=broonie@kernel.org \
    --cc=jhubbard@nvidia.com \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-next@vger.kernel.org \
    --cc=peterx@redhat.com \
    --cc=steven.price@arm.com \
    --cc=will@kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.