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 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4A8DAC00140 for ; Thu, 18 Aug 2022 22:42:23 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id C702A8E0001; Thu, 18 Aug 2022 18:42:22 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id C20688D0002; Thu, 18 Aug 2022 18:42:22 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id AEBD98E0001; Thu, 18 Aug 2022 18:42:22 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id 9BE9F8D0002 for ; Thu, 18 Aug 2022 18:42:22 -0400 (EDT) Received: from smtpin04.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id 7E0FEACD13 for ; Thu, 18 Aug 2022 22:42:22 +0000 (UTC) X-FDA: 79814188524.04.A2A3327 Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf25.hostedemail.com (Postfix) with ESMTP id 79C4DA5144 for ; Thu, 18 Aug 2022 21:57:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=Content-Type:MIME-Version:Message-ID: Subject:Cc:To:From:Date:Sender:Reply-To:Content-Transfer-Encoding:Content-ID: Content-Description:In-Reply-To:References; bh=qiGFXCYM/2WRNcawHN5oLf2KN4DHpJpSGoCkRaMtGM8=; b=JHwwEhcktWGw70GxUXK6Mi9tpv xgwbeWLGfg4vFNfClI52K/+A5lkDa0L98BRGKZLuum84QfeLO9lxeFh+s43st5aQtheEu3uCJsJmc vk0NYTQuuH6btRbo1C0PAJJl+s97OywdUhifd/V1YGYAxf92mlDIv1b/uS3kDCSLMLfO1xiPIrnUD cj6G9l22s0bm9/hsrQJG9M9h5Pdrz/JlnXIOIlXfBSBMG9dynv4RlhMcjyZGNdF65hUBIJg576m1u mmIEu+eMqlJMINnEvXtOQ7k9cnnf7JXwr7UKmcY0b/+U5XVGJv8B4xkkpceszyGi007spUrJVP5uj Ym8f+TEA==; Received: from willy by casper.infradead.org with local (Exim 4.94.2 #2 (Red Hat Linux)) id 1oOmjt-00AHQt-HA; Thu, 18 Aug 2022 21:07:41 +0000 Date: Thu, 18 Aug 2022 22:07:41 +0100 From: Matthew Wilcox To: Andrew Morton , Uladzislau Rezki , linux-mm@kvack.org Cc: Nicholas Piggin Subject: [PATCH] Support HIGHMEM pages in vmap_pages_range_noflush() Message-ID: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1660859822; 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-type:content-transfer-encoding:in-reply-to: references:dkim-signature; bh=qiGFXCYM/2WRNcawHN5oLf2KN4DHpJpSGoCkRaMtGM8=; b=DWMfhNc9ZlzZw+GtHOK/Gc0iEI2OvMc652LYzmam3olMRSc0qV4MQFW3+VmacuTH6kdaad eTbyP9o/EcyVpy3ELnrdOW8CQCf7HZ7wTGoO1TuJqA7WdElRh8xW/n4VpIGCBoQKrUnSO0 tYhEMoO5IMucfkBwm3I2AftTCaXSpzY= ARC-Authentication-Results: i=1; imf25.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=JHwwEhck; dmarc=none; spf=none (imf25.hostedemail.com: domain of willy@infradead.org has no SPF policy when checking 90.155.50.34) smtp.mailfrom=willy@infradead.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1660859822; a=rsa-sha256; cv=none; b=CQHA1dMf/9EfBRBClSlbNafPnqciFaHzhJj2CS4auhWGcsBveB2Z7m5XYNzxxGhPpHk2zy S11AG/t1OZPUFTzCDlnps0W80HVt0OjYSh4ysakEtfl+u1iCQyfKS2IDjOl3cebAp0wBtD KEGNAIIsCQRwwcp77Tg1OBAVQvJ+thM= X-Stat-Signature: oamg81ng4htwsdbhwr75hpingbnpk9ys X-Rspamd-Server: rspam07 X-Rspamd-Queue-Id: 79C4DA5144 Authentication-Results: imf25.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=JHwwEhck; dmarc=none; spf=none (imf25.hostedemail.com: domain of willy@infradead.org has no SPF policy when checking 90.155.50.34) smtp.mailfrom=willy@infradead.org X-Rspam-User: X-HE-Tag: 1660859820-513818 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: If the pages being mapped are in HIGHMEM, page_address() returns NULL. This probably wasn't noticed before because there aren't currently any architectures with HAVE_ARCH_HUGE_VMALLOC and HIGHMEM, but it's simpler to call page_to_phys() and futureproofs us against such configurations existing. Fixes: 121e6f3258fe ("mm/vmalloc: hugepage vmalloc mappings") Signed-off-by: Matthew Wilcox (Oracle) diff --git a/mm/vmalloc.c b/mm/vmalloc.c index dd6cdb201195..bea9b0c37295 100644 --- a/mm/vmalloc.c +++ b/mm/vmalloc.c @@ -590,7 +590,7 @@ int vmap_pages_range_noflush(unsigned long addr, unsigned long end, int err; err = vmap_range_noflush(addr, addr + (1UL << page_shift), - __pa(page_address(pages[i])), prot, + page_to_phys(pages[i]), prot, page_shift); if (err) return err;