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=-12.3 required=3.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED,DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FORGED_FROMDOMAIN, FREEMAIL_FROM,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,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 C81F4C433E4 for ; Fri, 21 Aug 2020 04:45:08 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 7F385206FA for ; Fri, 21 Aug 2020 04:45:08 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="J4ddgUza" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 7F385206FA 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 27E588D001F; Fri, 21 Aug 2020 00:45:08 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 20BD78D0005; Fri, 21 Aug 2020 00:45:08 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 0CF398D001F; Fri, 21 Aug 2020 00:45:08 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0084.hostedemail.com [216.40.44.84]) by kanga.kvack.org (Postfix) with ESMTP id E6E808D0005 for ; Fri, 21 Aug 2020 00:45:07 -0400 (EDT) Received: from smtpin18.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay05.hostedemail.com (Postfix) with ESMTP id B1613181AEF09 for ; Fri, 21 Aug 2020 04:45:07 +0000 (UTC) X-FDA: 77173336254.18.spade96_5d123f027036 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin18.hostedemail.com (Postfix) with ESMTP id 4B154100EC667 for ; Fri, 21 Aug 2020 04:45:07 +0000 (UTC) X-HE-Tag: spade96_5d123f027036 X-Filterd-Recvd-Size: 4682 Received: from mail-pf1-f195.google.com (mail-pf1-f195.google.com [209.85.210.195]) by imf39.hostedemail.com (Postfix) with ESMTP for ; Fri, 21 Aug 2020 04:45:06 +0000 (UTC) Received: by mail-pf1-f195.google.com with SMTP id k18so463919pfp.7 for ; Thu, 20 Aug 2020 21:45:06 -0700 (PDT) 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=8C8wdRPXIlS04tUD/986mX054vDuu2PdIQ/xTcAZZAA=; b=J4ddgUzasDXInj6ZCF2fxwiLsaEtScdGAOu8lOPhDFaYakCO3NrGk1LBxDUoJ2mXDg Cl7ESjYKzCuQKNbvsXKKZvD2eOHZhUqWcZF5TMNmPbRLGU4MsaPYfq+QCQcLA8q9W26z hs0tBFGG6129YBPGD1vMB9R7gD0+37YOzqN4rBxndaMqpt0WgDpXD19Gspzzq2JQo3gA mqxkfxRpdKad9bmkpLvHnAPblr3MCauTS/S9XUd5dMBBYpocjBbgU1hNHm7zJBi6Okwm 3b89yZyODzFGBBBHGRL6KzHhFuU/alVEYGDYpKF20JifG2kUrdfIClwhUGnoMUoqi0ys PZvQ== 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=8C8wdRPXIlS04tUD/986mX054vDuu2PdIQ/xTcAZZAA=; b=DSSSSsLb5DD4yuOD5tZxcmVvGNedFXGDTwBKjEexYXD4mLnscDa1hKHTEAtWJdmQdZ 3Os0ZTzp7WZqfbLNj58Ovdizh17DC46dsJnYpDpvWLgbNn7GNTeztWyUKsLqnAaBqaVG Vibufpz8ocqFObCiqH8Soay2MiZRyMJ4xcqYWhwz8ERGi3QsKMGYDWNe19yE7oKmyxQC w9C4DVswwpA1mVQ+mZmT0iFP+75f4rMIjrVa5QTPtlo6/fPGvuaSxgdHaXLc/8G4lOxo 85ppqPqJFfREoi7dM/MIdoJ3VGI7HwuWLhO5VJm3LgOT348iFAQCNYfZRDYt/Hf9kUtO E+kQ== X-Gm-Message-State: AOAM531Dpktf+gr/yj24qs/+0M1BYL87wc354LYkpU4GnTJVprbDrmC5 Ga72iuARPz23xenA42Gki6j4GgyTEvA= X-Google-Smtp-Source: ABdhPJy7zCMoLaQ0q66stfVNfIyt+ykygBNPJfPuPBH8S4/UD8Lo5p19sMJZjysKorBqq4yJjZdPbQ== X-Received: by 2002:a63:b24b:: with SMTP id t11mr1038962pgo.233.1597985106002; Thu, 20 Aug 2020 21:45:06 -0700 (PDT) Received: from bobo.ibm.com (61-68-212-105.tpgi.com.au. [61.68.212.105]) by smtp.gmail.com with ESMTPSA id l9sm683374pgg.29.2020.08.20.21.45.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 20 Aug 2020 21:45:05 -0700 (PDT) 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, Zefan Li , Jonathan Cameron Subject: [PATCH v5 7/8] mm/vmalloc: add vmap_range_noflush variant Date: Fri, 21 Aug 2020 14:44:26 +1000 Message-Id: <20200821044427.736424-8-npiggin@gmail.com> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20200821044427.736424-1-npiggin@gmail.com> References: <20200821044427.736424-1-npiggin@gmail.com> MIME-Version: 1.0 X-Rspamd-Queue-Id: 4B154100EC667 X-Spamd-Result: default: False [0.00 / 100.00] X-Rspamd-Server: rspam05 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. Signed-off-by: Nicholas Piggin --- mm/vmalloc.c | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/mm/vmalloc.c b/mm/vmalloc.c index 129f10545bb1..4e5cb7c7f780 100644 --- a/mm/vmalloc.c +++ b/mm/vmalloc.c @@ -234,8 +234,8 @@ 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, phys_addr_t phys_a= ddr, pgprot_t prot, - unsigned int max_page_shift) +static int vmap_range_noflush(unsigned long addr, unsigned long end, phy= s_addr_t phys_addr, + pgprot_t prot, unsigned int max_page_shift) { pgd_t *pgd; unsigned long start; @@ -255,14 +255,23 @@ int vmap_range(unsigned long addr, unsigned long en= d, phys_addr_t phys_addr, pgp 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_a= ddr, 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