From patchwork Mon Feb 17 14:08:03 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ryan Roberts X-Patchwork-Id: 13977916 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id AE21EC021AA for ; Mon, 17 Feb 2025 14:08:51 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 320CD6B00B6; Mon, 17 Feb 2025 09:08:51 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 28381280059; Mon, 17 Feb 2025 09:08:51 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 0AB4C6B00B8; Mon, 17 Feb 2025 09:08:51 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id DDA216B00B6 for ; Mon, 17 Feb 2025 09:08:50 -0500 (EST) Received: from smtpin22.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id 950601203EA for ; Mon, 17 Feb 2025 14:08:50 +0000 (UTC) X-FDA: 83129617620.22.A1A3DAA Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by imf20.hostedemail.com (Postfix) with ESMTP id 08B591C0011 for ; Mon, 17 Feb 2025 14:08:48 +0000 (UTC) Authentication-Results: imf20.hostedemail.com; dkim=none; dmarc=pass (policy=none) header.from=arm.com; spf=pass (imf20.hostedemail.com: domain of ryan.roberts@arm.com designates 217.140.110.172 as permitted sender) smtp.mailfrom=ryan.roberts@arm.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1739801329; a=rsa-sha256; cv=none; b=KizdGRvCmpzxxi/jkH7U1jKtvdWmOYf8fi30D/MQN5c40em+FHJtAHAln8w/LfXX/PZdB4 N2F3s5+1LUc6z7pO1GDVj1NOLi7X1/IITPlTKhFWd7SlFHtRjKMEwpJXLa5bljsiaLxTgw DO5TM1Ea+yFPI5u4dGprEngqSE9rkjE= ARC-Authentication-Results: i=1; imf20.hostedemail.com; dkim=none; dmarc=pass (policy=none) header.from=arm.com; spf=pass (imf20.hostedemail.com: domain of ryan.roberts@arm.com designates 217.140.110.172 as permitted sender) smtp.mailfrom=ryan.roberts@arm.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1739801329; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=uaCYE6J03jFfScCeArmGchXyS88UX/fmWKyf4HvQMQw=; b=P6FJrJh6BiHns+ftgOlXenkp/KFDRGXmRTz8wcLGdJqOfPLAD2EydC8LITn4K2x1Xk8lyU Vw1+q8yAE+cCLt2dnXhEJQhDFG4zwjHrWMDH3Ib4Prq+nZEJVsrqv63ABGvGgoI4nLzxsX Wbys6rxeLkPixRtlJvETLPcI29TbNWQ= Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 80BD71E5E; Mon, 17 Feb 2025 06:09:07 -0800 (PST) Received: from e125769.cambridge.arm.com (e125769.cambridge.arm.com [10.1.196.27]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 134433F6A8; Mon, 17 Feb 2025 06:08:45 -0800 (PST) From: Ryan Roberts To: Catalin Marinas , Will Deacon , Pasha Tatashin , Andrew Morton , Uladzislau Rezki , Christoph Hellwig , David Hildenbrand , "Matthew Wilcox (Oracle)" , Mark Rutland , Anshuman Khandual , Alexandre Ghiti , Kevin Brodsky Cc: Ryan Roberts , linux-arm-kernel@lists.infradead.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 11/14] mm/vmalloc: Batch arch_sync_kernel_mappings() more efficiently Date: Mon, 17 Feb 2025 14:08:03 +0000 Message-ID: <20250217140809.1702789-12-ryan.roberts@arm.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250217140809.1702789-1-ryan.roberts@arm.com> References: <20250217140809.1702789-1-ryan.roberts@arm.com> MIME-Version: 1.0 X-Rspam-User: X-Rspamd-Queue-Id: 08B591C0011 X-Rspamd-Server: rspam12 X-Stat-Signature: qzngxmd5kgzkn4tuqp6h786iqrnuhjgk X-HE-Tag: 1739801328-663346 X-HE-Meta: U2FsdGVkX1+ojrxWva6Ula33Cq8BveHHEMvYk/ryKyzRsJfR86IjRU5zI6h4WKt0N7KTW20JdRdb0rxoIlAPAHf1e2iahdzYFDUwXHaIy6vrF7lFpvIupaG2MsbCr0uNYIHZ2zfThq62g2C0gNipMUhC55PB7M01QSJoYtRV8eGnDp+zBgRyatLVE7cwcwhWLepYtnoJcFOZv74Wf0DpsSoVkgKUUO6REoGii/c2Gj7gAExWEd7Vyd3x+EdeH+SLKMiBdK1sZihLpcINQZ0gbK93yiF6vIXyvDKzIX+Ssyey0Fltb7y2QLymsprzo+D0Iui4hrC4BcNdmvboBcwvehS9aopXtC2i9/w/HHndrRVeTFooL5gG1Svt7i4lPuAF0UKoCxU1dmc8DQwGVP4ONbiGlEwoquSMLmR7VZtqgI1scW3i7QoKdoBzdwNUtohR52irB/uyxwy8Ymauuu+GquvY+smboAFmNnbjME37EQD11XzXY3fJxnbin19aXsCHYifeV3vz3dMUGWqH/K8vN956tKvaW/zG9ek3hb4c+U/JI4BzHat0o17KoFEHbqvs1iaN5nACsB6pEs/vExWEvqoGT/ShR3TYRDrZVbWkCiyetZ1uJZghyjPZvuIgdQSb1is4GKtEZOw4aqIleU3MB+OPQ3XG3V83nXZEpt4VsfviqJQNbbNpoIs9SKa3yHVpW6HXzK/mKetS70l9pkv2/Mbf4ikevI2CoUfEq6sFCAM1Aj4iHy6oWHzMtOOMzMhBx7+AR/Ty1hbuQFw9+Tf31vggWYCCE5AkVcIV1k7wiGP69ph2yJVpMZtswW9tliVFafaBPRxh1WKM0z/1NDizk6WNY/qyNQO8QTLOCzSpkvdVXn9Y1R+HdZGVWpEZlwnOFpsNxYToFVJhnIk26lAtsP6755zM1iBnum6zYJp2MmiyvjhTGEZpL4lYOS6LVyPI/XUDHYCap6APiQNmydX VJTmEFhh ttArTO4VOk6trNHktkxxHyJyyQXKquIT8GaUheuwbncyaRWH1Pfx0KviEo9S6amnWC/cor09yCyQIJji4v6K4BX8o0RAf0o/tr+7SEuAPw+N9oETzir30ZPviyEI+BMiVm6bLaGm/pviOf4FUFo/ciy135QOhbWWcmPLzbDpVR0XkuhowvXMswENJoQu3GV8hzesh9pqBwbKdS6Y= 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: List-Subscribe: List-Unsubscribe: When page_shift is greater than PAGE_SIZE, __vmap_pages_range_noflush() will call vmap_range_noflush() for each individual huge page. But vmap_range_noflush() would previously call arch_sync_kernel_mappings() directly so this would end up being called for every huge page. We can do better than this; refactor the call into the outer __vmap_pages_range_noflush() so that it is only called once for the entire batch operation. This will benefit performance for arm64 which is about to opt-in to using the hook. Reviewed-by: Anshuman Khandual Signed-off-by: Ryan Roberts --- mm/vmalloc.c | 60 ++++++++++++++++++++++++++-------------------------- 1 file changed, 30 insertions(+), 30 deletions(-) diff --git a/mm/vmalloc.c b/mm/vmalloc.c index 68950b1824d0..50fd44439875 100644 --- a/mm/vmalloc.c +++ b/mm/vmalloc.c @@ -285,40 +285,38 @@ static int vmap_p4d_range(pgd_t *pgd, 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) + unsigned int max_page_shift, pgtbl_mod_mask *mask) { pgd_t *pgd; - unsigned long start; unsigned long next; int err; - pgtbl_mod_mask mask = 0; might_sleep(); BUG_ON(addr >= end); - start = addr; pgd = pgd_offset_k(addr); do { next = pgd_addr_end(addr, end); err = vmap_p4d_range(pgd, addr, next, phys_addr, prot, - max_page_shift, &mask); + max_page_shift, mask); if (err) break; } while (pgd++, phys_addr += (next - addr), addr = next, addr != end); - if (mask & ARCH_PAGE_TABLE_SYNC_MASK) - arch_sync_kernel_mappings(start, end); - return err; } int vmap_page_range(unsigned long addr, unsigned long end, phys_addr_t phys_addr, pgprot_t prot) { + pgtbl_mod_mask mask = 0; int err; err = vmap_range_noflush(addr, end, phys_addr, pgprot_nx(prot), - ioremap_max_page_shift); + ioremap_max_page_shift, &mask); + if (mask & ARCH_PAGE_TABLE_SYNC_MASK) + arch_sync_kernel_mappings(addr, end); + flush_cache_vmap(addr, end); if (!err) err = kmsan_ioremap_page_range(addr, end, phys_addr, prot, @@ -587,29 +585,24 @@ static int vmap_pages_p4d_range(pgd_t *pgd, unsigned long addr, } static int vmap_small_pages_range_noflush(unsigned long addr, unsigned long end, - pgprot_t prot, struct page **pages) + pgprot_t prot, struct page **pages, pgtbl_mod_mask *mask) { - unsigned long start = addr; pgd_t *pgd; unsigned long next; int err = 0; int nr = 0; - pgtbl_mod_mask mask = 0; BUG_ON(addr >= end); pgd = pgd_offset_k(addr); do { next = pgd_addr_end(addr, end); if (pgd_bad(*pgd)) - mask |= PGTBL_PGD_MODIFIED; - err = vmap_pages_p4d_range(pgd, addr, next, prot, pages, &nr, &mask); + *mask |= PGTBL_PGD_MODIFIED; + err = vmap_pages_p4d_range(pgd, addr, next, prot, pages, &nr, mask); if (err) break; } while (pgd++, addr = next, addr != end); - if (mask & ARCH_PAGE_TABLE_SYNC_MASK) - arch_sync_kernel_mappings(start, end); - return err; } @@ -626,26 +619,33 @@ int __vmap_pages_range_noflush(unsigned long addr, unsigned long end, pgprot_t prot, struct page **pages, unsigned int page_shift) { unsigned int i, nr = (end - addr) >> PAGE_SHIFT; + unsigned long start = addr; + pgtbl_mod_mask mask = 0; + int err = 0; WARN_ON(page_shift < PAGE_SHIFT); if (!IS_ENABLED(CONFIG_HAVE_ARCH_HUGE_VMALLOC) || - page_shift == PAGE_SHIFT) - return vmap_small_pages_range_noflush(addr, end, prot, pages); - - for (i = 0; i < nr; i += 1U << (page_shift - PAGE_SHIFT)) { - int err; - - err = vmap_range_noflush(addr, addr + (1UL << page_shift), - page_to_phys(pages[i]), prot, - page_shift); - if (err) - return err; + page_shift == PAGE_SHIFT) { + err = vmap_small_pages_range_noflush(addr, end, prot, pages, + &mask); + } else { + for (i = 0; i < nr; i += 1U << (page_shift - PAGE_SHIFT)) { + err = vmap_range_noflush(addr, + addr + (1UL << page_shift), + page_to_phys(pages[i]), prot, + page_shift, &mask); + if (err) + break; - addr += 1UL << page_shift; + addr += 1UL << page_shift; + } } - return 0; + if (mask & ARCH_PAGE_TABLE_SYNC_MASK) + arch_sync_kernel_mappings(start, end); + + return err; } int vmap_pages_range_noflush(unsigned long addr, unsigned long end,