From patchwork Fri Mar 18 06:09:48 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Suthikulpanit, Suravee" X-Patchwork-Id: 64022 Delivered-To: patch@linaro.org Received: by 10.112.199.169 with SMTP id jl9csp870102lbc; Thu, 17 Mar 2016 23:13:12 -0700 (PDT) X-Received: by 10.66.251.194 with SMTP id zm2mr21173471pac.131.1458281592457; Thu, 17 Mar 2016 23:13:12 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id u22si713057pfa.245.2016.03.17.23.13.12; Thu, 17 Mar 2016 23:13:12 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dkim=pass header.i=@amdcloud.onmicrosoft.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757108AbcCRGMq (ORCPT + 30 others); Fri, 18 Mar 2016 02:12:46 -0400 Received: from mail-by2on0058.outbound.protection.outlook.com ([207.46.100.58]:3904 "EHLO na01-by2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1756927AbcCRGL7 (ORCPT ); Fri, 18 Mar 2016 02:11:59 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amdcloud.onmicrosoft.com; s=selector1-amd-com; h=From:To:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=whz/kHAAKmcorA4DCPBUIVxNyd3cr2M5B5mw1UCb6m4=; b=FHbUFb7ZdxgfCsycZKGIu8lfr53ET0SCqrMmsicPzi5Ns/13RzwfSIY0E8Ktrh5u7nLdFFADbCI8aOnIXrlxyKv7ZPtBeBAbonI5jFZ3aFDrA9BI2DvCLZWID0nzet1iA1q65ES4O3/TEbdpdwjzpYe+54GQzQUhpdYK7PiXjVM= Authentication-Results: redhat.com; dkim=none (message not signed) header.d=none; redhat.com; dmarc=none action=none header.from=amd.com; Received: from localhost.localdomain (124.121.8.20) by BY1PR12MB0437.namprd12.prod.outlook.com (10.162.147.139) with Microsoft SMTP Server (TLS) id 15.1.443.12; Fri, 18 Mar 2016 06:11:45 +0000 From: Suravee Suthikulpanit To: , , , , , CC: , , , , Suravee Suthikulpanit Subject: [PART1 RFC v3 12/12] svm: Manage vcpu load/unload when enable AVIC Date: Fri, 18 Mar 2016 01:09:48 -0500 Message-ID: <1458281388-14452-13-git-send-email-Suravee.Suthikulpanit@amd.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1458281388-14452-1-git-send-email-Suravee.Suthikulpanit@amd.com> References: <1458281388-14452-1-git-send-email-Suravee.Suthikulpanit@amd.com> MIME-Version: 1.0 X-Originating-IP: [124.121.8.20] X-ClientProxiedBy: SG2PR04CA0047.apcprd04.prod.outlook.com (25.169.49.143) To BY1PR12MB0437.namprd12.prod.outlook.com (25.162.147.139) X-MS-Office365-Filtering-Correlation-Id: 547c9f6f-bbd9-45c4-f6c3-08d34ef4307c X-Microsoft-Exchange-Diagnostics: 1; BY1PR12MB0437; 2:rZ6Um5Xe1goefJ1KTjLQrnc6D+9g+XxDCYLf/wm5zVU9S47F2nf1fNcuQn7Mmv60HogpkQdTI+RNyS/pk/nUZMI3OrlE9iruOb39BjCLdvk61UmsWmS+wO63aa331s6RfSaiNNu/Ts8JEQhYmv/7DSsS3mfzJAKx8HM9hD1zc/ZCYhXy9WuS2qzy1pgiwxVH; 3:W96tws7tR3m4rq3fsU1Owd1JzxfGKWJ3Oo6ZX9kbzYYN/sJu3vzvhvEpTRKQ0BtETwWvSeIvT133w/7ZoUTrZLpyKVr+3xbadITVL2E/yyMr/v3cTCkjQ/tNGb4wQhGi; 25:vRTkP/rPrJ62LOLy2OLhiAqkA6x+tWxUvYPNaHPxwMG1dVpsDI9i9cBKwwKCavQh+nvF0B4YciNBZTXXaTtmTN3E/R1k1IdGRcr+OKT0O7Cl7w3DdMKrKY+5fg1qXhref27U9ZXB7j8vMEOllrht6YP9QjiMxLarWfHoDKRvvB+QueWqIE0olvUyjX5HmopuKHj2LaCbF1Wnu3R1reeE9Qi1xVcECaDQlMJBANJAv2wdrD0HlEr8oMsUKmAtpWpcV/M20CujyYYJaaIEgj8ULsYbpz5hlqeSjrV/SSw5HPYMCfURPiF4Rpq6XMim3Eq9ShiieDTKN4CKQAC5hRGG/vuguRDtNkVQ32E+Oa5JBB0fLvePBeDRd3dQSESPs2kLFJnCws7aaiW5lVz0koFbqwkLx1RfGEztnL7HiRhP4Mru2MJdD8D3EISfxQl5GG2ZKiZv3f/qzCTTF3zd7APmxM9G2JAgFfE2hdPqGBCqmrZj+R00b+mm9f253Qi32fti X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:BY1PR12MB0437; X-Microsoft-Exchange-Diagnostics: 1; BY1PR12MB0437; 20:U+l1A0XS8wSKpOIzmYCz3EwSd5rgHWuUyrZcO/oUgBz+9bwhdCYvkFsVq3JUF3HBffqaUNc5IXjHOBsiiCis2X8Ga6hui3dyc0skdhR008lGEbVQdSiDdMf/YrkXTQmwqTowUaiIfc/o0zrJZEQs54T9AIpcYpz72vMSmyq3CgzS0MTkonLlV0vjf1zQNg9CxBIzYm7AC6ZEJjMliix/eZ2X/WOtRlDiGqcw/qUyRGQaxaX9tQY41UoNzn38+nc4paOHY7WpQwwGNPt9u+Nvu0340zg1jaLV6WwdzifWX2kfzWPFGyeOAeifxaPNbaJfbd9a/1DiPRqJDL4vPTWPgOMQZHZh1gCE1uC1leCcd06pCCQzfe5I4+f1sFKQfBpN86xU7thi9mB++dA98OFmqV7nrkUtf9OHuWhCiklk3X17UQeAR3L5dYoVyRDHAKu3IPJdGVc/k0KD3LkbRuuWZ0X47g4UGYwLwaWWodaRqSYoKzutt1S8uGU5MHZ8Yv92; 4:uclAXgr6F0ybTdjuMn9aZk5BwEPAsMt0sFBDqM8RM2YUOO6CmNI5OMCZa57ytY8nrGmBnMOki97kteg1KYNW53Z7NoreO2kXs+ob25CsPBoYp/Zob1ozH6xCq/L6TZmTBwU6Sdcua0kuaMZhgqHq5JbkQRfsTaYge3oT682v5nv6T+jt4TxfhqQPvQPPmxvo2hfuQWWf4rDuDka+XSB1+vUuFB9Qt2+sGtH8Z2Zz7LRTcQYw6gFlXiG3MhGpsiuXLs824uGiVsQ77SuYqsC4tzwJtQmBoNW8rghwI1AAtTFMY7rrQQ5VllIf9snBQV9KSup9yfMiCgmMrZQdKPyDfHK2K1CvNMkwA9F6zRr7tMuCp+CcEYajVGSVEg80fuu/ X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004)(2401047)(8121501046)(5005006)(10201501046)(3002001); SRVR:BY1PR12MB0437; BCL:0; PCL:0; RULEID:; SRVR:BY1PR12MB0437; X-Forefront-PRVS: 088552DE73 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(4630300001)(6009001)(6069001)(189998001)(66066001)(19580395003)(19580405001)(47776003)(42186005)(3846002)(5001770100001)(50226001)(6116002)(2201001)(86362001)(586003)(229853001)(2950100001)(36756003)(5004730100002)(77096005)(81166005)(5003940100001)(4326007)(50466002)(92566002)(48376002)(5008740100001)(76176999)(50986999); DIR:OUT; SFP:1101; SCL:1; SRVR:BY1PR12MB0437; H:localhost.localdomain; FPR:; SPF:None; MLV:sfv; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BY1PR12MB0437; 23:rR5Oz6ACKv/AZKTfr4rG9K+fmqHbPfknQn3h8XIEt5llgf12IXXeliv4Zrf/5MTE6YSqxeG7FjaAazyoJG2I8O+nMiSV+ZcfGSltj3KwOGSlgXBkE3EUdmEPUgn9EobXj3z8VJKe92zxN/PfbbuD+R32qziDkRJTbXoU35j/hwaji9zpfakWADMVkRP9ZUW+Mt0dVwAZViCyJKVxwdfArPRK1D7u6o2FN5QAeJwhq0Ky4YrRzqA2k4/eXiPfqa61NTm6S6MpMm7VdEhF7W1jLP5wcpGCfmWRwVdIzSkf8kxfgZdXMSVPn1b7lich8daCkZyNszkW+ubX5tToda/VpSUGEiUZge9Q0grYY6n9AosB6JZgKyqH0Nl7HW4APV6Q+9p1g/92Qgjkw1yQtceXVg1xsm/BZmfdwOeU8JGvF7yuGsVJ/ZrtcWvdaZNatilTh7GKPmHlMNAfE3fo96wW4VsDBxrJnoJbLxBe7t2jUklOpBE6BiuIJaXTKsFDufxZyGaLf1csm857S4ZEoM1C2rmqKLczlgg8CnCGfwRSrHK1K+IUnIdQGvC59ZpXl1wIdPs/bUjPBf/VVHcefN/hgy3UgxfXd/bxDVQ3Tumw01XuYAgQTXhIvPTArBkDOnIyUq/R7RsRU199Iqk2ghZrsIDwVmMbCIjjsmlGiZZXzkzDK7qYAuB2PcSaGdX1WeWmKxhJjZinjPonxBmGw2iAOa8jxeje8Rx0KuP5S0fbCQLQwidWAG+cKJw35/OfqWl1iycFvbn8bHoGXTh/KM/9mWnzKDISZjwuVA1J01bFYabRUrBW/FCA5uS/pKTdGbtV/RxUs7ls7nFsz+2+dKSRJESLDFEVOWGx6yIxEPuNsIw= X-Microsoft-Exchange-Diagnostics: 1; BY1PR12MB0437; 5:Q23QJkhXnpeYSfECaJleYiAgM0396H0iDEBNHmddXmKeJSEpbxiM0swqpHs9t+zagIYJkSOZI1fM3PqeIvjFSfzZDcwOskH0vc38wcD6wiCntU/ThTrpL/iTe8iZw+YeFyVLX2PKMHn7Pfymvxklig==; 24:CbuMEkoAaB4PA0rCbwDyBF69sDmpobbe98AIfxsZ+OP7KnWJo/lDbK0IauRbja7+fvSQvNcJwT3zAdMUg+pBWehMwSAY31JbSdGO4oypaTw=; 20:Ou1lFFWHpPbCVr8EL36uV25H+UaCMNXj3aFPOAbeQAZFz6phHWL4+HMkTK6+NuFHsUIw+e55hfYKqqLSx6x5qM/tyUVlOkx4IJo3fge7HYUjFMO85joYAcIPqhdPHQ+j4Gbv3ch1jsuTw3bkAtNx2oK7Kr0mpRjVjPcLwt0Mgq2mYRnUO+pldKOiZ4g7hfSNRvZe9TLjNGSJwbb/z0JsQb2dEGURWqerhgFSrt2F8RznO+h1+5Fae1Bqxarmk3/3 X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Mar 2016 06:11:45.2166 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY1PR12MB0437 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Suravee Suthikulpanit When a vcpu is loaded/unloaded to a physical core, we need to update host physical APIC ID information in the Physical APIC-ID table accordingly. Also, when vCPU is blocking/un-blocking (due to halt instruction), we need to make sure that the is-running bit in set accordingly in the physical APIC-ID table. Signed-off-by: Suravee Suthikulpanit --- arch/x86/kvm/svm.c | 121 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 121 insertions(+) -- 1.9.1 diff --git a/arch/x86/kvm/svm.c b/arch/x86/kvm/svm.c index d5418c3..c5e8100 100644 --- a/arch/x86/kvm/svm.c +++ b/arch/x86/kvm/svm.c @@ -35,6 +35,7 @@ #include #include +#include #include #include #include @@ -1334,6 +1335,110 @@ free_avic: return err; } +static int avic_vcpu_load(struct kvm_vcpu *vcpu, int cpu, bool is_load) +{ + int h_phy_apic_id; + u64 *entry, new_entry; + struct vcpu_svm *svm = to_svm(vcpu); + int ret = 0; + + if (!svm_vcpu_avic_enabled(svm)) + return 0; + + if (!svm) + return -EINVAL; + + /* Note: APIC ID = 0xff is used for broadcast. + * APIC ID > 0xff is reserved. + */ + h_phy_apic_id = __default_cpu_present_to_apicid(cpu); + + if (h_phy_apic_id >= AVIC_PHY_APIC_ID_MAX) + return -EINVAL; + + entry = svm->avic_phy_apic_id_cache; + if (!entry) + return -EINVAL; + + if (is_load) { + new_entry = READ_ONCE(*entry); + + BUG_ON(new_entry & AVIC_PHY_APIC_ID__IS_RUN_MSK); + + new_entry &= ~AVIC_PHY_APIC_ID__HOST_PHY_APIC_ID_MSK; + new_entry |= (h_phy_apic_id & AVIC_PHY_APIC_ID__HOST_PHY_APIC_ID_MSK); + + /** + * Restore AVIC running flag if it was set during + * vcpu unload. + */ + if (svm->avic_was_running) + new_entry |= AVIC_PHY_APIC_ID__IS_RUN_MSK; + else + new_entry &= ~AVIC_PHY_APIC_ID__IS_RUN_MSK; + + WRITE_ONCE(*entry, new_entry); + + } else { + new_entry = READ_ONCE(*entry); + + /** + * This handles the case when vcpu is scheduled out + * and has not yet not called blocking. We save the + * AVIC running flag so that we can restore later. + */ + if (new_entry & AVIC_PHY_APIC_ID__IS_RUN_MSK) { + svm->avic_was_running = true; + new_entry &= ~AVIC_PHY_APIC_ID__IS_RUN_MSK; + WRITE_ONCE(*entry, new_entry); + } else { + svm->avic_was_running = false; + } + } + + return ret; +} + +/** + * This function is called during VCPU halt/unhalt. + */ +static int avic_set_running(struct kvm_vcpu *vcpu, bool is_run) +{ + int ret = 0; + int h_phy_apic_id; + u64 *entry, new_entry; + struct vcpu_svm *svm = to_svm(vcpu); + + if (!svm_vcpu_avic_enabled(svm)) + return 0; + + /* Note: APIC ID = 0xff is used for broadcast. + * APIC ID > 0xff is reserved. + */ + h_phy_apic_id = __default_cpu_present_to_apicid(vcpu->cpu); + + if (h_phy_apic_id >= AVIC_PHY_APIC_ID_MAX) + return -EINVAL; + + entry = svm->avic_phy_apic_id_cache; + if (!entry) + return -EINVAL; + + if (is_run) { + /* Handle vcpu unblocking after HLT */ + new_entry = READ_ONCE(*entry); + new_entry |= AVIC_PHY_APIC_ID__IS_RUN_MSK; + WRITE_ONCE(*entry, new_entry); + } else { + /* Handle vcpu blocking due to HLT */ + new_entry = READ_ONCE(*entry); + new_entry &= ~AVIC_PHY_APIC_ID__IS_RUN_MSK; + WRITE_ONCE(*entry, new_entry); + } + + return ret; +} + static void svm_vcpu_reset(struct kvm_vcpu *vcpu, bool init_event) { struct vcpu_svm *svm = to_svm(vcpu); @@ -1476,6 +1581,8 @@ static void svm_vcpu_load(struct kvm_vcpu *vcpu, int cpu) /* This assumes that the kernel never uses MSR_TSC_AUX */ if (static_cpu_has(X86_FEATURE_RDTSCP)) wrmsrl(MSR_TSC_AUX, svm->tsc_aux); + + avic_vcpu_load(vcpu, cpu, true); } static void svm_vcpu_put(struct kvm_vcpu *vcpu) @@ -1483,6 +1590,8 @@ static void svm_vcpu_put(struct kvm_vcpu *vcpu) struct vcpu_svm *svm = to_svm(vcpu); int i; + avic_vcpu_load(vcpu, 0, false); + ++vcpu->stat.host_state_reload; kvm_load_ldt(svm->host.ldt); #ifdef CONFIG_X86_64 @@ -1498,6 +1607,16 @@ static void svm_vcpu_put(struct kvm_vcpu *vcpu) wrmsrl(host_save_user_msrs[i], svm->host_user_msrs[i]); } +static void svm_vcpu_blocking(struct kvm_vcpu *vcpu) +{ + avic_set_running(vcpu, false); +} + +static void svm_vcpu_unblocking(struct kvm_vcpu *vcpu) +{ + avic_set_running(vcpu, true); +} + static unsigned long svm_get_rflags(struct kvm_vcpu *vcpu) { return to_svm(vcpu)->vmcb->save.rflags; @@ -4876,6 +4995,8 @@ static struct kvm_x86_ops svm_x86_ops = { .prepare_guest_switch = svm_prepare_guest_switch, .vcpu_load = svm_vcpu_load, .vcpu_put = svm_vcpu_put, + .vcpu_blocking = svm_vcpu_blocking, + .vcpu_unblocking = svm_vcpu_unblocking, .update_bp_intercept = update_bp_intercept, .get_msr = svm_get_msr,