From patchwork Mon Feb 8 16:57:57 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Corneliu ZUZU X-Patchwork-Id: 8252241 Return-Path: X-Original-To: patchwork-xen-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id A2B599F1C1 for ; Mon, 8 Feb 2016 17:01:12 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id AF47D203B8 for ; Mon, 8 Feb 2016 17:01:11 +0000 (UTC) Received: from lists.xen.org (lists.xenproject.org [50.57.142.19]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id A1163203B7 for ; Mon, 8 Feb 2016 17:01:10 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aSp8p-0005QA-Oy; Mon, 08 Feb 2016 16:58:23 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aSp8n-0005Pn-SL for xen-devel@lists.xen.org; Mon, 08 Feb 2016 16:58:22 +0000 Received: from [193.109.254.147] by server-16.bemta-14.messagelabs.com id 7E/CA-15991-C29C8B65; Mon, 08 Feb 2016 16:58:20 +0000 X-Env-Sender: czuzu@bitdefender.com X-Msg-Ref: server-7.tower-27.messagelabs.com!1454950699!22327846!1 X-Originating-IP: [91.199.104.161] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 50164 invoked from network); 8 Feb 2016 16:58:20 -0000 Received: from mx01.buh.bitdefender.com (HELO mx01.buh.bitdefender.com) (91.199.104.161) by server-7.tower-27.messagelabs.com with DHE-RSA-AES256-GCM-SHA384 encrypted SMTP; 8 Feb 2016 16:58:20 -0000 Comment: DomainKeys? See http://domainkeys.sourceforge.net/ DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws; s=default; d=bitdefender.com; b=JmGXRGz1xevCNjIB4MhlpCysWRWBv5McfrFV7/kDK/zrq67CWm2CUDCI71SazGiQXZWH4JuhdtUHhz24HsHp6dHBI6uP7Jo98tSCRyGDCJiaGdUlog9iKl6EwFuPPhDyAeMhmI/8BTWaEFJt7TbqBFkWSYxuUAN7nmzTtpbY9ENuKLir0ND1KI+f66FUeJdbHmtHu2EPQPYTC7AW4nR34dvmyb/1ygW5aB2cUBCRpPfOc48ZY/jhxI5cKPbyfcdl7XPto5UB3yCTIuIJogqxEhB/CMoBseRu823iSsGp0wvAfJ2s8GzxwXcMMXGTynXooIWA//uEAMPxU54OkuKSow==; h=Received:Received:Received:Received:Received:From:To:Cc:Subject:Date:Message-Id:X-Mailer:In-Reply-To:References:X-BitDefender-Scanner:X-BitDefender-Spam:X-BitDefender-SpamStamp:X-BitDefender-CF-Stamp; DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=bitdefender.com; h=from:to :cc:subject:date:message-id:in-reply-to:references; s=default; bh=bms+1e2yXYlInXVf7PHlyHIy14c=; b=u7fKENBoZVIysUfhapED1bZTlNjK fkf+MjytUt17TrmeyZUaJrm4693D24vDFk0KxrsHo7/tys3pt16+GE+NuLpmaFHK SjMc+ANXT3D0IZbUm1KWo0/BzAxtq9+HfLuPSAsoaw6HErE54kvtcpARIr5e7rev pv7xuCQvfmZoGpJj9lJwmvX6zTfp53EQXnkVoQHX7CejfU4mnCSHB9l8OZ8mw+5D 4Xy0h3K6IfgSsf+7/oANXrEhbOL13gyZ+FPN7McjWUUiTTuq5P9ikvvFa2BRxbNz WGUyP9mBXDmQGdw2SHB/vCxKbp1lu7ddgFywjKf0xU/ZX1l0SSyiiDzyMA== Received: (qmail 25271 invoked from network); 8 Feb 2016 18:58:18 +0200 Received: from unknown (HELO mx-sr.buh.bitdefender.com) (10.17.80.103) by mx01.buh.bitdefender.com with AES256-GCM-SHA384 encrypted SMTP; 8 Feb 2016 18:58:18 +0200 Received: from smtp02.buh.bitdefender.net (unknown [10.17.80.76]) by mx-sr.buh.bitdefender.com (Postfix) with ESMTP id 0D8347FBD8 for ; Mon, 8 Feb 2016 18:58:18 +0200 (EET) Received: (qmail 31554 invoked from network); 8 Feb 2016 18:58:18 +0200 Received: from 82-137-8-119.rdsnet.ro (HELO localhost.localdomain) (czuzu@bitdefender.com@82.137.8.119) by smtp02.buh.bitdefender.net with AES128-SHA256 encrypted SMTP; 8 Feb 2016 18:58:17 +0200 From: Corneliu ZUZU To: xen-devel@lists.xen.org Date: Mon, 8 Feb 2016 18:57:57 +0200 Message-Id: <1454950682-9459-3-git-send-email-czuzu@bitdefender.com> X-Mailer: git-send-email 2.5.0 In-Reply-To: <1454950682-9459-1-git-send-email-czuzu@bitdefender.com> References: <1454950682-9459-1-git-send-email-czuzu@bitdefender.com> X-BitDefender-Scanner: Clean, Agent: BitDefender qmail 3.1.4 on smtp02.buh.bitdefender.net, sigver: 7.64434 X-BitDefender-Spam: No (0) X-BitDefender-SpamStamp: Build: [Engines: 2.15.6.743, Dats: 413947, Stamp: 3], Multi: [Enabled, t: (0.000010, 0.003997)], BW: [Enabled, t: (0.000007,0.000001)], RBL DNSBL: [Disabled], APM: [Enabled, Score: 500, t: (0.003359), Flags: 2A917CE3; NN_NO_CONTENT_TYPE; NN_LEGIT_SUMM_400_WORDS; NN_NO_LINK_NMD; NN_LEGIT_BITDEFENDER; NN_LEGIT_S_SQARE_BRACKETS; NN_LEGIT_MAILING_LIST_TO], SGN: [Enabled, t: (0.010445)], URL: [Enabled, t: (0.000005)], RTDA: [Enabled, t: (0.040834), Hit: No, Details: v2.3.3; Id: 2m1ghap.1aaoiaabr.2cu8v], total: 0(775) X-BitDefender-CF-Stamp: none Cc: Kevin Tian , Tamas K Lengyel , Keir Fraser , Ian Campbell , Razvan Cojocaru , Jun Nakajima , Andrew Cooper , Stefano Stabellini , Jan Beulich Subject: [Xen-devel] [PATCH 2/7] x86: hvm events: merge 2 functions into 1 X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org X-Spam-Status: No, score=-4.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP This patch merges almost identical functions hvm_event_int3 and hvm_event_single_step into a single function called hvm_event_software_breakpoint. Signed-off-by: Corneliu ZUZU --- xen/arch/x86/hvm/event.c | 52 ++++++++++++++--------------------------- xen/arch/x86/hvm/vmx/vmx.c | 11 +++++---- xen/include/asm-x86/hvm/event.h | 5 ++-- 3 files changed, 26 insertions(+), 42 deletions(-) diff --git a/xen/arch/x86/hvm/event.c b/xen/arch/x86/hvm/event.c index a3d4892..9dc533b 100644 --- a/xen/arch/x86/hvm/event.c +++ b/xen/arch/x86/hvm/event.c @@ -151,17 +151,20 @@ void hvm_event_guest_request(void) } } -int hvm_event_int3(unsigned long rip) +int hvm_event_software_breakpoint(unsigned long rip, bool_t single_step) { int rc = 0; struct vcpu *curr = current; + struct arch_domain *ad = &curr->domain->arch; + bool_t enabled = ( single_step ? ad->monitor.singlestep_enabled + : ad->monitor.software_breakpoint_enabled ); - if ( curr->domain->arch.monitor.software_breakpoint_enabled ) + if ( enabled ) { + uint64_t gfn; struct segment_register sreg; uint32_t pfec = PFEC_page_present | PFEC_insn_fetch; vm_event_request_t req = { - .reason = VM_EVENT_REASON_SOFTWARE_BREAKPOINT, .vcpu_id = curr->vcpu_id, }; @@ -170,37 +173,18 @@ int hvm_event_int3(unsigned long rip) pfec |= PFEC_user_mode; hvm_get_segment_register(curr, x86_seg_cs, &sreg); - req.u.software_breakpoint.gfn = paging_gva_to_gfn(curr, - sreg.base + rip, - &pfec); - - rc = hvm_event_traps(1, &req); - } - - return rc; -} - -int hvm_event_single_step(unsigned long rip) -{ - int rc = 0; - struct vcpu *curr = current; - - if ( curr->domain->arch.monitor.singlestep_enabled ) - { - struct segment_register sreg; - uint32_t pfec = PFEC_page_present | PFEC_insn_fetch; - vm_event_request_t req = { - .reason = VM_EVENT_REASON_SINGLESTEP, - .vcpu_id = curr->vcpu_id, - }; - - hvm_get_segment_register(curr, x86_seg_ss, &sreg); - if ( sreg.attr.fields.dpl == 3 ) - pfec |= PFEC_user_mode; - - hvm_get_segment_register(curr, x86_seg_cs, &sreg); - req.u.singlestep.gfn = paging_gva_to_gfn(curr, sreg.base + rip, - &pfec); + gfn = paging_gva_to_gfn(curr, sreg.base + rip, &pfec); + + if ( single_step ) + { + req.reason = VM_EVENT_REASON_SINGLESTEP; + req.u.singlestep.gfn = gfn; + } + else + { + req.reason = VM_EVENT_REASON_SOFTWARE_BREAKPOINT; + req.u.software_breakpoint.gfn = gfn; + } rc = hvm_event_traps(1, &req); } diff --git a/xen/arch/x86/hvm/vmx/vmx.c b/xen/arch/x86/hvm/vmx/vmx.c index b9f340c..1a24788 100644 --- a/xen/arch/x86/hvm/vmx/vmx.c +++ b/xen/arch/x86/hvm/vmx/vmx.c @@ -3192,7 +3192,7 @@ void vmx_vmexit_handler(struct cpu_user_regs *regs) break; } else { - int handled = hvm_event_int3(regs->eip); + int handled = hvm_event_software_breakpoint(regs->eip, 0); if ( handled < 0 ) { @@ -3517,10 +3517,11 @@ void vmx_vmexit_handler(struct cpu_user_regs *regs) case EXIT_REASON_MONITOR_TRAP_FLAG: v->arch.hvm_vmx.exec_control &= ~CPU_BASED_MONITOR_TRAP_FLAG; vmx_update_cpu_exec_control(v); - if ( v->arch.hvm_vcpu.single_step ) { - hvm_event_single_step(regs->eip); - if ( v->domain->debugger_attached ) - domain_pause_for_debugger(); + if ( v->arch.hvm_vcpu.single_step ) + { + hvm_event_software_breakpoint(regs->eip, 1); + if ( v->domain->debugger_attached ) + domain_pause_for_debugger(); } break; diff --git a/xen/include/asm-x86/hvm/event.h b/xen/include/asm-x86/hvm/event.h index 11eb1fe..7c2252b 100644 --- a/xen/include/asm-x86/hvm/event.h +++ b/xen/include/asm-x86/hvm/event.h @@ -27,9 +27,8 @@ bool_t hvm_event_cr(unsigned int index, unsigned long value, #define hvm_event_crX(what, new, old) \ hvm_event_cr(VM_EVENT_X86_##what, new, old) void hvm_event_msr(unsigned int msr, uint64_t value); -/* Called for current VCPU: returns -1 if no listener */ -int hvm_event_int3(unsigned long rip); -int hvm_event_single_step(unsigned long rip); +int hvm_event_software_breakpoint(unsigned long rip, + bool_t single_step); void hvm_event_guest_request(void); #endif /* __ASM_X86_HVM_EVENT_H__ */