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 45ECBC433EF for ; Thu, 3 Feb 2022 16:43:56 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id AAD166B03DA; Thu, 3 Feb 2022 11:43:55 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id A5C9F6B03DB; Thu, 3 Feb 2022 11:43:55 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 8D74F6B03DC; Thu, 3 Feb 2022 11:43:55 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0136.hostedemail.com [216.40.44.136]) by kanga.kvack.org (Postfix) with ESMTP id 7F97E6B03DA for ; Thu, 3 Feb 2022 11:43:55 -0500 (EST) Received: from smtpin09.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay01.hostedemail.com (Postfix) with ESMTP id 42F18181951DA for ; Thu, 3 Feb 2022 16:43:55 +0000 (UTC) X-FDA: 79102040430.09.C9639D5 Received: from mail-oo1-f48.google.com (mail-oo1-f48.google.com [209.85.161.48]) by imf31.hostedemail.com (Postfix) with ESMTP id E419F20002 for ; Thu, 3 Feb 2022 16:43:54 +0000 (UTC) Received: by mail-oo1-f48.google.com with SMTP id r15-20020a4ae5cf000000b002edba1d3349so1962043oov.3 for ; Thu, 03 Feb 2022 08:43:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=eclypsium.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=zqxGKfIaElLILaxF70bDCH7K86RuUZa6ey16asaAIL8=; b=datlh4dR78ilyTuX5QJMyasJ51wpsY/9yQWHYGQ5q+433ZIPXwWIrpKMsFE6Scjokx VVmwwBvqOxzijJNX6FoIk2lBAXVjwP18b7JWnw/DUTcY2nlfRG1h0DhNZkY/sRr2hBAk cFcAktlfD8CBOQtWCtesgfwtCD30Ag+pnjxeef09PTYlVmecbF7xr47SFmHX4pJr8eaC WbxOL1lARe1FGG//DOrbrVjBmmNl953y/6PcDdyUEevozYmWj3fUpEuOQqaT/kn2Lvke zdywgqZAjdL6sRg3kQs8EKm+q0Gm/wJYCEMcsXnxCnFgDwNUf2wXdDR99WKaXGadra07 jKsg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=zqxGKfIaElLILaxF70bDCH7K86RuUZa6ey16asaAIL8=; b=cowonjHaSPMBXsCHZoxKmeMHZCtIo2luwWn3dWNZdbcp91zlUCBtCsJ3/Ijbne6o7+ u/SHTgvRrypm+2g79Tto6F2DzWaMoCh5asfx16x6IqAKOHKhwy0yzoKVcDuk0YkRTOxv AbJYwl/C+XTikLJFSPzy+8OwsXdv8J+TrllcegpRELd5erqZKK3Z1BOkGa9s+Ox0zo8C 4kg18SaDFsmjFlDHzmD55x1rbzcoMEP5tX9AgIBBX8Jn6m00IpETls6Td+DU5RWrVDOi rI1+g3jt3DoLX12xw/LKYCYkaYD8Kduf5L1LeNjXbgyX7AV7jeCXZilHuNicp261WfKT 2YxA== X-Gm-Message-State: AOAM530iNYSVDlWcGSULqR18vdrnxcfqBmwU9GyA3mNU7B1Hd0dTGxno w3z8CfrK9jiRJEAhTV75QqCdPQ== X-Google-Smtp-Source: ABdhPJz3KHjC1PcTs960s+pnZHPdMPi5tX1gUa+Hy63Y3u0iqFld1EfTMFHHJ54cHT2MusHjn7bfpQ== X-Received: by 2002:a05:6870:2144:: with SMTP id g4mr360672oae.30.1643906634240; Thu, 03 Feb 2022 08:43:54 -0800 (PST) Received: from localhost (host8.190-224-49.telecom.net.ar. [190.224.49.8]) by smtp.gmail.com with ESMTPSA id x16sm3107305ooa.6.2022.02.03.08.43.48 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 03 Feb 2022 08:43:54 -0800 (PST) From: Martin Fernandez To: linux-kernel@vger.kernel.org, linux-efi@vger.kernel.org, platform-driver-x86@vger.kernel.org, linux-mm@kvack.org Cc: tglx@linutronix.de, mingo@redhat.com, bp@alien8.de, dave.hansen@linux.intel.com, x86@kernel.org, hpa@zytor.com, ardb@kernel.org, dvhart@infradead.org, andy@infradead.org, gregkh@linuxfoundation.org, rafael@kernel.org, rppt@kernel.org, akpm@linux-foundation.org, daniel.gutson@eclypsium.com, hughsient@gmail.com, alex.bazhaniuk@eclypsium.com, alison.schofield@intel.com, keescook@chromium.org, Martin Fernandez Subject: [PATCH v6 1/6] mm/memblock: Tag memblocks with crypto capabilities Date: Thu, 3 Feb 2022 13:43:23 -0300 Message-Id: <20220203164328.203629-2-martin.fernandez@eclypsium.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220203164328.203629-1-martin.fernandez@eclypsium.com> References: <20220203164328.203629-1-martin.fernandez@eclypsium.com> MIME-Version: 1.0 Authentication-Results: imf31.hostedemail.com; dkim=pass header.d=eclypsium.com header.s=google header.b=datlh4dR; spf=pass (imf31.hostedemail.com: domain of martin.fernandez@eclypsium.com designates 209.85.161.48 as permitted sender) smtp.mailfrom=martin.fernandez@eclypsium.com; dmarc=pass (policy=quarantine) header.from=eclypsium.com X-Rspam-User: nil X-Rspamd-Queue-Id: E419F20002 X-Stat-Signature: ddeuqmxpgf1yxeddjw119tnanirux56j X-Rspamd-Server: rspam12 X-HE-Tag: 1643906634-451335 Content-Transfer-Encoding: quoted-printable 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: Add the capability to mark regions of the memory memory_type able of hardware memory encryption. Also add the capability to query if all regions of a memory node are able to do hardware memory encryption to call it when initializing the nodes. Warn the user if a node has both encryptable and non-encryptable regions. Signed-off-by: Martin Fernandez --- include/linux/memblock.h | 15 ++++++---- mm/memblock.c | 64 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 74 insertions(+), 5 deletions(-) diff --git a/include/linux/memblock.h b/include/linux/memblock.h index 9dc7cb239d21..73edcce165a5 100644 --- a/include/linux/memblock.h +++ b/include/linux/memblock.h @@ -41,13 +41,15 @@ extern unsigned long long max_possible_pfn; * via a driver, and never indicated in the firmware-provided memory map= as * system RAM. This corresponds to IORESOURCE_SYSRAM_DRIVER_MANAGED in t= he * kernel resource tree. + * @MEMBLOCK_CRYPTO_CAPABLE: capable of hardware encryption */ enum memblock_flags { - MEMBLOCK_NONE =3D 0x0, /* No special request */ - MEMBLOCK_HOTPLUG =3D 0x1, /* hotpluggable region */ - MEMBLOCK_MIRROR =3D 0x2, /* mirrored region */ - MEMBLOCK_NOMAP =3D 0x4, /* don't add to kernel direct mapping */ - MEMBLOCK_DRIVER_MANAGED =3D 0x8, /* always detected via a driver */ + MEMBLOCK_NONE =3D 0x0, /* No special request */ + MEMBLOCK_HOTPLUG =3D 0x1, /* hotpluggable region */ + MEMBLOCK_MIRROR =3D 0x2, /* mirrored region */ + MEMBLOCK_NOMAP =3D 0x4, /* don't add to kernel direct mapping */ + MEMBLOCK_DRIVER_MANAGED =3D 0x8, /* always detected via a driver */ + MEMBLOCK_CRYPTO_CAPABLE =3D 0x10, /* capable of hardware encryption */ }; =20 /** @@ -121,6 +123,9 @@ int memblock_physmem_add(phys_addr_t base, phys_addr_= t size); void memblock_trim_memory(phys_addr_t align); bool memblock_overlaps_region(struct memblock_type *type, phys_addr_t base, phys_addr_t size); +bool memblock_node_is_crypto_capable(int nid); +int memblock_mark_crypto_capable(phys_addr_t base, phys_addr_t size); +int memblock_clear_crypto_capable(phys_addr_t base, phys_addr_t size); int memblock_mark_hotplug(phys_addr_t base, phys_addr_t size); int memblock_clear_hotplug(phys_addr_t base, phys_addr_t size); int memblock_mark_mirror(phys_addr_t base, phys_addr_t size); diff --git a/mm/memblock.c b/mm/memblock.c index 1018e50566f3..fcf79befeab3 100644 --- a/mm/memblock.c +++ b/mm/memblock.c @@ -191,6 +191,42 @@ bool __init_memblock memblock_overlaps_region(struct= memblock_type *type, return i < type->cnt; } =20 +/** + * memblock_node_is_crypto_capable - get if whole node is capable + * of encryption + * @nid: number of node + * + * Iterate over all memory memblock_type and find if all regions under + * node @nid are capable of hardware encryption. + * + * Return: + * true if every region in memory memblock_type is capable of + * encryption, false otherwise. + */ +bool __init_memblock memblock_node_is_crypto_capable(int nid) +{ + struct memblock_region *region; + bool crypto_capable =3D false; + bool not_crypto_capable =3D false; + + for_each_mem_region(region) { + if (memblock_get_region_node(region) =3D=3D nid) { + crypto_capable =3D + crypto_capable || + (region->flags & MEMBLOCK_CRYPTO_CAPABLE); + not_crypto_capable =3D + not_crypto_capable || + !(region->flags & MEMBLOCK_CRYPTO_CAPABLE); + } + } + + if (crypto_capable && not_crypto_capable) + pr_warn_once("Node %d has regions that are encryptable and regions tha= t aren't", + nid); + + return !not_crypto_capable; +} + /** * __memblock_find_range_bottom_up - find free area utility in bottom-up * @start: start of candidate range @@ -885,6 +921,34 @@ static int __init_memblock memblock_setclr_flag(phys= _addr_t base, return 0; } =20 +/** + * memblock_mark_crypto_capable - Mark memory regions capable of hardwar= e + * encryption with flag MEMBLOCK_CRYPTO_CAPABLE. + * @base: the base phys addr of the region + * @size: the size of the region + * + * Return: 0 on success, -errno on failure. + */ +int __init_memblock memblock_mark_crypto_capable(phys_addr_t base, + phys_addr_t size) +{ + return memblock_setclr_flag(base, size, 1, MEMBLOCK_CRYPTO_CAPABLE); +} + +/** + * memblock_clear_crypto_capable - Clear flag MEMBLOCK_CRYPTO for a + * specified region. + * @base: the base phys addr of the region + * @size: the size of the region + * + * Return: 0 on success, -errno on failure. + */ +int __init_memblock memblock_clear_crypto_capable(phys_addr_t base, + phys_addr_t size) +{ + return memblock_setclr_flag(base, size, 0, MEMBLOCK_CRYPTO_CAPABLE); +} + /** * memblock_mark_hotplug - Mark hotpluggable memory with flag MEMBLOCK_H= OTPLUG. * @base: the base phys addr of the region --=20 2.30.2