From patchwork Wed Jul 6 15:54:29 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Corneliu ZUZU X-Patchwork-Id: 9216581 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 7124C60752 for ; Wed, 6 Jul 2016 15:57:23 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 611822705B for ; Wed, 6 Jul 2016 15:57:23 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 53F7E27165; Wed, 6 Jul 2016 15:57:23 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id D3EC82705B for ; Wed, 6 Jul 2016 15:57:22 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bKpAH-0002BX-5R; Wed, 06 Jul 2016 15:55:05 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bKpAF-0002BK-VS for xen-devel@lists.xen.org; Wed, 06 Jul 2016 15:55:04 +0000 Received: from [193.109.254.147] by server-11.bemta-14.messagelabs.com id EE/B0-01707-7D92D775; Wed, 06 Jul 2016 15:55:03 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFlrNIsWRWlGSWpSXmKPExsUSfTxjoe41zdp wgxMHtC2WfFzM4sDocXT3b6YAxijWzLyk/IoE1oy5uxewFvzjrrh1+ApbA+Muzi5GTg4hATeJ y98vsXUxcgHZaxglVvxdywrhnGSUmHN5MyNElbvE9UsdUFWrGCVaFy1hBUmwCWhLnDt0jwnEF hGQlrj2+TIjSBGzwFJGiYcLroIlhIF2HLrznBnEZhFQlVjQtBPM5hVwlXhzZxvQIA4OCQE5iQ UX0kFMTqDyO4+rIfa6SixaeBGsWkIgR2LrqQeMENVSEv9blUA2SQh0s0jMuD+VHaJGRuLRxJt sExiFFjAyrGLUKE4tKkst0jU01EsqykzPKMlNzMwB8kz0clOLixPTU3MSk4r1kvNzNzECA5EB CHYwnlnhfIhRkoNJSZSX5Vt1uBBfUn5KZUZicUZ8UWlOavEhRhkODiUJ3j0ateFCgkWp6akVa Zk5wJiASUtw8CiJ8IaApHmLCxJzizPTIVKnGBWlxHkrQRICIImM0jy4NlgcXmKUlRLmZQQ6RI inILUoN7MEVf4VozgHo5Iw73qQKTyZeSVw018BLWYCWvzTpRpkcUkiQkqqgVFP69hf1SVp6rm GRk3vzoSwPFZbkljIeXGfuEpr+GzrGwfu/MlaJHezZb+/tPSx4qYD4VzzdxZGZ32bsDutQm/j VEWhA1uXLP3xzfBZiUd2bqXk1ls/NxaEceYs+3lKK5H7pPH/qI3yyoclVeZ4hl4+bjt3cdCsr 5EVYZevvwvaUvL/sqm8pKwSS3FGoqEWc1FxIgCtvMKvvgIAAA== X-Env-Sender: czuzu@bitdefender.com X-Msg-Ref: server-6.tower-27.messagelabs.com!1467820501!52333200!1 X-Originating-IP: [91.199.104.161] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 8.46; banners=-,-,- X-VirusChecked: Checked Received: (qmail 11224 invoked from network); 6 Jul 2016 15:55:02 -0000 Received: from mx01.bbu.dsd.mx.bitdefender.com (HELO mx01.bbu.dsd.mx.bitdefender.com) (91.199.104.161) by server-6.tower-27.messagelabs.com with DHE-RSA-AES128-GCM-SHA256 encrypted SMTP; 6 Jul 2016 15:55:02 -0000 Received: (qmail 3547 invoked from network); 6 Jul 2016 18:55:01 +0300 Received: from unknown (HELO mx-sr.buh.bitdefender.com) (10.17.80.103) by mx01.bbu.dsd.mx.bitdefender.com with AES256-GCM-SHA384 encrypted SMTP; 6 Jul 2016 18:55:01 +0300 Received: from smtp03.buh.bitdefender.org (unknown [10.17.80.77]) by mx-sr.buh.bitdefender.com (Postfix) with ESMTP id 20FB37FBE8 for ; Wed, 6 Jul 2016 18:55:01 +0300 (EEST) Received: (qmail 22304 invoked from network); 6 Jul 2016 18:55:01 +0300 Received: from unknown (HELO czuzu-dev-vm.clj.bitdefender.biz) (czuzu@bitdefender.com@91.199.104.243) by smtp03.buh.bitdefender.org with SMTP; 6 Jul 2016 18:55:00 +0300 From: Corneliu ZUZU To: xen-devel@lists.xen.org Date: Wed, 6 Jul 2016 18:54:29 +0300 Message-Id: <1467820469-13538-1-git-send-email-czuzu@bitdefender.com> X-Mailer: git-send-email 2.5.0 In-Reply-To: <1467820154-13256-1-git-send-email-czuzu@bitdefender.com> References: <1467820154-13256-1-git-send-email-czuzu@bitdefender.com> X-BitDefender-Scanner: Clean, Agent: BitDefender qmail 3.1.6 on smtp03.buh.bitdefender.org, sigver: 7.66204 X-BitDefender-Spam: No (0) X-BitDefender-SpamStamp: Build: [Engines: 2.15.6.911, Dats: 425554, Stamp: 3], Multi: [Enabled, t: (0.000008, 0.001924)], BW: [Enabled, t: (0.000007,0.000001)], RBL DNSBL: [Disabled], APM: [Enabled, Score: 500, t: (0.002356), Flags: BB9BAF5C; NN_NO_CONTENT_TYPE; NN_NO_LINK_NMD; NN_LEGIT_BITDEFENDER; NN_LEGIT_S_SQARE_BRACKETS; NN_LEGIT_MAILING_LIST_TO], SGN: [Enabled, t: (0.007388)], URL: [Enabled, t: (0.000005)], RTDA: [Enabled, t: (0.150491), Hit: No, Details: v2.3.10; Id: 2m1ghk0.1amgknva0.pu60], total: 0(775) X-BitDefender-CF-Stamp: none Cc: Andrew Cooper , Tamas K Lengyel , Razvan Cojocaru , Jan Beulich Subject: [Xen-devel] [PATCH v3 6/8] x86/vm-event: minor ASSERT fix, add 'unlikely' X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" X-Virus-Scanned: ClamAV using ClamSMTP Minor fixes: * vm_event_register_write_resume: ASSERT on non-NULL v->arch.vm_event instead of &v->arch.vm_event->write_data. * add 'unlikely' in if Signed-off-by: Corneliu ZUZU Acked-by: Jan Beulich Acked-by: Tamas K Lengyel --- Changed since v2: --- xen/arch/x86/hvm/hvm.c | 2 +- xen/arch/x86/vm_event.c | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index ac6d9eb..091cabe 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -475,7 +475,7 @@ void hvm_do_resume(struct vcpu *v) if ( unlikely(v->arch.vm_event) ) { - if ( v->arch.vm_event->emulate_flags ) + if ( unlikely(v->arch.vm_event->emulate_flags) ) { enum emul_kind kind = EMUL_KIND_NORMAL; diff --git a/xen/arch/x86/vm_event.c b/xen/arch/x86/vm_event.c index ff2ba92..e37d6d3 100644 --- a/xen/arch/x86/vm_event.c +++ b/xen/arch/x86/vm_event.c @@ -96,14 +96,16 @@ void vm_event_register_write_resume(struct vcpu *v, vm_event_response_t *rsp) { if ( rsp->flags & VM_EVENT_FLAG_DENY ) { - struct monitor_write_data *w = &v->arch.vm_event->write_data; + struct monitor_write_data *w; - ASSERT(w); + ASSERT(v->arch.vm_event); /* deny flag requires the vCPU to be paused */ if ( !atomic_read(&v->vm_event_pause_count) ) return; + w = &v->arch.vm_event->write_data; + switch ( rsp->reason ) { case VM_EVENT_REASON_MOV_TO_MSR: