From patchwork Mon Oct 30 08:03:33 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dongli Zhang X-Patchwork-Id: 10032183 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 0C872603B4 for ; Mon, 30 Oct 2017 08:06:25 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id F27F828709 for ; Mon, 30 Oct 2017 08:06:24 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E75BA287B1; Mon, 30 Oct 2017 08:06:24 +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, UNPARSEABLE_RELAY 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 4B1C428709 for ; Mon, 30 Oct 2017 08:06:24 +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 1e953F-0003Yw-Au; Mon, 30 Oct 2017 08:04:05 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1e953E-0003Yp-2h for xen-devel@lists.xenproject.org; Mon, 30 Oct 2017 08:04:04 +0000 Received: from [85.158.139.211] by server-15.bemta-5.messagelabs.com id 92/7D-23912-3FCD6F95; Mon, 30 Oct 2017 08:04:03 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFupjkeJIrShJLcpLzFFi42KZM10+UPfTnW+ RBj83GFt83zKZyYHR4/CHKywBjFGsmXlJ+RUJrBmvZ3xiKniuXzFr82GmBsbH6l2MXBxCApOZ JG4dXsUG4fxllFh8p4sdwtnIKHF1039mCKebUWLh5X7GLkZODjYBHYlpB06xgNgiAg4Sm/YfB Org4GAW8JKYPkcXJCwsECGx8ts2JhCbRUBVYsfcfnYQm1fAXeLJgW9gcQkBOYmb5zqZIWxjib 5ZfSwTGHkWMDKsYtQoTi0qSy3SNbTQSyrKTM8oyU3MzNE1NDDVy00tLk5MT81JTCrWS87P3cQ I9D0DEOxgbNrueYhRkoNJSZSXq+FbpBBfUn5KZUZicUZ8UWlOavEhRhkODiUJXm1gKAkJFqWm p1akZeYAgxAmLcHBoyTC+/U2UJq3uCAxtzgzHSJ1itGb49imy3+YOH5MugIkO27eBZKbwOSG7 w+A5LOZrxuYhVjy8vNSpcR5j4OMEAAZkVGaB7cAFk2XGGWlhHkZgU4W4ilILcrNLEGVf8Uozs GoJMw7EWQKT2ZeCdwdr4BOZAI6UUPyC8iJJYkIKakGRuuSrkfRfypFFvau+CyRLeo7x7TGu6q yQzMq6+bX1CLb0i9idYX5zeknItZJJ/msOc6jym0rKOEawO0QYjvt9in/oDCGuSmTfp1VOcG8 M/Zrwv3Vioe/fI6wFCt/dik95/DtLtUVjN4P+AwYLSsYdvUpr7x1V1KYpVaULezBvbff5i2cG DBbiaU4I9FQi7moOBEAX9m4caECAAA= X-Env-Sender: dongli.zhang@oracle.com X-Msg-Ref: server-5.tower-206.messagelabs.com!1509350640!107568248!1 X-Originating-IP: [156.151.31.81] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTU2LjE1MS4zMS44MSA9PiAyODgzMzk=\n X-StarScan-Received: X-StarScan-Version: 9.4.45; banners=-,-,- X-VirusChecked: Checked Received: (qmail 8550 invoked from network); 30 Oct 2017 08:04:02 -0000 Received: from userp1040.oracle.com (HELO userp1040.oracle.com) (156.151.31.81) by server-5.tower-206.messagelabs.com with DHE-RSA-AES256-GCM-SHA384 encrypted SMTP; 30 Oct 2017 08:04:02 -0000 Received: from aserv0021.oracle.com (aserv0021.oracle.com [141.146.126.233]) by userp1040.oracle.com (Sentrion-MTA-4.3.2/Sentrion-MTA-4.3.2) with ESMTP id v9U83xi0007341 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 30 Oct 2017 08:04:00 GMT Received: from aserv0122.oracle.com (aserv0122.oracle.com [141.146.126.236]) by aserv0021.oracle.com (8.14.4/8.14.4) with ESMTP id v9U83xCV017277 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 30 Oct 2017 08:03:59 GMT Received: from abhmp0009.oracle.com (abhmp0009.oracle.com [141.146.116.15]) by aserv0122.oracle.com (8.14.4/8.14.4) with ESMTP id v9U83wQB020535; Mon, 30 Oct 2017 08:03:59 GMT Received: from linux.cn.oracle.com (/10.182.70.198) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Mon, 30 Oct 2017 01:03:58 -0700 From: Dongli Zhang To: xen-devel@lists.xenproject.org, linux-kernel@vger.kernel.org Date: Mon, 30 Oct 2017 16:03:33 +0800 Message-Id: <1509350613-15356-1-git-send-email-dongli.zhang@oracle.com> X-Mailer: git-send-email 2.7.4 X-Source-IP: aserv0021.oracle.com [141.146.126.233] Cc: jgross@suse.com, boris.ostrovsky@oracle.com, joao.m.martins@oracle.com Subject: [Xen-devel] [PATCH v5 1/1] xen/time: do not decrease steal time after live migration on xen 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 After guest live migration on xen, steal time in /proc/stat (cpustat[CPUTIME_STEAL]) might decrease because steal returned by xen_steal_lock() might be less than this_rq()->prev_steal_time which is derived from previous return value of xen_steal_clock(). For instance, steal time of each vcpu is 335 before live migration. cpu 198 0 368 200064 1962 0 0 1340 0 0 cpu0 38 0 81 50063 492 0 0 335 0 0 cpu1 65 0 97 49763 634 0 0 335 0 0 cpu2 38 0 81 50098 462 0 0 335 0 0 cpu3 56 0 107 50138 374 0 0 335 0 0 After live migration, steal time is reduced to 312. cpu 200 0 370 200330 1971 0 0 1248 0 0 cpu0 38 0 82 50123 500 0 0 312 0 0 cpu1 65 0 97 49832 634 0 0 312 0 0 cpu2 39 0 82 50167 462 0 0 312 0 0 cpu3 56 0 107 50207 374 0 0 312 0 0 Since runstate times are cumulative and cleared during xen live migration by xen hypervisor, the idea of this patch is to accumulate runstate times to global percpu variables before live migration suspend. Once guest VM is resumed, xen_get_runstate_snapshot_cpu() would always return the sum of new runstate times and previously accumulated times stored in global percpu variables. Similar and more severe issue would impact prior linux 4.8-4.10 as discussed by Michael Las at https://0xstubs.org/debugging-a-flaky-cpu-steal-time-counter-on-a-paravirtualized-xen-guest, which would overflow steal time and lead to 100% st usage in top command for linux 4.8-4.10. A backport of this patch would fix that issue. References: https://0xstubs.org/debugging-a-flaky-cpu-steal-time-counter-on-a-paravirtualized-xen-guest Signed-off-by: Dongli Zhang --- Changed since v1: * relocate modification to xen_get_runstate_snapshot_cpu Changed since v2: * accumulate runstate times before live migration Changed since v3: * do not accumulate times in the case of guest checkpointing Changed since v4: * allocate array of vcpu_runstate_info to reduce number of memory allocation --- drivers/xen/manage.c | 2 ++ drivers/xen/time.c | 68 ++++++++++++++++++++++++++++++++++++++++++-- include/xen/interface/vcpu.h | 2 ++ include/xen/xen-ops.h | 1 + 4 files changed, 71 insertions(+), 2 deletions(-) diff --git a/drivers/xen/manage.c b/drivers/xen/manage.c index c425d03..3dc085d 100644 --- a/drivers/xen/manage.c +++ b/drivers/xen/manage.c @@ -72,6 +72,7 @@ static int xen_suspend(void *data) } gnttab_suspend(); + xen_accumulate_runstate_time(-1); xen_arch_pre_suspend(); /* @@ -84,6 +85,7 @@ static int xen_suspend(void *data) : 0); xen_arch_post_suspend(si->cancelled); + xen_accumulate_runstate_time(si->cancelled); gnttab_resume(); if (!si->cancelled) { diff --git a/drivers/xen/time.c b/drivers/xen/time.c index ac5f23f..cf3afb9 100644 --- a/drivers/xen/time.c +++ b/drivers/xen/time.c @@ -19,6 +19,9 @@ /* runstate info updated by Xen */ static DEFINE_PER_CPU(struct vcpu_runstate_info, xen_runstate); +static DEFINE_PER_CPU(u64[RUNSTATE_max], old_runstate_time); +static struct vcpu_runstate_info *runstate_delta; + /* return an consistent snapshot of 64-bit time/counter value */ static u64 get64(const u64 *p) { @@ -47,8 +50,8 @@ static u64 get64(const u64 *p) return ret; } -static void xen_get_runstate_snapshot_cpu(struct vcpu_runstate_info *res, - unsigned int cpu) +static void xen_get_runstate_snapshot_cpu_delta( + struct vcpu_runstate_info *res, unsigned int cpu) { u64 state_time; struct vcpu_runstate_info *state; @@ -66,6 +69,67 @@ static void xen_get_runstate_snapshot_cpu(struct vcpu_runstate_info *res, (state_time & XEN_RUNSTATE_UPDATE)); } +static void xen_get_runstate_snapshot_cpu(struct vcpu_runstate_info *res, + unsigned int cpu) +{ + int i; + + xen_get_runstate_snapshot_cpu_delta(res, cpu); + + for (i = 0; i < RUNSTATE_max; i++) + res->time[i] += per_cpu(old_runstate_time, cpu)[i]; +} + +void xen_accumulate_runstate_time(int action) +{ + struct vcpu_runstate_info state; + int cpu, i; + + switch (action) { + case -1: /* backup runstate time before suspend */ + WARN_ON_ONCE(unlikely(runstate_delta)); + + runstate_delta = kcalloc(num_possible_cpus(), + sizeof(*runstate_delta), + GFP_KERNEL); + if (unlikely(!runstate_delta)) { + pr_alert("%s: failed to allocate runstate_delta\n", + __func__); + return; + } + + for_each_possible_cpu(cpu) { + xen_get_runstate_snapshot_cpu_delta(&state, cpu); + memcpy(runstate_delta[cpu].time, state.time, + RUNSTATE_max * sizeof(*runstate_delta[cpu].time)); + } + + break; + + case 0: /* backup runstate time after resume */ + if (unlikely(!runstate_delta)) { + pr_alert("%s: cannot accumulate runstate time as runstate_delta is NULL\n", + __func__); + return; + } + + for_each_possible_cpu(cpu) { + for (i = 0; i < RUNSTATE_max; i++) + per_cpu(old_runstate_time, cpu)[i] += + runstate_delta[cpu].time[i]; + } + break; + + default: /* do not accumulate runstate time for checkpointing */ + break; + } + + if (action != -1 && runstate_delta) { + kfree(runstate_delta); + runstate_delta = NULL; + } +} + /* * Runstate accounting */ diff --git a/include/xen/interface/vcpu.h b/include/xen/interface/vcpu.h index 98188c8..85e81ce 100644 --- a/include/xen/interface/vcpu.h +++ b/include/xen/interface/vcpu.h @@ -110,6 +110,8 @@ DEFINE_GUEST_HANDLE_STRUCT(vcpu_runstate_info); */ #define RUNSTATE_offline 3 +#define RUNSTATE_max 4 + /* * Register a shared memory area from which the guest may obtain its own * runstate information without needing to execute a hypercall. diff --git a/include/xen/xen-ops.h b/include/xen/xen-ops.h index 218e6aa..b1f9ae9 100644 --- a/include/xen/xen-ops.h +++ b/include/xen/xen-ops.h @@ -32,6 +32,7 @@ void xen_resume_notifier_unregister(struct notifier_block *nb); bool xen_vcpu_stolen(int vcpu); void xen_setup_runstate_info(int cpu); void xen_time_setup_guest(void); +void xen_accumulate_runstate_time(int action); void xen_get_runstate_snapshot(struct vcpu_runstate_info *res); u64 xen_steal_clock(int cpu);