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=-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 5E410C433DB for ; Tue, 2 Feb 2021 11:06:38 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 0E0A564DAF for ; Tue, 2 Feb 2021 11:06:38 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 0E0A564DAF 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 97B376B0071; Tue, 2 Feb 2021 06:06:37 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 903F66B0083; Tue, 2 Feb 2021 06:06:37 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 7F35A6B0085; Tue, 2 Feb 2021 06:06:37 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0212.hostedemail.com [216.40.44.212]) by kanga.kvack.org (Postfix) with ESMTP id 6A4076B0071 for ; Tue, 2 Feb 2021 06:06:37 -0500 (EST) Received: from smtpin28.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay02.hostedemail.com (Postfix) with ESMTP id 337A73630 for ; Tue, 2 Feb 2021 11:06:37 +0000 (UTC) X-FDA: 77773049634.28.yard00_30138a6275ca Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin28.hostedemail.com (Postfix) with ESMTP id 0F6B86C1A for ; Tue, 2 Feb 2021 11:06:37 +0000 (UTC) X-HE-Tag: yard00_30138a6275ca X-Filterd-Recvd-Size: 4855 Received: from mail-pl1-f179.google.com (mail-pl1-f179.google.com [209.85.214.179]) by imf24.hostedemail.com (Postfix) with ESMTP for ; Tue, 2 Feb 2021 11:06:36 +0000 (UTC) Received: by mail-pl1-f179.google.com with SMTP id x9so6361457plb.5 for ; Tue, 02 Feb 2021 03:06:36 -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=Q54VSUyxFjq2LjEeAJPNCU+WR/2kVaNjZk0Za03INShYBYMhttc3N1NUHL8847fVRe VSV5Rei6EI7nFdF3pwZ2uOgu9iQwSWdeE0Dw7rB+pYopphuQUNVaSqCCTMbZhsQU4u2K 0NgsEQRVnBDvlh8VkwnQPzb4LWG7wrbTmw39IukkODmXHpxSu6gMxhNJBvOAdnC24OqL rzjtQckiW5DLg38VK2eDDwKAxn8b69a/UBiF3QjrhShfJZ9eXz9qJCD8f/bEyqyHF+1t gKKEfDyAghVhHxbs8rpruo8U7ouDGssyNUMrKY0CYNQvacFpXZog2qGClmKyim4Hief8 pIeQ== 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=C8Hz5tSqq4ysovkVJrN+DuIbmgoAe0y4dASQYAcV+qAd3K1V+prUX7jruNg1WbVJlD I+y0CnLzICLzdFWEu5fcVr4bbKv8DXbHqtXxHaO6n3LoHsv+bH1OFOZJUPiPyMX0Q0of CsR/rwFn/+Qz/MkLt2d9pYDACdJKxv3k89TkYMJPRBFukOfYQ6syvbADKVp/q75LaloN 5Pe6+CtEVNrUtlp6RVUE2ne+jmT9XiJS6Z1LtKl6vSPQxGTwVSPMW1LENKDVNOQ0h0wv CaWUl3oWf7mWWefNS5RTeimPqXrmE7hq1lzqCo6w0gtMOG39O28+v2qwhO3N0VCdciOi VWPw== X-Gm-Message-State: AOAM531K7ystroFqCQkiO8paReiK/DyQ1uxgGABQhWWRGpW1NhffyH0U fe5j3Xueb4eeEsHfi6WfBivVqrEZij8= X-Google-Smtp-Source: ABdhPJxRTy9eWr3BNvH4OMX3zh1FH14Nb6sVUmv6Fk/NPAKR8HOPVuT+15Bqzg23KyJaTsRYWg71Vw== X-Received: by 2002:a17:902:e783:b029:e1:24a9:a5c6 with SMTP id cp3-20020a170902e783b02900e124a9a5c6mr18981686plb.43.1612263995617; Tue, 02 Feb 2021 03:06:35 -0800 (PST) Received: from bobo.ozlabs.ibm.com (60-242-11-44.static.tpgi.com.au. [60.242.11.44]) by smtp.gmail.com with ESMTPSA id g19sm3188979pfk.113.2021.02.02.03.06.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 02 Feb 2021 03:06:35 -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 v12 12/14] mm/vmalloc: add vmap_range_noflush variant Date: Tue, 2 Feb 2021 21:05:13 +1000 Message-Id: <20210202110515.3575274-13-npiggin@gmail.com> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20210202110515.3575274-1-npiggin@gmail.com> References: <20210202110515.3575274-1-npiggin@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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 a= ddr, unsigned long end, return 0; } =20 -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 en= d, break; } while (pgd++, phys_addr +=3D (next - addr), addr =3D next, addr !=3D = end); =20 - flush_cache_vmap(start, end); - if (mask & ARCH_PAGE_TABLE_SYNC_MASK) arch_sync_kernel_mappings(start, end); =20 return err; } =20 +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 =3D 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 lo= ng end, pgtbl_mod_mask *mask) { --=20 2.23.0