Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932283AbbFEJdU (ORCPT ); Fri, 5 Jun 2015 05:33:20 -0400 Received: from smtp.citrix.com ([66.165.176.89]:53432 "EHLO SMTP.CITRIX.COM" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751376AbbFEJdS (ORCPT ); Fri, 5 Jun 2015 05:33:18 -0400 X-IronPort-AV: E=Sophos;i="5.13,557,1427760000"; d="scan'208";a="269250592" Message-ID: <55716CDA.4020007@citrix.com> Date: Fri, 5 Jun 2015 10:33:14 +0100 From: David Vrabel User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Icedove/31.4.0 MIME-Version: 1.0 To: Rusty Russell , "H. Peter Anvin" , Andrew Cooper , Xen-devel CC: , , , , Ingo Molnar , David Vrabel , Thomas Gleixner , Boris Ostrovsky Subject: Re: [Xen-devel] [PATCH] x86/cpu: Fix SMAP check in PVOPS environments References: <1433323874-6927-1-git-send-email-andrew.cooper3@citrix.com> <556FF270.5060306@zytor.com> <5570131C.1000704@citrix.com> <873827uu2i.fsf@rustcorp.com.au> <5570B51F.4060908@zytor.com> <87lhfyuaiu.fsf@rustcorp.com.au> In-Reply-To: <87lhfyuaiu.fsf@rustcorp.com.au> Content-Type: text/plain; charset="windows-1252" Content-Transfer-Encoding: 7bit X-DLP: MIA2 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2021 Lines: 50 On 05/06/15 03:58, Rusty Russell wrote: > > Subject: x86: rename save_fl/restore_fl paravirt ops to highlight eflags. > From: Rusty Russell > > As the comment in arch/x86/include/asm/paravirt_types.h says: > > * Get/set interrupt state. save_fl and restore_fl are only > * expected to use X86_EFLAGS_IF; all other bits > * returned from save_fl are undefined, and may be ignored by > * restore_fl. > > Signed-off-by: Rusty Russell [...] > --- a/arch/x86/xen/enlighten.c > +++ b/arch/x86/xen/enlighten.c > @@ -1074,8 +1074,8 @@ void xen_setup_vcpu_info_placement(void) > * percpu area for all cpus, so make use of it. Note that for > * PVH we want to use native IRQ mechanism. */ > if (have_vcpu_info_placement && !xen_pvh_domain()) { > - pv_irq_ops.save_fl = __PV_IS_CALLEE_SAVE(xen_save_fl_direct); > - pv_irq_ops.restore_fl = __PV_IS_CALLEE_SAVE(xen_restore_fl_direct); > + pv_irq_ops.save_eflags_if = __PV_IS_CALLEE_SAVE(xen_save_fl_direct); > + pv_irq_ops.restore_eflags_if = __PV_IS_CALLEE_SAVE(xen_restore_fl_direct); > pv_irq_ops.irq_disable = __PV_IS_CALLEE_SAVE(xen_irq_disable_direct); > pv_irq_ops.irq_enable = __PV_IS_CALLEE_SAVE(xen_irq_enable_direct); > pv_mmu_ops.read_cr2 = xen_read_cr2_direct; > @@ -1102,8 +1102,8 @@ static unsigned xen_patch(u8 type, u16 clobbers, void *insnbuf, > switch (type) { > SITE(pv_irq_ops, irq_enable); > SITE(pv_irq_ops, irq_disable); > - SITE(pv_irq_ops, save_fl); > - SITE(pv_irq_ops, restore_fl); > + SITE(pv_irq_ops, save_eflags_if); > + SITE(pv_irq_ops, restore_eflags_if); > #undef SITE > > patch_site: > diff --git a/arch/x86/xen/irq.c b/arch/x86/xen/irq.c Acked-by: David Vrabel Thanks. David -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/