From patchwork Tue Jan 26 04:45:08 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicholas Piggin X-Patchwork-Id: 12045213 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=-13.5 required=3.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED,DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FORGED_FROMDOMAIN, FREEMAIL_FROM,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, 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 89BADC433E0 for ; Tue, 26 Jan 2021 04:46:28 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 2C95C22B2C for ; Tue, 26 Jan 2021 04:46:28 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 2C95C22B2C Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id BD4FE8D0085; Mon, 25 Jan 2021 23:46:27 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id B85D48D0076; Mon, 25 Jan 2021 23:46:27 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id A9AFD8D0085; Mon, 25 Jan 2021 23:46:27 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0064.hostedemail.com [216.40.44.64]) by kanga.kvack.org (Postfix) with ESMTP id 940DE8D0076 for ; Mon, 25 Jan 2021 23:46:27 -0500 (EST) Received: from smtpin21.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay04.hostedemail.com (Postfix) with ESMTP id 567001EE6 for ; Tue, 26 Jan 2021 04:46:27 +0000 (UTC) X-FDA: 77746690014.21.wound61_2705d6a2758b Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin21.hostedemail.com (Postfix) with ESMTP id 3AF14180442C3 for ; Tue, 26 Jan 2021 04:46:27 +0000 (UTC) X-HE-Tag: wound61_2705d6a2758b X-Filterd-Recvd-Size: 4839 Received: from mail-pl1-f178.google.com (mail-pl1-f178.google.com [209.85.214.178]) by imf18.hostedemail.com (Postfix) with ESMTP for ; Tue, 26 Jan 2021 04:46:26 +0000 (UTC) Received: by mail-pl1-f178.google.com with SMTP id b8so9125907plh.12 for ; Mon, 25 Jan 2021 20:46:26 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=hrndBY8R68kIi1pHIRutw3ucH/2Px5UWTBnGPJp9HrY=; b=Kh7bj2IR06EDd1qGZ2t3ulwctmkhxiZs/U4o/vDOkXNuGmRG3EiJDvHyiw26B1KE/Z noBts4EDsXI7gbOV9ihyk6VX5ck9GK6f3W3T+PkS4vyUxs/Izt2qYf4wrsTriSkNDYwG 8K64qbx5re/qJBgvVDx6ImIm0xTaeBPkbVaexUyy4H8+lhfZpXxpTjpmv0ChdfpA8/Io NHmwmR26KBOHb/8slnYFAfQDKthfgoKBFsrBMSh+pFZkalrdy1KqFxovgB07EJpTs1F9 fV674H7DUCRmTRlID/NC6dsv8Uz5aa9E0xd99LlPyoF7PQxZswj7finw26pOve/Kewcd KSlw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=hrndBY8R68kIi1pHIRutw3ucH/2Px5UWTBnGPJp9HrY=; b=X7ijj5j9opujeFyN/2S+F7eDaNpih56lfTvt7XWGYj5VsoFZVqJdcmGQqBjeil52jt aqcb6JyIjctgTorfg9X5VWpx6/v371Hd9KfqQkNyppsvwxtsoOC/qv1FRf6MB4NUUp4N mFEPrC6cH4q7o+gBkHNeCyEmWbtMKd8HqpBPrp38FWXIBRcxE3188wv9PyOTQftHCqhf Mst0EpJcSTUf/siAjbzvQAEaVqfP2G3RXozkxI1FDJ08Plr4VaGWZvGjxH2JHSMqgFzB B44v0JA7KoCmFW5/88L53gNrE9jBHkM3c+2uLozkeUuozTZnEseB66CyrGyOh84g7iw2 ckOQ== X-Gm-Message-State: AOAM533ssdf23F9m9yi8Rz2yvcCqVZoyEKTRrDLjJzEWNZV9ZVfBMbHp 2/2Qy+fYPtrpxTDh7D1CLkvGZUNYVM8= X-Google-Smtp-Source: ABdhPJwxZpxVcs5+yRJ6hGh8RKOyIh9OTe/nY1FORrQk/LwAUAC2vXL/Za9+EjHe6HQoxPwvXVNlgw== X-Received: by 2002:a17:90b:350b:: with SMTP id ls11mr3967571pjb.166.1611636385804; Mon, 25 Jan 2021 20:46:25 -0800 (PST) Received: from bobo.ozlabs.ibm.com (192.156.221.203.dial.dynamic.acc50-nort-cbr.comindico.com.au. [203.221.156.192]) by smtp.gmail.com with ESMTPSA id 68sm19272293pfg.90.2021.01.25.20.46.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 25 Jan 2021 20:46:25 -0800 (PST) From: Nicholas Piggin To: linux-mm@kvack.org, Andrew Morton Cc: Nicholas Piggin , linux-kernel@vger.kernel.org, linux-arch@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, Jonathan Cameron , Christoph Hellwig , Christophe Leroy , Rick Edgecombe , Ding Tianhong , Christoph Hellwig Subject: [PATCH v11 11/13] mm/vmalloc: add vmap_range_noflush variant Date: Tue, 26 Jan 2021 14:45:08 +1000 Message-Id: <20210126044510.2491820-12-npiggin@gmail.com> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20210126044510.2491820-1-npiggin@gmail.com> References: <20210126044510.2491820-1-npiggin@gmail.com> MIME-Version: 1.0 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: As a side-effect, the order of flush_cache_vmap() and arch_sync_kernel_mappings() calls are switched, but that now matches the other callers in this file. Reviewed-by: Christoph Hellwig Signed-off-by: Nicholas Piggin --- mm/vmalloc.c | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/mm/vmalloc.c b/mm/vmalloc.c index f043386bb51d..47ab4338cfff 100644 --- a/mm/vmalloc.c +++ b/mm/vmalloc.c @@ -240,7 +240,7 @@ static int vmap_p4d_range(pgd_t *pgd, unsigned long addr, unsigned long end, return 0; } -int vmap_range(unsigned long addr, unsigned long end, +static int vmap_range_noflush(unsigned long addr, unsigned long end, phys_addr_t phys_addr, pgprot_t prot, unsigned int max_page_shift) { @@ -263,14 +263,24 @@ int vmap_range(unsigned long addr, unsigned long end, break; } while (pgd++, phys_addr += (next - addr), addr = next, addr != end); - flush_cache_vmap(start, end); - if (mask & ARCH_PAGE_TABLE_SYNC_MASK) arch_sync_kernel_mappings(start, end); return err; } +int vmap_range(unsigned long addr, unsigned long end, + phys_addr_t phys_addr, pgprot_t prot, + unsigned int max_page_shift) +{ + int err; + + err = vmap_range_noflush(addr, end, phys_addr, prot, max_page_shift); + flush_cache_vmap(addr, end); + + return err; +} + static void vunmap_pte_range(pmd_t *pmd, unsigned long addr, unsigned long end, pgtbl_mod_mask *mask) {