From patchwork Fri Apr 17 14:29:14 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Beulich X-Patchwork-Id: 11495315 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id B849F912 for ; Fri, 17 Apr 2020 14:30:03 +0000 (UTC) Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 9D8DB21924 for ; Fri, 17 Apr 2020 14:30:03 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 9D8DB21924 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=suse.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1jPRza-0008Fb-AC; Fri, 17 Apr 2020 14:29:18 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1jPRzZ-0008FP-4H for xen-devel@lists.xenproject.org; Fri, 17 Apr 2020 14:29:17 +0000 X-Inumbo-ID: d1004c5e-80b7-11ea-b4f4-bc764e2007e4 Received: from mx2.suse.de (unknown [195.135.220.15]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id d1004c5e-80b7-11ea-b4f4-bc764e2007e4; Fri, 17 Apr 2020 14:29:16 +0000 (UTC) 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 21949AB64; Fri, 17 Apr 2020 14:29:14 +0000 (UTC) Subject: [PATCH 09/10] x86/shadow: the trace_emul_write_val() hook is HVM-only From: Jan Beulich To: "xen-devel@lists.xenproject.org" References: <65bfcd6a-2bb0-da6f-9e85-39f224bd81fb@suse.com> Message-ID: <8d02bf12-1380-725b-7aca-a494c8258e54@suse.com> Date: Fri, 17 Apr 2020 16:29:14 +0200 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:68.0) Gecko/20100101 Thunderbird/68.7.0 MIME-Version: 1.0 In-Reply-To: <65bfcd6a-2bb0-da6f-9e85-39f224bd81fb@suse.com> Content-Language: en-US X-BeenThere: xen-devel@lists.xenproject.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Cc: Andrew Cooper , Tim Deegan , George Dunlap , Wei Liu , =?utf-8?q?R?= =?utf-8?q?oger_Pau_Monn=C3=A9?= Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" Its only caller lives in HVM-only code, and the only caller of trace_shadow_emulate() also already site in a HVM-only code section. Signed-off-by: Jan Beulich --- a/xen/arch/x86/mm/shadow/multi.c +++ b/xen/arch/x86/mm/shadow/multi.c @@ -2694,6 +2694,7 @@ static inline void trace_shadow_emulate_ } } +#ifdef CONFIG_HVM #if GUEST_PAGING_LEVELS == 3 static DEFINE_PER_CPU(guest_va_t,trace_emulate_initial_va); static DEFINE_PER_CPU(int,trace_extra_emulation_count); @@ -2745,6 +2746,7 @@ static inline void trace_shadow_emulate( __trace_var(event, 0/*!tsc*/, sizeof(d), &d); } } +#endif /* CONFIG_HVM */ /**************************************************************************/ /* Entry points into the shadow code */ @@ -4887,8 +4889,8 @@ const struct paging_mode sh_paging_mode .shadow.guess_wrmap = sh_guess_wrmap, #endif .shadow.pagetable_dying = sh_pagetable_dying, -#endif /* CONFIG_HVM */ .shadow.trace_emul_write_val = trace_emulate_write_val, +#endif /* CONFIG_HVM */ .shadow.shadow_levels = SHADOW_PAGING_LEVELS, }; --- a/xen/include/asm-x86/paging.h +++ b/xen/include/asm-x86/paging.h @@ -108,10 +108,10 @@ struct shadow_paging_mode { int (*guess_wrmap )(struct vcpu *v, unsigned long vaddr, mfn_t gmfn); void (*pagetable_dying )(paddr_t gpa); -#endif void (*trace_emul_write_val )(const void *ptr, unsigned long vaddr, const void *src, unsigned int bytes); #endif +#endif /* For outsiders to tell what mode we're in */ unsigned int shadow_levels; };