From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.5 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_1 autolearn=no autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5379AC433E1 for ; Thu, 23 Jul 2020 18:12:08 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 113F320714 for ; Thu, 23 Jul 2020 18:12:08 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="muHIE4sI" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 113F320714 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=arm.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:References:Message-ID: Subject:To:From:Date:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=lXdcB4cGjhqRVxtj2j3FngH31nSPXBQRXW13xiE69R0=; b=muHIE4sINpH409rUsGDcBO1em BbuUIyxs9tTFyKiHXOYs4FsjWJOqEE0+KbEqA3TbmzCA1kHlZNEC+SXcFIqk+HgXkTPT5r0k+pp7M PZsOCy51oR+zQhH3iGsVlmyHWDX1i8mrXfbrsEgue78pQWk3KAdGkbEN1uhjnUF1lD89Y5YD7oy+c S6X5DBE1oR8BJcT5TYyfDAZagXmhb3/I8uJP03MS5UaJ5MDPBePTTs+nhk7zvywVgUeGXircoMJvn oEgM0skOo+BgmDYh6bvqe+EUarYSBcbnh+C76p4cTfNcVsiiDrtC8y0kM0xU8Q6NpbPe5aCRi97Bz LXRXi1UEA==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1jyfg5-0003jA-45; Thu, 23 Jul 2020 18:10:45 +0000 Received: from mail.kernel.org ([198.145.29.99]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1jyfg2-0003ih-Lu for linux-arm-kernel@lists.infradead.org; Thu, 23 Jul 2020 18:10:43 +0000 Received: from gaia (unknown [95.146.230.158]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 4A13020714; Thu, 23 Jul 2020 18:10:40 +0000 (UTC) Date: Thu, 23 Jul 2020 19:10:37 +0100 From: Catalin Marinas To: Andrew Morton Subject: Re: Build failure in -next with get_user_pages_remote() API change Message-ID: <20200723181037.GA29530@gaia> References: <20200710113201.GC5653@sirena.org.uk> <20200710122457.GK199122@xz-x1> <20200710152357.GC11839@gaia> <20200710152858.73c25ad43921728d4d78f0f8@linux-foundation.org> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20200710152858.73c25ad43921728d4d78f0f8@linux-foundation.org> User-Agent: Mutt/1.10.1 (2018-07-13) X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200723_141042_778898_FE1DBDF5 X-CRM114-Status: GOOD ( 21.34 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: John Hubbard , Mark Brown , Peter Xu , Steven Price , linux-next@vger.kernel.org, Will Deacon , linux-arm-kernel@lists.infradead.org Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.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 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