Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Message-ID: <dac4d609-98a3-0311-4234-1e6ba4644cb0@amd.com>
Date:   Thu, 7 Apr 2022 09:44:44 +0700
User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:91.0)
 Gecko/20100101 Thunderbird/91.7.0
Subject: Re: [PATCH 07/12] KVM: SVM: Adding support for configuring x2APIC
 MSRs interception
Content-Language: en-US
To:     linux-kernel@vger.kernel.org, kvm@vger.kernel.org, x86@kernel.org
Cc:     mlevitsk@redhat.com, seanjc@google.com, pbonzini@redhat.com,
        joro@8bytes.org, tglx@linutronix.de, mingo@redhat.com,
        bp@alien8.de, peterz@infradead.org, hpa@zytor.com,
        jon.grimm@amd.com, wei.huang2@amd.com, terry.bowman@amd.com
References: <20220405230855.15376-1-suravee.suthikulpanit@amd.com>
 <20220405230855.15376-8-suravee.suthikulpanit@amd.com>
From:   Suravee Suthikulpanit <suravee.suthikulpanit@amd.com>
In-Reply-To: <20220405230855.15376-8-suravee.suthikulpanit@amd.com>
Content-Type: text/plain; charset=UTF-8; format=flowed
Content-Transfer-Encoding: 7bit
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 2
X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?QU11bmVMVVozd2l6eU9ndXFVVWVYMzRNZkhraGZNYVhZaFg4eit1US9TTVhs?=
 =?utf-8?B?V2lwc2MxYkZ6TmtoM2twRU9WSDcyN1FjV1RDaUdxOEFycXhpcjZVQ2lwNTQ4?=
 =?utf-8?B?cTVRczU4bVRwUWFFeU9rNkMrUVJYU0dmT0tFdjFoY2tSbWRZdzlwSXF6NjNG?=
 =?utf-8?B?MXRLSVRvaDZNTFFKbHl4ckN0UGlILzFTV1pQVkVaM25idEFLakZlekZvMi90?=
 =?utf-8?B?NTRVWEhVc1RDNW1aakpGNGo4TkxBenFVVGVxd3lic213YW1OdDAxdE1jdWhk?=
 =?utf-8?B?dCthZ0xlMEU3alRDZ1NxcklZazUwbmdpSXpJSzBuUHlHbUNwV2c2L0VXRFB4?=
 =?utf-8?B?OE42cFhCQUI2T1JkU0ZCQUdzdHVlLy9wUEo4VXI0ckM3aGQxOXpQZW04WW9X?=
 =?utf-8?B?bEMzQStpVlRxWlRmNUhWMjM2L3pFY0JyN2o3aHlxd2Z3cHZ3QXRKaWVyMjhZ?=
 =?utf-8?B?NEhQYnUxMkluNHNZVHpzR0dZdldHdDZNTG4ySXdoaW1NTFdxd1JXUXRTNW1T?=
 =?utf-8?B?ZThuZXNSM3lwUWFiZkcvMHA5UllKQ1JyT3lGaDlRSkN3VlhjYmx4YVc5TVYv?=
 =?utf-8?B?M2NqUzl5U1FZaUxveWJHRmlKa3JnL3NBQXlBOUd1VjVrMUlONVA1NThxNFk2?=
 =?utf-8?B?Vk4rQ1dzYkdHdFRzR0JDY1ZOQmJZNHREVXRPQnlWT2xaL0xOZHZLalZMWXhv?=
 =?utf-8?B?UStsZDRDK2NQUjlTcGl3ZDNkbG40N3N0NzR2SzhLcHVlaXBycnpLTFlNaGYy?=
 =?utf-8?B?WlNsNXI3QnBvMU1xYkRCQjFVN2k0YlkzMERKRDF4bkdxRlFCZldaQ1I0SE9l?=
 =?utf-8?B?TUhNM2M2WFBWTzlKN1hscnNrU0ZSUFpPSlFCOGZRR1VNYm1UcnN4RU9NSXUv?=
 =?utf-8?B?UFlKSlZIRERKelNrZDQ0MnVTOFM1NWk5eTFVaHU0TWNKSHZ3cmFpS2hZSFcz?=
 =?utf-8?B?YmZyMFJvamYvdUVJOWZ3d1pOdUlMaVJPYm5QaWgxZ2oyWFplSGNsWUxDVFdP?=
 =?utf-8?B?dTdWMWhhYjB4K25mMHZrWWhid1k1aEF1U1AwL1M2dlF6T1lVSS85U1N3dXdo?=
 =?utf-8?B?a2R6NlI3cG5sVTlFWElkTW9QT1RYd3N2aEUwQUQ1ZDd1VEtiRHZUQm8yUkl1?=
 =?utf-8?B?Nm1hWGJqSkZxS3R0aFZ0MUhaQzJrSnE1ZDZoRVBVNitzam9DeE9kQWlmRVhF?=
 =?utf-8?B?dnRDMDU2T001aEl2V1FkSHFPUk5EZXpzSlJORXk1VkczT05rVVJsYUZsaTF1?=
 =?utf-8?B?TzRkakFFanNQMmY0OUVmQ2N4UnR6QTNDdmZEZElOVGJjc1pEQmd4VmUrZy8x?=
 =?utf-8?B?NG1ES2VMWEFjeFVwekZ1eTdVeGdGbHdBTy9KdGJvUkhNdFRnQXQ0NW02bWlN?=
 =?utf-8?B?YzN6Q243TTE5QlpTdHBUNloweUtzN2ppOEYxbHhUMjJTZ2JBL0o5Q2RDaXRI?=
 =?utf-8?B?WWJsQ3AxYnBZSDNsSDIzaUxMN0FjdXludEV2dW9tTTQ5SVZkaVA0bG13d3Np?=
 =?utf-8?B?VGFtOG9qSlJKUkY4T2U0eTNSWkVuRnh1K1oydWlTcnJtQ1o2U0psQlJVUlND?=
 =?utf-8?B?WUdBR09xZUEwRW5oRlBiSGI1cFpzb1FLT0JWN21vakRjNW04ZU1WZ05UcW50?=
 =?utf-8?B?d2RrMUhSTTY4K01vOFdneWwrSFFlU3dSVzBWMDZVOWdvSmpaZWNyR1luQjcx?=
 =?utf-8?B?V1lGM25oQmV6WjRqaW5ENXUxQmFIdTNZRmhjaTAxdzRBb3o1RFFSbDZubm8y?=
 =?utf-8?B?NUM0bVJLYVc0ZitoemxXZW1QV0VjQkRPUE90R2V4M1hiUzl6a2VlUzlmbHpK?=
 =?utf-8?B?MURIUWpubWZFV0dDYklKNXBqYjM2Sm1KK2RZbWw4L1ZtRTdMNGVJS3Vwd1pR?=
 =?utf-8?B?QXN4NTk2Qzl5MGw2cjZ2WTFjZ0xNelhJTkJyNjc4cTN6NDJGcWVhM0NnQzZ6?=
 =?utf-8?B?cFU3QTVsTEJJdWhzNWYreWlqTTZxQ0xTUC9pY1NidG1DSDUwbUU4TW9CYUMv?=
 =?utf-8?B?UzJYUkFuck9VWXoxOXRsbTFnNWdta1pFRUNpTktWdXdnQkNvQjI5NW5SdHUw?=
 =?utf-8?B?d2d3V1JqbHAwQzdBUFpES2wxNXhPUlFMVHI4RVVaVUNweHd5V3V3OXhlS08v?=
 =?utf-8?B?Y3lKTVFQdDBEaStxbS9VeGdKMmdOcHpua0NGbjVKZ2gyVXRwTmhDYU50S0lM?=
 =?utf-8?B?NjQwamNYdGFNY1UrbU83UjNpbFVhYWUrcTQ2cUMyT1pPTWpQOHFXZE1FOHZp?=
 =?utf-8?B?ejNyd2FVMGxoMHdkREpXK2dHQmZoM0lDdDB0MGJSRFpRZkdTN0xWL2tqZG1C?=
 =?utf-8?B?Q0xNVm8wT0tDMFhKNDFLYUpkUkUxYUFFam9jdEp1NExlMGZVK3ZXWVd2b3Mv?=
 =?utf-8?Q?MLpkUkkbZPdVoHh26A76fTJIAOLrdFABrUrCB3qFF/etM?=
