Received-SPF: pass (google.com: domain of linux-kernel+bounces-79190-linux.lists.archive=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) client-ip=139.178.88.99;
Message-ID: <635699af-4abc-491e-9528-66ebfe9eaf6d@intel.com>
Date: Fri, 23 Feb 2024 13:18:22 -0800
User-Agent: Mozilla Thunderbird
Subject: Re: [PATCH v3 2/3] selftests/resctrl: Simplify cleanup in ctrl-c
 handler
Content-Language: en-US
To: Maciej Wieczor-Retman <maciej.wieczor-retman@intel.com>, Fenghua Yu
	<fenghua.yu@intel.com>, Shuah Khan <shuah@kernel.org>
CC: <ilpo.jarvinen@linux.intel.com>, <linux-kernel@vger.kernel.org>,
	<linux-kselftest@vger.kernel.org>
References: <cover.1708599491.git.maciej.wieczor-retman@intel.com>
 <e84995d79debfa8775a1535a82c6ca637f6891da.1708599491.git.maciej.wieczor-retman@intel.com>
From: Reinette Chatre <reinette.chatre@intel.com>
In-Reply-To: <e84995d79debfa8775a1535a82c6ca637f6891da.1708599491.git.maciej.wieczor-retman@intel.com>
Content-Type: text/plain; charset="UTF-8"
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?c25ibVQvdkpTMGdDMkxTK1BSN2JtRFhjbi9wMWlxZmdkRVZ0NWJKSkk4R3pL?=
 =?utf-8?B?UkVQUHIwaWUwK2pqWVBZTWdiQlBLdFVPUi8xVEUvMUpsVXZ4VzJQdUVPRmtF?=
 =?utf-8?B?eDBmZzlJOXlzdVRKaFkrNlh3dFlZQTlScHh3YVR3N2trTkdyRm5yZjhvaVJJ?=
 =?utf-8?B?N0ZONjRkK0NHVEhHU3o4Z1FZOUl4WUJoYjZNTVlaK0w0UUY0b2FEVUd1Wlh4?=
 =?utf-8?B?N2g4dm92VmFmSkN6TXo1dlhnVmRMK0k5Y1Q3UC9UNThaYzhacHhheXRNYTQx?=
 =?utf-8?B?U2dVcVdjRnkyc1I1NWhZYitFWGhmMzhuNkgwMFd2NFJrcHVCYnVva1kyZC8y?=
 =?utf-8?B?ODRGKytITzZpdVFXVUZqRUdKS29mWnQxcGFRRlBiekRWVjZabmFWcU1kN2lP?=
 =?utf-8?B?R3BhMkd4bmNsRWd6aUxPL3Z3ZW9WYUxRY1Y4OHR2QTRydk5yVWRzeDluZlVB?=
 =?utf-8?B?RkJ5aFl4OUJKL3dqTlBuNnBjbGRyQkFuRnNRTWRlaEhBQmlwWHkyTnF5akFn?=
 =?utf-8?B?OHdJSlFUS2xvWE5teU1jc3d1MzIwOWFsQjgxZzl0Qi9PNHZMZXlMWXQwdDk4?=
 =?utf-8?B?UGREZUdscUNuakVEaFhuK2VzWWRQWUMrbHdVNS9WdFBDQnVTUGJIaFllWS9k?=
 =?utf-8?B?TWNiV0JhWEZGUC9XMGxjRmJPZnVuYWFoTDhXZGpqYytBQzFSaE9RNE0vMk1s?=
 =?utf-8?B?MW1MWHkxeVcreElURlBYVnhsdDZsRVh1dDIxcldOTERnbXNZYzR6bTdSRDFG?=
 =?utf-8?B?Ym9qZGM3NGRORnNNY3d3WHBOSkZIbm1VNzhtUUx1WjViMm5JRG13alh5bW5y?=
 =?utf-8?B?VnhZQmxvS2NqdHlGWG1jbCtxT2JXMnRnRVhyTnA3b2NsbU16RlVvaERpOSs1?=
 =?utf-8?B?N05iNm5ZNTJEVmM1d0EwczUxcjgyQlI1R1pvWW13VCs5RmlrMGNNbUQvUWRr?=
 =?utf-8?B?WXRHc0ZmeGRWNWFhS3pUWU9Pb2lpWnIvVnBYQ0pBbEJuNTFESk1wTXA2bm0x?=
 =?utf-8?B?Nmx0dy9kMkhxK3dldU4yRGExQlEwZWlZM1pZbk9YT2xHck13VXdsUUwvVlJk?=
 =?utf-8?B?TlNKUGxNbnpxZnFWY2IwaGNhN01aYjNQbGFJbUpLUmtZVXAwS2ovS3VsSkdM?=
 =?utf-8?B?eUIrblcyQTJrZXR1R0VWaHYrdncxb0lvcFhIdnovWGdGQVhkbXpzWmN4UUJD?=
 =?utf-8?B?eDZ4eFI3TWRNblRHSGFwUDZvRjZSTzNBN3pSU0t4WmNGMTh1RmtQV0FGbVZM?=
 =?utf-8?B?OWNuQXZheU5pdTVWbGFYVklQbytXNmpLYVNyQTMxbHJGWW81VmpHTDhQWlJz?=
 =?utf-8?B?YnpwOTRUZzE4Ymh0WUYvL1ZaNDVJN3hkWDZXQkdXZXVRRG9OU3psVGJLSVdu?=
 =?utf-8?B?aXBXY1pVVUV6R1dsRlpaL2FXMjVBNzl1RGp3VU9YditXUVpLenpqbDZvRTN3?=
 =?utf-8?B?elhrUktPRjJyektDa1pES1NVQzI1Z1RGTk9GOURxZHRiUjVGY2pHcUxpS1BO?=
 =?utf-8?B?Y09NRWdKM2VBcSt4eFdQYWVOMzRZSXFPRExTNVdhVDNCakw4QjQrQ2VETmow?=
 =?utf-8?B?VlpNRlBQTVNSYzhJdTdWQTdvVUxuRTZrYzh5RW5hdTc0cVkzQ3FqUWUzbmNP?=
 =?utf-8?B?SmZaTUlYTURLM1JPWStVSG1HVU5lcTNoRlY2NFRWNFhZVWZSczJFOEtzZzNw?=
 =?utf-8?B?VCt2dVJVSmQzY2FGcnkvT0xWRllyZ0tGaTdCY2FmMnNhSzBGY3JubUFYaHhB?=
 =?utf-8?B?MXZBVEVERE92YVZSY1JVMldneHR3Wlh5WjJtL1V5V0NYcG5MM29obGFFeVhj?=
 =?utf-8?B?VTNkckpDTFZSYWRVNVZROCtUTHY1cWExQ3l4eFFqTXRRZDhDZGF6dDduc1Ft?=
 =?utf-8?B?VjFVSis4bzhrTHlTcW1yaUVqaWxIbFJzUjd4djFtTW1SUTNrZEMvdWpCQXFy?=
 =?utf-8?B?T2REVXgrem1ud0hWQXlnckdUaUE5NzM0SjBXNE40aDhwWThVMzFpZm92UlJF?=
 =?utf-8?B?YTl5b0VsbEQrUjJSZlpRbzF0NWdyZmU0ZkF6UWplRlpobDYzb2haSy9WS1Bz?=
 =?utf-8?B?ZTNqL2thZFJoL3NvbmZwalZ2aTluaHR1ZUtCL3FyNk0zRGxJZEt6d1RmK0VB?=
 =?utf-8?B?UkZ5bFhkS2EyRnJYam1NZmdiRGZOdWNpVHphc0JlRFNHenYzV3hrdTA3VW1a?=
 =?utf-8?B?UHc9PQ==?=
