Message ID | 1487878008-10413-1-git-send-email-ard.biesheuvel@linaro.org (mailing list archive) |
---|---|
State | New, archived |
Headers | show
Return-Path: <linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org> Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 7344160210 for <patchwork-linux-arm@patchwork.kernel.org>; Thu, 23 Feb 2017 19:27:25 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 60AC8283AC for <patchwork-linux-arm@patchwork.kernel.org>; Thu, 23 Feb 2017 19:27:25 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 558E62846C; Thu, 23 Feb 2017 19:27:25 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id C8CFB283AC for <patchwork-linux-arm@patchwork.kernel.org>; Thu, 23 Feb 2017 19:27:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:Message-Id:Date: Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To: References:List-Owner; bh=kSSNMCbTZCjhQwWeEa2nCoQTleYiaHBrLRPr+Xk93p0=; b=I/p L8PlN4n9jVprdiFpx77N24PjMxNPc+Uft0FhXGna9PQVKV1kIPxv+k+7z1UcaOy4HfnUiKnGcPecP k/JpJQ79yByjJace1WVMp+bxaX08G3w4LHiaP1yCIroLv2fa5IpNBKUZkGnvcKZ1xCEzLeFesF1o5 4hUSgDhDIOpCmAi/N1MkiDZub3KKoJnjZzhbzvJYzPntgio+IzdOrq8ib0/zyLvqbOUweUxHjSzrB 1KJRRmtCXN0COv9GunAOKK7bpygNjotE/luZLd+6+7fORHsTr9J/6gQWxcj5889rqkAVDxT4Ms6pT lHPv1KRDVsOJ3D85DSvUHHdo3Aku/HQ==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1cgz2v-0006Fm-Qa; Thu, 23 Feb 2017 19:27:21 +0000 Received: from mail-wm0-x231.google.com ([2a00:1450:400c:c09::231]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1cgz2r-0006Dq-FZ for linux-arm-kernel@lists.infradead.org; Thu, 23 Feb 2017 19:27:19 +0000 Received: by mail-wm0-x231.google.com with SMTP id r141so8338212wmg.1 for <linux-arm-kernel@lists.infradead.org>; Thu, 23 Feb 2017 11:26:57 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id; bh=XBdj44xwsnqx5Fz8ZqRhKNYTNuNRsjs72IDZrbJI7Wg=; b=SnwpDYgWr6DWV5ek90oMnA6T9QK31vTQGfQZ0nxwQwtiAzYVpQEwtwvM719aTWy3qb 0/twifSP/iIIJ2AczFi62qHRibjNbRZNC7UhEK/MDRUKqMInbqDHRJlnzkK7f11lPggI P4SiYznodhlUG8vSR2kLGvHblckWNVrsfSBr0= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=XBdj44xwsnqx5Fz8ZqRhKNYTNuNRsjs72IDZrbJI7Wg=; b=U8zw7KntL9fNeFxshe582eArtAaMxpK36DFcAM/zZV/IUCUWGSrctwwUh8MNtDRpgR UJC6J/qx2czKcg9Q0nqeBqQzWNnTLTnpHJI+nsQEPCy2zzWG5HdBXQ/0sW9WhILiZ6Tw XO6WTsAeKFxlTCoiArtXEgBlNxRsIHamXbyl/VZzrCWimz+7d6H+WlpGgoQf9o9Wm16L KMZTs9K5pQBFWXyKwtGQUZPNApMvPu7RGprY36Vu7f4i5wCM3iOlVjcP4e1yNjq7ol03 dk78cX/SmymmRBHpnuNzmIERj+lVs3+6ezrpHcxrqATdOUQ6N2sndFchbCPb0pp3u7dJ phEw== X-Gm-Message-State: AMke39nleDq81HjN/RsZ/CC/pAgGfXvR5yoXrA8DcrdUlyfZQbcbDalLJA44YBeFv4hzwTIZ X-Received: by 10.28.61.84 with SMTP id k81mr6258340wma.27.1487878015677; Thu, 23 Feb 2017 11:26:55 -0800 (PST) Received: from localhost.localdomain ([105.149.201.216]) by smtp.gmail.com with ESMTPSA id e74sm7612360wmd.2.2017.02.23.11.26.53 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 23 Feb 2017 11:26:54 -0800 (PST) From: Ard Biesheuvel <ard.biesheuvel@linaro.org> To: linux-arm-kernel@lists.infradead.org, linux-efi@vger.kernel.org, leif.lindholm@linaro.org, kraxel@redhat.com Subject: [PATCH] efi: ARM/arm64: fix boot crash with CONFIG_CPUMASK_OFFSTACK=y Date: Thu, 23 Feb 2017 19:26:48 +0000 Message-Id: <1487878008-10413-1-git-send-email-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.7.4 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170223_112717_793431_8BF5E70F X-CRM114-Status: GOOD ( 15.70 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: <linux-arm-kernel.lists.infradead.org> List-Unsubscribe: <http://lists.infradead.org/mailman/options/linux-arm-kernel>, <mailto:linux-arm-kernel-request@lists.infradead.org?subject=unsubscribe> List-Archive: <http://lists.infradead.org/pipermail/linux-arm-kernel/> List-Post: <mailto:linux-arm-kernel@lists.infradead.org> List-Help: <mailto:linux-arm-kernel-request@lists.infradead.org?subject=help> List-Subscribe: <http://lists.infradead.org/mailman/listinfo/linux-arm-kernel>, <mailto:linux-arm-kernel-request@lists.infradead.org?subject=subscribe> Cc: matt@codeblueprint.co.uk, lersek@redhat.com, Ard Biesheuvel <ard.biesheuvel@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" <linux-arm-kernel-bounces@lists.infradead.org> Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP |
diff --git a/drivers/firmware/efi/arm-runtime.c b/drivers/firmware/efi/arm-runtime.c index c394b81fe452..b4dd8b5ad516 100644 --- a/drivers/firmware/efi/arm-runtime.c +++ b/drivers/firmware/efi/arm-runtime.c @@ -45,6 +45,7 @@ static bool __init efi_virtmap_init(void) bool systab_found; efi_mm.pgd = pgd_alloc(&efi_mm); + mm_init_cpumask(&efi_mm); init_new_context(NULL, &efi_mm); systab_found = false;
On ARM and arm64, we use a dedicated mm_struct to map the UEFI Runtime Services regions, which allows us to map those regions on demand, and in a way that is guaranteed to be compatible with incoming kernels across kexec. As it turns out, we don't fully initialize the mm_struct in the same way as process mm_structs are initialized on fork(), which results in the following crash if CONFIG_CPUMASK_OFFSTACK is enabled: EFI Variables Facility v0.08 2004-May-17 Unable to handle kernel NULL pointer dereference at virtual address 00000000 pgd = c0204000 [00000000] *pgd=00000000 Internal error: Oops: 805 [#1] SMP ARM Modules linked in: CPU: 0 PID: 1 Comm: swapper/0 Not tainted 4.8.6-300.fc25.armv7hl #1 Hardware name: Generic DT based system task: ee90d700 task.stack: ee904000 PC is at __memzero+0x60/0x7c LR is at check_and_switch_context+0x22c/0x494 pc : [<c0515a80>] lr : [<c02234e0>] psr: 000c0093 sp : ee905e18 ip : 00000004 fp : 00000000 r10: 00000000 r9 : c0e8e718 r8 : c0e38f70 r7 : 00000000 r6 : 00000005 r5 : c0e390d8 r4 : c0d87098 r3 : 00000000 r2 : 00000000 r1 : 00000004 r0 : 00000000 Flags: nzcv IRQs off FIQs on Mode SVC_32 ISA ARM Segment none Control: 10c5383d Table: 4020406a DAC: 00000051 Process swapper/0 (pid: 1, stack limit = 0xee904220) Stack: (0xee905e18 to 0xee906000) ... [<c0515a80>] (__memzero) from [<c02234e0>] (check_and_switch_context+0x22c/0x494) [<c02234e0>] (check_and_switch_context) from [<c0770cc4>] (virt_efi_get_next_variable+0x28/0x8c) [<c0770cc4>] (virt_efi_get_next_variable) from [<c076dbac>] (efivar_init+0x94/0x2d4) [<c076dbac>] (efivar_init) from [<c076fa38>] (efivars_sysfs_init+0x8c/0x1e8) [<c076fa38>] (efivars_sysfs_init) from [<c0209d48>] (do_one_initcall+0x130/0x158) [<c0209d48>] (do_one_initcall) from [<c0c5bea8>] (kernel_init_freeable+0x210/0x25c) This is due to a missing call to mm_init_cpumask(), so add it. Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org> --- drivers/firmware/efi/arm-runtime.c | 1 + 1 file changed, 1 insertion(+)