From nobody Mon Jun 15 03:52:34 2026 Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.12]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 6F8BBB67E; Wed, 8 Apr 2026 00:12:39 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=192.198.163.12 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775607161; cv=fail; b=Msh2WuzM9D+hABr43wEg+mY/cNZ9ajB+D2Q5ZFlFGESzSkmiy5AaBskCtNnmlVEEabmMY5YMa8axuy7X84/69rw5+dJcgx/wAsjLO0u26iQCkmcNcUfZGhgvL+OV/LMH72m2kzFdfJt1xMA/stSyY5xOVBcpNnMEqn66j8zArM8= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775607161; c=relaxed/simple; bh=fQgHdJOoZw9n3OlrcPN4pbtlirqw3b4Uh0gyZsPLnZg=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: Content-Type:MIME-Version; b=I+k3XXx/P1gq3yb4r+wec5yOoF0IsO41k8TNUEL58KbrWCaTBUwSuXsKCrRyJcItK+LJ0qtm94+G0f7Egk/v+06nkUs0PHQVHlmJFGmHTT6b44RIcy4xcUEmsHj9tEgN7WaYVjLfPnYJ3zliU3X58UqcS+NaCLY7DYOKx+hIv+A= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=intel.com; spf=pass smtp.mailfrom=intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=T5R0noZS; arc=fail smtp.client-ip=192.198.163.12 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=intel.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=intel.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="T5R0noZS" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1775607159; x=1807143159; h=from:to:cc:subject:date:message-id:in-reply-to: references:content-transfer-encoding:mime-version; bh=fQgHdJOoZw9n3OlrcPN4pbtlirqw3b4Uh0gyZsPLnZg=; b=T5R0noZSKfhWhWGFqfb1P3zhM1Zlzb5uc5CT+hS8vcq7/JW4CS107VQS lQiMAyCc6HXKQWzN1KL/rkHUfGuKcQGGMCT6FN2zd5Ajl+G4W57MZd0z/ cQ1Z9lioiAckCUOrZpGNCDR4zCN9EoOZlZf6qEx6egLZqCgcgwvxy8hsb orF1RAi13Gqr+8iXHx2MpYPTjsCBYQAvEdl7n0tQsF5cKRQQ8ESX6YZ6a 8J2UEVDivjfME3sqPaJ90geULfwU6qc9DFcbz4pEVr8a+DR0/QgtqxOnN 0dOC/6XcwOZt1XcM7cT6/juk4aRn74HSayn9YJ7ri0WC5QtXKCDLFLiaF A==; X-CSE-ConnectionGUID: KV11VCJURBaqSGi4Z5uXvA== X-CSE-MsgGUID: AWE/+aGNSgqrrKudNlPWAg== X-IronPort-AV: E=McAfee;i="6800,10657,11752"; a="80466766" X-IronPort-AV: E=Sophos;i="6.23,166,1770624000"; d="scan'208";a="80466766" Received: from orviesa005.jf.intel.com ([10.64.159.145]) by fmvoesa106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 07 Apr 2026 17:12:39 -0700 X-CSE-ConnectionGUID: mvwz+I+4R6yLN6/QqPvAiw== X-CSE-MsgGUID: KW5NVmRgTA6FpZ9MNEGmGA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.23,166,1770624000"; d="scan'208";a="233272608" Received: from orsmsx903.amr.corp.intel.com ([10.22.229.25]) by orviesa005.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 07 Apr 2026 17:12:38 -0700 Received: from ORSMSX903.amr.corp.intel.com (10.22.229.25) by ORSMSX903.amr.corp.intel.com (10.22.229.25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.37; Tue, 7 Apr 2026 17:12:38 -0700 Received: from ORSEDG902.ED.cps.intel.com (10.7.248.12) by ORSMSX903.amr.corp.intel.com (10.22.229.25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.37 via Frontend Transport; Tue, 7 Apr 2026 17:12:38 -0700 Received: from CY7PR03CU001.outbound.protection.outlook.com (40.93.198.21) by edgegateway.intel.com (134.134.137.112) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.37; Tue, 7 Apr 2026 17:12:37 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=ZH2psOw/WroKaHHVQo7FJNbWD3wZ5k/C8n94AiO9zIS6rmehDZnmT+rT7OpFlwuFiVwPMuq24ImaDKqk2+nH0lDRcNCtsRqlggX2OynIFX3Q+bUuwwv5/EKOPMb4Mj6MfoEab4Y/Rch2v7VRMiPEIO4pYkrp/jTz0iPLEsXoCaULTChJXlOk0imfRrOowitbqUltXGqY7FCNIWHxiqecii7lanQ8usGU/Ge74xk3p6BAOaEKpMOyjKvRet0N9InYfTTzjWqlOy91fYjlguRqoIdaPTRas3jnjCAaoR4lE1BqPxeoqejwhRhscK4H+dJZYogWv7RAe9uB7swZHkaneg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=HmpcEhJRXNLSrVvtO+q3NPl8oAVZNB7FR37VZ5VJvZ4=; b=g35RC63dRItgI6qKpwRxgjC1C27HCaJ5ieOQiIXsV311GnDML5PDsGWXBnfxcfDdc/vPiOQLtRCnJ8jtnFSnZ3Gnyaj15S7KIaQX5d/2UEN+nHXXcYtkrT+vTY7eQpAPcjgh9Lpy83YFOL9rZV2dzZUh9IvJfThWkzjS/tlLA+DQ0VFe9D2yMhWIu00MG91gmOYCfFdzxZVqg6RTTHGva9DTmFIzdELU195oiq9PKZH0g5y4n3/gLFby6IFMfxd5ppmqVOeMhnOKCWl+j3siAk+F89v2Nvq+DNFKrev/4LidKM/foiHv82dW0lN04Klpfte2BycBFgxiYd8U9L0/TQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=intel.com; dmarc=pass action=none header.from=intel.com; dkim=pass header.d=intel.com; arc=none Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=intel.com; Received: from SJ0PR11MB5645.namprd11.prod.outlook.com (2603:10b6:a03:3b9::19) by BL3PR11MB6529.namprd11.prod.outlook.com (2603:10b6:208:38c::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9769.16; Wed, 8 Apr 2026 00:12:34 +0000 Received: from SJ0PR11MB5645.namprd11.prod.outlook.com ([fe80::fb19:f933:8bb3:b42e]) by SJ0PR11MB5645.namprd11.prod.outlook.com ([fe80::fb19:f933:8bb3:b42e%4]) with mapi id 15.20.9769.018; Wed, 8 Apr 2026 00:12:34 +0000 From: Peter Fang To: Paolo Bonzini , Sean Christopherson , Madhavan Srinivasan , "Nicholas Piggin" CC: Yosry Ahmed , Ritesh Harjani , Michael Ellerman , "Christophe Leroy (CS GROUP)" , Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , , "H. Peter Anvin" , , , , Peter Fang , "KarimAllah Ahmed" , Konrad Rzeszutek Wilk Subject: [PATCH v2 1/3] KVM: Fix kvm_vcpu_map[_readonly]() function prototypes Date: Tue, 7 Apr 2026 17:11:28 -0700 Message-ID: <20260408001137.3290444-2-peter.fang@intel.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260408001137.3290444-1-peter.fang@intel.com> References: <20260408001137.3290444-1-peter.fang@intel.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: BYAPR04CA0011.namprd04.prod.outlook.com (2603:10b6:a03:40::24) To SJ0PR11MB5645.namprd11.prod.outlook.com (2603:10b6:a03:3b9::19) Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ0PR11MB5645:EE_|BL3PR11MB6529:EE_ X-MS-Office365-Filtering-Correlation-Id: bcc18e15-f2c6-4a6c-5413-08de9503888e X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|366016|1800799024|376014|7416014|56012099003|22082099003|18002099003; X-Microsoft-Antispam-Message-Info: C+woclGz3/KKypkYSMYvyfmbEtjHnb7mAOslMLTAqwOxyJZHHUlj55e5XRccUe2EgnxtsFnR8NMcPABw8/3Fe4NC102fLhpCudwjDOVVsbUCLqP1C18ci4Ra12a4CnYiJIh5gsZaTJOR/PVeJNwlI/gP1IbO943lQgJJQ3mFV6ldVxmxVvsyPL0KxU/zzd1FSePlyO4WW1SdL0reHigdKQMKJxo8ihWBpnf6qPPHvL0659f/sEgS2KBotWMf0cgmoq7HIjVe7vNC3IYBZ1Jxhha6o3VS4jd+SZLjQMWb5c6gAIJUPspI9S+P7mrNYY0WF3AKJQl3++RDHMOBE3Kvru0UwApGrJ/fEVF/4LxmXGnsZgAyaLZp3xIRZsCmIma+eTB1vM3EyWbmp8330fhgITzOQtcg+MUPW84YgDB5f82+zrLBnNIR32azGZXs0KPSyofbPJSVM7CkY1VOUVrtmFYaXyKG7iUor5ArbxXiFckB/zFJoWvqShRAFLYkv+YZlMZFqVHDHPz7k/YLCHb0nhOUDm+sCJMpf14uzIVseyNicQ38ep47hozLN7xncrzZK9sFI4y/2Xp58r+v5MKsbWSSfkPTBiGx21upIMrUPyCoTxTCSppPQ55g1hjZ8iBkpCrRrzwx3+CCVqQOaiYgsptguNYxMH4XxSaqbnXQswQ/J5AL4JBOjXNVPvxiF7hkKvVUszEJ5UqCrY7YinTJEPzoVsvFAdGkzrUcfGxCAWQ= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:SJ0PR11MB5645.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(366016)(1800799024)(376014)(7416014)(56012099003)(22082099003)(18002099003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?hvKaWTmKXdrrGjjevpAF/bnulifbxRME2Pv/sfMRBxvbmsZ1CmMAqs7jzLAF?= =?us-ascii?Q?UZI8XYJQpyDpMlbRQdjQDxxiOk38No3YnoUJ7btp4IWrBQIzc3WdmuuhrzLV?= =?us-ascii?Q?zPyLpRw4q0TFblRH8mWufFHOWBX4ZLRTbs4zoe7IzFfC44nDD4v7xc0rw0Aw?= =?us-ascii?Q?+MxQHQvjsoogZ3QsCBaA8LejwChBdwY5ElgOMCtNMP3ttp1jQk12J6p72V39?= =?us-ascii?Q?ta7Tm8YPoV78Lc9tzbeu3WVgTHrAc8U2GWi4w92FFCxtwHACaNlYFMrCVd+l?= =?us-ascii?Q?SAJ6SgeeUURBqi7g/FOBjsgmy5T9mkOr4S5aIquIwT/Obe2w7yKYb8y5tMhx?= =?us-ascii?Q?HLSpnK5V2hihN+CJAd0q0okEgEdwDEi4leJoJHp00YOb6+/9t1B/CD3mxbtQ?= =?us-ascii?Q?yPx+SGerDKnmHa/RUuQK8HkRUQPZESzOv19p0CYenFgyRkl0EyCnPixRy7uC?= =?us-ascii?Q?YUh/O+qKFDqFW2Xvyzn3hWiyP1noGOhPMSNYCkQrH5C0koXmQ42xylAyso96?= =?us-ascii?Q?HynD5Jd8qMlCKeHGxqlJmCCfCqtPeei4O2FdUTt7cWymlsm/mXaMJOTLE0pf?= =?us-ascii?Q?rVqmNJyV3ZRonKqu15KUDYubzxH651czk1HjSrvwog9LpMawkOdlLSsCmH5N?= =?us-ascii?Q?FWmpAOGuUF2jYh3OVwbu5Wq/uCw2+Cp7oSV9hkJW0yVVT6hhNpYijnVECcVD?= =?us-ascii?Q?go5HyOtigiWed6CC8AEx/weIB7XViTSTj7IM2PyBiboKXalF8k5wM221xtGX?= =?us-ascii?Q?tFv3ROEJsHqYcH9ArS8gaEwMFxIFkZLlMFdraqx62wODxgmJ0zUjiMLPLMoq?= =?us-ascii?Q?3Ab86SvKNuAe3QKiiiHTZvewE4n9+pF9dyfLDIQBEGQh4PWt/xf/8cizk1lZ?= =?us-ascii?Q?IU4dDPGouGflxIPh/TXfB1/usi/3nVXpNwwUW3HUT3GMPg/TzJXkI4TbwOTZ?= =?us-ascii?Q?6mFXJ1e+MJPnwQBzalBxv1kj8BLf/wRAqrPE4CnkySIv57kj4QCHJ0Po67pw?= =?us-ascii?Q?atDGQNOzKJQsB+dhfbFRVdH4NxE53B9kYELSEsq1MPqaE03hn94ahX7houb+?= =?us-ascii?Q?Rj3E/FPecbHKCQfA/NndVZjS7oSAiwF/KqCx6Sis4gad9luWUZuVghO8FKqQ?= =?us-ascii?Q?nrZpLrh8QD9OlwXgvylnYwZ/YS5Bif2e3lcspyJgK9hX2yN7O3MaxrWTU/ka?= =?us-ascii?Q?l3hPa9ic/VvUHE9SXD7AixT+kzdIkVZOTgKrHSv35j9G5el+NQNhuSudhpHK?= =?us-ascii?Q?b5I+D23QVZW/XOTh9SvgLm+nVhz0CK4N8AXfXisldwlsVW7f/wm53o1jvR1E?= =?us-ascii?Q?DsuMtAaKWieUmC9DaaqEK8enVT7gg460P/RS4e/ZBNxorNIcrjfbjzqR56d0?= =?us-ascii?Q?jUJZUbvEI0p66jJnE8U30bwZGfViE4zKD14SIK3t14atsHh0j39GmNw+9RSV?= =?us-ascii?Q?sl0Kya5AB7IcPT4hHEXr2YKNhPaizlIjmqdt+vQ/8iY0qtAgsNwv6YsbsR++?= =?us-ascii?Q?Ck59H/VKOePq9IcPxnYB8kqKxdKOw9dBfcPoHlZkSCtzEcc5R7VDHY7ZTd+N?= =?us-ascii?Q?Zo4L9La15JY0552QDbl6+UVjQVyd9mr9MTJTy+s3AZaf/tWnIbsfkuc3PxMb?= =?us-ascii?Q?u25p32JiqIEo/vfCOPFtdXreePQG7v+Vn/01YIvb8+KNmXT7dFNdtUpdeJ1n?= =?us-ascii?Q?+ROQrLmBcB7pgx2ffUX8L+o3/fOc8oj5ZazSTp4XhRtAyhRWKA5AoX0HA49n?= =?us-ascii?Q?ueJ4EXJwFw=3D=3D?= X-Exchange-RoutingPolicyChecked: sUsP2g+TfsZxopZ4aiVeAodwMWRwsWx54/E/HZQLRIsldOjDIfxTzE+g2ZIQ6Z1Qv6zMRHKr5ehSFUASCuc/kT3+cjwsdQ0s06kZiMNgrE61En68ZIiF+lb6z+C6JdBt8OMJdc2rKKpo1Z2n2nCPBeoWOGVjtLb8UZNUDAVivxHIpVx+Otl9V/5c9C5tBoL7q2ZUGQVTMgACiRRC5eMs2jJodij0ti1+7ADwsb6USXSaecShsi2sy1gV3j3t+I2hb6Inm9myC/Dr0gv8KDL5D5JyXUVua9U1xpPkgA7Oa4IeXZ9AaydX0x3+EHl1aM4uzdR/fo9lS72lVfrmV1cf+Q== X-MS-Exchange-CrossTenant-Network-Message-Id: bcc18e15-f2c6-4a6c-5413-08de9503888e X-MS-Exchange-CrossTenant-AuthSource: SJ0PR11MB5645.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Apr 2026 00:12:34.5442 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 46c98d88-e344-4ed4-8496-4ed7712e255d X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: fL5SJjwLmmAS1DnsHlFn08TLmOBVuOpkzUJV1+ES5zZwQopWm5o5pH2zpvEerRvRUvX7Y36pgAkSmA/xqrAYOQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: BL3PR11MB6529 X-OriginatorOrg: intel.com Content-Type: text/plain; charset="utf-8" kvm_vcpu_map() and kvm_vcpu_map_readonly() should take a gfn instead of a gpa. This appears to be a result of the original kvm_vcpu_map() being declared with the wrong function prototype in kvm_host.h, even though it was correct in the actual implementation in kvm_main.c. No actual harm has been done yet as all of the call sites are correctly passing in a gfn. Plus, both gfn_t and gpa_t are typedef'd to u64 so this change shouldn't have any functional impact. Compile-tested on x86 and ppc, which are the current users of these interfaces. Fixes: e45adf665a53 ("KVM: Introduce a new guest mapping API") Cc: KarimAllah Ahmed Cc: Konrad Rzeszutek Wilk Signed-off-by: Peter Fang Reviewed-by: Yosry Ahmed --- include/linux/kvm_host.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/include/linux/kvm_host.h b/include/linux/kvm_host.h index 6b76e7a6f4c2..4e3bea92a06b 100644 --- a/include/linux/kvm_host.h +++ b/include/linux/kvm_host.h @@ -1382,20 +1382,20 @@ void mark_page_dirty_in_slot(struct kvm *kvm, const= struct kvm_memory_slot *mems void mark_page_dirty(struct kvm *kvm, gfn_t gfn); void kvm_vcpu_mark_page_dirty(struct kvm_vcpu *vcpu, gfn_t gfn); =20 -int __kvm_vcpu_map(struct kvm_vcpu *vcpu, gpa_t gpa, struct kvm_host_map *= map, +int __kvm_vcpu_map(struct kvm_vcpu *vcpu, gfn_t gfn, struct kvm_host_map *= map, bool writable); void kvm_vcpu_unmap(struct kvm_vcpu *vcpu, struct kvm_host_map *map); =20 -static inline int kvm_vcpu_map(struct kvm_vcpu *vcpu, gpa_t gpa, +static inline int kvm_vcpu_map(struct kvm_vcpu *vcpu, gfn_t gfn, struct kvm_host_map *map) { - return __kvm_vcpu_map(vcpu, gpa, map, true); + return __kvm_vcpu_map(vcpu, gfn, map, true); } =20 -static inline int kvm_vcpu_map_readonly(struct kvm_vcpu *vcpu, gpa_t gpa, +static inline int kvm_vcpu_map_readonly(struct kvm_vcpu *vcpu, gfn_t gfn, struct kvm_host_map *map) { - return __kvm_vcpu_map(vcpu, gpa, map, false); + return __kvm_vcpu_map(vcpu, gfn, map, false); } =20 static inline void kvm_vcpu_map_mark_dirty(struct kvm_vcpu *vcpu, --=20 2.53.0 From nobody Mon Jun 15 03:52:34 2026 Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.21]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id DEB49EADC; Wed, 8 Apr 2026 00:12:39 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=198.175.65.21 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775607161; cv=fail; b=pz+xGZDDfaCJZWwclv+XxO9m9+egkIJxFXwr1FvCB5RLK8G3LCBlPtNb70V4/ifGV9uKFLNLwYKo9lQvGx6XM4I9zLVrKUu85hjmyW71CletTs5YNSCQ8L2xew6yNdUpZg5KdrZXbUs/Dm2nFxFykbYdtn3djdKCnkF9x4GeI6M= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775607161; c=relaxed/simple; bh=cxKFD5zF7CEalAKf7AlBTUEcFnA4PkVju+MGC/K1gao=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: Content-Type:MIME-Version; b=Weap2WAq//pOvA8msxym4+/1tG/BDVa8APtMSZNZEy/THa0+xhrgW7nYLmosR6qosM0jSLf78+wPV7mqzmLf0OxHxKozvM0M5mvE0F1TfRL8jXOpVVjtGTx7Ov7s0/nc53wyjdE4fRVQHyK/iQYuGnjXb1997Rg7POTLYoCrFNg= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=intel.com; spf=pass smtp.mailfrom=intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=XgMeujbJ; arc=fail smtp.client-ip=198.175.65.21 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=intel.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=intel.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="XgMeujbJ" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1775607160; x=1807143160; h=from:to:cc:subject:date:message-id:in-reply-to: references:content-transfer-encoding:mime-version; bh=cxKFD5zF7CEalAKf7AlBTUEcFnA4PkVju+MGC/K1gao=; b=XgMeujbJdZbIsD387gQ19NXt60swpfw+8c0JMRAgWH4OpLMg9LOk5rDG PR+jOquTvPXKNvXN46qHQE1judhla5peg9kztr2AlGPkt1NwLFN8w3QAw SEqPPpa8Y7MKeLa8tskxEF4kIwCOV2PCBCiiWRswFzG0cY1V0MD1/7pU6 HWZSzcleE/bxncnt7Ob+CS4s+xyex1bCfuYzfp6HjWzdJ809fXpQwc6UJ BZ0rP+0WpVtMxvMyHKGnBF5fGZHg/07WcJeoHhqrP+TZa6AeoYpCiDOIw cODZ0Tdwz/tEQV8mGjawb8yupFcSUuX3lOwKO6B/DgZa+ZiL5aYG23Yun A==; X-CSE-ConnectionGUID: 8VpbgDGVSTO8KcOLbkfYZw== X-CSE-MsgGUID: A6mSR3nhRhyFMWZIIFjFLQ== X-IronPort-AV: E=McAfee;i="6800,10657,11752"; a="76462864" X-IronPort-AV: E=Sophos;i="6.23,166,1770624000"; d="scan'208";a="76462864" Received: from orviesa006.jf.intel.com ([10.64.159.146]) by orvoesa113.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 07 Apr 2026 17:12:40 -0700 X-CSE-ConnectionGUID: dJL55AWpQ4i9UJxjN7/6PQ== X-CSE-MsgGUID: s33TZcTlSQi1B10wSMmGOA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.23,166,1770624000"; d="scan'208";a="227298001" Received: from orsmsx902.amr.corp.intel.com ([10.22.229.24]) by orviesa006.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 07 Apr 2026 17:12:39 -0700 Received: from ORSMSX901.amr.corp.intel.com (10.22.229.23) by ORSMSX902.amr.corp.intel.com (10.22.229.24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.37; Tue, 7 Apr 2026 17:12:39 -0700 Received: from ORSEDG902.ED.cps.intel.com (10.7.248.12) by ORSMSX901.amr.corp.intel.com (10.22.229.23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.37 via Frontend Transport; Tue, 7 Apr 2026 17:12:38 -0700 Received: from CY7PR03CU001.outbound.protection.outlook.com (40.93.198.21) by edgegateway.intel.com (134.134.137.112) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.37; Tue, 7 Apr 2026 17:12:38 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=ceWwbk7KGWODP0FPmyJAIBUAaq5JaAnkZTccMnNMHXsrT2Slf87cvbLkJlLwkeofFS5YZFyqL6EVOYewId/G+PsSzBs/VcDlPlC1+TcAN9owvCbP1mxGl79sh+A39QE9CxO7S0BtT7hMoEoqbnCUVZ8hcsyDusvm1hjvKlOLZRyI2RGjMjaHjrLH4XokDDY20vVdeexnRhtR4BL3V6MgbVAEQoqdrEkC9coQ0vTXrKEa+Yr0I5EcksjXOKHzRC8bXpIYkhFhJYjf9OtE+T6R6yhoYrYJsrvLCuf4xOpIGxih20meEMWSYvsykOcorvfOjGXtL1YByV3VWQb7Uw4RxQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=2BnsEb0EUtpokN/BKhrgP4HSzyuLR+43WQoj65XEU70=; b=f8VxRwWhk7KrlLgtbERXq+y8GacoqE6NUCFFbkWVFpSYM5gVozSezIC6sHJGoLAYfmzS1f2IT13BIiU35FxIFc8GvHc3xnqroR1UXeVZtbN+xKmnKgIlCl7w07neWyG6MK4z8Ycb0XOVjK0bKBo7S/jplIcgLEJpYY1+u9UYrnpJBLyQUgTo7LQ+J3iFMVjPqg2y1dZVQk/f1ctNzmRqtS7wqeZe35L61KVYOw5IO+l+G8Fc3Sgmw5KuqiIGRFZo0/XyKpojWJAGYLryrtb2unUu/cnsCIBXciV5rfbR/bo3/r7cBtc/EkqQCORjEHlf950dRUWkLMjWLqoM0U+0jQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=intel.com; dmarc=pass action=none header.from=intel.com; dkim=pass header.d=intel.com; arc=none Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=intel.com; Received: from SJ0PR11MB5645.namprd11.prod.outlook.com (2603:10b6:a03:3b9::19) by BL3PR11MB6529.namprd11.prod.outlook.com (2603:10b6:208:38c::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9769.16; Wed, 8 Apr 2026 00:12:35 +0000 Received: from SJ0PR11MB5645.namprd11.prod.outlook.com ([fe80::fb19:f933:8bb3:b42e]) by SJ0PR11MB5645.namprd11.prod.outlook.com ([fe80::fb19:f933:8bb3:b42e%4]) with mapi id 15.20.9769.018; Wed, 8 Apr 2026 00:12:35 +0000 From: Peter Fang To: Paolo Bonzini , Sean Christopherson , Madhavan Srinivasan , "Nicholas Piggin" CC: Yosry Ahmed , Ritesh Harjani , Michael Ellerman , "Christophe Leroy (CS GROUP)" , Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , , "H. Peter Anvin" , , , , Peter Fang Subject: [PATCH v2 2/3] KVM: Move page mapping/unmapping APIs in kvm_host.h Date: Tue, 7 Apr 2026 17:11:29 -0700 Message-ID: <20260408001137.3290444-3-peter.fang@intel.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260408001137.3290444-1-peter.fang@intel.com> References: <20260408001137.3290444-1-peter.fang@intel.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: BYAPR04CA0011.namprd04.prod.outlook.com (2603:10b6:a03:40::24) To SJ0PR11MB5645.namprd11.prod.outlook.com (2603:10b6:a03:3b9::19) Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ0PR11MB5645:EE_|BL3PR11MB6529:EE_ X-MS-Office365-Filtering-Correlation-Id: 9f6834c6-99c9-46f8-fdb2-08de95038911 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|366016|1800799024|376014|7416014|56012099003|22082099003|18002099003; X-Microsoft-Antispam-Message-Info: IUKs7L41ezuFBNnkpHG13g7/1QLF1e2xzaAfPXbok4sLA+Q1iD73tiYuAE+By+yeYZJUlrXMjICtTWpkZDfWSYTap/1PHflmuTZ0R7Ufg+pLulhKRJ/yeUVfOVgjFbVvcqVDfey2mUYk/3GPeLY/mg71dGCghc9+3ddeoraAuwqiZTotxPb1MrgLodnuUFAZhkpChO8LKhax022nwF34HcF6JozStfqQfe1zmG2rKsBS8abGVchP02KRsf9ZLr6jqruhfMOiQHAdTjTqjmC1JJZB/yqssn5/7HTNpYLJMd3UVNSGMYy5j19ZqukFXaPlRr8C0Ae3tr6BA1rB7d4qXh1NYBntm0tA5YjWcyqVNiAuuNeHef3/XsUhj5FBL2TOXT+54jPSuSiDrkSNfAwQNjo6btYXeju9Ke1bJb98VbRYkH6ge3QWL/MXlxz+CJu0uTuzXmwoLAa9FHeuKJTfeX0eIil5QYQ+F5eIxCDFtBEJtyhW02jDV9FD0kKRi6RW8EfpdeT8qTgiTuBWiwuIYi2c39jUQlHjVcYocpGWgxi5met9EyiOUNBm54XiXsuO0HED2m5mJXcJSidZ3h0vs8lUBTyL7btX27ToFDQSagVysQLAx+Olg9peCHnuwJLXDv6j//ag7fEpY1sm7A6qDMLXxbfwCc38x37KbSHND9b0XWywsbtsFLx/2pX+xM8+qhzlNZwDDjnlJkfiJZGVuWGF7QDsSf11wVWywdVhVp8= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:SJ0PR11MB5645.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(366016)(1800799024)(376014)(7416014)(56012099003)(22082099003)(18002099003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?XK11Ua7Wp6MOxe3Ys9G/RX2UxhjXuqmVcsO5rBbFN1bf/yYmWS3+sXWNkWT0?= =?us-ascii?Q?2Y3QDnW+R5OzN7ueu3V/D1oKXLTrxKCUf7Nmw0V5zUjXBWRMcIvNiGl6ugkK?= =?us-ascii?Q?EAp7PvaRJFo1S1bq9tZh1vGZSVFu/WTrK2+iSzlQcQnpvtBPo2QqlTsV2Goy?= =?us-ascii?Q?VVfLLIx4HoLCToqwf30yrGm2jmtu8ySjYrdYhmlZdYuoUcHLoq+62zUgSgRG?= =?us-ascii?Q?gfztv6cTfEc8fJM7wRTEhyIVQUEg/CDqvfhU28fVC6EntOoPbGRfyeCSu8rR?= =?us-ascii?Q?oZO4QSdY8JPJE6MRsQNhg2D4gDcFareKZ9Phtwto+Zm2oAZvHqetFYyuF1V7?= =?us-ascii?Q?SXIIh5De0DKY/cQzxEXg8Yoiqn2YjLJy+GPjeBm8Xvqo7SXrjG9xOQfcUfj2?= =?us-ascii?Q?+3mEn9BLdbNubEutnFgKXOkyT48/hIQFqLw6pKmDOhOtiMPwBXHEvimpTEFD?= =?us-ascii?Q?v3XaUepbhM4Qjt/o4KgKWhhHbMdTVxu7Cl/Je4z5AJ6rZ65Q0RDIOD6vtHY4?= =?us-ascii?Q?7a+OobnflIvU26aMXG8d5gV5A4VDj1y24qePb4J7i/APL+rL2SHR5OaacBe3?= =?us-ascii?Q?+ydvy5k4vp3x5foA9eD/jB+K9ByuZbmF4eSl47ggqtv2uPV0LCwF/gmezYRH?= =?us-ascii?Q?LXZG56slX5mhivDof4zNTjw7vaDqkm/4d4ywnqsCk/VQTLfSHiruy/fqqF5S?= =?us-ascii?Q?F0bAjGopogZWojsR1utGO+IJCQ9ICb3fdzeuuziAWC1XPz9HY6S2pbKOXImz?= =?us-ascii?Q?1FztMmNMozZdCZ2sHfOHWIOCItY5M79OS/yq9p9ZrsjHs5DBSBG5U4UZhMES?= =?us-ascii?Q?2V8iQCLDpAsZ//rIkQD6IrogMeHkkYEh08IBDdUx+g5XV37fcLMJVhUpR0LB?= =?us-ascii?Q?RZ2gm3u6NRi+FvzK8l3OF9Jomf1jWqrPBPP+eJStaB3+dIFb0s8Tj87Ppk0g?= =?us-ascii?Q?e8isH5fumyrHvtwWdiccaOvRIBOf+s9RkS0YuKdRYhI+wlyvtPdYALvb+lIG?= =?us-ascii?Q?w/Yey0MQMgLKMZcQu9oumdw3TY0DNbAdllzabyxSpv9bDKcNJ66Wngkgpbqe?= =?us-ascii?Q?HPsLKr/CU8dhx3mcuxhrOJri5kDtovo2CvIhtuKn9mqrx/pKFArlQScoUI1C?= =?us-ascii?Q?rjYwpu58NJA5eQkw5WK/AJi+TDteO+1sbgTX38maUMSgJ+4wV/YWddCRhu8L?= =?us-ascii?Q?0xWhgldXBn/FhGkmu1oYFpKPYtPDRafFOz9NKSM4oJFyrFOa5qwqx1JI47PV?= =?us-ascii?Q?19pgfB8M9Fi6ZaWn7f+nJ2OU87/rr/6JDswTpTmgt6+YkZefvuUZ4oCrZPCn?= =?us-ascii?Q?d/sYSIra1jgv8Ag8aas1abyOBndK4s6gGvrcboykalnveHlnSb5XGLgXvpqv?= =?us-ascii?Q?zfeBy2Z5eRyUeLWByeYE3XVF8JbnGhbTDTv8CmrTFQCqWCcEGAetajWgBTYi?= =?us-ascii?Q?pc681Og+sbh2+Bk6BCDsCX2y96E9mpHMBv8c5EWpWLyLn0W7um3KzwXSRBl/?= =?us-ascii?Q?OPoMqIrRI0ok/LFz80dRfEm/Lm3oElUNDfccSbQw1VkMkcfL9XGbFQ4Gk2pE?= =?us-ascii?Q?FFtIfeRroKtidvGP23IBv82iJfuj2+i8PcpRQ3C/O0C60UBwWhUTyAkwWAas?= =?us-ascii?Q?LtBgOx7TgvfzW6/u9k8GTRT/26YcqaABTz0nN3SHZBePtbQE0jTIem8kyKTS?= =?us-ascii?Q?wp4JK3QKI1BgZxfdTx6po/ey6FP1s+x4oBPWd3Yrpj+gHE/O4OIT2u5Eirib?= =?us-ascii?Q?OtzR59qUjA=3D=3D?= X-Exchange-RoutingPolicyChecked: whgIHmSNaIOWeA6VKMoIznTTT7KWSts3OgrfpFBIitecnzAzSINa9Ip3lJJ7Z+4sVoPRcD07fV5vEL84eHbMOBkXZgSgaXyXEZj90ig24+UXn11kUEDxy/Y6JNBi7fWGTxw+iYJezioV90HNxkYG7+uRMlTvLExoIRMYH6qyNZw9mQamohFOlIVaies5/2NasQeohXqjvf1qxUIhWQmbU9PJ+18eV4xkYCJgoPeBFHwzrKx6ViTly6eGHAnxI/c5GX4NchiojkwSxaN3uDLRt6JVQaDZYxo+lFhwZo3aRwPJVxTkU/Xv6ZpRKfVWT5Ig70CbhCSqqt6sMOIIBSAF1Q== X-MS-Exchange-CrossTenant-Network-Message-Id: 9f6834c6-99c9-46f8-fdb2-08de95038911 X-MS-Exchange-CrossTenant-AuthSource: SJ0PR11MB5645.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Apr 2026 00:12:35.2821 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 46c98d88-e344-4ed4-8496-4ed7712e255d X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: yB27rhSeG3sLgq6skZ0z0quzQCjqwcmb1zgsn1Hld97dF5tZLtlEMv40zDDMK0zEQoU35MmcgSj1vz75czv1Ew== X-MS-Exchange-Transport-CrossTenantHeadersStamped: BL3PR11MB6529 X-OriginatorOrg: intel.com Content-Type: text/plain; charset="utf-8" Move kvm_vcpu_map*() and kvm_vcpu_unmap() so that a subsequent refactor can use gpa_to_gfn() without a forward declaration. No functional change intended. Signed-off-by: Peter Fang Reviewed-by: Yosry Ahmed --- include/linux/kvm_host.h | 46 ++++++++++++++++++++-------------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/include/linux/kvm_host.h b/include/linux/kvm_host.h index 4e3bea92a06b..484378cfdcc0 100644 --- a/include/linux/kvm_host.h +++ b/include/linux/kvm_host.h @@ -1382,29 +1382,6 @@ void mark_page_dirty_in_slot(struct kvm *kvm, const = struct kvm_memory_slot *mems void mark_page_dirty(struct kvm *kvm, gfn_t gfn); void kvm_vcpu_mark_page_dirty(struct kvm_vcpu *vcpu, gfn_t gfn); =20 -int __kvm_vcpu_map(struct kvm_vcpu *vcpu, gfn_t gfn, struct kvm_host_map *= map, - bool writable); -void kvm_vcpu_unmap(struct kvm_vcpu *vcpu, struct kvm_host_map *map); - -static inline int kvm_vcpu_map(struct kvm_vcpu *vcpu, gfn_t gfn, - struct kvm_host_map *map) -{ - return __kvm_vcpu_map(vcpu, gfn, map, true); -} - -static inline int kvm_vcpu_map_readonly(struct kvm_vcpu *vcpu, gfn_t gfn, - struct kvm_host_map *map) -{ - return __kvm_vcpu_map(vcpu, gfn, map, false); -} - -static inline void kvm_vcpu_map_mark_dirty(struct kvm_vcpu *vcpu, - struct kvm_host_map *map) -{ - if (kvm_vcpu_mapped(map)) - kvm_vcpu_mark_page_dirty(vcpu, map->gfn); -} - unsigned long kvm_vcpu_gfn_to_hva(struct kvm_vcpu *vcpu, gfn_t gfn); unsigned long kvm_vcpu_gfn_to_hva_prot(struct kvm_vcpu *vcpu, gfn_t gfn, b= ool *writable); int kvm_vcpu_read_guest_page(struct kvm_vcpu *vcpu, gfn_t gfn, void *data,= int offset, @@ -1916,6 +1893,29 @@ static inline hpa_t pfn_to_hpa(kvm_pfn_t pfn) return (hpa_t)pfn << PAGE_SHIFT; } =20 +int __kvm_vcpu_map(struct kvm_vcpu *vcpu, gfn_t gfn, struct kvm_host_map *= map, + bool writable); +void kvm_vcpu_unmap(struct kvm_vcpu *vcpu, struct kvm_host_map *map); + +static inline int kvm_vcpu_map(struct kvm_vcpu *vcpu, gfn_t gfn, + struct kvm_host_map *map) +{ + return __kvm_vcpu_map(vcpu, gfn, map, true); +} + +static inline int kvm_vcpu_map_readonly(struct kvm_vcpu *vcpu, gfn_t gfn, + struct kvm_host_map *map) +{ + return __kvm_vcpu_map(vcpu, gfn, map, false); +} + +static inline void kvm_vcpu_map_mark_dirty(struct kvm_vcpu *vcpu, + struct kvm_host_map *map) +{ + if (kvm_vcpu_mapped(map)) + kvm_vcpu_mark_page_dirty(vcpu, map->gfn); +} + static inline bool kvm_is_gpa_in_memslot(struct kvm *kvm, gpa_t gpa) { unsigned long hva =3D gfn_to_hva(kvm, gpa_to_gfn(gpa)); --=20 2.53.0 From nobody Mon Jun 15 03:52:34 2026 Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.21]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 2050A2A1BF; Wed, 8 Apr 2026 00:12:41 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=198.175.65.21 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775607162; cv=fail; b=mnFE8JBH7JlHyPhhpxjqC0erTjIyuW7Rn7qHQ8L7zcqBr5JAP57gCawlTkhDMjf/AsjuccZ9tLKVy1hlIepPfXEZNZ2iq9vftJvCW7bA3EO/IBFwFB6xHrQ1Lsxzv3VpTqs4ZUfKzyAXWz+jRmhkhX31VfQibAiXHJZBAGSc48A= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775607162; c=relaxed/simple; bh=HJbPDeF+WPeL5foRctvZ1+POr5lFQSblmKA6N/v1bp0=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: Content-Type:MIME-Version; b=iayzyN1OFGpzckKgCD+3BqhwS6bJ7zIOWF6BtJ2JONKoiqITxcLjfFhUQQoJzVmWF/1feWoJXPxSEKgLrWJ8ysoafT/jJsXabXFLb0ga1HDgTkICSKl6JverGQTbBif4G4VT6ahD/iheObUTETx9I17BD72egn2Ly6Mtouok7Vs= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=intel.com; spf=pass smtp.mailfrom=intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=FYV41B2D; arc=fail smtp.client-ip=198.175.65.21 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=intel.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=intel.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="FYV41B2D" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1775607161; x=1807143161; h=from:to:cc:subject:date:message-id:in-reply-to: references:content-transfer-encoding:mime-version; bh=HJbPDeF+WPeL5foRctvZ1+POr5lFQSblmKA6N/v1bp0=; b=FYV41B2Dn0Q2UJeyBZSemq0SkcFZVGGRWWzyl2TgZTfMlx0GG3BLRDuM r60UPNQbJ9sDkWKvPYaRwksYVHCJxha2FFDdoykfkbxdNUKqtpCDuGJZa J71kQRzAnbPeETKAOo1f/WsoJ0837R9M276DTuPArvnfpwtgyivasIHO2 m+TvQjZp4Arf0qPgZ4zck66sloELAgwtNAVKtCkACIQLan4uFhjAxtHry RGg5LSUYHuFcIQtYWq+pMi7HTFdsYp56P9hDkx/duEvhhulvAfSyEGIqG PWkrXT3iRaenj5CHleqNdnZxeAZ4aXuIATFmIK5bt897OGxlklr2h4b7D Q==; X-CSE-ConnectionGUID: tRXu0gA7QXK7oSZeuOA89g== X-CSE-MsgGUID: P8q39so7QZqib9os3F6zNw== X-IronPort-AV: E=McAfee;i="6800,10657,11752"; a="76462883" X-IronPort-AV: E=Sophos;i="6.23,166,1770624000"; d="scan'208";a="76462883" Received: from fmviesa004.fm.intel.com ([10.60.135.144]) by orvoesa113.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 07 Apr 2026 17:12:41 -0700 X-CSE-ConnectionGUID: ePAZYGG2QA+rXKXCEVeM2w== X-CSE-MsgGUID: gmBcmd/aStWv75XB4K8vqg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.23,166,1770624000"; d="scan'208";a="229981380" Received: from orsmsx901.amr.corp.intel.com ([10.22.229.23]) by fmviesa004.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 07 Apr 2026 17:12:40 -0700 Received: from ORSMSX901.amr.corp.intel.com (10.22.229.23) by ORSMSX901.amr.corp.intel.com (10.22.229.23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.37; Tue, 7 Apr 2026 17:12:39 -0700 Received: from ORSEDG902.ED.cps.intel.com (10.7.248.12) by ORSMSX901.amr.corp.intel.com (10.22.229.23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.37 via Frontend Transport; Tue, 7 Apr 2026 17:12:39 -0700 Received: from CY7PR03CU001.outbound.protection.outlook.com (40.93.198.21) by edgegateway.intel.com (134.134.137.112) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.37; Tue, 7 Apr 2026 17:12:39 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=BCEg+N2/0rdIyyZ8gZaJdE+BBMpv1zK5GAfK6qCc9AanayvfpvJzsrWfv8K07psZnypQnZofDP5i4x8KyircFvTaM8k8w20WN4gjgrI7dKpve7gjUa8HykDaxpGwNMhyLxmZ5RV18l0jeFj4/Wf0Ns5ZjPrfxm51bmR20dC+oKPsTh49nq8Nx8NBVorzuVj9kGfkG7dl/FZ4smZG13EACbNIqVmmT39RKaLeMY0a+UGbYSADIMQmOq5mM+OJPSDI7OrCJc/4vRkhHS9V+rWxFeYIyRE++bnbxCPyZJKQiCsn6c6tSXhkbnr8NULDt8EbTjl71sLOWuBw2LCspgN6ZA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=PyMlckwGvP3HnQaH+7OKKjm4GBje42aG21PW2eDFub8=; b=ErDZu4TrPoxj0ZWSSd+R4GjZKl6Am7CM+cD8nXdZaz7x4soc06ulH1/3pzLvWAZopbtiFsRBeV55mZuMKe8Zi0FL3KdN9pdSYy0leSa0AdI9HUHyeIbBjLUSfIwhSHi0NW5pW7aNDgqcR/B2J31XfDjXZlzCElzifsFriAsNGknRSTYfWKmtEZ8kgLT5vWioJANpfaIxxBOq1EWfICedCoVkDoskzo5yFcoQVm9Z/+ygFpxJnSi7Acl4HUpLKg5299XUB7KObzOjWeLPP2au2lviK9o/oqSEZkW4k89/xzDs2Yoe6iflLer/3dj+WRnk6Tdq7aucfC/i1t/q1IOOUA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=intel.com; dmarc=pass action=none header.from=intel.com; dkim=pass header.d=intel.com; arc=none Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=intel.com; Received: from SJ0PR11MB5645.namprd11.prod.outlook.com (2603:10b6:a03:3b9::19) by BL3PR11MB6529.namprd11.prod.outlook.com (2603:10b6:208:38c::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9769.16; Wed, 8 Apr 2026 00:12:36 +0000 Received: from SJ0PR11MB5645.namprd11.prod.outlook.com ([fe80::fb19:f933:8bb3:b42e]) by SJ0PR11MB5645.namprd11.prod.outlook.com ([fe80::fb19:f933:8bb3:b42e%4]) with mapi id 15.20.9769.018; Wed, 8 Apr 2026 00:12:36 +0000 From: Peter Fang To: Paolo Bonzini , Sean Christopherson , Madhavan Srinivasan , "Nicholas Piggin" CC: Yosry Ahmed , Ritesh Harjani , Michael Ellerman , "Christophe Leroy (CS GROUP)" , Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , , "H. Peter Anvin" , , , , Peter Fang Subject: [PATCH v2 3/3] KVM: Take gpa_t in kvm_vcpu_map[_readonly]() Date: Tue, 7 Apr 2026 17:11:30 -0700 Message-ID: <20260408001137.3290444-4-peter.fang@intel.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260408001137.3290444-1-peter.fang@intel.com> References: <20260408001137.3290444-1-peter.fang@intel.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: BYAPR04CA0011.namprd04.prod.outlook.com (2603:10b6:a03:40::24) To SJ0PR11MB5645.namprd11.prod.outlook.com (2603:10b6:a03:3b9::19) Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ0PR11MB5645:EE_|BL3PR11MB6529:EE_ X-MS-Office365-Filtering-Correlation-Id: b23f9b63-40f0-45ff-47e1-08de950389b5 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|366016|1800799024|376014|7416014|56012099003|22082099003|18002099003; X-Microsoft-Antispam-Message-Info: n89boivCTCvnhkGZUYL9AbsXvhwrV1ON7De21qfEE3XsRCYe3v3U3xIveDksRWLWhqUXe14/ADkeZN68+iIsqyDuX71oyZxP34gs2yeREK1A5JlBxr+BeIjbWIWBW1GtssbpC503KHUxv2uRNQa0io7p5/7sWVc16TWb+TLGvzDBh1PQ1NJQlgyNMD1WZpMyGKuw3Z5rV10f1kfT2kRh6id5hKt15l2sPRSKs81JJa07BGlIxsY0Ha4gSmwBfspD3/gS4k/bSbtBcx07byDjKsci3T+UWJlqcTXvLCftMCBo2IA7Jtl+hwJA6yQ7UKU3c+2d3cZggibvwG5o2E2HE9XSDEZZWY4zW2pOIcmLhiL+UvrvhrlqhEQwl3SbkjNKUI2TS7bZ4UGeEqtaUGlz23H1AthZNuuU2N5G+xwz26iGss3i+mkpoKqH9OFgHoHPfOfndpO5dElp9loj/jmRSRpfSjqCAFWCyBUOb3zVr/qW9gVkTEavsJ8ktneB6kLh7qlt5AyyfRNqC+hJ9K/xOJi/dGXCLafz0JkKujHoFq9wE2whJ/CqlF2BlZ9SEvn0sW9F41RBCLi/mK9+pD8C1aYV1/Hg+bTwAvsKXM6Hg0o3AALnBqXEhpr1NFY/7o+PFrkVpmb0dxQAIlA9mt00mgle2bzH1id2wKrLOOsa1/G8osilM79p533DuFqrjDOYcM1yt2qT6OXl7OB9yu+K32q5viE3R1M0i9DvewCSFaA= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:SJ0PR11MB5645.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(366016)(1800799024)(376014)(7416014)(56012099003)(22082099003)(18002099003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?OtQFpwRqSUNkuboZQXjNwDdQXKCi06Sn3dbxZb+vZXpNo6gXUyYXlDMaTahP?= =?us-ascii?Q?F9r41KSEudkGXlKFvQ2n9w1PqKf2eyDsCj+noxPlcpW4wJ0mYvQcLQ+7RtEa?= =?us-ascii?Q?ZsxFsh96lVw+7bShyse2ViRLw1nFkOp4pi5wCwZyYjj11hoDKeAP4lHC/zcf?= =?us-ascii?Q?D9hvMYdaPe89O6ovSiXXbhXwqKekWIQZXqTEBuG1f+MUEnayQTpFC9+stExa?= =?us-ascii?Q?ywFcJBQG8wIV9tyVj3K24ejnwm4pVa3Lb1vCD64R/Ty9NVmuOWEQYMxVgQUD?= =?us-ascii?Q?6GkMh/oIwbFCfAKkgDKd0ftbAJeCFEgulpQ1SYeBpZXeOMtUHRZg2utSSneM?= =?us-ascii?Q?oD2JGD5zx5KoeZFLE3c3xghhnDcPRwGFX8xdjthqPXGMNM+Xv5eIwINjp+w4?= =?us-ascii?Q?1UdQ6U+JT7dkQ3JGDB7g/R7XWQJxhb5dQaaJjzTJd9v93sAIO/T2xXhdsWlb?= =?us-ascii?Q?e8HaIuDYq0CqFIRO0GiJ4qVsdrxPOa/8OagMVCln2yK/yIxZWUxzP58+FYBl?= =?us-ascii?Q?fN0eUJarDyiSEUeoHSkOfImve6r/aFCngzDOcpyYhGaiqv8aL8fPaECZ87Zk?= =?us-ascii?Q?I62eO8BkLiZK/eanHtF68EKJFtyIpfeTjCNC6swwrsqo8C4FRMDFcMH3GsGG?= =?us-ascii?Q?bzoZUEW3Ol7ehNh/n8XAvyCgBsQtp+vhfyYfQY/lHj1OTKMpq4mfaSrutTZs?= =?us-ascii?Q?2HcaIkJ1sV9iVEtSIvqJgv0N/D9NKs9nkzxYp9NlW2i3+d5r28kFH2QhE6WT?= =?us-ascii?Q?idvPog37NV8JZZpitrNd9LwLi909AM8687NeuT5OCK2CbUYkQSeNeC1RAzll?= =?us-ascii?Q?IWyavQqDhnxqalbk7e3QoAyJI4UevT4zI08qmy5Pd+wZLfvHNQKpBlMphjEr?= =?us-ascii?Q?5hUX+JBxeuytIeOqtpHpl/YfuX6K86+FT/smX1rR+AIAA6uxZalMAXuXQBpe?= =?us-ascii?Q?QbhHCIsdvRoGpRO8lmvTjsJWZVG/49b36guTePhOkGKUhm09e7C5mVV+MthR?= =?us-ascii?Q?39TY+5kXMx3VZnSkpFHXbsuqky1bfIDqQm29UTtsKqJvUxqRqRROQ6UR/ySh?= =?us-ascii?Q?/9m5fYNqd1fsC78YsaREAfdFAWQRI5SfCDvA7cflna8qsnJ7Ie5MvxTGoBff?= =?us-ascii?Q?7tUFR9RnmKnHalPG2jHER/6FxJ2Xwc8SLVW+t49adojTqUENRbbTDLI6r04k?= =?us-ascii?Q?fVSOkCGTavB7MNZJbn8sONMrVmFsIjKMC4I1jmIZoPeSnjziaFnID4BiWzsp?= =?us-ascii?Q?qsNzidfanxfOj4Pz0ImSmcOyMIdmfWDTOyfSVFiXZ297hiZYs0kKjhM+z3tB?= =?us-ascii?Q?Tl0zI+AVo8NOG6sefYGGpmQEDaRghX0KFG/8rp+ZtcEZNEw/w1BWtWyT90kl?= =?us-ascii?Q?DJedCKhhyQB4FJXSGY9bFbovJDgYTricv+1Fm0Z6dzsHIvfwX7S9diD9wbKd?= =?us-ascii?Q?4c9qcNdDHquxRqW/UQuoENdJCdX2z7xh7JW3jxWzZNqX8hdRsbVH4ucw8Z3v?= =?us-ascii?Q?6Uyjmn6y3LKo5mESYSp4PSZ4/G6R5rgEWwPGNzD4JWtycD02Ml4f2zWnd8YH?= =?us-ascii?Q?Z2IVklA7wpzpteeCEBjS7QtJ/4q55UvzNGtPiWgZsiUCUqcKB3sjuUqdz0Uh?= =?us-ascii?Q?kRDk0isDIYqd9FN2yr63sHaMoPaX3idTDtjf03STuG0AR5GCeN05goTJjPej?= =?us-ascii?Q?kA4BZdrgE0UXoveuGcNK6kQPvpUuw/IFIYAm4QrdRBdaRupkfh+H5j9VOybM?= =?us-ascii?Q?hzUL8GhiXg=3D=3D?= X-Exchange-RoutingPolicyChecked: bbqYG5LaZYMOzxHMzitrCw4necGHqF1ccBv0ujdNTTKZ+H1UN9yIHQXNBS1TydXamAiolCe3UpckeJ+JMHBun1v6oJWoez+QjStumbQoWBjtDlOLlQxzJBp1RaEs3pTPYrPhoTkqjQnuIXAJDnSMYCfBCZeesc3JPkyKsFxXAodqzm6pxsqnOqmpouh7J5MD2YCHBsVeZ7JjIqRiSjUsIMx7PVp8dO7IVbTDudWCbGs9BT2ngzeI0v5rjF2JTGfZvs8h2GUrPee6uYGQI83WWI1DbTKZvfvtLjfjGX0+9W4Qvx42Z58tVhYGIagixuD6FLQ75TbKC6jjMGw4zXTwaQ== X-MS-Exchange-CrossTenant-Network-Message-Id: b23f9b63-40f0-45ff-47e1-08de950389b5 X-MS-Exchange-CrossTenant-AuthSource: SJ0PR11MB5645.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Apr 2026 00:12:36.3132 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 46c98d88-e344-4ed4-8496-4ed7712e255d X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: vUfdY2U4X0bNqilDf7aNxILG5w4ccEeTXjb5lmFowK+RgylaEusQQfPHI7Arw+3MB+s9LjUYwXmX6DeFxaZtkQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: BL3PR11MB6529 X-OriginatorOrg: intel.com Content-Type: text/plain; charset="utf-8" Move the conversion from a gpa_t to a gfn_t into kvm_vcpu_map() and kvm_vcpu_map_readonly() so that they take a gpa_t directly, reducing boilerplate at call sites. __kvm_vcpu_map() still takes a gfn_t because guest page mapping is fundamentally GFN-based. No functional change intended. Compile-tested on x86 and ppc, which are the current users of these interfaces. Suggested-by: Yosry Ahmed Signed-off-by: Peter Fang Reviewed-by: Yosry Ahmed --- arch/powerpc/kvm/book3s_pr.c | 2 +- arch/x86/kvm/svm/nested.c | 4 ++-- arch/x86/kvm/svm/sev.c | 2 +- arch/x86/kvm/svm/svm.c | 8 ++++---- arch/x86/kvm/vmx/nested.c | 11 +++++------ include/linux/kvm_host.h | 8 ++++---- 6 files changed, 17 insertions(+), 18 deletions(-) diff --git a/arch/powerpc/kvm/book3s_pr.c b/arch/powerpc/kvm/book3s_pr.c index 2ba2dd26a7ea..45dea4064618 100644 --- a/arch/powerpc/kvm/book3s_pr.c +++ b/arch/powerpc/kvm/book3s_pr.c @@ -644,7 +644,7 @@ static void kvmppc_patch_dcbz(struct kvm_vcpu *vcpu, st= ruct kvmppc_pte *pte) u32 *page; int i, r; =20 - r =3D kvm_vcpu_map(vcpu, pte->raddr >> PAGE_SHIFT, &map); + r =3D kvm_vcpu_map(vcpu, pte->raddr, &map); if (r) return; =20 diff --git a/arch/x86/kvm/svm/nested.c b/arch/x86/kvm/svm/nested.c index b36c33255bed..f168b54828bb 100644 --- a/arch/x86/kvm/svm/nested.c +++ b/arch/x86/kvm/svm/nested.c @@ -1019,7 +1019,7 @@ int nested_svm_vmrun(struct kvm_vcpu *vcpu) } =20 vmcb12_gpa =3D svm->vmcb->save.rax; - ret =3D kvm_vcpu_map(vcpu, gpa_to_gfn(vmcb12_gpa), &map); + ret =3D kvm_vcpu_map(vcpu, vmcb12_gpa, &map); if (ret =3D=3D -EINVAL) { kvm_inject_gp(vcpu, 0); return 1; @@ -1134,7 +1134,7 @@ int nested_svm_vmexit(struct vcpu_svm *svm) struct kvm_host_map map; int rc; =20 - rc =3D kvm_vcpu_map(vcpu, gpa_to_gfn(svm->nested.vmcb12_gpa), &map); + rc =3D kvm_vcpu_map(vcpu, svm->nested.vmcb12_gpa, &map); if (rc) { if (rc =3D=3D -EINVAL) kvm_inject_gp(vcpu, 0); diff --git a/arch/x86/kvm/svm/sev.c b/arch/x86/kvm/svm/sev.c index 3f9c1aa39a0a..524607bb8cc2 100644 --- a/arch/x86/kvm/svm/sev.c +++ b/arch/x86/kvm/svm/sev.c @@ -4405,7 +4405,7 @@ int sev_handle_vmgexit(struct kvm_vcpu *vcpu) return 1; } =20 - if (kvm_vcpu_map(vcpu, ghcb_gpa >> PAGE_SHIFT, &svm->sev_es.ghcb_map)) { + if (kvm_vcpu_map(vcpu, ghcb_gpa, &svm->sev_es.ghcb_map)) { /* Unable to map GHCB from guest */ vcpu_unimpl(vcpu, "vmgexit: error mapping GHCB [%#llx] from guest\n", ghcb_gpa); diff --git a/arch/x86/kvm/svm/svm.c b/arch/x86/kvm/svm/svm.c index e6477affac9a..823c6a6f3594 100644 --- a/arch/x86/kvm/svm/svm.c +++ b/arch/x86/kvm/svm/svm.c @@ -2159,7 +2159,7 @@ static int vmload_vmsave_interception(struct kvm_vcpu= *vcpu, bool vmload) if (nested_svm_check_permissions(vcpu)) return 1; =20 - ret =3D kvm_vcpu_map(vcpu, gpa_to_gfn(svm->vmcb->save.rax), &map); + ret =3D kvm_vcpu_map(vcpu, svm->vmcb->save.rax, &map); if (ret) { if (ret =3D=3D -EINVAL) kvm_inject_gp(vcpu, 0); @@ -4820,7 +4820,7 @@ static int svm_enter_smm(struct kvm_vcpu *vcpu, union= kvm_smram *smram) * that, see svm_prepare_switch_to_guest()) which must be * preserved. */ - if (kvm_vcpu_map(vcpu, gpa_to_gfn(svm->nested.hsave_msr), &map_save)) + if (kvm_vcpu_map(vcpu, svm->nested.hsave_msr, &map_save)) return 1; =20 BUILD_BUG_ON(offsetof(struct vmcb, save) !=3D 0x400); @@ -4854,11 +4854,11 @@ static int svm_leave_smm(struct kvm_vcpu *vcpu, con= st union kvm_smram *smram) if (!(smram64->efer & EFER_SVME)) return 1; =20 - if (kvm_vcpu_map(vcpu, gpa_to_gfn(smram64->svm_guest_vmcb_gpa), &map)) + if (kvm_vcpu_map(vcpu, smram64->svm_guest_vmcb_gpa, &map)) return 1; =20 ret =3D 1; - if (kvm_vcpu_map(vcpu, gpa_to_gfn(svm->nested.hsave_msr), &map_save)) + if (kvm_vcpu_map(vcpu, svm->nested.hsave_msr, &map_save)) goto unmap_map; =20 if (svm_allocate_nested(svm)) diff --git a/arch/x86/kvm/vmx/nested.c b/arch/x86/kvm/vmx/nested.c index 937aeb474af7..ee3ff76a8678 100644 --- a/arch/x86/kvm/vmx/nested.c +++ b/arch/x86/kvm/vmx/nested.c @@ -696,7 +696,7 @@ static inline bool nested_vmx_prepare_msr_bitmap(struct= kvm_vcpu *vcpu, return true; } =20 - if (kvm_vcpu_map_readonly(vcpu, gpa_to_gfn(vmcs12->msr_bitmap), &map)) + if (kvm_vcpu_map_readonly(vcpu, vmcs12->msr_bitmap, &map)) return false; =20 msr_bitmap_l1 =3D (unsigned long *)map.hva; @@ -2138,8 +2138,7 @@ static enum nested_evmptrld_status nested_vmx_handle_= enlightened_vmptrld( =20 nested_release_evmcs(vcpu); =20 - if (kvm_vcpu_map(vcpu, gpa_to_gfn(evmcs_gpa), - &vmx->nested.hv_evmcs_map)) + if (kvm_vcpu_map(vcpu, evmcs_gpa, &vmx->nested.hv_evmcs_map)) return EVMPTRLD_ERROR; =20 vmx->nested.hv_evmcs =3D vmx->nested.hv_evmcs_map.hva; @@ -3437,7 +3436,7 @@ static bool nested_get_vmcs12_pages(struct kvm_vcpu *= vcpu) if (nested_cpu_has2(vmcs12, SECONDARY_EXEC_VIRTUALIZE_APIC_ACCESSES)) { map =3D &vmx->nested.apic_access_page_map; =20 - if (!kvm_vcpu_map(vcpu, gpa_to_gfn(vmcs12->apic_access_addr), map)) { + if (!kvm_vcpu_map(vcpu, vmcs12->apic_access_addr, map)) { vmcs_write64(APIC_ACCESS_ADDR, pfn_to_hpa(map->pfn)); } else { pr_debug_ratelimited("%s: no backing for APIC-access address in vmcs12\= n", @@ -3453,7 +3452,7 @@ static bool nested_get_vmcs12_pages(struct kvm_vcpu *= vcpu) if (nested_cpu_has(vmcs12, CPU_BASED_TPR_SHADOW)) { map =3D &vmx->nested.virtual_apic_map; =20 - if (!kvm_vcpu_map(vcpu, gpa_to_gfn(vmcs12->virtual_apic_page_addr), map)= ) { + if (!kvm_vcpu_map(vcpu, vmcs12->virtual_apic_page_addr, map)) { vmcs_write64(VIRTUAL_APIC_PAGE_ADDR, pfn_to_hpa(map->pfn)); } else if (nested_cpu_has(vmcs12, CPU_BASED_CR8_LOAD_EXITING) && nested_cpu_has(vmcs12, CPU_BASED_CR8_STORE_EXITING) && @@ -3479,7 +3478,7 @@ static bool nested_get_vmcs12_pages(struct kvm_vcpu *= vcpu) if (nested_cpu_has_posted_intr(vmcs12)) { map =3D &vmx->nested.pi_desc_map; =20 - if (!kvm_vcpu_map(vcpu, gpa_to_gfn(vmcs12->posted_intr_desc_addr), map))= { + if (!kvm_vcpu_map(vcpu, vmcs12->posted_intr_desc_addr, map)) { vmx->nested.pi_desc =3D (struct pi_desc *)(((void *)map->hva) + offset_in_page(vmcs12->posted_intr_desc_addr)); diff --git a/include/linux/kvm_host.h b/include/linux/kvm_host.h index 484378cfdcc0..893a8c76a665 100644 --- a/include/linux/kvm_host.h +++ b/include/linux/kvm_host.h @@ -1897,16 +1897,16 @@ int __kvm_vcpu_map(struct kvm_vcpu *vcpu, gfn_t gfn= , struct kvm_host_map *map, bool writable); void kvm_vcpu_unmap(struct kvm_vcpu *vcpu, struct kvm_host_map *map); =20 -static inline int kvm_vcpu_map(struct kvm_vcpu *vcpu, gfn_t gfn, +static inline int kvm_vcpu_map(struct kvm_vcpu *vcpu, gpa_t gpa, struct kvm_host_map *map) { - return __kvm_vcpu_map(vcpu, gfn, map, true); + return __kvm_vcpu_map(vcpu, gpa_to_gfn(gpa), map, true); } =20 -static inline int kvm_vcpu_map_readonly(struct kvm_vcpu *vcpu, gfn_t gfn, +static inline int kvm_vcpu_map_readonly(struct kvm_vcpu *vcpu, gpa_t gpa, struct kvm_host_map *map) { - return __kvm_vcpu_map(vcpu, gfn, map, false); + return __kvm_vcpu_map(vcpu, gpa_to_gfn(gpa), map, false); } =20 static inline void kvm_vcpu_map_mark_dirty(struct kvm_vcpu *vcpu, --=20 2.53.0