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=-4.1 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, T_DKIMWL_WL_HIGH 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 34040C04AB6 for ; Fri, 31 May 2019 12:10:54 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 0DC4A26886 for ; Fri, 31 May 2019 12:10:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1559304654; bh=clAIEBmajpiQKktOEKSBKpbFw41J7aLzihGd1Cq4U9g=; h=Date:From:To:cc:Subject:In-Reply-To:References:List-ID:From; b=lsbfCB35+pNE8ziM0RTgM3RqZR4Vx+29Ws/ar/BnBpwe9ENB4olncEEBtbQoHGtR1 p45RVinHh2zrejhnGciO/fN4S4YFD9FmgmyO3b6/yq3t2pzzGXVJ6hMsHoPgx+FAda ZTA5U4clVjmFVNeMK4f+kLOll2lHUpQj+PLhmOZ4= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727455AbfEaMKs (ORCPT ); Fri, 31 May 2019 08:10:48 -0400 Received: from mail.kernel.org ([198.145.29.99]:39472 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727327AbfEaMK0 (ORCPT ); Fri, 31 May 2019 08:10:26 -0400 Received: from pobox.suse.cz (prg-ext-pat.suse.com [213.151.95.130]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 2D4BB2685F; Fri, 31 May 2019 12:10:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1559304625; bh=clAIEBmajpiQKktOEKSBKpbFw41J7aLzihGd1Cq4U9g=; h=Date:From:To:cc:Subject:In-Reply-To:References:From; b=LJUT1u8nmKrWqTtqdGX7cDrBNk1X4cVcD5sgVhwJBPzSXBLNYDyOVx4lk82YnTS4B gFRwuZPOQwBm61NZd47QschHiuMnsQ2SatbFHoeGGLkwD1Z7+DXQI7HDiQmSl3PKjJ bchq8b9ilYkT2a+lkmhzedx7jr//JvmCaF+eAbkY= Date: Fri, 31 May 2019 14:09:57 +0200 (CEST) From: Jiri Kosina To: Josh Poimboeuf cc: "Rafael J. Wysocki" , Thomas Gleixner , the arch/x86 maintainers , "Rafael J. Wysocki" , Pavel Machek , Ingo Molnar , Borislav Petkov , "H. Peter Anvin" , Peter Zijlstra , Linux PM , Linux Kernel Mailing List , Andy Lutomirski Subject: Re: [PATCH v4] x86/power: Fix 'nosmt' vs. hibernation triple fault during resume In-Reply-To: <20190531051456.fzkvn62qlkf6wqra@treble> Message-ID: References: <20190530233804.syv4brpe3ndslyvo@treble> <20190531051456.fzkvn62qlkf6wqra@treble> User-Agent: Alpine 2.21 (LSU 202 2017-01-01) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Fri, 31 May 2019, Josh Poimboeuf wrote: > Something like this (not yet tested)? Maybe we could also remove the > resume_play_dead() hack? I tried to test this, but the resumed kernel doesn't seem to be healthy for reason I don't understand yet. Symptoms I've seen so far -- 'dazed and confused NMI', spontaneous reboot, userspace segfault. > diff --git a/arch/x86/include/asm/fixmap.h b/arch/x86/include/asm/fixmap.h > index 9da8cccdf3fb..1c328624162c 100644 > --- a/arch/x86/include/asm/fixmap.h > +++ b/arch/x86/include/asm/fixmap.h > @@ -80,6 +80,7 @@ enum fixed_addresses { > #ifdef CONFIG_X86_VSYSCALL_EMULATION > VSYSCALL_PAGE = (FIXADDR_TOP - VSYSCALL_ADDR) >> PAGE_SHIFT, > #endif > + FIX_MWAIT = (FIXADDR_TOP - VSYSCALL_ADDR - 1) >> PAGE_SHIFT, Two things to this: - you don't seem to fix x86_32 - shouldn't it rather be FIXADDR_TOP - VSYSCALL_ADDR + 1 instead? Thanks, -- Jiri Kosina SUSE Labs