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=-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_RED 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 0DEF3C433E0 for ; Sun, 24 Jan 2021 05:02:07 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id A238E22D3E for ; Sun, 24 Jan 2021 05:02:06 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org A238E22D3E Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=linux-foundation.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 45BA96B0005; Sun, 24 Jan 2021 00:02:06 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 40C2B6B0027; Sun, 24 Jan 2021 00:02:06 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 2D6E76B0028; Sun, 24 Jan 2021 00:02:06 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0129.hostedemail.com [216.40.44.129]) by kanga.kvack.org (Postfix) with ESMTP id 192986B0005 for ; Sun, 24 Jan 2021 00:02:06 -0500 (EST) Received: from smtpin17.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay01.hostedemail.com (Postfix) with ESMTP id D0804180ACEE9 for ; Sun, 24 Jan 2021 05:02:05 +0000 (UTC) X-FDA: 77739471810.17.jelly47_5e17ded2757a Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin17.hostedemail.com (Postfix) with ESMTP id B8622180D0184 for ; Sun, 24 Jan 2021 05:02:05 +0000 (UTC) X-HE-Tag: jelly47_5e17ded2757a X-Filterd-Recvd-Size: 2986 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by imf20.hostedemail.com (Postfix) with ESMTP for ; Sun, 24 Jan 2021 05:02:05 +0000 (UTC) Received: by mail.kernel.org (Postfix) with ESMTPSA id 5C60F22CF6; Sun, 24 Jan 2021 05:02:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linux-foundation.org; s=korg; t=1611464524; bh=bbsjMM+yWgSR7ZuBAnbkfU6dGQOOg6KAHFhpLK/Fveo=; h=Date:From:To:Subject:In-Reply-To:From; b=AlP9WOmEmhH2p1sx7vr6sjDWq/uPSJfGnJcCjI9goPS+G5lOpmmajGhXxvLjk/3I+ hM5yjm4bea3nLcVuZeg7S6YmqecFTUF7Xsjc06c5TcuN+f8Jg7ZaDVYCoMmIDE8Sq2 AFoYdwnaspa/+O5b+FwkUr29/aoiXSBlzA89+cEE= Date: Sat, 23 Jan 2021 21:02:02 -0800 From: Andrew Morton To: akpm@linux-foundation.org, andreas@gaisler.com, davem@davemloft.net, linux-mm@kvack.org, mm-commits@vger.kernel.org, mpe@ellerman.id.au, paul@crapouillou.net, peterz@infradead.org, tglx@linutronix.de, torvalds@linux-foundation.org, tsbogend@alpha.franken.de Subject: [patch 15/19] mm/highmem: prepare for overriding set_pte_at() Message-ID: <20210124050202.jztUQWP25%akpm@linux-foundation.org> In-Reply-To: <20210123210029.a7c704d0cab204683e41ad10@linux-foundation.org> User-Agent: s-nail v14.8.16 X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: From: Thomas Gleixner Subject: mm/highmem: prepare for overriding set_pte_at() The generic kmap_local() map function uses set_pte_at(), but MIPS requires set_pte() and PowerPC wants __set_pte_at(). Provide arch_kmap_local_set_pte() and default it to set_pte_at(). Link: https://lkml.kernel.org/r/20210112170411.056306194@linutronix.de Signed-off-by: Thomas Gleixner Cc: Andreas Larsson Cc: "David S. Miller" Cc: Michael Ellerman Cc: Paul Cercueil Cc: Peter Zijlstra Cc: Thomas Bogendoerfer Signed-off-by: Andrew Morton --- mm/highmem.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) --- a/mm/highmem.c~mm-highmem-prepare-for-overriding-set_pte_at +++ a/mm/highmem.c @@ -473,6 +473,11 @@ static inline void *arch_kmap_local_high } #endif +#ifndef arch_kmap_local_set_pte +#define arch_kmap_local_set_pte(mm, vaddr, ptep, ptev) \ + set_pte_at(mm, vaddr, ptep, ptev) +#endif + /* Unmap a local mapping which was obtained by kmap_high_get() */ static inline bool kmap_high_unmap_local(unsigned long vaddr) { @@ -515,7 +520,7 @@ void *__kmap_local_pfn_prot(unsigned lon vaddr = __fix_to_virt(FIX_KMAP_BEGIN + idx); BUG_ON(!pte_none(*(kmap_pte - idx))); pteval = pfn_pte(pfn, prot); - set_pte_at(&init_mm, vaddr, kmap_pte - idx, pteval); + arch_kmap_local_set_pte(&init_mm, vaddr, kmap_pte - idx, pteval); arch_kmap_local_post_map(vaddr, pteval); current->kmap_ctrl.pteval[kmap_local_idx()] = pteval; preempt_enable(); _