From patchwork Wed Feb 10 09:42:15 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 12080277 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=-15.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED 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 36044C433DB for ; Wed, 10 Feb 2021 09:44:51 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id E1E3964DDF for ; Wed, 10 Feb 2021 09:44:50 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229969AbhBJJot (ORCPT ); Wed, 10 Feb 2021 04:44:49 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36388 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230071AbhBJJnL (ORCPT ); Wed, 10 Feb 2021 04:43:11 -0500 Received: from ozlabs.org (bilbo.ozlabs.org [IPv6:2401:3900:2:1::2]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0E10AC06174A; Wed, 10 Feb 2021 01:42:29 -0800 (PST) Received: from authenticated.ozlabs.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.ozlabs.org (Postfix) with ESMTPSA id 4DbFD04H3wz9sCD; Wed, 10 Feb 2021 20:42:23 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au; s=201702; t=1612950145; bh=J9lGZTrqX2s2/B1qIZ8e77GL8+B9fY0I9TXfY6sYe/8=; h=Date:From:To:Cc:Subject:From; b=uSThYFWrLYpUQEF0KWeH9xx8LK5CMonAm1c53irvHAtThiZ1R13V5ciblSWV3nwqz ClbXyKWxgpcvN9x0PtdID996yZ+jLypi8ztpKFJxw5lW0kcytsFWffMn3clvt0aFq5 9rPEQRAUulCyN7l9miCXY/iIHs8HgAfAwMvqlYO6yZeUHlLmh4P0HGuFGIVMCoBXF8 n5JdJQK8qD59qE/cjzTGezrLq3DlFbf4LtdB1YePV5AooTsy0urSC8hOUCTlqw0+Fe vqcTQCTmdVOAx50zJc4jqtYMfkCx+DLxopphIkP12vJuOdMMRuKMdOGaJvW9mjTJeS OGKjax5aiUBHg== Date: Wed, 10 Feb 2021 20:42:15 +1100 From: Stephen Rothwell To: Daniel Vetter , Paolo Bonzini , KVM Cc: Daniel Vetter , Linux Kernel Mailing List , Linux Next Mailing List Subject: linux-next: build failure after merge of the iomem-mmap-vs-gup tree Message-ID: <20210210204215.2912b80b@canb.auug.org.au> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org Hi all, After merging the iomem-mmap-vs-gup tree, today's linux-next build (powerpc ppc64_defconfig) failed like this: Caused by commit 96667f8a4382 ("mm: Close race in generic_access_phys") interacting with commit 9fd6dad1261a ("mm: provide a saner PTE walking API for modules") from the kvm tree. I have applied the following merge fix patch for today. From: Stephen Rothwell Date: Wed, 10 Feb 2021 20:29:22 +1100 Subject: [PATCH] mm: fixup for follow_pte() API change Signed-off-by: Stephen Rothwell --- mm/memory.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mm/memory.c b/mm/memory.c index b518bf4273d2..2c436e3a6259 100644 --- a/mm/memory.c +++ b/mm/memory.c @@ -4825,7 +4825,7 @@ int generic_access_phys(struct vm_area_struct *vma, unsigned long addr, return -EINVAL; retry: - if (follow_pte(vma->vm_mm, addr, NULL, &ptep, NULL, &ptl)) + if (follow_pte(vma->vm_mm, addr, &ptep, &ptl)) return -EINVAL; pte = *ptep; pte_unmap_unlock(ptep, ptl); @@ -4840,7 +4840,7 @@ int generic_access_phys(struct vm_area_struct *vma, unsigned long addr, if (!maddr) return -ENOMEM; - if (follow_pte(vma->vm_mm, addr, NULL, &ptep, NULL, &ptl)) + if (follow_pte(vma->vm_mm, addr, &ptep, &ptl)) goto out_unmap; if (!pte_same(pte, *ptep)) {