Received-SPF: pass (google.com: domain of linux-kernel+bounces-205136-linux.lists.archive=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) client-ip=139.178.88.99;
Message-ID: <3bd755d7-e5c7-3dc3-9875-4884c857e325@amd.com>
Date: Thu, 6 Jun 2024 18:09:24 -0500
User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:91.0) Gecko/20100101
 Thunderbird/91.5.0
Reply-To: babu.moger@amd.com
Subject: Re: [PATCH] selftests/resctrl: Fix noncont_cat_run_test for AMD
Content-Language: en-US
To: Reinette Chatre <reinette.chatre@intel.com>,
 Babu Moger <babu.moger@amd.com>, fenghua.yu@intel.com, shuah@kernel.org
Cc: linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org,
 ilpo.jarvinen@linux.intel.com, maciej.wieczor-retman@intel.com,
 peternewman@google.com, eranian@google.com
References: <3a6c9dd9dc6bda6e2582db049bfe853cd836139f.1717622080.git.babu.moger@amd.com>
 <9a7213d2-a782-4342-93f2-acf191c745fd@intel.com>
From: "Moger, Babu" <bmoger@amd.com>
In-Reply-To: <9a7213d2-a782-4342-93f2-acf191c745fd@intel.com>
Content-Type: text/plain; charset=UTF-8; format=flowed
Content-Transfer-Encoding: 8bit
Precedence: bulk
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0:
	=?utf-8?B?MmJvN3ByeW9LcnF5SkxtUjBJR29aeUtFSEpvSGxZOVlkM3I2ajFobEkzZjQ3?=
 =?utf-8?B?SDZmVmN5OUJxbkFta1dXMndSVklvdUZsVnYvZU8zY3Vqa2NlUzBIbHVkYS9B?=
 =?utf-8?B?L2RXaEZBbVBPcHlwYUhmd3ZkQ0t1R3dXQ3BZYWJCeVB5RTFZaG03ZjlqdGdN?=
 =?utf-8?B?UjBVcmNJS0U5VXlobm53SXZBSkJoTmJUak1IUEs0TXRPWENrZlBQWUZoL0ht?=
 =?utf-8?B?UTJ2d3lIMGxsU1hlRGNPK2VBMHVpZ2N4SDlZWGlkbVRFcEpxOTM0VVphUkFQ?=
 =?utf-8?B?a1ZIU01weEkxeGVwODVad0trQTBhMFUvSWZjd0hsSFJYUGlRcEdPNUU0ZTE1?=
 =?utf-8?B?Vm5UVEZTTjR6dmhhSUp5Q3lCZllNU2JHZWR2eWFSLzcvNVpQSXhFVTNFMC82?=
 =?utf-8?B?bVpBSkk1MFowRmpZeW9SSElIR1psWk9KRTlCRnlzYUNsMUJqRlZjZ2lrdStN?=
 =?utf-8?B?eU4wUldNWGUyeDRxNU50cjh0U3BsQllncCtZUlh3THVGaWFTWFlNSS9HZCtj?=
 =?utf-8?B?M1Bkalo5ZHNBaWJGN2MrYWNKZDFiS0RGWU5GQUU0M0ZvQkY5OFVOZEpXakx3?=
 =?utf-8?B?d1ZpYVBzYVVBNGdjd01MSUdiaUxqL08xejQzS1A0RmtKVGlPWS81SlYwZHI2?=
 =?utf-8?B?UkRvZW5WblZ1dldaZUljQjJOSU4vTytrT3ZWVWVVc3RsbFlXODFQVjEvdWlo?=
 =?utf-8?B?c1lVS1lZZkpmTnhmWmJmdzg3K2YxV3A0S2c3a2M4bGppajVCUkd3b3U3WFIw?=
 =?utf-8?B?ckc5dDNlbnNRYmgyMGowVmdtWmplSkJSbFM5UWEvWWcwSStwVkZYNWVUcmpJ?=
 =?utf-8?B?N3ZEeElEUlhSZ05hcW9XbFFCUkoyb3NvRkhESjY0dERzY3ZJMWFBRnMvNDFQ?=
 =?utf-8?B?SVNTbndISFN4dTZKUE9sU2pjMHJMQ2FndWlJZjFoTFNsdnJBcE85cHlhdXJq?=
 =?utf-8?B?Z1R0TU1KZ3NRbmpHRjlWNzNTMGVtUC96ZXFzRFg3dXFFQTFiMVo0aFYzRVBF?=
 =?utf-8?B?ayt3RWh3ckxZQmJIWEZsWGZva2twcEJ2dEdjdGNvQ0ZrWE1IbHpQa092N2pz?=
 =?utf-8?B?ZSsrc0V5aFNxMWFnNGdQQkNCQk1XYmxaQXp1dDYrUHdGODRka3IvbXk2Rk16?=
 =?utf-8?B?RmxkQ3g3ekE2emFma2g4QnI3by9aUWI0VXZpMWhjL1Y4RW9CRHIyWjNVcGk5?=
 =?utf-8?B?MUJOdHRwOTJmZ0J4NE0wRmxBLzY5N212cTdlZ01CSGJDdTZGYVYyUUtLYUls?=
 =?utf-8?B?alJIelcvMmJNazFTajNDcE9abWJ0QWNxVXVHeXgxRFVvN25JSEFvaGlqQ0Nt?=
 =?utf-8?B?dUhSemJNblFWWVlFalozQVRzbUMwVGlTZm9iVXhweU9LcXc1RzNGbW8xZEJp?=
 =?utf-8?B?KzFGS3JsVmxmVy92ZlB2cXZGWmxJd05BUDZ0eGJkSUN4UjRZTUViT09yNmM0?=
 =?utf-8?B?eks5SVV6aFp6ZFlybkpNZTcxUUJFYmFsNm1OQ2pVUzFHUFhDUFhhbFJrWDBT?=
 =?utf-8?B?bWlIWXFRV1VmSUZFUFFZcm5kM0Yva0VFZ2hSaXBRNkIzR0tzT3pVclF4czBv?=
 =?utf-8?B?bVlad0laSXFCU0Jxb1c5bzcyeHA2R0NVU25YbUtkdS9ldVhNSElUczBjYmlo?=
 =?utf-8?B?ekxxdUNSRURYajRWNFl4d0NOMFRjR3hEMkNGZk9Wb3BnejVvQ0pTTHZjRHRB?=
 =?utf-8?B?S25Ob0crbWg0QytjN0NkSG1oVVFmNGdhSHlyR3BFYnNPVmF4MTk2ZVdiN3Fq?=
 =?utf-8?B?SUZIelpWOGhCUDhrRmJtTndwa1kxNVNxdHV3Q1N3dW4vejIzUWVyWmtGNklN?=
 =?utf-8?B?K0hKNU94NHg4ZnA4NHkyQnZJYll2dUdNUWdQQnQwUm4wTExacm50TnpLNDNX?=
 =?utf-8?B?ZFloZmhNZmNJM21JVEM3WUFWUVFiSzFJZVNYK21qY3NZenRXTEl0cHZ2YTBz?=
 =?utf-8?B?ZFF6djZkUTN6clNzbzJCQWNlVzdXR2x3NzlHa21Ka1dYZnArL1ArWHA5OFFi?=
 =?utf-8?B?Yjgvby9kM3RNMDRCeE9BVzFLR2xJNlRlc0kyZ0ZsQTBGMExZWXhCVk00NU9U?=
 =?utf-8?B?YXBEVnJZVEh4a043YmlUYU0zM21OU2kzRXdoZk96Q1dsTDZrWU0reWVjbW1Z?=
 =?utf-8?Q?imxs=3D?=
