From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8C77AC432C0 for ; Wed, 27 Nov 2019 21:36:48 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 535992075C for ; Wed, 27 Nov 2019 21:36:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574890608; bh=kRaaeLyVrJkQ2s1HL5fTS7pl1D9tLcbEPABB7AWikDA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=VVYXWxQ9eRdRawa52txGHq6TIqTE69gfY/QCKf71s8ME8jss3HM3rPR0mL2+Vgh2L 4MH2ioU/trwfTloKwmdMc0AscOD5QgRNLkaxOU0JICpN19z1G4Kflk0NNRHvZzWGrx 78g8pldBRh5bqz0xR/AMrt4pzI5u+b3ZEt4QWoEU= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730032AbfK0Urr (ORCPT ); Wed, 27 Nov 2019 15:47:47 -0500 Received: from mail.kernel.org ([198.145.29.99]:60882 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728828AbfK0Urp (ORCPT ); Wed, 27 Nov 2019 15:47:45 -0500 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id EEDDA217C3; Wed, 27 Nov 2019 20:47:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574887665; bh=kRaaeLyVrJkQ2s1HL5fTS7pl1D9tLcbEPABB7AWikDA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=MduOnWqL60nP+gwrpn23M9QxoECWzFwXPIZoV+ezHbW4JHL+ZKkbMC/oPOyj7oukJ A3mC5wu1hjq+7t8x4pPsqj30Vk4r/uUOQhibjsERO7dL9AxR+u+IeHVWavM/Sfl+HT O2++UdanwUhHTPo0ahyWunLwxhD68nXyAgyoZBNs= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Uros Bizjak , Paolo Bonzini , Sasha Levin Subject: [PATCH 4.14 045/211] KVM/x86: Fix invvpid and invept register operand size in 64-bit mode Date: Wed, 27 Nov 2019 21:29:38 +0100 Message-Id: <20191127203058.390469148@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191127203049.431810767@linuxfoundation.org> References: <20191127203049.431810767@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Uros Bizjak [ Upstream commit 5ebb272b2ea7e02911a03a893f8d922d49f9bb4a ] Register operand size of invvpid and invept instruction in 64-bit mode has always 64 bits. Adjust inline function argument type to reflect correct size. Signed-off-by: Uros Bizjak Signed-off-by: Paolo Bonzini Signed-off-by: Sasha Levin --- arch/x86/kvm/vmx.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c index 1c4e5eb8be835..f67fc0f359ff3 100644 --- a/arch/x86/kvm/vmx.c +++ b/arch/x86/kvm/vmx.c @@ -1602,7 +1602,7 @@ static int __find_msr_index(struct vcpu_vmx *vmx, u32 msr) return -1; } -static inline void __invvpid(int ext, u16 vpid, gva_t gva) +static inline void __invvpid(unsigned long ext, u16 vpid, gva_t gva) { struct { u64 vpid : 16; @@ -1616,7 +1616,7 @@ static inline void __invvpid(int ext, u16 vpid, gva_t gva) : : "a"(&operand), "c"(ext) : "cc", "memory"); } -static inline void __invept(int ext, u64 eptp, gpa_t gpa) +static inline void __invept(unsigned long ext, u64 eptp, gpa_t gpa) { struct { u64 eptp, gpa; -- 2.20.1