From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755264AbcEDTK5 (ORCPT ); Wed, 4 May 2016 15:10:57 -0400 Received: from mail-by2on0093.outbound.protection.outlook.com ([207.46.100.93]:44256 "EHLO na01-by2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1754537AbcEDTKj (ORCPT ); Wed, 4 May 2016 15:10:39 -0400 Authentication-Results: redhat.com; dkim=none (message not signed) header.d=none;redhat.com; dmarc=none action=none header.from=amd.com; From: Suravee Suthikulpanit To: , , , , , CC: , , , Subject: [PART1 V5 05/13] KVM: split kvm_vcpu_wake_up from kvm_vcpu_kick Date: Wed, 4 May 2016 14:09:44 -0500 Message-ID: <1462388992-25242-6-git-send-email-Suravee.Suthikulpanit@amd.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1462388992-25242-1-git-send-email-Suravee.Suthikulpanit@amd.com> References: <1462388992-25242-1-git-send-email-Suravee.Suthikulpanit@amd.com> MIME-Version: 1.0 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 8bit X-Originating-IP: [165.204.77.1] X-ClientProxiedBy: BY2PR21CA0014.namprd21.prod.outlook.com (10.162.74.152) To BLUPR12MB0433.namprd12.prod.outlook.com (10.162.92.139) X-MS-Office365-Filtering-Correlation-Id: 112e4459-b1a1-4299-5246-08d3744fc6a8 X-Microsoft-Exchange-Diagnostics: 1;BLUPR12MB0433;2:UGTaKLKpKek7zJIaJJSHYM9TbbSwC31Qk06LKHS53Xz93zPeLD87QG+KA5TKXARVsuUuEJYENAbv5A03APHJUI4GARu/fiK6MJXHzm4n18qP01OLVNKhQV3llGt7UHU6Qx0hFOec3y6no/MrKdD7pw0FXlpVCyrLcf6G+TpGHqSUE1RFhky1W4QKYQTU6TDL;3:+cb+mczdBfpf2yTKDEPuoH63c2OLqhfT98QMHZAtvtT+9Ou8n0sWFtPlLL4LC9VhSkfeE2LyrH2pyehuR6hzH0CxKzN0TpUSADr0jpNtQmDdx5dTOM/gzSlazftu4i8i X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:BLUPR12MB0433; X-Microsoft-Exchange-Diagnostics: 1;BLUPR12MB0433;25:MwKyY1mwXwiOsjEZHqw5oKdJtr6Sk4OccZGXlQ7hz8WIAT0ZDXhHr9TITjTGapI1IY/3+jKnDb/pNtdZgKRMrRALtIOhqKeH9JuQccOAHV5peEw+9hX2pDPNV8sO7GH+P/dEQtHwQqVSFln21SV6gtmrM07f3TCWGEYpZZMCxz22gJ3PyTXgpRIDe2PAyAFqJ/Bjk+54t1fs3lzVMBstBZPzVuoHZZI6IVlRFAaMbP2VUdofMyeNg/gW1TuD/ef6rt3qdjXOK2XxQGhEyMLM8BpdolTKZRbJDre7PU7MDbTuqzvFi7W5KjYuOJ4J1Kdbr3JekRLjRSombmx2wW9mqjMRYeVYIPG+UwNmqQejbAROR2mfURU5fw7jgAxPA6unNnvnkiI38ULr9GK/uA9qd1T/7HEm+Ytz7wnWW1quHd8zX4yZKYXPBiQL4Z5ZfvjE3gNWTuCLS9GLtCeBZylWPv1iIlk6KdUEUsRHSEaAH58hAtqhtbDI4+bGVCQtjNaCTN3LFGJAGurJOCJspYvoywZ2AVVIIRQYnIgoXOt5gy1uRhNo3hvpS/qzxw9vEHCd7Y9OSY6ehDPogeDnkXG2xIOs0ROmmcVRoQfep2/T4DWIoPUQny8tzJ0DXBbZ+T8IetPfHbr8+PCKW8E3IuFc5Q== X-Microsoft-Exchange-Diagnostics: 1;BLUPR12MB0433;20:QqW+kH+trndm5+uJ/bD62A7NNGztIpzTv8gc9RsIdsprckN40iSLNTu0hnm655JV2e1JUxD67SUUHpTFxARUzTrwGg/eUFI5jWXUFKqT1skWaGXP9PmheZB1FdiuQqSI/Ii/seXc22B/s2kXh38Mkyd2STF8iapgmsDbeQCQRE+0xNOptspgAie/t9cwfUuJloOQEXcqahxXJFfaHdA1TAr9z5WfPxIofBEdoB13zN3DePpMoXUDHRfuIONp+MEcqJoP6m9AwujAVGcQd+y/vv+vbk34Rh+IeTJJiWf207YUXLVB7o1/1TWtsEbxncuDk2sKCMpwVRx4tFL+xinjIZApbV4PbjEhVE5DDEijYHzMZtwoZhyAcWSSpe7t8wWeubpvJcFw9CtWR4yjahrXvcLvVibpWbYj60++mM5VD5b6ijqBqO0bZJi1etWVttwef7MmRCqJvc14Hx0eFuo9GcG0ElTxMd+wQQDWdED1MZIBsk675XLsjLVjaq6yJlxr;4:acnxy5/TX9NTFqrcVrE7JOXqs3aQ2XswpyovsrqSFd2uQQzLY/pnIg5P675pnI5Di1HsWTK/xMU2B3zkajI0yr5z5uLTzxPKMwObN53irRYdtydVo6RWdUuYgxClE7+wBP06RJ5zbNPQ+FuHMsHRr3d4yP3C+3h8PEbfuBnssoxCDpSK8eHZs0QPcjpw91uy7fcqZGHHO9EcEjJJlB+hT/rUrSkXehm/UxCIRUZ99PAO8W6Yb1V9NY6dTZDelFosj0pCyN4VX5xuvhczIZZ9zfVcbJi2AWYxUAZwJkL54+CBlta2xrZNTiVYivFOfTi3OEIt/Oaw1/GAnfGDhe+dbQAIqalylh48svQ6ta0hLwjdjFSuWKrPli8ZUjAAhZYHLaoDRffTzBEzsZNUiOGkGjlTg2WeuMic/+/psjcNPXKH5tr+PEtH0t9N1/1OlrGu X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(9101528026)(9101521098)(601004)(2401047)(8121501046)(5005006)(3002001)(10201501046)(6055026);SRVR:BLUPR12MB0433;BCL:0;PCL:0;RULEID:;SRVR:BLUPR12MB0433; X-Forefront-PRVS: 093290AD39 X-Forefront-Antispam-Report: SFV:NSPM;SFS:(10009020)(4630300001)(6009001)(50986999)(76176999)(50226002)(2870700001)(47776003)(66066001)(229853001)(36756003)(189998001)(19580395003)(19580405001)(2906002)(2950100001)(53416004)(2201001)(5004730100002)(92566002)(4326007)(23676002)(5001770100001)(77096005)(586003)(42186005)(5008740100001)(81166005)(5820100001)(3846002)(6116002)(86362001)(50466002);DIR:OUT;SFP:1101;SCL:1;SRVR:BLUPR12MB0433;H:ssuthiku-cz-dev.amd.com;FPR:;SPF:None;MLV:sfv;LANG:en; X-Microsoft-Exchange-Diagnostics: 1;BLUPR12MB0433;23:8Xjm/gwXD9yfNtF3AYmG0tVkOYn6HeGBUUrbLSNCjxMIYeifd9jl6264FfUI4rTJtJSpl0nbLIGRp7xXBFLPS+/Pb8ZanTzomEcQCFPTf1qEI2ANmGrbO2earJzEjgI+9vK1hZ/wvt7WWzX86LBK+NBbJUyGbvd5vXozLF+3EUTib40o9I33UIqk+Ok/mrc64S9m2KOFsYlhaVtcIeRO5u3x5gb+gKQfhyuhotge364/3jCCQz5OzuhukaJISEvNPvfk2QYPbw5ezY1Dhw7FLT7FD8LNVS/ymSTCN1YC3+piTwLfFOsGQi3sVjVvNMrykIrUkP6RWQV6wYdUQ8dMzBL7JZ6dOWLf+iNki9CeQGhZzOUYcj4YPe5vDNtTyiUh34PdZYqt3Peb6YZ4+5PbeWTi5aLVCxOaNig1UDDlACHP6exmY2fcAGn0otd/l+WxJm4ICFXdjNnzTTdhPacs0u4eb7bI42Cy4uha/YteGx7FhuzQVqAHbeMAryqwsdrZ5xzH5Tarpj8XlXKOVutVp+J6ayEHd0jb4IZsk7EkzwjHR2DpH5F+P5jXPXLYvt+Own7In/00rlqsJVxzPqa1Sdmxf2rMUKmKslzv+8H2zjCjAHINIrOaesF6fq5RmGXsVm52r07iwSMXAM34mYZsYa2ko+sXh9FFqrVCZMBuABxn3s/ePbunpDxkMxapasjjINOCQXGmYGhCdbd+JVidE5f9tCIQUB8QEk+B5eCcMT09vmi9NqM+q5pa3o200CQqec++xNnwjsjIUp3EpMe+xOk3bxKO3xWhQNf90x5nqIlFeQHDflKQIJMiU+bbTS6VlPee/LT+w12pbFNLT5HV2jP/9blrivB1XxUov3Jysi29ym5p9yWSZHTEQLwjAlpJf1VcwqOC3P7jAgcKL8y92w== X-Microsoft-Exchange-Diagnostics: 1;BLUPR12MB0433;5:h2riq5jDMuoJILCPlQJfEoR0uf2y0MsCEaJ28U2DzodHx8PBVEY/VchlrIDaNR0vzCHhfL8zXXkDz0IDRjZG2UQtOwvxpAGDbPqRHHo3CXR9bme9zkdf6R+bPtyh3tz7+YzhDvLXnXrWcdXHCmI5yw==;24:jFH+ucBH6mElrUTTuo3AgO9WBXGnz2lX84MXqghrvWvhwgorJiGYydTO6JHllLXSfHBxH6zf03V1soDH2Lkk9ohj4bNLcRieauBXPihPp7E=;7:b86NgqXsVcNvzRvF/TD4oNJlDtLIGwchCCxQoa4NC5OQ4MhwYGPOie1vjwRBrRatAF1pnn1MsNjb+e6FeBPV8x+fEtd5Y7aeJXgWkTkvaxrNB6xati3ZXI7naVNFF7ccrH1HP/QuGeYGYIS2L9yooVGSTAnVPNZvPfoacjMQPks=;20:eEOQlLld26RjjPgaF6KmavLWBjD5hgp3DMf9IrgPM4mRn07s+9wcbzRwPLptoIg9UHnB14izbF4FrqUDwSzxt0kEpIZ5g8BBcSNcz88+CSvvNmRSVxmSEj0S/fEhmuzcTGQId26Aeom8FBOHHbQDtqaFttzACGD+WccTZy9B+QFgc7Fgj1sAFt9lHqJSlBl+fSoPb26CvoFtN5Ft1n1QwlSVRuMgiG+C3w9qQXyUDP6emDDfW8K+VpS2P6ZMwEQj X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 May 2016 19:10:35.8060 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: BLUPR12MB0433 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Radim Krčmář AVIC has a use for kvm_vcpu_wake_up. Signed-off-by: Radim Krčmář Tested-by: Suravee Suthikulpanit Reviewed-by: Paolo Bonzini --- include/linux/kvm_host.h | 1 + virt/kvm/kvm_main.c | 19 +++++++++++++------ 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/include/linux/kvm_host.h b/include/linux/kvm_host.h index 5276fe0..673749d 100644 --- a/include/linux/kvm_host.h +++ b/include/linux/kvm_host.h @@ -651,6 +651,7 @@ void kvm_vcpu_mark_page_dirty(struct kvm_vcpu *vcpu, gfn_t gfn); void kvm_vcpu_block(struct kvm_vcpu *vcpu); void kvm_arch_vcpu_blocking(struct kvm_vcpu *vcpu); void kvm_arch_vcpu_unblocking(struct kvm_vcpu *vcpu); +void kvm_vcpu_wake_up(struct kvm_vcpu *vcpu); void kvm_vcpu_kick(struct kvm_vcpu *vcpu); int kvm_vcpu_yield_to(struct kvm_vcpu *target); void kvm_vcpu_on_spin(struct kvm_vcpu *vcpu); diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c index 4fd482f..5bf20f8 100644 --- a/virt/kvm/kvm_main.c +++ b/virt/kvm/kvm_main.c @@ -2071,13 +2071,8 @@ out: EXPORT_SYMBOL_GPL(kvm_vcpu_block); #ifndef CONFIG_S390 -/* - * Kick a sleeping VCPU, or a guest VCPU in guest mode, into host kernel mode. - */ -void kvm_vcpu_kick(struct kvm_vcpu *vcpu) +void kvm_vcpu_wake_up(struct kvm_vcpu *vcpu) { - int me; - int cpu = vcpu->cpu; struct swait_queue_head *wqp; wqp = kvm_arch_vcpu_wq(vcpu); @@ -2086,6 +2081,18 @@ void kvm_vcpu_kick(struct kvm_vcpu *vcpu) ++vcpu->stat.halt_wakeup; } +} +EXPORT_SYMBOL_GPL(kvm_vcpu_wake_up); + +/* + * Kick a sleeping VCPU, or a guest VCPU in guest mode, into host kernel mode. + */ +void kvm_vcpu_kick(struct kvm_vcpu *vcpu) +{ + int me; + int cpu = vcpu->cpu; + + kvm_vcpu_wake_up(vcpu); me = get_cpu(); if (cpu != me && (unsigned)cpu < nr_cpu_ids && cpu_online(cpu)) if (kvm_arch_vcpu_should_kick(vcpu)) -- 1.9.1