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 X-Spam-Level: X-Spam-Status: No, score=-16.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1A4BEC07E96 for ; Tue, 13 Jul 2021 05:31:44 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id E3B6F601FE for ; Tue, 13 Jul 2021 05:31:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232060AbhGMFe2 (ORCPT ); Tue, 13 Jul 2021 01:34:28 -0400 Received: from mx0b-001b2d01.pphosted.com ([148.163.158.5]:26654 "EHLO mx0b-001b2d01.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231373AbhGMFeZ (ORCPT ); Tue, 13 Jul 2021 01:34:25 -0400 Received: from pps.filterd (m0098417.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.0.43/8.16.0.43) with SMTP id 16D53TbN132201; Tue, 13 Jul 2021 01:31:22 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-transfer-encoding; s=pp1; bh=Fu4B94XecByGojpzF5/h47uD37QP24gK+CFWTVJGVa0=; b=IARshPrmvDXJbSeHT39yxIRaTvhyn/UoyxM4/i2LEl7dZIxOZirOD0Z7w4u6ZRDFqxMP mhiKJlH4LrQtm6khAkPF6Eefu0bNLp+Tp6ixt8v7IrnBbZAuOO15m84BubJ7zemmf40V 91lT6haMx4W9sHSABP/FaL/ux8Vgedds7XGVxLKwXT3QlOY/ze+GZH6h0LMoUh9KxXXH Zhws2ndwKrtjs6dneRl1b1elPmyLoqqHe8scjJiavkA5MpEIeXQuOb5OQBERBuuY5lto 1NekkVA0mz4FcydIXFWRu8OMLF4l30b8XtNUX9YfJFrSkkxJCP9WOi4YIEvO2JjPLoH3 Sg== Received: from pps.reinject (localhost [127.0.0.1]) by mx0a-001b2d01.pphosted.com with ESMTP id 39qs49fw0h-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 13 Jul 2021 01:31:22 -0400 Received: from m0098417.ppops.net (m0098417.ppops.net [127.0.0.1]) by pps.reinject (8.16.0.43/8.16.0.43) with SMTP id 16D53Xew132596; Tue, 13 Jul 2021 01:31:22 -0400 Received: from ppma03dal.us.ibm.com (b.bd.3ea9.ip4.static.sl-reverse.com [169.62.189.11]) by mx0a-001b2d01.pphosted.com with ESMTP id 39qs49fw09-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 13 Jul 2021 01:31:22 -0400 Received: from pps.filterd (ppma03dal.us.ibm.com [127.0.0.1]) by ppma03dal.us.ibm.com (8.16.1.2/8.16.1.2) with SMTP id 16D5Ri3q003535; Tue, 13 Jul 2021 05:31:21 GMT Received: from b03cxnp08026.gho.boulder.ibm.com (b03cxnp08026.gho.boulder.ibm.com [9.17.130.18]) by ppma03dal.us.ibm.com with ESMTP id 39rkgtqcf9-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 13 Jul 2021 05:31:21 +0000 Received: from b03ledav005.gho.boulder.ibm.com (b03ledav005.gho.boulder.ibm.com [9.17.130.236]) by b03cxnp08026.gho.boulder.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 16D5VKca30540092 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 13 Jul 2021 05:31:20 GMT Received: from b03ledav005.gho.boulder.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 271B7BE051; Tue, 13 Jul 2021 05:31:20 +0000 (GMT) Received: from b03ledav005.gho.boulder.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id C62A6BE04F; Tue, 13 Jul 2021 05:31:19 +0000 (GMT) Received: from oc8246131445.ibm.com (unknown [9.163.19.100]) by b03ledav005.gho.boulder.ibm.com (Postfix) with SMTP; Tue, 13 Jul 2021 05:31:19 +0000 (GMT) Received: from oc8246131445.ibm.com (localhost.localdomain [127.0.0.1]) by oc8246131445.ibm.com (Postfix) with ESMTP id 3D036BC0C21; Tue, 13 Jul 2021 00:31:15 -0500 (CDT) From: "Christopher M. Riedl" To: linuxppc-dev@lists.ozlabs.org Cc: tglx@linutronix.de, x86@kernel.org, linux-hardening@vger.kernel.org, keescook@chromium.org, npiggin@gmail.com, dja@axtens.net, peterz@infradead.org Subject: [PATCH v5 7/8] powerpc/64s: Initialize and use a temporary mm for patching on Radix Date: Tue, 13 Jul 2021 00:31:12 -0500 Message-Id: <20210713053113.4632-8-cmr@linux.ibm.com> X-Mailer: git-send-email 2.26.1 In-Reply-To: <20210713053113.4632-1-cmr@linux.ibm.com> References: <20210713053113.4632-1-cmr@linux.ibm.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-TM-AS-GCONF: 00 X-Proofpoint-GUID: r7wF62Wuxc73CQARFB0IJIKBroXqIKTb X-Proofpoint-ORIG-GUID: 6fbwWfuh-8eTmZzb9mOWiVRLpQ-wptY0 X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.391,18.0.790 definitions=2021-07-13_03:2021-07-13,2021-07-12 signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 mlxscore=0 adultscore=0 phishscore=0 lowpriorityscore=0 bulkscore=0 priorityscore=1501 clxscore=1015 spamscore=0 malwarescore=0 suspectscore=0 impostorscore=0 mlxlogscore=999 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2104190000 definitions=main-2107130026 Precedence: bulk List-ID: X-Mailing-List: linux-hardening@vger.kernel.org When code patching a STRICT_KERNEL_RWX kernel the page containing the address to be patched is temporarily mapped as writeable. Currently, a per-cpu vmalloc patch area is used for this purpose. While the patch area is per-cpu, the temporary page mapping is inserted into the kernel page tables for the duration of patching. The mapping is exposed to CPUs other than the patching CPU - this is undesirable from a hardening perspective. Use a temporary mm instead which keeps the mapping local to the CPU doing the patching. Use the `poking_init` init hook to prepare a temporary mm and patching address. Initialize the temporary mm by copying the init mm. Choose a randomized patching address inside the temporary mm userspace address space. The patching address is randomized between PAGE_SIZE and DEFAULT_MAP_WINDOW-PAGE_SIZE. Bits of entropy with 64K page size on BOOK3S_64: bits of entropy =3D log2(DEFAULT_MAP_WINDOW_USER64 / PAGE_SIZE) PAGE_SIZE=3D64K, DEFAULT_MAP_WINDOW_USER64=3D128TB bits of entropy =3D log2(128TB / 64K) bits of entropy =3D 31 The upper limit is DEFAULT_MAP_WINDOW due to how the Book3s64 Hash MMU operates - by default the space above DEFAULT_MAP_WINDOW is not available. Currently the Hash MMU does not use a temporary mm so technically this upper limit isn't necessary; however, a larger randomization range does not further "harden" this overall approach and future work may introduce patching with a temporary mm on Hash as well. Randomization occurs only once during initialization at boot for each possible CPU in the system. Introduce two new functions, map_patch() and unmap_patch(), to respectively create and remove the temporary mapping with write permissions at patching_addr. Map the page with PAGE_KERNEL to set EAA[0] for the PTE which ignores the AMR (so no need to unlock/lock KUAP) according to PowerISA v3.0b Figure 35 on Radix. Based on x86 implementation: commit 4fc19708b165 ("x86/alternatives: Initialize temporary mm for patching") and: commit b3fd8e83ada0 ("x86/alternatives: Use temporary mm for text poking") Signed-off-by: Christopher M. Riedl --- v5: * Only support Book3s64 Radix MMU for now. * Use a per-cpu datastructure to hold the patching_addr and patching_mm to avoid the need for a synchronization lock/mutex. v4: * In the previous series this was two separate patches: one to init the temporary mm in poking_init() (unused in powerpc at the time) and the other to use it for patching (which removed all the per-cpu vmalloc code). Now that we use poking_init() in the existing per-cpu vmalloc approach, that separation doesn't work as nicely anymore so I just merged the two patches into one. * Preload the SLB entry and hash the page for the patching_addr when using Hash on book3s64 to avoid taking an SLB and Hash fault during patching. The previous implementation was a hack which changed current->mm to allow the SLB and Hash fault handlers to work with the temporary mm since both of those code-paths always assume mm =3D=3D current->mm. * Also (hmm - seeing a trend here) with the book3s64 Hash MMU we have to manage the mm->context.active_cpus counter and mm cpumask since they determine (via mm_is_thread_local()) if the TLB flush in pte_clear() is local or not - it should always be local when we're using the temporary mm. On book3s64's Radix MMU we can just call local_flush_tlb_mm(). * Use HPTE_USE_KERNEL_KEY on Hash to avoid costly lock/unlock of KUAP. --- arch/powerpc/lib/code-patching.c | 132 +++++++++++++++++++++++++++++-- 1 file changed, 125 insertions(+), 7 deletions(-) diff --git a/arch/powerpc/lib/code-patching.c b/arch/powerpc/lib/code-pat= ching.c index 9f2eba9b70ee4..027dabd42b8dd 100644 --- a/arch/powerpc/lib/code-patching.c +++ b/arch/powerpc/lib/code-patching.c @@ -11,6 +11,7 @@ #include #include #include +#include =20 #include #include @@ -103,6 +104,7 @@ static inline void unuse_temporary_mm(struct temp_mm = *temp_mm) =20 static DEFINE_PER_CPU(struct vm_struct *, text_poke_area); static DEFINE_PER_CPU(unsigned long, cpu_patching_addr); +static DEFINE_PER_CPU(struct mm_struct *, cpu_patching_mm); =20 #if IS_BUILTIN(CONFIG_LKDTM) unsigned long read_cpu_patching_addr(unsigned int cpu) @@ -133,6 +135,51 @@ static int text_area_cpu_down(unsigned int cpu) return 0; } =20 +static __always_inline void __poking_init_temp_mm(void) +{ + int cpu; + spinlock_t *ptl; /* for protecting pte table */ + pte_t *ptep; + struct mm_struct *patching_mm; + unsigned long patching_addr; + + for_each_possible_cpu(cpu) { + /* + * Some parts of the kernel (static keys for example) depend on + * successful code patching. Code patching under + * STRICT_KERNEL_RWX requires this setup - otherwise we cannot + * patch at all. We use BUG_ON() here and later since an early + * failure is preferred to buggy behavior and/or strange + * crashes later. + */ + patching_mm =3D copy_init_mm(); + BUG_ON(!patching_mm); + + per_cpu(cpu_patching_mm, cpu) =3D patching_mm; + + /* + * Choose a randomized, page-aligned address from the range: + * [PAGE_SIZE, DEFAULT_MAP_WINDOW - PAGE_SIZE] The lower + * address bound is PAGE_SIZE to avoid the zero-page. The + * upper address bound is DEFAULT_MAP_WINDOW - PAGE_SIZE to + * stay under DEFAULT_MAP_WINDOW with the Book3s64 Hash MMU. + */ + patching_addr =3D PAGE_SIZE + ((get_random_long() & PAGE_MASK) + % (DEFAULT_MAP_WINDOW - 2 * PAGE_SIZE)); + + per_cpu(cpu_patching_addr, cpu) =3D patching_addr; + + /* + * PTE allocation uses GFP_KERNEL which means we need to + * pre-allocate the PTE here because we cannot do the + * allocation during patching when IRQs are disabled. + */ + ptep =3D get_locked_pte(patching_mm, patching_addr, &ptl); + BUG_ON(!ptep); + pte_unmap_unlock(ptep, ptl); + } +} + /* * Although BUG_ON() is rude, in this case it should only happen if ENOM= EM, and * we judge it as being preferable to a kernel that will crash later whe= n @@ -140,6 +187,11 @@ static int text_area_cpu_down(unsigned int cpu) */ void __init poking_init(void) { + if (radix_enabled()) { + __poking_init_temp_mm(); + return; + } + BUG_ON(!cpuhp_setup_state(CPUHP_AP_ONLINE_DYN, "powerpc/text_poke:online", text_area_cpu_up, text_area_cpu_down)); @@ -213,30 +265,96 @@ static inline int unmap_patch_area(void) return -EINVAL; } =20 +struct patch_mapping { + spinlock_t *ptl; /* for protecting pte table */ + pte_t *ptep; + struct temp_mm temp_mm; +}; + +/* + * This can be called for kernel text or a module. + */ +static int map_patch(const void *addr, struct patch_mapping *patch_mappi= ng) +{ + struct page *page; + pte_t pte; + pgprot_t pgprot; + struct mm_struct *patching_mm =3D __this_cpu_read(cpu_patching_mm); + unsigned long patching_addr =3D __this_cpu_read(cpu_patching_addr); + + if (is_vmalloc_or_module_addr(addr)) + page =3D vmalloc_to_page(addr); + else + page =3D virt_to_page(addr); + + patch_mapping->ptep =3D get_locked_pte(patching_mm, patching_addr, + &patch_mapping->ptl); + if (unlikely(!patch_mapping->ptep)) { + pr_warn("map patch: failed to allocate pte for patching\n"); + return -1; + } + + pgprot =3D PAGE_KERNEL; + pte =3D mk_pte(page, pgprot); + pte =3D pte_mkdirty(pte); + set_pte_at(patching_mm, patching_addr, patch_mapping->ptep, pte); + + init_temp_mm(&patch_mapping->temp_mm, patching_mm); + use_temporary_mm(&patch_mapping->temp_mm); + + return 0; +} + +static void unmap_patch(struct patch_mapping *patch_mapping) +{ + struct mm_struct *patching_mm =3D __this_cpu_read(cpu_patching_mm); + unsigned long patching_addr =3D __this_cpu_read(cpu_patching_addr); + + pte_clear(patching_mm, patching_addr, patch_mapping->ptep); + + local_flush_tlb_mm(patching_mm); + + pte_unmap_unlock(patch_mapping->ptep, patch_mapping->ptl); + + unuse_temporary_mm(&patch_mapping->temp_mm); +} + static int do_patch_instruction(u32 *addr, struct ppc_inst instr) { int err, rc =3D 0; u32 *patch_addr =3D NULL; unsigned long flags; + struct patch_mapping patch_mapping; =20 /* - * During early early boot patch_instruction is called - * when text_poke_area is not ready, but we still need - * to allow patching. We just do the plain old patching + * During early early boot patch_instruction is called when the + * patching_mm/text_poke_area is not ready, but we still need to allow + * patching. We just do the plain old patching. */ - if (!this_cpu_read(text_poke_area)) - return raw_patch_instruction(addr, instr); + if (radix_enabled()) { + if (!this_cpu_read(cpu_patching_mm)) + return raw_patch_instruction(addr, instr); + } else { + if (!this_cpu_read(text_poke_area)) + return raw_patch_instruction(addr, instr); + } =20 local_irq_save(flags); =20 - err =3D map_patch_area(addr); + if (radix_enabled()) + err =3D map_patch(addr, &patch_mapping); + else + err =3D map_patch_area(addr); if (err) goto out; =20 patch_addr =3D (u32 *)(__this_cpu_read(cpu_patching_addr) | offset_in_p= age(addr)); rc =3D __patch_instruction(addr, instr, patch_addr); =20 - err =3D unmap_patch_area(); + if (radix_enabled()) + unmap_patch(&patch_mapping); + else + err =3D unmap_patch_area(); =20 out: local_irq_restore(flags); --=20 2.26.1