Received: by 2002:a05:6a10:a841:0:0:0:0 with SMTP id d1csp2860641pxy; Sun, 25 Apr 2021 06:31:56 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyIgW1NyJryrQ0wXhQur2hoIcAxQ3i/1SYM0VGC4Xv2SdUrKlwSxlQncu510kbHPATcHrSh X-Received: by 2002:aa7:cc03:: with SMTP id q3mr15779289edt.366.1619357516616; Sun, 25 Apr 2021 06:31:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1619357516; cv=none; d=google.com; s=arc-20160816; b=fhe26CMmGSRzMgF0NZwdydTXgXZcX19DTCwQJ7vxzy6aoPYXDVzWheaJv+vcInBLyO GcmST4gyDN+Q50YxorPpOc1oz+dGpfHPHUwXdl4i7H/WCI2NOTbEhyiIgHL7UcvxVZAC 5d+cq/TWx8HVGL399gjKl8+J7e/JNOobB5ZT1t9YdnDuTio0NTmLKFvKZwwmYSKZ5nXj KiU5Ai1K/rafyMw9gfr3VY/7FLbzHhK7J5kY6Wz5koqX8Af4n/16sSwSlYKhCohAC66T G7zQZvWzXyjz+sas5c0jg5CupxMV8kiy/tekMCgL7xH/2fnXbsr0QKkEE9bcLWghBuhs 8Dqg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-language:content-transfer-encoding :in-reply-to:mime-version:user-agent:date:message-id:from:references :cc:to:subject:dkim-signature:dkim-filter; bh=Kc0oAIUnVUkQ1h+dBy1jBjYsvzdBD19GYfEUFG19BVI=; b=GJfRplciJR176/T82mNKeu7JDnfd+nTIytlf41zYNiZDU9kaRc12qH8CIL2DcMFFOi Y1vfnuXYtdDx3/1k/OD7iJ/rVwFDHrj5glAMMrQxwXY6Y9IrtV5LODbHDBnz2eu1eXo0 angV+8KorQYQlfusEBj9TutHkk3HtjapmQUwdG3vHa+t7DOf7VVxNyWofoO425GMU1yL 0NH7SW4qQoJKvTggPAYDEW0ThSHDj38GBZLsHcgIbEjl/zl3M6jYXD4PWSehH8xelpw0 HAmZVrI20Vwe1mRW8r3AC7bbtZ01j1OOaYlkBpPxj2JbLs5wHnHUA0jItw/QXasPZcoF G76Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linux.microsoft.com header.s=default header.b=aQpbDHjd; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linux.microsoft.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id v22si10642391ejr.255.2021.04.25.06.31.32; Sun, 25 Apr 2021 06:31:56 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linux.microsoft.com header.s=default header.b=aQpbDHjd; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linux.microsoft.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229997AbhDYNbW (ORCPT + 99 others); Sun, 25 Apr 2021 09:31:22 -0400 Received: from linux.microsoft.com ([13.77.154.182]:43566 "EHLO linux.microsoft.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229688AbhDYNbW (ORCPT ); Sun, 25 Apr 2021 09:31:22 -0400 Received: from [192.168.86.30] (c-73-38-52-84.hsd1.vt.comcast.net [73.38.52.84]) by linux.microsoft.com (Postfix) with ESMTPSA id 50EC720B8000; Sun, 25 Apr 2021 06:30:39 -0700 (PDT) DKIM-Filter: OpenDKIM Filter v2.11.0 linux.microsoft.com 50EC720B8000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.microsoft.com; s=default; t=1619357442; bh=Kc0oAIUnVUkQ1h+dBy1jBjYsvzdBD19GYfEUFG19BVI=; h=Subject:To:Cc:References:From:Date:In-Reply-To:From; b=aQpbDHjdvnOaBmYs06fWF9xy2LIYL1PCo4YfDfeU7AIQY4H6J5xM8VLpK08X9mNGQ au4X+h77xCC7QGMiaceYjvZGngk/JWtjIWnn7UJU4bxCUms1/GiKFblXBONYmMuEvU UsDGj6d+YT7e95MepeE0KFJXyu38o8LUgKSw3gVY= Subject: Re: [PATCH v3 4/7] KVM: SVM: hyper-v: Nested enlightenments in VMCB To: Tom Lendacky , Lan Tianyu , Michael Kelley , Paolo Bonzini , Sean Christopherson , Vitaly Kuznetsov , Wanpeng Li , Jim Mattson , Joerg Roedel , Wei Liu , Stephen Hemminger , Haiyang Zhang , viremana@linux.microsoft.com Cc: "H. Peter Anvin" , Thomas Gleixner , Ingo Molnar , Borislav Petkov , "K. Y. Srinivasan" , x86@kernel.org, kvm@vger.kernel.org, linux-kernel@vger.kernel.org, linux-hyperv@vger.kernel.org References: <8c24e4fe8bee44730716e28a1985b6536a9f15c5.1619013347.git.viremana@linux.microsoft.com> <81cc0700-ab88-0b37-4a6f-685589e73212@amd.com> From: Vineeth Pillai Message-ID: <59bcf102-d6e7-361d-abc9-7fe046d246c8@linux.microsoft.com> Date: Sun, 25 Apr 2021 09:30:39 -0400 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:78.0) Gecko/20100101 Thunderbird/78.10.0 MIME-Version: 1.0 In-Reply-To: <81cc0700-ab88-0b37-4a6f-685589e73212@amd.com> Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit Content-Language: en-US Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Tom, >> >> + >> +#if IS_ENABLED(CONFIG_HYPERV) >> +struct __packed hv_enlightenments { >> + struct __packed hv_enlightenments_control { >> + u32 nested_flush_hypercall:1; >> + u32 msr_bitmap:1; >> + u32 enlightened_npt_tlb: 1; >> + u32 reserved:29; >> + } hv_enlightenments_control; >> + u32 hv_vp_id; >> + u64 hv_vm_id; >> + u64 partition_assist_page; >> + u64 reserved; >> +}; >> +#define VMCB_CONTROL_END 992 // 32 bytes for Hyper-V >> +#else >> +#define VMCB_CONTROL_END 1024 >> +#endif >> + >> struct vmcb { >> struct vmcb_control_area control; >> - u8 reserved_control[1024 - sizeof(struct vmcb_control_area)]; >> + u8 reserved_control[VMCB_CONTROL_END - sizeof(struct vmcb_control_area)]; >> +#if IS_ENABLED(CONFIG_HYPERV) >> + struct hv_enlightenments hv_enlightenments; >> +#endif > I believe the 32 bytes at the end of the VMCB control area will be for use > by any software/hypervisor. The APM update that documents this change, > along with clean bit 31, isn't public, yet, but should be in a month or so > (from what I was told). > > So these fields should be added generically and then your code should make > use of the generic field mapped with your structure. > > To my knowledge (until the APM is public and documents everything), I > believe the following will be in place: > > VMCB offset 0x3e0 - 0x3ff is reserved for software > Clean bit 31 is reserved for software > SVM intercept exit code 0xf0000000 is reserved for software Thanks for the details. I shall modify the code to accommodate this. > > +#if IS_ENABLED(CONFIG_HYPERV) > + if (hypervisor_is_type(X86_HYPER_MS_HYPERV)) > + vmcb_all_clean_mask |= BIT(VMCB_HV_NESTED_ENLIGHTENMENTS); > +#endif > + > Is there any way to hide all the #if's in this and the other patches so > that the .c files are littered with the #if IS_ENABLED() lines. Put them > in svm.h or a new svm-hv.h file? Will do. > >> */ >> VMCB_DIRTY_MAX, >> +#if IS_ENABLED(CONFIG_HYPERV) >> + VMCB_HV_NESTED_ENLIGHTENMENTS = 31, >> +#endif > Again, this should be generic. Will do. Thanks, Vineeth