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 DA73DEB8FB5 for ; Wed, 6 Sep 2023 07:39:32 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 60FF6440155; Wed, 6 Sep 2023 03:39:32 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 572AA8E0014; Wed, 6 Sep 2023 03:39:32 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 41292440155; Wed, 6 Sep 2023 03:39:32 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id 2CCAF8E0014 for ; Wed, 6 Sep 2023 03:39:32 -0400 (EDT) Received: from smtpin09.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id D8D14140BFA for ; Wed, 6 Sep 2023 07:39:31 +0000 (UTC) X-FDA: 81205372542.09.317956F Received: from mgamail.intel.com (mgamail.intel.com [192.55.52.120]) by imf05.hostedemail.com (Postfix) with ESMTP id C0D34100015 for ; Wed, 6 Sep 2023 07:39:29 +0000 (UTC) Authentication-Results: imf05.hostedemail.com; dkim=pass header.d=intel.com header.s=Intel header.b=g0CHtJZh; spf=pass (imf05.hostedemail.com: domain of adrian.hunter@intel.com designates 192.55.52.120 as permitted sender) smtp.mailfrom=adrian.hunter@intel.com; dmarc=pass (policy=none) header.from=intel.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1693985970; a=rsa-sha256; cv=none; b=PykxCJakoTo17XdSuC1Dx3uXgqv3shM5ZI8sHXIjGMEwXsGBqqF4wBczPJXsFjTA4GlxOf RDktwqHGEDeY2TAfycxliYlydC1dRLdEJ54RCmsAh6iMD3XZrA22GQHMQ0mCu5nFgKNyfQ XFCA+TTOpEkAEh9BoemHMHGBIpSPi28= ARC-Authentication-Results: i=1; imf05.hostedemail.com; dkim=pass header.d=intel.com header.s=Intel header.b=g0CHtJZh; spf=pass (imf05.hostedemail.com: domain of adrian.hunter@intel.com designates 192.55.52.120 as permitted sender) smtp.mailfrom=adrian.hunter@intel.com; dmarc=pass (policy=none) header.from=intel.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1693985970; 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:dkim-signature; bh=+SVKZe6+5PkobVPpF5tu7Kfv8jlMx+qn8JH9ILH7SJ4=; b=LwZZ81MatMCAz/PzHfk1bhhGCw/hKZt9DtEQ1Zra8cll2hxMsJB0VCmTvSRzTb5TeUtb6O 3kOIJ/0Upd+W1gJpXyPhvnhb6kIOEBok+esvBV/IfLZlArDxpl28RT+BDIPgvP5H9MiSaC U/8bCOaLOh2BVYl9fat5Xl478ZE93pk= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1693985969; x=1725521969; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=hCFPnesd773Gv+sIsXwxuNHU7U7Bs8P2FxvU4qByuSM=; b=g0CHtJZhrNgF7OKEUSNtmuSGYuZH5Ox8IysJ9Th981FngrpLjy4fYyVP T9MODacwYflplKZDKyC1V7fRTuH15PlSF4Nww2qDk+aVgYXED/dP7QYD6 m8RMO2trK0vGnhpXr+5V3tp1PRQxHQILUEkTn8T6flhP6fHTimIG50spk on2kJeK+dsTwQApZaH5H2QmL+mP11qtH/yKdwVgfLZNasbS955YU4B9A8 3X8pYaCp6+LNHVEn44uzkgkuf8QDctwrLLJBJ3Sqt/CcLVLiDExlO8EyL fSyRSFXcLpFD6dm1rS9KuLd3x8KMtOUUtDm83PCYBKxc9YsFQ3bLg2Kpq w==; X-IronPort-AV: E=McAfee;i="6600,9927,10824"; a="375898468" X-IronPort-AV: E=Sophos;i="6.02,231,1688454000"; d="scan'208";a="375898468" Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 06 Sep 2023 00:39:29 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10824"; a="988133794" X-IronPort-AV: E=Sophos;i="6.02,231,1688454000"; d="scan'208";a="988133794" Received: from ahunter6-mobl1.ger.corp.intel.com (HELO ahunter-VirtualBox.home\044ger.corp.intel.com) ([10.252.60.154]) by fmsmga006-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 06 Sep 2023 00:39:24 -0700 From: Adrian Hunter To: "Kirill A. Shutemov" , Borislav Petkov , Andrew Morton Cc: Dave Hansen , Vlastimil Babka , Mike Rapoport , Lorenzo Stoakes , Tom Lendacky , Baoquan He , Vivek Goyal , Dave Young , linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-mm@kvack.org, linux-coco@lists.linux.dev, linux-efi@vger.kernel.org, kexec@lists.infradead.org Subject: [PATCH 2/3] proc/kcore: Do not map unaccepted memory Date: Wed, 6 Sep 2023 10:39:01 +0300 Message-Id: <20230906073902.4229-3-adrian.hunter@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230906073902.4229-1-adrian.hunter@intel.com> References: <20230906073902.4229-1-adrian.hunter@intel.com> MIME-Version: 1.0 Organization: Intel Finland Oy, Registered Address: PL 281, 00181 Helsinki, Business Identity Code: 0357606 - 4, Domiciled in Helsinki Content-Transfer-Encoding: 8bit X-Rspamd-Server: rspam08 X-Rspamd-Queue-Id: C0D34100015 X-Stat-Signature: akstf1a6kbkia9jjwixtrhbmrj5yswp1 X-Rspam-User: X-HE-Tag: 1693985969-694296 X-HE-Meta: U2FsdGVkX1/wqGGPlRlvJP7vok4LO41y5NHBI7z7HcMs0zumW2PS+6SazmejNeDokzs3X5bNJTPEeYbgIH3vDxSOP725lqW77my6BP5kcW5PIXjwIeKsS0DI6ivAf9IYV3rdZ19s5gPkUFL2tVyI4WuttkANwozaD6orJ5zagKvfA/d3Al+Fovje1WkUnLVHK/pd6ia1x+WB+aYAVIXl/WLKgpefTt7tsrPuu6ldZsAbCjrj+FkRGkb/tEZe3awyrYiMPmN//sg2MAYD8Iv37RZkluaeK4u1pZd14r/OoRsAzoieP2sqLs33B1Y/qAgKSj9mlzYdhDG4L5yjp9qA77v1Fn/i81jqeU+hImzLxAcF2sMxAtBvhMT1CbAwFzXPt5e8MTXEiY0JmQwMd57XnXLO16eFbWm3p6ZdKwq6JGa/39+tH3RXHoEAMDr8VmBu5uq/hRT4Q0ZEASKb9f+K6aXZS6OI+uC9YmAn5pNS6m9NFPDtbvARyCKzNQGFU+UV/p65mkg3EeXEl1Q8v8QF4znv0Q4hBsLXSWevFKM+wJZpyRqe7RxXCGnqVah3/J6aEhGS59wjts1zZ2AYS4rkAIaz7Kpx+aOU8sl/bm8Dn80bW0y2LTUKz/+JwaXBjo+3uoY0bs8qg/Y9hygl7hsp3/5RT3gVVFMGIUvqsWe9r1MdY4RQ2PHUHWCpSs+sqBB8ewGWqUpdUfGeLMXrRapl4X1ZxxVxPvakPgIwcXiz77p0Mhoz4EW8vjS2QlnHyOtye2Jimlua4iB1wcNxHnonoRng66vTBoZcFTX61SuKKI4faR44c0Uu6Sh4kPWdFPkioUwYMQ8TaBaMSdkCZDoU5UFrMtLAR4KLeD4v/ip7gWIKM2ir8UbUxV1bjkfz0BcFR3CyIxfEhUaU/ISC0hV0JFMrq6tpjhMKfXltHAq9l854pgesxB47LtwqveBEaLlMa9G/JSguqFQoS9SoG7+ 6OK2w4pS OfaVPJeaUn1DW0KiI50hlPVTYRVRrJQn8PbHnGnqNccyLT3tFRs2SrtnkNjrZeuT3wzsehf6ezcqjKEfz1I3LLmH25j209v4X8z8/B04WCaqGjXUNZc/mwovx1Jp0E15d54aOmh441+1+MfJDjEvQ/zkVbMcL7yfzRepBJMZVveBUefKgI+w6NZ8hth9jMf+TA0iM 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: Support for unaccepted memory was added recently, refer commit dcdfdd40fa82 ("mm: Add support for unaccepted memory"), whereby a virtual machine may need to accept memory before it can be used. Do not map unaccepted memory because it can cause the guest to fail. For /proc/kcore, which is read-only and does not support mmap, this means a read of unaccepted memory will return zeros. Fixes: dcdfdd40fa82 ("mm: Add support for unaccepted memory") Signed-off-by: Adrian Hunter --- fs/proc/kcore.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/fs/proc/kcore.c b/fs/proc/kcore.c index 23fc24d16b31..a3091c5ed871 100644 --- a/fs/proc/kcore.c +++ b/fs/proc/kcore.c @@ -76,6 +76,13 @@ static int pfn_is_ram(unsigned long pfn) return 1; } +static bool pfn_is_unaccepted_memory(unsigned long pfn) +{ + phys_addr_t paddr = pfn << PAGE_SHIFT; + + return range_contains_unaccepted_memory(paddr, paddr + PAGE_SIZE); +} + /* This doesn't grab kclist_lock, so it should only be used at init time. */ void __init kclist_add(struct kcore_list *new, void *addr, size_t size, int type) @@ -546,7 +553,8 @@ static ssize_t read_kcore_iter(struct kiocb *iocb, struct iov_iter *iter) * and explicitly excluded physical ranges. */ if (!page || PageOffline(page) || - is_page_hwpoison(page) || !pfn_is_ram(pfn)) { + is_page_hwpoison(page) || !pfn_is_ram(pfn) || + pfn_is_unaccepted_memory(pfn)) { if (iov_iter_zero(tsz, iter) != tsz) { ret = -EFAULT; goto out; -- 2.34.1