X-MS-Exchange-CrossTenant-Network-Message-Id: 60eec9da-5849-4847-735d-08dc34b4f848
X-MS-Exchange-CrossTenant-AuthSource: SJ2PR11MB7573.namprd11.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Feb 2024 21:18:24.5228
 (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: 11O2OyOdlPzA0nghnK9zRuchNSZ8h5VZ+xCqSnu5V5QtlJw32OsvGKM6FV2//wiaFJIWcG/Bwra5Y7mVhLuGf2L/qj01pMNtqqJXIeY41Mg=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN7PR11MB7510
X-OriginatorOrg: intel.com

Hi Maciej,

On 2/22/2024 4:07 AM, Maciej Wieczor-Retman wrote:
  	}
> diff --git a/tools/testing/selftests/resctrl/resctrl_val.c b/tools/testing/selftests/resctrl/resctrl_val.c
> index 5a49f07a6c85..0134aa2f896a 100644
> --- a/tools/testing/selftests/resctrl/resctrl_val.c
> +++ b/tools/testing/selftests/resctrl/resctrl_val.c
> @@ -62,6 +62,7 @@ struct imc_counter_config {
>  static char mbm_total_path[1024];
>  static int imcs;
>  static struct imc_counter_config imc_counters_config[MAX_IMCS][2];
> +static const struct resctrl_test *current_test;
>  
>  void membw_initialize_perf_event_attr(int i, int j)
>  {
> @@ -472,7 +473,8 @@ void ctrlc_handler(int signum, siginfo_t *info, void *ptr)
>  	if (bm_pid)
>  		kill(bm_pid, SIGKILL);
>  	umount_resctrlfs();
> -	tests_cleanup();
> +	if (current_test->cleanup)
> +		current_test->cleanup();

Could you please make this more robust with a:

	if (current_test && current_test->cleanup)

>  	ksft_print_msg("Ending\n\n");
>  
>  	exit(EXIT_SUCCESS);
> @@ -482,13 +484,14 @@ void ctrlc_handler(int signum, siginfo_t *info, void *ptr)
>   * Register CTRL-C handler for parent, as it has to kill
>   * child process before exiting.
>   */
> -int signal_handler_register(void)
> +int signal_handler_register(const struct resctrl_test *test)
>  {
>  	struct sigaction sigact = {};
>  	int ret = 0;
>  
>  	bm_pid = 0;
>  
> +	current_test = test;
>  	sigact.sa_sigaction = ctrlc_handler;
>  	sigemptyset(&sigact.sa_mask);
>  	sigact.sa_flags = SA_SIGINFO;

Could you please reset the pointer in signal_handler_unregister()?

Reinette