From patchwork Wed Mar 31 18:23:44 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zack Rusin X-Patchwork-Id: 12175903 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=-16.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham 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 84117C433B4 for ; Wed, 31 Mar 2021 18:25:30 +0000 (UTC) Received: from desiato.infradead.org (desiato.infradead.org [90.155.92.199]) (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 28AE760238 for ; Wed, 31 Mar 2021 18:25:30 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 28AE760238 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=vmware.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=desiato.20200630; h=Sender:Content-Transfer-Encoding :Content-Type:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:Message-ID:Date:Subject:CC:To:From: Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender :Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Owner; bh=M/mfEVBn/kPMsofUWQcXrWd5lm037k5QBZe/r3OC/vs=; b=fsk8AecWlXLpklH8QwSBWaUj3l WXKrkRhQYPKIAsI7EDgxNwVmjvQNTo7LcDjx+/Q+rZgSmYityNsb770EspoQUvVFaKe2SUb08027i p/8CZp+Xn8BKStFNOeuoEk7UWhI5Inl3M3D6KSnS5rYB8n5+8Rhc3fO9NrWChDZ4bLjm1jz9442WL FWhS++3Dk04WXVQExR1T8pf0/g0AEKzvzLHS/rqVZ5V5w5T65nxfPqzlq67Wn/By44gl5H8tJTMN3 xqiS9Nq2VyxU3cx1yHcvCm8L3pQn3G5CGmn70jA8iqm54Oq07gHDXoXqVX5fOj6OUBksxzajZ5Klf 0jG4xeGg==; Received: from localhost ([::1] helo=desiato.infradead.org) by desiato.infradead.org with esmtp (Exim 4.94 #2 (Red Hat Linux)) id 1lRfVg-007HoR-Mn; Wed, 31 Mar 2021 18:24:08 +0000 Received: from ex13-edg-ou-001.vmware.com ([208.91.0.189]) by desiato.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1lRfVX-007HmK-83 for linux-arm-kernel@lists.infradead.org; Wed, 31 Mar 2021 18:24:00 +0000 Received: from sc9-mailhost2.vmware.com (10.113.161.72) by EX13-EDG-OU-001.vmware.com (10.113.208.155) with Microsoft SMTP Server id 15.0.1156.6; Wed, 31 Mar 2021 11:23:41 -0700 Received: from vertex.vmware.com (unknown [10.16.120.226]) by sc9-mailhost2.vmware.com (Postfix) with ESMTP id C10DF20458; Wed, 31 Mar 2021 11:23:44 -0700 (PDT) From: Zack Rusin To: CC: Catalin Marinas , Will Deacon , Peter Zijlstra , Subject: [PATCH] arm64/mm: Fix mapping_dirty_helpers with arm64 Date: Wed, 31 Mar 2021 14:23:44 -0400 Message-ID: <20210331182344.47987-1-zackr@vmware.com> X-Mailer: git-send-email 2.27.0 MIME-Version: 1.0 Received-SPF: None (EX13-EDG-OU-001.vmware.com: zackr@vmware.com does not designate permitted sender hosts) X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210331_192359_352856_C611209B X-CRM114-Status: UNSURE ( 9.36 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org The pagetable walk callbacks in mm/mapping_dirty_helpers.c depend on a set of helpers from which pud_dirty(pud) was missing. I'm assuming mapping_dirty_helpers weren't used on ARM64 before because the missing pud_dirty is causing a compilation error. The drivers/gpu/drm/vmwgfx code uses mapping_dirty_helpers and has been ported to ARM64 but it depends on this code getting in first in order to compile/work. Cc: Catalin Marinas Cc: Will Deacon Cc: Peter Zijlstra Cc: linux-arm-kernel@lists.infradead.org Signed-off-by: Zack Rusin --- arch/arm64/include/asm/pgtable.h | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/arm64/include/asm/pgtable.h b/arch/arm64/include/asm/pgtable.h index 47027796c2f9..ecd80f87a996 100644 --- a/arch/arm64/include/asm/pgtable.h +++ b/arch/arm64/include/asm/pgtable.h @@ -451,6 +451,7 @@ static inline pmd_t pmd_mkdevmap(pmd_t pmd) #define pfn_pmd(pfn,prot) __pmd(__phys_to_pmd_val((phys_addr_t)(pfn) << PAGE_SHIFT) | pgprot_val(prot)) #define mk_pmd(page,prot) pfn_pmd(page_to_pfn(page),prot) +#define pud_dirty(pud) pte_dirty(pud_pte(pud)) #define pud_young(pud) pte_young(pud_pte(pud)) #define pud_mkyoung(pud) pte_pud(pte_mkyoung(pud_pte(pud))) #define pud_write(pud) pte_write(pud_pte(pud))