Received: by 2002:a25:e7d8:0:0:0:0:0 with SMTP id e207csp1528851ybh; Fri, 13 Mar 2020 02:54:48 -0700 (PDT) X-Google-Smtp-Source: ADFU+vvrepVIPj/YOrzcAmjZ0jM/fcYJAxzPPM4d2kHsy6U2dmT7vnP4wPB81sdiLWSHsWuWqDe5 X-Received: by 2002:a9d:6348:: with SMTP id y8mr10162600otk.347.1584093288747; Fri, 13 Mar 2020 02:54:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1584093288; cv=none; d=google.com; s=arc-20160816; b=JGqxH0Gc782mPAC7Z1T60HmzZsbcuAoKnb+YENT5gTFGSmvyCD2UWs9zL/EG8SQ3Yf PxNi4abLRp61nsE+doDKUFv4TZrfOAnDzLWht1jNdeJVnr+f2CR3DBVFNKhnKHWIwnPa WfWS8M+beujnAM7yAuOagdcsv68Bk/vqZWoMnW2eAZPtRp4eVsMl6rx7OvKEJFB8i4zN AqShyoMIAKvBWKPrXIqgizIG3DqX3oMy9bdn/jsY/aPuWey8Ajr5nWQ8uLZDmHQ7kfI8 Bfnd0GAqN15sMLOZDFH2k434vczVGwqKxddjJUZlSFa+zo23pwfL6v9cYI91h/8ZsbdV dc/g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:user-agent:references :message-id:in-reply-to:subject:cc:to:from:date; bh=GMPVF8ktjdNT3I72JAqsGhV+CBSZ3DX3nUyw8796U7Y=; b=McABts9+MXXl0+qntCT9ZDbvO5MXSNCJ1QGaHfwtDtQLqWQxri3bFs+uvJWd0ry3lB 2jX6JYtV+KH7WQlh5Uksm2MK3mKhQETFUyImnhRQ8vKL1WjFirM3zyodMUtUnSVJkDqi shVYlU+iBc82w06KFYc8pyBV6EwbNClmyJATU9bjKbfMZk1CW/3yruGQ99mtS72DiAFd WQd3IYB4/KEQRkc4I/zxbEV3Vsz6O7kLKIggemHOgagQL7KIU8yLSZGnNUG/BN3XJzq/ 476ILG8BamUJkKR5NGKL5feRZXOUBTPj/J8ibxqgflLO3Jx9hSusLTiWmiGX/1VPjxUW 49Rg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id w79si4300330oif.21.2020.03.13.02.54.36; Fri, 13 Mar 2020 02:54:48 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726559AbgCMJyP (ORCPT + 99 others); Fri, 13 Mar 2020 05:54:15 -0400 Received: from mx2.suse.de ([195.135.220.15]:40866 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726055AbgCMJyP (ORCPT ); Fri, 13 Mar 2020 05:54:15 -0400 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (unknown [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id 6A096ABEA; Fri, 13 Mar 2020 09:54:13 +0000 (UTC) Date: Fri, 13 Mar 2020 10:54:12 +0100 (CET) From: Miroslav Benes To: =?ISO-8859-15?Q?J=FCrgen_Gro=DF?= cc: boris.ostrovsky@oracle.com, sstabellini@kernel.org, tglx@linutronix.de, mingo@redhat.com, bp@alien8.de, hpa@zytor.com, jpoimboe@redhat.com, x86@kernel.org, xen-devel@lists.xenproject.org, linux-kernel@vger.kernel.org, live-patching@vger.kernel.org, jslaby@suse.cz Subject: Re: [RFC PATCH 2/2] x86/xen: Make the secondary CPU idle tasks reliable In-Reply-To: <75224ad1-f160-802a-9d72-b092ba864fb7@suse.com> Message-ID: References: <20200312142007.11488-1-mbenes@suse.cz> <20200312142007.11488-3-mbenes@suse.cz> <75224ad1-f160-802a-9d72-b092ba864fb7@suse.com> User-Agent: Alpine 2.21 (LSU 202 2017-01-01) MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="1678380546-951734477-1584093253=:30076" Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This message is in MIME format. The first part should be readable text, while the remaining parts are likely unreadable without MIME-aware tools. --1678380546-951734477-1584093253=:30076 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8BIT On Fri, 13 Mar 2020, Jürgen Groß wrote: > On 12.03.20 15:20, Miroslav Benes wrote: > > The unwinder reports the secondary CPU idle tasks' stack on XEN PV as > > unreliable, which affects at least live patching. > > cpu_initialize_context() sets up the context of the CPU through > > VCPUOP_initialise hypercall. After it is woken up, the idle task starts > > in cpu_bringup_and_idle() function and its stack starts at the offset > > right below pt_regs. The unwinder correctly detects the end of stack > > there but it is confused by NULL return address in the last frame. > > > > RFC: I haven't found the way to teach the unwinder about the state of > > the stack there. Thus the ugly hack using assembly. Similar to what > > startup_xen() has got for boot CPU. > > > > It introduces objtool "unreachable instruction" warning just right after > > the jump to cpu_bringup_and_idle(). It should show the idea what needs > > to be done though, I think. Ideas welcome. > > > > Signed-off-by: Miroslav Benes > > --- > > arch/x86/xen/smp_pv.c | 3 ++- > > arch/x86/xen/xen-head.S | 10 ++++++++++ > > 2 files changed, 12 insertions(+), 1 deletion(-) > > > > diff --git a/arch/x86/xen/smp_pv.c b/arch/x86/xen/smp_pv.c > > index 802ee5bba66c..6b88cdcbef8f 100644 > > --- a/arch/x86/xen/smp_pv.c > > +++ b/arch/x86/xen/smp_pv.c > > @@ -53,6 +53,7 @@ static DEFINE_PER_CPU(struct xen_common_irq, xen_irq_work) > > = { .irq = -1 }; > > static DEFINE_PER_CPU(struct xen_common_irq, xen_pmu_irq) = { .irq = -1 }; > > > > static irqreturn_t xen_irq_work_interrupt(int irq, void *dev_id); > > +extern unsigned char asm_cpu_bringup_and_idle[]; > > > > static void cpu_bringup(void) > > { > > Would adding this here work? > > + asm volatile (UNWIND_HINT(ORC_REG_UNDEFINED, 0, ORC_TYPE_CALL, 1)); I tried something similar. It did not work, because than the hint is "bound" to the closest next call in the function which is cr4_init() in this case. The unwinder would not take it into account. In my case, I placed it at the beginning of cpu_bringup_and_idle(). I also open coded it and played with the offset in the orc entry, but that did not work for some other reason. However, now I tried this diff --git a/arch/x86/xen/smp_pv.c b/arch/x86/xen/smp_pv.c index 6b88cdcbef8f..39afd88309cb 100644 --- a/arch/x86/xen/smp_pv.c +++ b/arch/x86/xen/smp_pv.c @@ -92,6 +92,7 @@ asmlinkage __visible void cpu_bringup_and_idle(void) { cpu_bringup(); boot_init_stack_canary(); + asm volatile (UNWIND_HINT(ORC_REG_UNDEFINED, 0, ORC_TYPE_CALL, 1)); cpu_startup_entry(CPUHP_AP_ONLINE_IDLE); } and that seems to work. I need to properly verify and test, but the explanation is that as opposed to the above, cpu_startup_entry() is on the idle task's stack and the hint is then taken into account. The unwound stack seems to be complete, so it could indeed be the fix. Thanks Miroslav --1678380546-951734477-1584093253=:30076--