X-OriginatorOrg: amd.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 700478c7-2765-471b-c8b2-08dc867db67f
X-MS-Exchange-CrossTenant-AuthSource: MW3PR12MB4553.namprd12.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Jun 2024 23:09:27.3141
 (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: ySZTfxAAv25F7VpU/IaLRIdk9Xu4hzB90sv2aEhwccixV+JiGZ2W183u6xvk4NXO
X-MS-Exchange-Transport-CrossTenantHeadersStamped: SJ2PR12MB7895

Hi Reinette,


On 6/6/2024 3:33 PM, Reinette Chatre wrote:
> Hi Babu,
> 
> On 6/5/24 2:36 PM, Babu Moger wrote:
>> The selftest noncont_cat_run_test fails on AMD with the warnings. Reason
>> is, AMD supports non contiguous CBM masks but does not report it via 
>> CPUID.
>>
>> Update noncont_cat_run_test to check for the vendor when verifying CPUID.
>>
>> Fixes: ae638551ab64 ("selftests/resctrl: Add non-contiguous CBMs CAT 
>> test")
>> Signed-off-by: Babu Moger <babu.moger@amd.com>
>> ---
>> This was part of the series
>> https://lore.kernel.org/lkml/cover.1708637563.git.babu.moger@amd.com/
>> Sending this as a separate fix per review comments.
>> ---
>>   tools/testing/selftests/resctrl/cat_test.c | 2 +-
>>   1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/tools/testing/selftests/resctrl/cat_test.c 
>> b/tools/testing/selftests/resctrl/cat_test.c
>> index d4dffc934bc3..b2988888786e 100644
>> --- a/tools/testing/selftests/resctrl/cat_test.c
>> +++ b/tools/testing/selftests/resctrl/cat_test.c
>> @@ -308,7 +308,7 @@ static int noncont_cat_run_test(const struct 
>> resctrl_test *test,
>>       else
>>           return -EINVAL;
>> -    if (sparse_masks != ((ecx >> 3) & 1)) {
>> +    if ((get_vendor() == ARCH_INTEL) && sparse_masks != ((ecx >> 3) & 
>> 1)) {
>>           ksft_print_msg("CPUID output doesn't match 'sparse_masks' 
>> file content!\n");
>>           return 1;
>>       }
> 
> Since AMD does not report this support via CPUID it does not seem
> appropriate to use CPUID at all on AMD when doing the hardware check.
> I think the above check makes it difficult to understand what is different
> on AMD.
> 
> What if instead there is a new function, for example,
> "static bool arch_supports_noncont_cat(const struct resctrl_test *test)"
> that returns true if the hardware supports non-contiguous CBM?

Sure.

> 
> The vendor check can be in there to make it obvious what is going on:
> 
>      /* AMD always supports non-contiguous CBM. */
>      if (get_vendor() == AMD)
>          return true;
> 
>      /* CPUID check for Intel here. */
> 
> The "sparse_masks" from kernel can then be checked against
> hardware support with an appropriate (no mention of CPUID)
> error message if this fails.
> 

Something like this?


diff --git a/tools/testing/selftests/resctrl/cat_test.c 
b/tools/testing/selftests/resctrl/cat_test.c
index d4dffc934bc3..b75d220f29f6 100644
--- a/tools/testing/selftests/resctrl/cat_test.c
+++ b/tools/testing/selftests/resctrl/cat_test.c
@@ -288,11 +288,30 @@ static int cat_run_test(const struct resctrl_test 
*test, const struct user_param
         return ret;
  }

+static bool arch_supports_noncont_cat(const struct resctrl_test *test)
+{
+       unsigned int eax, ebx, ecx, edx;
+
+       /* AMD always supports non-contiguous CBM. */
+       if (get_vendor() == ARCH_AMD) {
+               return true;
+       } else {
+               if (!strcmp(test->resource, "L3"))
+                       __cpuid_count(0x10, 1, eax, ebx, ecx, edx);
+               else if (!strcmp(test->resource, "L2"))
+                       __cpuid_count(0x10, 2, eax, ebx, ecx, edx);
+               else
+                       return false;
+
+               return ((ecx >> 3) & 1);
+       }
+}
+
  static int noncont_cat_run_test(const struct resctrl_test *test,
                                 const struct user_params *uparams)
  {
         unsigned long full_cache_mask, cont_mask, noncont_mask;
-       unsigned int eax, ebx, ecx, edx, sparse_masks;
+       unsigned int sparse_masks;
         int bit_center, ret;
         char schemata[64];

@@ -301,15 +320,8 @@ static int noncont_cat_run_test(const struct 
resctrl_test *test,
         if (ret)
                 return ret;

-       if (!strcmp(test->resource, "L3"))
-               __cpuid_count(0x10, 1, eax, ebx, ecx, edx);
-       else if (!strcmp(test->resource, "L2"))
-               __cpuid_count(0x10, 2, eax, ebx, ecx, edx);
-       else
-               return -EINVAL;
-
-       if (sparse_masks != ((ecx >> 3) & 1)) {
-               ksft_print_msg("CPUID output doesn't match 
'sparse_masks' file content!\n");
+       if (!(arch_supports_noncont_cat(test) && sparse_masks)) {
+               ksft_print_msg("Hardware does not support non-contiguous 
CBM!\n");
                 return 1;
         }


-- 
- Babu Moger