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=-9.0 required=3.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_PASS,URIBL_BLOCKED,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 B378CC4360F for ; Fri, 5 Apr 2019 16:19:44 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 7C4D5206C0 for ; Fri, 5 Apr 2019 16:19:44 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=tycho-ws.20150623.gappssmtp.com header.i=@tycho-ws.20150623.gappssmtp.com header.b="CrpcgeE1" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731486AbfDEQTn (ORCPT ); Fri, 5 Apr 2019 12:19:43 -0400 Received: from mail-it1-f194.google.com ([209.85.166.194]:36514 "EHLO mail-it1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726694AbfDEQTm (ORCPT ); Fri, 5 Apr 2019 12:19:42 -0400 Received: by mail-it1-f194.google.com with SMTP id y10so10459916itc.1 for ; Fri, 05 Apr 2019 09:19:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tycho-ws.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=2+JkgZDdl5N2hO6eHTTGUg0G8D47vLzKig9IC4yp3YI=; b=CrpcgeE17+CTivpvHrlCLNFULnU8kaS3ILd3g7brkhwctuM0f+t2Udr2c310BdiPDk cHsb513FI5EdMd43JjYr/e9FE7XHiIbzOZEZQACLu0yiJr7ST0mR6JUAI2qmlkHPHvIj BK+R/0ZeUK/owOk0FCXWRBnuyYMulOleYST7R2YxvyFqtCWK4jNyVUBrmwt9rpT/oqFG bFgXHAXBlCieyAClePPxKNHx8FOOjGU8bUrwAbgCriEbXQErBLeryyX1NPNyHKRt7QYr RqGiAV8uUfXkuCYO0xdh6PV3PhMW6YHxito5KQITteJiCXpMZj9pPsNLK0Jfu1p6AYcZ ontQ== 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:mime-version :content-transfer-encoding; bh=2+JkgZDdl5N2hO6eHTTGUg0G8D47vLzKig9IC4yp3YI=; b=TSY8cXv4IqfR0q+FLNdawBdeu7RMUAWe4W6F61xq3jFzSPfai7kkPQ08cprQ9p6pwH uSpa0iw+rTavvz1d7+8sagFHSy4h58aYraMS33Pzy6aqITyHUQATxep3g7EjR3i8PGDQ itPFIJEmiD/QxX6KDzCuKyH0GOwxGcYXLCZv7IJOmtzVaMFt9nC6io+NquS7oQ9YVo8R kjxGwACXS17Ks3Cwyof3eY/OvzHtaMebKYXUVIcHfPYmpZQehL7AVX4xpGNR49bBmIqY y4WaH5DfaXUP5UkEgm7Ah1moqyG1efzr5BlfLf5kbqNIrZ17vzbhfDqY+ZZ8DwcmvAVM G7sw== X-Gm-Message-State: APjAAAW/5oS9QJm1gpCibtOPhosad+4VZY8PhlXBVYOLW/g9lyaO0KgY O33Yhy7wKUQDs8c3OwBicKMLww== X-Google-Smtp-Source: APXvYqzcN7DaeOazb6OObbV0sX+5oElObKnR7q5PBeVOSU6NkWnHHaF6e0O4RAeg57irFCnNKPb4Nw== X-Received: by 2002:a24:6f49:: with SMTP id x70mr10104598itb.102.1554481181263; Fri, 05 Apr 2019 09:19:41 -0700 (PDT) Received: from cisco.hsd1.co.comcast.net ([2601:282:901:dd7b:38ae:7ccc:265c:2d2c]) by smtp.gmail.com with ESMTPSA id m6sm8945592ioj.36.2019.04.05.09.19.39 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 05 Apr 2019 09:19:40 -0700 (PDT) From: Tycho Andersen To: Andy Lutomirski Cc: Thomas Gleixner , x86@kernel.org, linux-kernel@vger.kernel.org, Khalid Aziz , Sebastian Andrzej Siewior , Tycho Andersen , Josh Poimboeuf Subject: [PATCH v2] x86/entry: re-enable interrupts before exiting Date: Fri, 5 Apr 2019 10:19:29 -0600 Message-Id: <20190405161929.4756-1-tycho@tycho.ws> X-Mailer: git-send-email 2.19.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org If the kernel oopses in an interrupt, nothing re-enables interrupts: Aug 23 19:30:27 xpfo kernel: [ 38.302714] BUG: sleeping function called from invalid context at ./include/linux/percpu-rwsem.h:33 Aug 23 19:30:27 xpfo kernel: [ 38.303837] in_atomic(): 0, irqs_disabled(): 1, pid: 1970, name: lkdtm_xpfo_test Aug 23 19:30:27 xpfo kernel: [ 38.304758] CPU: 3 PID: 1970 Comm: lkdtm_xpfo_test Tainted: G D 4.13.0-rc5+ #228 Aug 23 19:30:27 xpfo kernel: [ 38.305813] Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS 1.10.1-1ubuntu1 04/01/2014 Aug 23 19:30:27 xpfo kernel: [ 38.306926] Call Trace: Aug 23 19:30:27 xpfo kernel: [ 38.307243] dump_stack+0x63/0x8b Aug 23 19:30:27 xpfo kernel: [ 38.307665] ___might_sleep+0xec/0x110 Aug 23 19:30:27 xpfo kernel: [ 38.308139] __might_sleep+0x45/0x80 Aug 23 19:30:27 xpfo kernel: [ 38.308593] exit_signals+0x21/0x1c0 Aug 23 19:30:27 xpfo kernel: [ 38.309046] ? blocking_notifier_call_chain+0x11/0x20 Aug 23 19:30:27 xpfo kernel: [ 38.309677] do_exit+0x98/0xbf0 Aug 23 19:30:27 xpfo kernel: [ 38.310078] ? smp_reader+0x27/0x40 [lkdtm] Aug 23 19:30:27 xpfo kernel: [ 38.310604] ? kthread+0x10f/0x150 Aug 23 19:30:27 xpfo kernel: [ 38.311045] ? read_user_with_flags+0x60/0x60 [lkdtm] Aug 23 19:30:27 xpfo kernel: [ 38.311680] rewind_stack_do_exit+0x17/0x20 do_exit() expects to be called in a well-defined environment, so let's re-enable interrupts after unwinding the stack, in case they were disabled. Note that if any spinlocks are held, etc. we'll also get the above warning, so this isn't a silver bullet. So, let's add a C helper in case someone wants to add fancier lock busting or if we've forgotten to unwind something else. Signed-off-by: Tycho Andersen CC: Josh Poimboeuf --- I split this out from the XPFO series since it's mostly unrelated, and is just a bug I found while working on that series. v2: whitelist __finish_rewind_stack_do_exit() as a noreturn function in objtool (Josh) --- arch/x86/entry/common.c | 10 ++++++++++ arch/x86/entry/entry_32.S | 2 +- arch/x86/entry/entry_64.S | 2 +- tools/objtool/check.c | 1 + 4 files changed, 13 insertions(+), 2 deletions(-) diff --git a/arch/x86/entry/common.c b/arch/x86/entry/common.c index 7bc105f47d21..4e9c54e0495f 100644 --- a/arch/x86/entry/common.c +++ b/arch/x86/entry/common.c @@ -427,3 +427,13 @@ __visible long do_fast_syscall_32(struct pt_regs *regs) #endif } #endif + +void __noreturn __finish_rewind_stack_do_exit(long code) +{ + /* + * If we oopsed in an interrupt handler, interrupts may be off. Let's turn + * them back on before going back to "normal" code. + */ + local_irq_enable(); + do_exit(code); +} diff --git a/arch/x86/entry/entry_32.S b/arch/x86/entry/entry_32.S index d309f30cf7af..095b8770e3b0 100644 --- a/arch/x86/entry/entry_32.S +++ b/arch/x86/entry/entry_32.S @@ -1507,6 +1507,6 @@ ENTRY(rewind_stack_do_exit) movl PER_CPU_VAR(cpu_current_top_of_stack), %esi leal -TOP_OF_KERNEL_STACK_PADDING-PTREGS_SIZE(%esi), %esp - call do_exit + call __finish_rewind_stack_do_exit 1: jmp 1b END(rewind_stack_do_exit) diff --git a/arch/x86/entry/entry_64.S b/arch/x86/entry/entry_64.S index 1f0efdb7b629..890a66d17f31 100644 --- a/arch/x86/entry/entry_64.S +++ b/arch/x86/entry/entry_64.S @@ -1672,5 +1672,5 @@ ENTRY(rewind_stack_do_exit) leaq -PTREGS_SIZE(%rax), %rsp UNWIND_HINT_FUNC sp_offset=PTREGS_SIZE - call do_exit + call __finish_rewind_stack_do_exit END(rewind_stack_do_exit) diff --git a/tools/objtool/check.c b/tools/objtool/check.c index 5dde107083c6..f88f8f0b3f6e 100644 --- a/tools/objtool/check.c +++ b/tools/objtool/check.c @@ -156,6 +156,7 @@ static int __dead_end_function(struct objtool_file *file, struct symbol *func, "__stack_chk_fail", "panic", "do_exit", + "__finish_rewind_stack_do_exit", "do_task_dead", "__module_put_and_exit", "complete_and_exit", -- 2.19.1