Received-SPF: pass (google.com: domain of linux-kernel+bounces-130602-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) client-ip=147.75.199.223;
Message-ID: <4c5d27ee-1e79-4b67-9b1d-354328e47388@intel.com>
Date: Thu, 4 Apr 2024 10:03:18 +1300
User-Agent: Mozilla Thunderbird
Subject: Re: [PATCH v6 2/9] x86/cpu: KVM: Move macro to encode PAT value to
 common header
To: Sean Christopherson <seanjc@google.com>, Thomas Gleixner
	<tglx@linutronix.de>, Ingo Molnar <mingo@redhat.com>, Borislav Petkov
	<bp@alien8.de>, Dave Hansen <dave.hansen@linux.intel.com>, <x86@kernel.org>,
	Paolo Bonzini <pbonzini@redhat.com>, Andy Lutomirski <luto@kernel.org>,
	"Peter Zijlstra" <peterz@infradead.org>
CC: <linux-kernel@vger.kernel.org>, <kvm@vger.kernel.org>, Shan Kang
	<shan.kang@intel.com>, Xin Li <xin3.li@intel.com>
References: <20240309012725.1409949-1-seanjc@google.com>
 <20240309012725.1409949-3-seanjc@google.com>
Content-Language: en-US
From: "Huang, Kai" <kai.huang@intel.com>
In-Reply-To: <20240309012725.1409949-3-seanjc@google.com>
Content-Type: text/plain; charset="UTF-8"; format=flowed
Content-Transfer-Encoding: 7bit
Precedence: bulk
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?NDdGR1pQQ28xQ25NOW05QVRadkFqb1B4c1Q2ZDRhcGtwWldQTXZoVTZqYUxB?=
 =?utf-8?B?UWUzYlVuL1hOaUdaWW1NUkQxK0MwcDJ0S1ZEVWU4N3VPaUVFWENwZUtJS2N2?=
 =?utf-8?B?T1pkU0JXSHROY0hwQmh2UlNENHBGdmMzNVJtU0V6bW9uS2hHVEFBeDc2Y2pC?=
 =?utf-8?B?NlY3QUNOSllIZXZocHFxcXJBTzFDbUdyM0YwYnp1V09wejM0RXFuM1ozM1dM?=
 =?utf-8?B?aW43YVBtUk9QNHVLWE1zUXB5NTl6QlRPKzV0cEx5azJFRFFhU0EvUmplcGph?=
 =?utf-8?B?MUc0dEdkeHBUdjhMeXlpVmxiUHFYODRuNUtuK1EzclpPMWxPenI1U2dIaXRQ?=
 =?utf-8?B?QXRSaTZLMmwxQ0NNR1hOQkd0WmZQdFZEbjh6MU0xZi9vVWRhMTQrY2NGbmdF?=
 =?utf-8?B?SlRwVmFMQ0VlaWZTaStXMFhMalhjTUFXbVJSN043cWJDQ1h5dGdxcDNDa0dQ?=
 =?utf-8?B?cFhBK2NaMllseVQ0YVRnRUJNbEZlaEZjMzJKUDUzWnJLYzVWRW9sdHI3WEZk?=
 =?utf-8?B?aHhHb2ZRT1F1SkRyNTdKa2t3TVdPVUd5ampZdyt3dmZ5K29ybW9qdHVhZDVm?=
 =?utf-8?B?VlVGOEMyV2JvNnZaWGwxYUJDdlVTNlY3TzQ2ZFpabEtGTDk4QVZadlZyYU05?=
 =?utf-8?B?ckx5aStGSDFhOEpPWDFJSGtUMUNRM25JRlN2ZlA2dTk4RkVsWEpSOWxOSkhi?=
 =?utf-8?B?MTNmcVdEaHZhM0IwNkxmK1FvVFZ5K204RVVjTHg4dndlSEdQQUhjSnJVUjZr?=
 =?utf-8?B?TXRqVjU1SjY0VjFHY1ZUQllQYXMzS09xRTVJYWtKejEwaHhmd0hHam5sSzBZ?=
 =?utf-8?B?NDc2VzlBN2YwQ0hQZU5mRmt2djlmRHlXYzQ3bUpvc29FNEpMWVhWRGR4Z1Jl?=
 =?utf-8?B?QnVDUW1aMUFqZEZpUlVLTEVPTGJFcFg4eGI2WlRTUmpUcDQ0QkV5QkszVUtS?=
 =?utf-8?B?TlFua3Z4OE1YSm9CMkNlNFFodGpCVkovU0c4WjlsT0FiRWJjeWk1Y2ZuZTZN?=
 =?utf-8?B?UGdFYnpNeURXcEtHdVVJVDkydjhiaXYzeE1rN0xoUzFxekNwTXA0RzVMWndG?=
 =?utf-8?B?VjRvZ0UxQnpqUklZNlFCSS9yeUxna1hpdWtzT3Z0QTRzbmhobTFGdUhqdkg5?=
 =?utf-8?B?WENyZHQwSlVVVHp4b3RRZTNITHF4R1FCbEFtNzZMNzVDM1BJbmFTR2NLbkdU?=
 =?utf-8?B?dW8wYUhLZVNZRVdzOFZlUDA2djZrNFNPZWppVVNCQjg0anUzWjNELzBsLzVi?=
 =?utf-8?B?eGtpdWhzS0pDelQ5WTRUL2FjYW9EbytYdmpmeFprU05PaDJkK2VwdTZpeExT?=
 =?utf-8?B?OHNhSDJab3ZCV096QnI3R1RqMnZRTjNJZmhGeE5RVEpxdmt2L3ZKbW1tYXR4?=
 =?utf-8?B?ejFwN0tCUWhGN2pYNkZPRDFaSEFOV2QyanpDMkpOZGdSWGwzWDFmc3ljSSt6?=
 =?utf-8?B?ZVYzOVlieCt5SmhLWHNLVWZDY2Q0WEg2S0FIaEZ5a2J2eWlEYWdQY0R0S2c3?=
 =?utf-8?B?K0VZT0dpNFFSTEhuOHcycWVOSDhPSDM0SXJSWjYvQWppczh3S3duMkI1N0ZG?=
 =?utf-8?B?ZzhnQVhyVzZxVXNxVGdpQ1ByS3ppaDF2cjdQL20wK0MrWHhnajBBOEdyY2hF?=
 =?utf-8?B?dVI0NlBYaHN3WDEwMDBSQ3V1aHlGZmdsazRseHQ0bkE1WEZPUllON05DbDF6?=
 =?utf-8?B?VWg2MGdQbG1ULzVzU24wbVU1ZUhNUU5DbldDMmk0MFphWkpNV3F6QWx2YnZu?=
 =?utf-8?B?NTgzbnlUQ05OK3g2ajE2MjYybWZtODI4amZ4eC9SQ1R5MWY0QnZZeFZQZXQy?=
 =?utf-8?B?UlJOMkU5MllPekpYdmZSZWZOZ1Y2a3lQZVMyTzRYd0E5cGd1TnIwakphdEQz?=
 =?utf-8?B?REczL3Qyd0o4SXNwM1hwUy9WUWVncEpXWnJZQi90a1crOExqS3A0R2xJTXQ4?=
 =?utf-8?B?N3pBVFFHaldYc1dlUUZNeXlDN3h3Q1haTDRhSDRNYjhrcWpjdEJhQUpQNFhp?=
 =?utf-8?B?SThmbFdGYXduQ1k2cW9nWmdWWGEvZ1k5NHM0NTRkMXozdXVSbFNTSTlPUXhu?=
 =?utf-8?B?YUI1Y0Y4SjAvTUVjYmJnL0F3R3Q0T2cyazNEWFBZUXo4K0hPbFRFa2ZlNk55?=
 =?utf-8?Q?b86iwY7LcHUepAqY/VWv0xq5H?=
