Received: by 2002:a05:6512:3d0e:0:0:0:0 with SMTP id d14csp42222lfv; Tue, 12 Apr 2022 16:29:36 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzsc+TN4GyFTn3neBrQRSqr3Y0uWKaQ+CbbJ+0AZcot0okH8+bjVSmRnphx6fovJ1S7hNKS X-Received: by 2002:a63:f80e:0:b0:39d:6a06:517b with SMTP id n14-20020a63f80e000000b0039d6a06517bmr8608409pgh.308.1649806176704; Tue, 12 Apr 2022 16:29:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1649806176; cv=none; d=google.com; s=arc-20160816; b=BmPi2S9R0ipoQsUTEsJNlX0ox6sWKy9ALBt2w4hOTj0T3ipO9V71aok7tP8UV0n3hC xxUp6h0GGAcHYDXo4TC/klTCzZ4Tn0pWOhnqyYLf39J2YX4pbuV27iMraV1nXP63Y7+L 4FZSBIfWqoAbidb5Fm2o2aMJzFgFGqvYekFaMmz11EvnAcTotEUcugZr1YFnO6xxrxcF afzAXPo23dC5YBVqdW6unH/vQEL6hezVNP1bNPJBJJzZ314ucRYpb3YK9iIn6O5QhMaw tiMUkoIn5bznxN0JG5W7IcNzNcDWYTM2MyDC99U/NE5mwo+RbDkb1r8uVue8tHi2TX3T irpQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=79itJzmeiSpCXqzSlpGbuQrMWpaI6Hnplyuxz5ULs6o=; b=lQGG3x4/1iwDI7954Yg22YVuVa5S39XEYTtFRWQcyowWera/HD5fNYXUl0h9IVnHpi xZs8T+Dqarl3KU5lX+AJYplm5Cd2BIGvxPeMeC45m0kjPZjH5ixDtfNbv8SW0DYIiqIu gZglrlNQqlf24Jo4FM9nfz/aUFqapAK/Ldxs1yLS4ryqIH6It9B9c7i+MRef+pl33+s7 yBB7xrRIuz680ov1pl+p/ZgdZt5v2oOWdqghLuERp88YSHZKvfXPMn35S4cm8Jb8nv5U AsADrSuyU99KjCoBCsJhwhxWRe/22emEir8Nxr9zSNPk5BnsXuNbkWGQ2dTdd9NfNAOV 3zNw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=BRInyC0O; spf=softfail (google.com: domain of transitioning linux-kernel-owner@vger.kernel.org does not designate 23.128.96.19 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from lindbergh.monkeyblade.net (lindbergh.monkeyblade.net. [23.128.96.19]) by mx.google.com with ESMTPS id n1-20020a170902d2c100b001568bc04b41si9434974plc.147.2022.04.12.16.29.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 Apr 2022 16:29:36 -0700 (PDT) Received-SPF: softfail (google.com: domain of transitioning linux-kernel-owner@vger.kernel.org does not designate 23.128.96.19 as permitted sender) client-ip=23.128.96.19; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=BRInyC0O; spf=softfail (google.com: domain of transitioning linux-kernel-owner@vger.kernel.org does not designate 23.128.96.19 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id CC41414FB89; Tue, 12 Apr 2022 14:21:46 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241430AbiDLJC5 (ORCPT + 99 others); Tue, 12 Apr 2022 05:02:57 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46318 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1357141AbiDLHjs (ORCPT ); Tue, 12 Apr 2022 03:39:48 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 63042FD38; Tue, 12 Apr 2022 00:12:54 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id DBAC06153F; Tue, 12 Apr 2022 07:12:53 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id F01E6C385A1; Tue, 12 Apr 2022 07:12:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1649747573; bh=P9339kzxSF3vWnhasGJ8BLgcj+pm607be6iydjNTHqQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=BRInyC0O9oR19/y3S8GAnXLyBD5nRifESNtX9IsfO1ut0kylyZjdzICHBKQHftaNC /7iDmciHBnaRje5eF28Y7MYAmd06FnP/pnRseFWPZPIe5vxCeP2Nu3wBSC0WqzOn0b VW/BmlJy8p/Vn8rWu5ApN03i93jRMZuxiQO3oRoM= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Paul Menzel , Christophe Leroy , Michael Ellerman , Sasha Levin , Peter Zijlstra Subject: [PATCH 5.17 128/343] powerpc/code-patching: Pre-map patch area Date: Tue, 12 Apr 2022 08:29:06 +0200 Message-Id: <20220412062955.078609639@linuxfoundation.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220412062951.095765152@linuxfoundation.org> References: <20220412062951.095765152@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RDNS_NONE,SPF_HELO_NONE,T_SCC_BODY_TEXT_LINE autolearn=no autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Michael Ellerman [ Upstream commit 591b4b268435f00d2f0b81f786c2c7bd5ef66416 ] Paul reported a warning with DEBUG_ATOMIC_SLEEP=y: BUG: sleeping function called from invalid context at include/linux/sched/mm.h:256 in_atomic(): 0, irqs_disabled(): 1, non_block: 0, pid: 1, name: swapper/0 preempt_count: 0, expected: 0 ... Call Trace: dump_stack_lvl+0xa0/0xec (unreliable) __might_resched+0x2f4/0x310 kmem_cache_alloc+0x220/0x4b0 __pud_alloc+0x74/0x1d0 hash__map_kernel_page+0x2cc/0x390 do_patch_instruction+0x134/0x4a0 arch_jump_label_transform+0x64/0x78 __jump_label_update+0x148/0x180 static_key_enable_cpuslocked+0xd0/0x120 static_key_enable+0x30/0x50 check_kvm_guest+0x60/0x88 pSeries_smp_probe+0x54/0xb0 smp_prepare_cpus+0x3e0/0x430 kernel_init_freeable+0x20c/0x43c kernel_init+0x30/0x1a0 ret_from_kernel_thread+0x5c/0x64 Peter pointed out that this is because do_patch_instruction() has disabled interrupts, but then map_patch_area() calls map_kernel_page() then hash__map_kernel_page() which does a sleeping memory allocation. We only see the warning in KVM guests with SMT enabled, which is not particularly common, or on other platforms if CONFIG_KPROBES is disabled, also not common. The reason we don't see it in most configurations is that another path that happens to have interrupts enabled has allocated the required page tables for us, eg. there's a path in kprobes init that does that. That's just pure luck though. As Christophe suggested, the simplest solution is to do a dummy map/unmap when we initialise the patching, so that any required page table levels are pre-allocated before the first call to do_patch_instruction(). This works because the unmap doesn't free any page tables that were allocated by the map, it just clears the PTE, leaving the page table levels there for the next map. Reported-by: Paul Menzel Debugged-by: Peter Zijlstra Suggested-by: Christophe Leroy Signed-off-by: Michael Ellerman Link: https://lore.kernel.org/r/20220223015821.473097-1-mpe@ellerman.id.au Signed-off-by: Sasha Levin --- arch/powerpc/lib/code-patching.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/arch/powerpc/lib/code-patching.c b/arch/powerpc/lib/code-patching.c index 906d43463366..00c68e7fb11e 100644 --- a/arch/powerpc/lib/code-patching.c +++ b/arch/powerpc/lib/code-patching.c @@ -43,9 +43,14 @@ int raw_patch_instruction(u32 *addr, ppc_inst_t instr) #ifdef CONFIG_STRICT_KERNEL_RWX static DEFINE_PER_CPU(struct vm_struct *, text_poke_area); +static int map_patch_area(void *addr, unsigned long text_poke_addr); +static void unmap_patch_area(unsigned long addr); + static int text_area_cpu_up(unsigned int cpu) { struct vm_struct *area; + unsigned long addr; + int err; area = get_vm_area(PAGE_SIZE, VM_ALLOC); if (!area) { @@ -53,6 +58,15 @@ static int text_area_cpu_up(unsigned int cpu) cpu); return -1; } + + // Map/unmap the area to ensure all page tables are pre-allocated + addr = (unsigned long)area->addr; + err = map_patch_area(empty_zero_page, addr); + if (err) + return err; + + unmap_patch_area(addr); + this_cpu_write(text_poke_area, area); return 0; -- 2.35.1