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=-8.2 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_SANE_1 autolearn=unavailable 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 244B3C433E4 for ; Fri, 10 Jul 2020 15:25:25 +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 E661420720 for ; Fri, 10 Jul 2020 15:25:24 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="GwXx/MZN" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org E661420720 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=RdUyReIlf8d24rAZw0MXdOZMnzN9vmALqGnTisBdTPE=; b=GwXx/MZNlHVBvdiJ7QMcuI21J De5I4Qv9i2SrJ6ZmPiFmZEZBZJf/T0nXBgTxETUgJkjbCI5sTQAVkPF/KslFedvQOGLUAQkrIt8v2 88LxzKtTi2wFgvWC1yTfGUAmHn8L/h+9X9jmOAOQCC99yf+dGSYJkQdBAaoTJ75s5tzumxoDbgRel tuhdhDCBu4o/IegRkawyZZK68CCmm66ua7/BqgRC2NTCwhaajzZSc8laF0sCiDHWV/Y2Qa0MXYzvN PiUiBFSUy0WofEUJ3+HTQGU68HOOZkjVKenFC8dKoTFKkNMxLSD4GRZxH6JF27ZHQ4NuKPOJ8tVVC BIJflBaEA==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1jtusf-00083o-Kf; Fri, 10 Jul 2020 15:24:05 +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 1jtusd-000837-AF for linux-arm-kernel@lists.infradead.org; Fri, 10 Jul 2020 15:24:04 +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 B4C3320767; Fri, 10 Jul 2020 15:24:00 +0000 (UTC) Date: Fri, 10 Jul 2020 16:23:58 +0100 From: Catalin Marinas To: Peter Xu Subject: Re: Build failure in -next with get_user_pages_remote() API change Message-ID: <20200710152357.GC11839@gaia> References: <20200710113201.GC5653@sirena.org.uk> <20200710122457.GK199122@xz-x1> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20200710122457.GK199122@xz-x1> 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-20200710_112403_419509_D88F3135 X-CRM114-Status: GOOD ( 19.44 ) 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 , Steven Price , Mark Brown , linux-next@vger.kernel.org, Andrew Morton , 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 08:24:57AM -0400, Peter Xu wrote: > On Fri, Jul 10, 2020 at 12:32:01PM +0100, Mark Brown wrote: > > Today's -next fails to build in various arm64 configs with: > > > > arch/arm64/kernel/mte.c:225:23: error: too many arguments to function call, expected 7, have 8 > > &page, &vma, NULL); > > ^~~~ > > ./include/linux/stddef.h:8:14: note: expanded from macro 'NULL' > > #define NULL ((void *)0) > > ^~~~~~~~~~~ > > ./include/linux/mm.h:1705:6: note: 'get_user_pages_remote' declared here > > long get_user_pages_remote(struct mm_struct *mm, > > ^ > > 1 error generated. > > > > caused by b7363b0ab88d66d3c (mm/gup: remove task_struct pointer for all > > gup code) which updated the signature of get_user_pages_remote() without > > updating the caller in mte.c. > > We should need to squash into "mm/gup: remove task_struct pointer for all gup > code" with: > > diff --git a/arch/arm64/kernel/mte.c b/arch/arm64/kernel/mte.c > index 934639ab225d..11e558b02a05 100644 > --- 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). -- Catalin _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel