From nobody Tue Nov 26 13:22:59 2024 Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.21]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 428521E0B61 for ; Thu, 17 Oct 2024 15:57:02 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.175.65.21 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1729180627; cv=none; b=glPgSTvMZQR1Sy7BJAcKSyuRsdVELVX/MXIRSeHm6kFLdF3gskijWnvPcB1yuMgC3m/BfuwKU4pdy5YKD/3SGSEbhdKXs1F10+K0ODuVt3q5E/TPkAzUrPJZfLOjW0yCOtNjOYHugTT9o39jOKpsWUqgtkRP1jpbotAqXUTRrLY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1729180627; c=relaxed/simple; bh=X7oqsq0bMXF50IQWvSxcxdLufH4ePr/ItKwrUI5ikCs=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ZZ3CQoEKbI4oP7HaC5JrbFIeo1Ijt1QKaEFnLQsujBREe7QsrIrKYZdHM5OJbzz3laPMvH9cOwBzYC/RgHmSmdf4PmVVoPC+QTu/mW0CQMatzN2xRV4E+5z7Tj6P2fh6upjQTiZmquO1F9ZqLMhXhJdDBS36HkidYncQtJm0eB0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com; spf=none smtp.helo=mgamail.intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=OHUvSQ6S; arc=none smtp.client-ip=198.175.65.21 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.helo=mgamail.intel.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="OHUvSQ6S" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1729180622; x=1760716622; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=X7oqsq0bMXF50IQWvSxcxdLufH4ePr/ItKwrUI5ikCs=; b=OHUvSQ6S07QCd+SvVte5Bee1vQs0yXb/im341M/vONo98IaacQj83lEe H9dbe1bcOHVGV7WbiRISLq7VUYYNqJ6pZjgQqaPW3tkMFQFt94tdD6bNs AjdX+lS2rXwBDmZe+UVE68aCnyofjjtNi42m6SQzPqYZzHbUfLl8qHh5/ su1nAkhwFNZrmaZR6E1yB4oHZur9rmlZ6nKbAzCz0XqScPAd+VAtUnuoB wj2X97KylVe/rJ0cclbthNz4iQfd9yMncoMPjpjrLgFciddSmkWlm3TVO A039oL9nTetAtlYaYX4brWiqITBCC5gWYrsUjC+WJv5e2GCeH3bqOH++E A==; X-CSE-ConnectionGUID: TmzaPBycS6y+qrr/nJq+tA== X-CSE-MsgGUID: YQR6bZdqSDK3x9vauV5dlQ== X-IronPort-AV: E=McAfee;i="6700,10204,11222"; a="28637649" X-IronPort-AV: E=Sophos;i="6.11,199,1725346800"; d="scan'208";a="28637649" Received: from fmviesa007.fm.intel.com ([10.60.135.147]) by orvoesa113.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 17 Oct 2024 08:57:02 -0700 X-CSE-ConnectionGUID: HMBUxZ4NQkKfB/aWUHCFYA== X-CSE-MsgGUID: 4R18VR1FSe6VzTPQEisOjQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.11,211,1725346800"; d="scan'208";a="78254722" Received: from black.fi.intel.com ([10.237.72.28]) by fmviesa007.fm.intel.com with ESMTP; 17 Oct 2024 08:56:55 -0700 Received: by black.fi.intel.com (Postfix, from userid 1000) id CAE801BE; Thu, 17 Oct 2024 18:56:54 +0300 (EEST) From: "Kirill A. Shutemov" To: Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , x86@kernel.org, "H. Peter Anvin" , Andy Lutomirski Cc: Albert Ou , Alexei Starovoitov , Andrea Parri , Arnd Bergmann , Daniel Borkmann , Eric Chan , Jason Gunthorpe , Kai Huang , Kefeng Wang , Kent Overstreet , Palmer Dabbelt , Paul Walmsley , Russell King , Samuel Holland , Suren Baghdasaryan , Yuntao Wang , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-riscv@lists.infradead.org, "Kirill A. Shutemov" Subject: [PATCH 1/2] memremap: Pass down MEMREMAP_* flags to arch_memremap_wb() Date: Thu, 17 Oct 2024 18:56:41 +0300 Message-ID: <20241017155642.1942514-2-kirill.shutemov@linux.intel.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20241017155642.1942514-1-kirill.shutemov@linux.intel.com> References: <20241017155642.1942514-1-kirill.shutemov@linux.intel.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" x86 version of arch_memremap_wb() needs the flags to decide if the mapping has be encrypted or decrypted. Pass down the flag to arch_memremap_wb(). All current implementations ignore the argument. Signed-off-by: Kirill A. Shutemov --- arch/arm/include/asm/io.h | 2 +- arch/arm/mm/ioremap.c | 2 +- arch/arm/mm/nommu.c | 2 +- arch/riscv/include/asm/io.h | 2 +- kernel/iomem.c | 5 +++-- 5 files changed, 7 insertions(+), 6 deletions(-) diff --git a/arch/arm/include/asm/io.h b/arch/arm/include/asm/io.h index 1815748f5d2a..bae5edf348ef 100644 --- a/arch/arm/include/asm/io.h +++ b/arch/arm/include/asm/io.h @@ -381,7 +381,7 @@ void __iomem *ioremap_wc(resource_size_t res_cookie, si= ze_t size); void iounmap(volatile void __iomem *io_addr); #define iounmap iounmap =20 -void *arch_memremap_wb(phys_addr_t phys_addr, size_t size); +void *arch_memremap_wb(phys_addr_t phys_addr, size_t size, unsigned long f= lags); #define arch_memremap_wb arch_memremap_wb =20 /* diff --git a/arch/arm/mm/ioremap.c b/arch/arm/mm/ioremap.c index 794cfea9f9d4..9f7883e6db46 100644 --- a/arch/arm/mm/ioremap.c +++ b/arch/arm/mm/ioremap.c @@ -411,7 +411,7 @@ void __arm_iomem_set_ro(void __iomem *ptr, size_t size) set_memory_ro((unsigned long)ptr, PAGE_ALIGN(size) / PAGE_SIZE); } =20 -void *arch_memremap_wb(phys_addr_t phys_addr, size_t size) +void *arch_memremap_wb(phys_addr_t phys_addr, size_t size, unsigned long f= lags) { return (__force void *)arch_ioremap_caller(phys_addr, size, MT_MEMORY_RW, diff --git a/arch/arm/mm/nommu.c b/arch/arm/mm/nommu.c index c415f3859b20..279641f0780e 100644 --- a/arch/arm/mm/nommu.c +++ b/arch/arm/mm/nommu.c @@ -251,7 +251,7 @@ void __iomem *pci_remap_cfgspace(resource_size_t res_co= okie, size_t size) EXPORT_SYMBOL_GPL(pci_remap_cfgspace); #endif =20 -void *arch_memremap_wb(phys_addr_t phys_addr, size_t size) +void *arch_memremap_wb(phys_addr_t phys_addr, size_t size, unsigned long f= lags) { return (void *)phys_addr; } diff --git a/arch/riscv/include/asm/io.h b/arch/riscv/include/asm/io.h index 1c5c641075d2..0257f4aa7ff4 100644 --- a/arch/riscv/include/asm/io.h +++ b/arch/riscv/include/asm/io.h @@ -136,7 +136,7 @@ __io_writes_outs(outs, u64, q, __io_pbr(), __io_paw()) #include =20 #ifdef CONFIG_MMU -#define arch_memremap_wb(addr, size) \ +#define arch_memremap_wb(addr, size, flags) \ ((__force void *)ioremap_prot((addr), (size), _PAGE_KERNEL)) #endif =20 diff --git a/kernel/iomem.c b/kernel/iomem.c index dc2120776e1c..75e61c1c6bc0 100644 --- a/kernel/iomem.c +++ b/kernel/iomem.c @@ -6,7 +6,8 @@ #include =20 #ifndef arch_memremap_wb -static void *arch_memremap_wb(resource_size_t offset, unsigned long size) +static void *arch_memremap_wb(resource_size_t offset, unsigned long size, + unsigned long flags) { #ifdef ioremap_cache return (__force void *)ioremap_cache(offset, size); @@ -91,7 +92,7 @@ void *memremap(resource_size_t offset, size_t size, unsig= ned long flags) if (is_ram =3D=3D REGION_INTERSECTS) addr =3D try_ram_remap(offset, size, flags); if (!addr) - addr =3D arch_memremap_wb(offset, size); + addr =3D arch_memremap_wb(offset, size, flags); } =20 /* --=20 2.45.2 From nobody Tue Nov 26 13:22:59 2024 Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.14]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 411CF1DEFFB for ; Thu, 17 Oct 2024 15:57:03 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.175.65.14 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1729180628; cv=none; b=mxYZs+yGVeXrCj2mpFyTQGXQ9nk2gw1yl7+xe+9cWYVL4EhVvufmk1PU72R/4MKTKW2GjLUURN5vJlHcGe5IWbzZe2i9CXCX1T6vdK3mH+e6ZrHaRZD8l/PKcHHZ7ggOulcUYEovxYRUQfUyzJ8e9t+LEHLMlX2QKOQDKbQBdZ8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1729180628; c=relaxed/simple; bh=/VD9JVIlRFWH9Bbc/DMmpRuCSyMrevX6I9tRJs6OSeA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=TOp8JxzJpE/LZfiRgHh+kEibT8SDrxneKUDY6RcFpxbzgwFbPPmonxSEjNmTyRrz1gdemSKAlR5VA8Nn1+gYIE8y/JxJNetBXmd2+ZUjjpPcyFWCL/EpIlfdXOg+OLQwcJQp9Uehi5T9UuOZDdfYJ77OyatjT4qe3sMU7ppMfV0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com; spf=none smtp.helo=mgamail.intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=C0jMbSe+; arc=none smtp.client-ip=198.175.65.14 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.helo=mgamail.intel.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="C0jMbSe+" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1729180624; x=1760716624; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=/VD9JVIlRFWH9Bbc/DMmpRuCSyMrevX6I9tRJs6OSeA=; b=C0jMbSe+pk2jNze4JcBzX+ftAcmVjVnCCYadf4qjW/OeitV2IKNj8svg 8X2IBthtJ35xFmXFC9yp6+IlLt39Z/sbKP4fFMDBpB44Cep90TGDIOe55 n9m/JMT7Hz98cAOdmvogdlzQlNNor6tUSQBlcYSggb1InUzM22NZI3v5S KkbLjoTmFSROH6qTUfVIoGGzMcWy8yD0Q7veEuJHrhZk7jWqd65SFCAW1 BVNg68QceuXIwqIMBITJHnSO5B9Dqag9j8wCN8GfONpcJpS6nRUPhFTma bIO1aOp+UP6L0+05S+lAFttlYyDpemhcb4h33o1mzyVED8AgbXaY0aEPJ w==; X-CSE-ConnectionGUID: WMmCI3QzT3yPLriChcaNuA== X-CSE-MsgGUID: gWxLkcvgSg+CZ3w2yzKh2g== X-IronPort-AV: E=McAfee;i="6700,10204,11228"; a="32471904" X-IronPort-AV: E=Sophos;i="6.11,211,1725346800"; d="scan'208";a="32471904" Received: from fmviesa004.fm.intel.com ([10.60.135.144]) by orvoesa106.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 17 Oct 2024 08:57:03 -0700 X-CSE-ConnectionGUID: vA5l5zXuT9yH2rdgTtEmzA== X-CSE-MsgGUID: 8Nvm5QWhT6KF+CcCuAQORA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.11,211,1725346800"; d="scan'208";a="83233226" Received: from black.fi.intel.com ([10.237.72.28]) by fmviesa004.fm.intel.com with ESMTP; 17 Oct 2024 08:56:56 -0700 Received: by black.fi.intel.com (Postfix, from userid 1000) id D957036B; Thu, 17 Oct 2024 18:56:54 +0300 (EEST) From: "Kirill A. Shutemov" To: Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , x86@kernel.org, "H. Peter Anvin" , Andy Lutomirski Cc: Albert Ou , Alexei Starovoitov , Andrea Parri , Arnd Bergmann , Daniel Borkmann , Eric Chan , Jason Gunthorpe , Kai Huang , Kefeng Wang , Kent Overstreet , Palmer Dabbelt , Paul Walmsley , Russell King , Samuel Holland , Suren Baghdasaryan , Yuntao Wang , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-riscv@lists.infradead.org, "Kirill A. Shutemov" , Tom Lendacky , Ashish Kalra , "Maciej W. Rozycki" Subject: [PATCH 2/2] x86/mm: Make memremap(MEMREMAP_WB) map memory as encrypted by default Date: Thu, 17 Oct 2024 18:56:42 +0300 Message-ID: <20241017155642.1942514-3-kirill.shutemov@linux.intel.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20241017155642.1942514-1-kirill.shutemov@linux.intel.com> References: <20241017155642.1942514-1-kirill.shutemov@linux.intel.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Currently memremap(MEMREMAP_WB) produces decrypted/shared mapping: memremap(MEMREMAP_WB) arch_memremap_wb() ioremap_cache() __ioremap_caller(.encrytped =3D false) It is a bad default. On TDX guests, access via shared mapping can be destructive[1]. Kernel already provides a way to request decrypted mapping explicitly via MEMREMAP_DEC flag. Make memremap(MEMREMAP_WB) produce encrypted/private mapping by default unless MEMREMAP_DEC is specified. It fixes crash on kexec in TDX guests if CONFIG_EISA is enabled. [1] https://lore.kernel.org/all/20240822095122.736522-1-kirill.shutemov@lin= ux.intel.com Signed-off-by: Kirill A. Shutemov Cc: Tom Lendacky Cc: Ashish Kalra Cc: "Maciej W. Rozycki" --- arch/x86/include/asm/io.h | 3 +++ arch/x86/mm/ioremap.c | 8 ++++++++ 2 files changed, 11 insertions(+) diff --git a/arch/x86/include/asm/io.h b/arch/x86/include/asm/io.h index 1d60427379c9..1a3a34b40598 100644 --- a/arch/x86/include/asm/io.h +++ b/arch/x86/include/asm/io.h @@ -180,6 +180,9 @@ extern void __iomem *ioremap_prot(resource_size_t offse= t, unsigned long size, un extern void __iomem *ioremap_encrypted(resource_size_t phys_addr, unsigned= long size); #define ioremap_encrypted ioremap_encrypted =20 +void *arch_memremap_wb(phys_addr_t phys_addr, size_t size, unsigned long f= lags); +#define arch_memremap_wb arch_memremap_wb + /** * ioremap - map bus memory into CPU space * @offset: bus address of the memory diff --git a/arch/x86/mm/ioremap.c b/arch/x86/mm/ioremap.c index 70b02fc61d93..fc65a81fd777 100644 --- a/arch/x86/mm/ioremap.c +++ b/arch/x86/mm/ioremap.c @@ -503,6 +503,14 @@ void iounmap(volatile void __iomem *addr) } EXPORT_SYMBOL(iounmap); =20 +void *arch_memremap_wb(phys_addr_t phys_addr, size_t size, unsigned long f= lags) +{ + if (flags & MEMREMAP_DEC) + return ioremap_cache(phys_addr, size); + + return ioremap_encrypted(phys_addr, size); +} + /* * Convert a physical pointer to a virtual kernel pointer for /dev/mem * access --=20 2.45.2