From patchwork Wed Apr 19 18:21:36 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 85527 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp595011vqo; Wed, 19 Apr 2023 11:45:38 -0700 (PDT) X-Google-Smtp-Source: AKy350YihlMZupeM7G0rJkgFypPP0ACtZDoEHBunZW0zrZEGzU9ioy0P5kcyjHaQJ35NQCKRQCfa X-Received: by 2002:a05:6a00:2d13:b0:63d:368c:97c2 with SMTP id fa19-20020a056a002d1300b0063d368c97c2mr4076119pfb.8.1681929938175; Wed, 19 Apr 2023 11:45:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1681929938; cv=none; d=google.com; s=arc-20160816; b=cSSNUpnH47s723c1SB/DcrWe+kGN7XZcf1rMSASD+upPt5JvzQFp//WvU5VoeIHC4j x6v0z6ApJtX192aIidSEULfEFP8cHlBWfgFLHMKaUOT4asoira4OUDU4cXrSAEmhX04/ XknCGYPmXfLqm4Fvo7fEXvhgmgtDksLJBlEfxqzaAOZPfr1sh/rDfBgwDDDVYk+RfJH1 h5s6Fvrq4ZZpy7xGs5HIQdeKvHq0ztK8HnIE2EE71dhBymUiIKFG7C1hkbSxNT3lgTOv q3bXh5bIUP2yXLRQvInoDAFEDXtfn5TqWQ/tBxjpUVT2+WPaTkH4pnsfX06Kjl635u3w R+Xw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=ESc+J9vsiQEDGk0foRsgnbyDW8TOJY5eBqpoUf+NlaM=; b=prCv3tLF/LdXJ7qq32WA11Tt3C3O4767kxiZumPTcrePNC02QfiwCnFATkOAGHGlaQ LUVhI3hvUnBs/OUW0Jk2lwmtU/I9t7qV+qJaF+MZVKYX4oa9dQA4CspF8ZOOUmWB92al CHLcQgCgEQQW9ovbtbJYA1v9D9vrtCbL3KadQPp0LvWpu6dp49EXjGsHEX+SHMmPPxBX MahoZdcGC3U+LbdlTqwzk4dpsxbnJS7PlEmZO+7wCXCGognankMLWjqAJWqcDv41hklK SexDA4sKZ1H2ZO5WJE6GLCnGtMNIvURP5Iky+yo5lMYi6L6EZcKidLpZbr/CEBBx/B6N 9n8g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=QGhMALOj; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id h9-20020a056a00000900b0063cdf2e10fasi7709194pfk.212.2023.04.19.11.45.24; Wed, 19 Apr 2023 11:45:38 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=QGhMALOj; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233079AbjDSSWD (ORCPT + 99 others); Wed, 19 Apr 2023 14:22:03 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41168 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231482AbjDSSWC (ORCPT ); Wed, 19 Apr 2023 14:22:02 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7F7B983F6; Wed, 19 Apr 2023 11:21:50 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 180566417A; Wed, 19 Apr 2023 18:21:50 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id D79A1C433D2; Wed, 19 Apr 2023 18:21:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1681928509; bh=uXSdIo80daIsIj3rcz4D58UVn7dC1eLHNlCvy7csydk=; h=From:To:Cc:Subject:Date:From; b=QGhMALOjpQjkIlfYbhy254oioZ4ITd59f35AIwY11yMJcj6rQCI0fpuAk9F8ZGaWU +RcJYqF191I/sPZswjuCx0cf2IEBkzZMiHPI4sv87LO82N6gEcPoEZwaqEvQo4SQMn oWZ5zsieRgZakR2lwsGtG2/Q31lNKYNpnrYilRM5JdHDXaC0MQYWM8jvs5blATZv7R zvvVqISjTcF7yntQidLVON4Yg6RCaSgv62LUaXS/Xd/JqB+tl72WnLcy+BL+EZqLVA XwrKRLmRudmwujTCKFtMdONQKJxd41+bnYpBSKmjLQaJxMhbPo7JUWcXL0zjRGhsZO 30asrtav1XADw== From: broonie@kernel.org To: David Hildenbrand , "Kirill A . Shutemov" , Thomas Gleixner , Ingo Molnar , "H . Peter Anvin" , Peter Zijlstra , Rick Edgecombe , Dave Hansen , Kees Cook , Borislav Petkov , Mike Rapoport , Michael Ellerman Cc: Mel Gorman , Peter Xu , Andrew Morton , Linux Kernel Mailing List , Linux Next Mailing List Subject: linux-next: Build failure after merge of the tip tree Date: Wed, 19 Apr 2023 19:21:36 +0100 Message-Id: <20230419182136.112974-1-broonie@kernel.org> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 X-Spam-Status: No, score=-7.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1763631366929364902?= X-GMAIL-MSGID: =?utf-8?q?1763631366929364902?= Hi all, After merging the rcu tree, today's linux-next build (arm64 defconfig) failed like this: /tmp/next/build/mm/migrate.c: In function 'remove_migration_pte': /tmp/next/build/mm/migrate.c:222:31: error: too few arguments to function 'pte_mkwrite' 222 | pte = pte_mkwrite(pte); | ^~~~~~~~~~~ In file included from /tmp/next/build/include/linux/pgtable.h:6, from /tmp/next/build/include/linux/mm.h:29, from /tmp/next/build/include/linux/migrate.h:5, from /tmp/next/build/mm/migrate.c:16: /tmp/next/build/arch/arm64/include/asm/pgtable.h:190:21: note: declared here 190 | static inline pte_t pte_mkwrite(pte_t pte, struct vm_area_struct *vma) | ^~~~~~~~~~~ Caused by commit 717f95b494ac36 ("mm: don't check VMA write permissions if the PTE/PMD indicates write permissions") from the mm tree interacting with 74fd30bd28e4c7 ("mm: Make pte_mkwrite() take a VMA") from the tip tree. I've applied the fixup below diff --git a/mm/huge_memory.c b/mm/huge_memory.c index 1cc86d0a669e8..c3cc20c1b26cb 100644 --- a/mm/huge_memory.c +++ b/mm/huge_memory.c @@ -2235,7 +2235,7 @@ static void __split_huge_pmd_locked(struct vm_area_struct *vma, pmd_t *pmd, } else { entry = mk_pte(page + i, READ_ONCE(vma->vm_page_prot)); if (write) - entry = pte_mkwrite(entry); + entry = pte_mkwrite(entry, vma); if (anon_exclusive) SetPageAnonExclusive(page + i); if (!young) @@ -3272,7 +3272,7 @@ void remove_migration_pmd(struct page_vma_mapped_walk *pvmw, struct page *new) if (pmd_swp_soft_dirty(*pvmw->pmd)) pmde = pmd_mksoft_dirty(pmde); if (is_writable_migration_entry(entry)) - pmde = pmd_mkwrite(pmde); + pmde = pmd_mkwrite(pmde, vma); if (pmd_swp_uffd_wp(*pvmw->pmd)) pmde = pmd_mkuffd_wp(pmde); if (!is_migration_entry_young(entry)) diff --git a/mm/migrate.c b/mm/migrate.c index 01cac26a31279..8b46b722f1a44 100644 --- a/mm/migrate.c +++ b/mm/migrate.c @@ -219,7 +219,7 @@ static bool remove_migration_pte(struct folio *folio, if (folio_test_dirty(folio) && is_migration_entry_dirty(entry)) pte = pte_mkdirty(pte); if (is_writable_migration_entry(entry)) - pte = pte_mkwrite(pte); + pte = pte_mkwrite(pte, vma); else if (pte_swp_uffd_wp(*pvmw.pte)) pte = pte_mkuffd_wp(pte);