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 7C4F4EB8FAF for ; Wed, 6 Sep 2023 07:39:28 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 0E025440154; Wed, 6 Sep 2023 03:39:28 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 069E78E0014; Wed, 6 Sep 2023 03:39:28 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id E2487440154; Wed, 6 Sep 2023 03:39:27 -0400 (EDT) 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 C9ABE8E0014 for ; Wed, 6 Sep 2023 03:39:27 -0400 (EDT) Received: from smtpin06.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id 9712640C25 for ; Wed, 6 Sep 2023 07:39:27 +0000 (UTC) X-FDA: 81205372374.06.F1996D4 Received: from mgamail.intel.com (mgamail.intel.com [192.55.52.120]) by imf05.hostedemail.com (Postfix) with ESMTP id 6D7F410000E for ; Wed, 6 Sep 2023 07:39:25 +0000 (UTC) Authentication-Results: imf05.hostedemail.com; dkim=pass header.d=intel.com header.s=Intel header.b=kwrZY6Ut; 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=1693985965; a=rsa-sha256; cv=none; b=yXWERDlW0EFKBSwsrBlhmyh3/Ye2Y3zfWeXx4DAk08agjWmZai3WXgZ+zVJH0Zx6Aws14r FIEUtJwu4yNPvo30G8+/bp/VjPa/I3V0ImGuqTheErfMgGSiCGwRw3Uqu8XpuN9k9UEaSt oDi3APjD09u7jYSRHgNAmWR10a84L7A= ARC-Authentication-Results: i=1; imf05.hostedemail.com; dkim=pass header.d=intel.com header.s=Intel header.b=kwrZY6Ut; 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=1693985965; 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=BFKO6CLH4Z6nzxLAzTKVe/8IsnUDylg6HxbEjh3WKPU=; b=P8bhvui3gAKcvfoBKa138hC9YqjLDVR8/VgdbxBeOQJtdod6zkWawHTHXF5w5zZTi4X4QC glIip4mwnaz9qV82f7GngMnXgSNg6f7y4uv1tVcWMg31Go4UmaIL1pJEUaF7s8fodKt1oJ mMWJqJtz/ZEMPLp/Q2p/d3sKrwPDzL8= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1693985965; x=1725521965; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=qvs+CfaaOcukCPcQ3yn99op16Cq3tmycYYGCo66m1aQ=; b=kwrZY6Ut+8R+95gMkpMAf2aMdCGH4KrJn+GQrVO3Xy6s4m09jDPWukG/ RqgMRnLqvGGuVHvRkU4m+6JEsbjJTmiDTDAWSwgb2z9BCTXB07EWiWWkh l/0qUSJYMP5b85NjTH/dGOXz/4gvPACQeSFKGflZjfHsklCHouVya7ulc m0Q+F597laFR45zMMcWwzhjjp5alGiUVoK+nnbYrzFFR8WJNz2SdUDk7c 6ghBOe9LEZivArtyB9A964u3XCU9hcZohCC/Mowve1iKmea7AtFmPq/M8 GBHnKsbKzXy+vQYL1sbrADq0oxEDasPzOi32YbtYbIF0dquV+as2BNQE4 w==; X-IronPort-AV: E=McAfee;i="6600,9927,10824"; a="375898454" X-IronPort-AV: E=Sophos;i="6.02,231,1688454000"; d="scan'208";a="375898454" 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:24 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10824"; a="988133789" X-IronPort-AV: E=Sophos;i="6.02,231,1688454000"; d="scan'208";a="988133789" 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:20 -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 1/3] proc/vmcore: Do not map unaccepted memory Date: Wed, 6 Sep 2023 10:39:00 +0300 Message-Id: <20230906073902.4229-2-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: 6D7F410000E X-Stat-Signature: dxo1tsbkqerah3hmufg38aygucqq4yqy X-Rspam-User: X-HE-Tag: 1693985965-621995 X-HE-Meta: U2FsdGVkX1+Gb7IgG1PqyrF7jbrj8b50aWBtu9yRn/m0e48VpSrT2MWruWozDVNl/gJnrrACwBRPygYwLoSz4i5ned99R7TNjfD8ghVt9yY54FjrvslJWgcV5vsXvYDeRWk277kcfCdIIIGfceH3Us/iX6PtjnUiHYrjVgLPrm2+Jd+t2HU9KH1hsxDRu/rUNXGxEzdvcHLpjzRy6OlLZE6ARVwAOykgs87lT0wwzwpIi6wUWJGMBoIl2KOS+jGCPLqF3gmhNra7crsy9mJKXd7Cd1i2tkTbwlYX3utOu+FUuAYRufu1kDrIxt4ThxkyERcewo/DLY988iIF1Rzu0TWtVCIy/4M78ntI19WDsNKcErTpiy8FEfJbxqnKNN6MBTffAjz5zghgVHfgcHf8SF4e3X9kioeDhWYdivIIgYCR2h88vhiyCFMZevVuBwTC/x3I15CaotLh1gns2plMfuosRMyIncmwDnHJTwY8NJU1hdqOqvELvcRmoHP/rP+EblW5lzE41E5QSCBB7boGCYsR+r8gNzx5zcuk6IWVmFW3bgddgeqq4R2BYpNBBIqDjkRBNovcZE+9iEOfYRFMMuR9nFm/R0YIBp/MWAYmiq7XAuN4Lt4h/W7WV2UDjLHuRzmYcZBZ2Y9mpzDOqD11R308W25zW+sKB9xgsl41HqIhNzBRQa2kgi4rekNSnTw015SnPUlVKBWevBgS7QcoI0kbQTniHYxy6jDJeXqqdnuroYhGgw8yOzjV6/q0CZpeUgpLTa2CG8/X9GN46dIsz0yUpYbz9UGOHmUa+/I7LUs/ZrvcvLfcUUMfTPq6WpUObTxXg1BRQ8hnzSi8jjw2VNyfbrcBp2oVco8dRJlJawkuR5Y1Gk28njLtk78QWqGvs0of/JmHigQMIc7zW5oQEZNEzXdBz0MRckHiw66KI5LsGSSc5on4m2Wrb8SstZbdW8pWnFRdvOA5y/ccLLp ZmOHs9iU bW/FwYP4JAthZercoIB1wTUAi1uZd565wxb8ENUc+z0kJ86vK7Af8RedNmMiH7qp+6fhnBA4H8WNMeQki6iIyu09G4oS5CPkbqlaYlOI9gLaFV8FYyxvGyZYTyDvJrZaBJ4vcl3asOLnZqjsi927mCX4YhE21PcEJhVv8RHzRJBDqKIbR4m5GBWFUgrOCSmWwz0XC 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/vmcore, which is read-only, this means a read or mmap of unaccepted memory will return zeros. Fixes: dcdfdd40fa82 ("mm: Add support for unaccepted memory") Signed-off-by: Adrian Hunter --- fs/proc/vmcore.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/fs/proc/vmcore.c b/fs/proc/vmcore.c index 1fb213f379a5..a28da2033ce8 100644 --- a/fs/proc/vmcore.c +++ b/fs/proc/vmcore.c @@ -118,6 +118,13 @@ static bool pfn_is_ram(unsigned long pfn) return ret; } +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); +} + static int open_vmcore(struct inode *inode, struct file *file) { spin_lock(&vmcore_cb_lock); @@ -150,7 +157,7 @@ ssize_t read_from_oldmem(struct iov_iter *iter, size_t count, nr_bytes = count; /* If pfn is not ram, return zeros for sparse dump files */ - if (!pfn_is_ram(pfn)) { + if (!pfn_is_ram(pfn) || pfn_is_unaccepted_memory(pfn)) { tmp = iov_iter_zero(nr_bytes, iter); } else { if (encrypted) @@ -511,7 +518,7 @@ static int remap_oldmem_pfn_checked(struct vm_area_struct *vma, pos_end = pfn + (size >> PAGE_SHIFT); for (pos = pos_start; pos < pos_end; ++pos) { - if (!pfn_is_ram(pos)) { + if (!pfn_is_ram(pos) || pfn_is_unaccepted_memory(pos)) { /* * We hit a page which is not ram. Remap the continuous * region between pos_start and pos-1 and replace @@ -552,6 +559,7 @@ static int vmcore_remap_oldmem_pfn(struct vm_area_struct *vma, unsigned long from, unsigned long pfn, unsigned long size, pgprot_t prot) { + phys_addr_t paddr = pfn << PAGE_SHIFT; int ret, idx; /* @@ -559,7 +567,8 @@ static int vmcore_remap_oldmem_pfn(struct vm_area_struct *vma, * pages without a reason. */ idx = srcu_read_lock(&vmcore_cb_srcu); - if (!list_empty(&vmcore_cb_list)) + if (!list_empty(&vmcore_cb_list) || + range_contains_unaccepted_memory(paddr, paddr + size)) ret = remap_oldmem_pfn_checked(vma, from, pfn, size, prot); else ret = remap_oldmem_pfn_range(vma, from, pfn, size, prot); -- 2.34.1