X-MS-Exchange-CrossTenant-Network-Message-Id: bf3dea50-ad40-40ca-d621-08dc542182d3
X-MS-Exchange-CrossTenant-AuthSource: BL1PR11MB5978.namprd11.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Apr 2024 21:03:28.7792
 (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: CtTNWqSfPfsfuHLSA3xwu3KScNLq/XaHy5oz4RWqIKEtfVgQ+WkhpccpZpn5SR0jnuk2uOXjDq3cwP9pExEibA==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA2PR11MB5035
X-OriginatorOrg: intel.com


>   void __init pat_bp_init(void)
>   {
>   	struct cpuinfo_x86 *c = &boot_cpu_data;
> -#define PAT(p0, p1, p2, p3, p4, p5, p6, p7)				\
> -	((X86_MEMTYPE_ ## p0)      | (X86_MEMTYPE_ ## p1 << 8)  |	\
> -	(X86_MEMTYPE_ ## p2 << 16) | (X86_MEMTYPE_ ## p3 << 24) |	\
> -	(X86_MEMTYPE_ ## p4 << 32) | (X86_MEMTYPE_ ## p5 << 40) |	\
> -	(X86_MEMTYPE_ ## p6 << 48) | (X86_MEMTYPE_ ## p7 << 56))
> -
>   
>   	if (!IS_ENABLED(CONFIG_X86_PAT))
>   		pr_info_once("x86/PAT: PAT support disabled because CONFIG_X86_PAT is disabled in the kernel.\n");
> @@ -281,7 +275,7 @@ void __init pat_bp_init(void)
>   		 * NOTE: When WC or WP is used, it is redirected to UC- per
>   		 * the default setup in __cachemode2pte_tbl[].
>   		 */
> -		pat_msr_val = PAT(WB, WT, UC_MINUS, UC, WB, WT, UC_MINUS, UC);
> +		pat_msr_val = PAT_VALUE(WB, WT, UC_MINUS, UC, WB, WT, UC_MINUS, UC);
>   	}
>   
>   	/*
> @@ -321,7 +315,7 @@ void __init pat_bp_init(void)
>   		 * NOTE: When WT or WP is used, it is redirected to UC- per
>   		 * the default setup in __cachemode2pte_tbl[].
>   		 */
> -		pat_msr_val = PAT(WB, WC, UC_MINUS, UC, WB, WC, UC_MINUS, UC);
> +		pat_msr_val = PAT_VALUE(WB, WC, UC_MINUS, UC, WB, WC, UC_MINUS, UC);
>   	} else {
>   		/*
>   		 * Full PAT support.  We put WT in slot 7 to improve
> @@ -349,7 +343,7 @@ void __init pat_bp_init(void)
>   		 * The reserved slots are unused, but mapped to their
>   		 * corresponding types in the presence of PAT errata.
>   		 */
> -		pat_msr_val = PAT(WB, WC, UC_MINUS, UC, WB, WP, UC_MINUS, WT);
> +		pat_msr_val = PAT_VALUE(WB, WC, UC_MINUS, UC, WB, WP, UC_MINUS, WT);
>   	}
>   
>   	memory_caching_control |= CACHE_PAT;

I found there's one "#undef PAT" at the end of pat_bp_init() and it 
should be removed:

void __init pat_bp_init(void)
{
         struct cpuinfo_x86 *c = &boot_cpu_data;
#define PAT(p0, p1, p2, p3, p4, p5, p6, p7)                     \
         (((u64)PAT_ ## p0) | ((u64)PAT_ ## p1 << 8) |           \
         ((u64)PAT_ ## p2 << 16) | ((u64)PAT_ ## p3 << 24) |     \
         ((u64)PAT_ ## p4 << 32) | ((u64)PAT_ ## p5 << 40) |     \
         ((u64)PAT_ ## p6 << 48) | ((u64)PAT_ ## p7 << 56))

	...

         memory_caching_control |= CACHE_PAT;

         init_cache_modes(pat_msr_val);
#undef PAT
}