From patchwork Mon Jun 26 09:48:17 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Razvan Cojocaru X-Patchwork-Id: 9808979 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 2FD5A60329 for ; Mon, 26 Jun 2017 09:50:32 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 38DC12853A for ; Mon, 26 Jun 2017 09:50:32 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 2BA4A2855C; Mon, 26 Jun 2017 09:50:32 +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 B6D1228569 for ; Mon, 26 Jun 2017 09:50:31 +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 1dPQdE-0006M3-PE; Mon, 26 Jun 2017 09:48:32 +0000 Received: from mail6.bemta6.messagelabs.com ([193.109.254.103]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dPQdD-0006Lo-NP for xen-devel@lists.xen.org; Mon, 26 Jun 2017 09:48:31 +0000 Received: from [85.158.143.35] by server-3.bemta-6.messagelabs.com id 71/C4-03058-F68D0595; Mon, 26 Jun 2017 09:48:31 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFprEIsWRWlGSWpSXmKPExsUSfTxjoW7ejYB Ig60NWhZLPi5mcWD0OLr7N1MAYxRrZl5SfkUCa8bCR4vZCzpEK9ZuvM/WwLhAsIuRk0NIwF3i V+9eli5GLiB7LaPE1jP3WCAS1xglVi7lgrA9JNZunckOUbSHUeLG/nNsIAk2AUOJ1RtbwGwRA WmJa58vM4LYzAKJEn03zjOD2MICfhJH7v1iArFZBFQl3rzfxQ5i8wp4StzqXA/WKyEgJ3Hy2G RWCDtH4vKBpUD1HEC2lMT/ViWQvRICfSwSvZ86GCFqZCQeTbzJNoFRYAEjwypG9eLUorLUIl0 LvaSizPSMktzEzBxdQwMzvdzU4uLE9NScxKRiveT83E2MwLBiAIIdjLMv+x9ilORgUhLlfXot IFKILyk/pTIjsTgjvqg0J7X4EKMMB4eSBG/IdaCcYFFqempFWmYOMMBh0hIcPEoivPWXgNK8x QWJucWZ6RCpU4yKUuK8nCAzBUASGaV5cG2wqLrEKCslzMsIdIgQT0FqUW5mCar8K0ZxDkYlYV 4JkCk8mXklcNNfAS1mAlrMMg9scUkiQkqqgXGW74l1n6Z+VJynHXllN6vVDGYNkd6lYUY84b/ i2+au/R17uTD4Wwz/0RuF5ya1LUq5cnb/P8Hl8T2dL7d5yq+7Fn7xSfiDzC5uhYdG2mwTcnNj km/oKr/TL1vJLLKU7xiXlLowi5/JzshupTc+X5/dlf1VdUTh9zXlO5Zrdq75LTcxIr87I12Jp Tgj0VCLuag4EQCvZkvZpQIAAA== X-Env-Sender: rcojocaru@bitdefender.com X-Msg-Ref: server-13.tower-21.messagelabs.com!1498470510!69759563!1 X-Originating-IP: [91.199.104.161] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 9.4.19; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13863 invoked from network); 26 Jun 2017 09:48:30 -0000 Received: from mx01.bbu.dsd.mx.bitdefender.com (HELO mx01.bbu.dsd.mx.bitdefender.com) (91.199.104.161) by server-13.tower-21.messagelabs.com with DHE-RSA-AES128-GCM-SHA256 encrypted SMTP; 26 Jun 2017 09:48:30 -0000 Received: (qmail 6933 invoked from network); 26 Jun 2017 12:48:29 +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; 26 Jun 2017 12:48:29 +0300 Received: from smtp01.buh.bitdefender.com (smtp.bitdefender.biz [10.17.80.75]) by mx-sr.buh.bitdefender.com (Postfix) with ESMTP id 730F67FC2B for ; Mon, 26 Jun 2017 12:48:29 +0300 (EEST) Received: (qmail 10963 invoked from network); 26 Jun 2017 12:48:29 +0300 Received: from unknown (HELO xen.dsd.bitdefender.biz) (rcojocaru@bitdefender.com@10.10.14.109) by smtp01.buh.bitdefender.com with AES128-SHA256 encrypted SMTP; 26 Jun 2017 12:48:29 +0300 From: Razvan Cojocaru To: xen-devel@lists.xen.org Date: Mon, 26 Jun 2017 12:48:17 +0300 Message-Id: <1498470497-20595-1-git-send-email-rcojocaru@bitdefender.com> X-Mailer: git-send-email 1.9.1 X-BitDefender-Scanner: Clean, Agent: BitDefender qmail 3.1.6 on smtp01.buh.bitdefender.com, sigver: 7.72017 X-BitDefender-Spam: No (0) X-BitDefender-SpamStamp: Build: [Engines: 2.15.8.1074, Dats: 453189, Stamp: 3], Multi: [Enabled, t: (0.000012, 0.014653)], BW: [Enabled, t: (0.000024)], RBL DNSBL: [Disabled], APM: [Enabled, Score: 500, t: (0.004971), Flags: 85D2ED72; 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.014237,0.000154)], URL: [Enabled, t: (0.000007)], RTDA: [Enabled, t: (0.100001), Hit: No, Details: v2.5.1; Id: 15.5f4g8g.1bj8u00tt.2desi], total: 0(775) X-BitDefender-CF-Stamp: none Cc: andrew.cooper3@citrix.com, tamas@tklengyel.com, Razvan Cojocaru Subject: [Xen-devel] [PATCH] common/vm_event: Initialize vm_event lists on domain creation 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 Pending livepatch code wants to check if the vm_event wait queues are active, and this is made harder by the fact that they were previously only initialized some time after the domain was created, in vm_event_enable(). This patch initializes the lists immediately after xzalloc()ating the vm_event memory, in domain_create(), in the newly added init_domain_vm_event() function. Signed-off-by: Razvan Cojocaru --- xen/common/domain.c | 5 ++--- xen/common/vm_event.c | 23 ++++++++++++++++++++--- xen/include/xen/vm_event.h | 2 ++ 3 files changed, 24 insertions(+), 6 deletions(-) diff --git a/xen/common/domain.c b/xen/common/domain.c index b22aacc..89a8f1d 100644 --- a/xen/common/domain.c +++ b/xen/common/domain.c @@ -362,11 +362,10 @@ struct domain *domain_create(domid_t domid, unsigned int domcr_flags, poolid = 0; - err = -ENOMEM; - d->vm_event = xzalloc(struct vm_event_per_domain); - if ( !d->vm_event ) + if ( (err = init_domain_vm_event(d)) != 0 ) goto fail; + err = -ENOMEM; d->pbuf = xzalloc_array(char, DOMAIN_PBUF_SIZE); if ( !d->pbuf ) goto fail; diff --git a/xen/common/vm_event.c b/xen/common/vm_event.c index 9291db6..294ddd7 100644 --- a/xen/common/vm_event.c +++ b/xen/common/vm_event.c @@ -39,6 +39,26 @@ #define vm_event_ring_lock(_ved) spin_lock(&(_ved)->ring_lock) #define vm_event_ring_unlock(_ved) spin_unlock(&(_ved)->ring_lock) +int init_domain_vm_event(struct domain *d) +{ + d->vm_event = xzalloc(struct vm_event_per_domain); + + if ( !d->vm_event ) + return -ENOMEM; + +#ifdef CONFIG_HAS_MEM_PAGING + init_waitqueue_head(&d->vm_event->paging.wq); +#endif + + init_waitqueue_head(&d->vm_event->monitor.wq); + +#ifdef CONFIG_HAS_MEM_SHARING + init_waitqueue_head(&d->vm_event->share.wq); +#endif + + return 0; +} + static int vm_event_enable( struct domain *d, xen_domctl_vm_event_op_t *vec, @@ -93,9 +113,6 @@ static int vm_event_enable( /* Save the pause flag for this particular ring. */ ved->pause_flag = pause_flag; - /* Initialize the last-chance wait queue. */ - init_waitqueue_head(&ved->wq); - vm_event_ring_unlock(ved); return 0; diff --git a/xen/include/xen/vm_event.h b/xen/include/xen/vm_event.h index 2fb3951..482243e 100644 --- a/xen/include/xen/vm_event.h +++ b/xen/include/xen/vm_event.h @@ -80,6 +80,8 @@ void vm_event_set_registers(struct vcpu *v, vm_event_response_t *rsp); void vm_event_monitor_next_interrupt(struct vcpu *v); +int init_domain_vm_event(struct domain *d); + #endif /* __VM_EVENT_H__ */ /*