X-MS-Exchange-AntiSpam-MessageData-1: OkyVMmsaKogZEg==
X-OriginatorOrg: amd.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 3e33eb16-a210-4579-6263-08da184099f5
X-MS-Exchange-CrossTenant-AuthSource: DM8PR12MB5445.namprd12.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Apr 2022 02:44:57.0368
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: b4qhDolUHcc9sTgk55NqlZoekX+EreOEqnGXwODLXccTAqduyhUBEMWBeawt8fCCFaYX1snO4iHeop5wzmfAww==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN6PR12MB1794
X-Spam-Status: No, score=-5.0 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,NICE_REPLY_A,RCVD_IN_MSPIKE_H2,
        SPF_HELO_PASS,SPF_PASS,T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED
        autolearn=ham autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org


On 4/6/22 6:08 AM, Suravee Suthikulpanit wrote:
> diff --git a/arch/x86/kvm/svm/svm.c b/arch/x86/kvm/svm/svm.c
> index bbdc16c4b6d7..56ad9ba05111 100644
> --- a/arch/x86/kvm/svm/svm.c
> +++ b/arch/x86/kvm/svm/svm.c
> @@ -89,7 +89,7 @@ static uint64_t osvw_len = 4, osvw_status;
>   static DEFINE_PER_CPU(u64, current_tsc_ratio);
>   #define TSC_RATIO_DEFAULT	0x0100000000ULL
>   
> -static const struct svm_direct_access_msrs {
> +static struct svm_direct_access_msrs {
>   	u32 index;   /* Index of the MSR */
>   	bool always; /* True if intercept is initially cleared */
>   } direct_access_msrs[MAX_DIRECT_ACCESS_MSRS] = {
> @@ -786,6 +786,33 @@ static void add_msr_offset(u32 offset)
>   	BUG();
>   }
>   
> +static void init_direct_access_msrs(void)
> +{
> +	int i, j;
> +
> +	/* Find first MSR_INVALID */
> +	for (i = 0; i < MAX_DIRECT_ACCESS_MSRS; i++) {
> +		if (direct_access_msrs[i].index == MSR_INVALID)
> +			break;
> +	}
> +	BUG_ON(i >= MAX_DIRECT_ACCESS_MSRS);
> +
> +	/*
> +	 * Initialize direct_access_msrs entries to intercept X2APIC MSRs
> +	 * (range 0x800 to 0x8ff)
> +	 */
> +	for (j = 0; j < 0x100; j++) {
> +		direct_access_msrs[i + j].index = boot_cpu_has(X86_FEATURE_X2AVIC) ?
> +						  (APIC_BASE_MSR + j) : MSR_INVALID;

I found a bug in this part, when testing on system w/o support for x2AVIC feature.

The following change fixes the issue.

-               direct_access_msrs[i + j].index = boot_cpu_has(X86_FEATURE_X2AVIC) ?
-                                                 (APIC_BASE_MSR + j) : MSR_INVALID;
+               direct_access_msrs[i + j].index = (APIC_BASE_MSR + j);

I will update this in V2.

Regards,
Suravee