Received-SPF: pass (google.com: domain of linux-kernel+bounces-81083-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) client-ip=2604:1380:45e3:2400::1;
Date: Mon, 26 Feb 2024 10:43:35 +0100
From: Maciej Wieczor-Retman <maciej.wieczor-retman@intel.com>
To: Reinette Chatre <reinette.chatre@intel.com>
CC: Fenghua Yu <fenghua.yu@intel.com>, Shuah Khan <shuah@kernel.org>,
	<ilpo.jarvinen@linux.intel.com>, <linux-kernel@vger.kernel.org>,
	<linux-kselftest@vger.kernel.org>
Subject: Re: [PATCH v3 2/3] selftests/resctrl: Simplify cleanup in ctrl-c
 handler
Message-ID: <qxn5tpm3gkv7l32rbcjapik6mn7uzmv24zw7hyrvp55mngyufb@3fgphjebxkvb>
References: <cover.1708599491.git.maciej.wieczor-retman@intel.com>
 <e84995d79debfa8775a1535a82c6ca637f6891da.1708599491.git.maciej.wieczor-retman@intel.com>
 <635699af-4abc-491e-9528-66ebfe9eaf6d@intel.com>
Content-Type: text/plain; charset="iso-8859-1"
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
In-Reply-To: <635699af-4abc-491e-9528-66ebfe9eaf6d@intel.com>
Precedence: bulk
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?iso-8859-1?Q?zW+GA0f1vojNlviYvKjL027UY+RtQzL/oJLSVIR6+ZGLJgFoabPCZqF6I2?=
 =?iso-8859-1?Q?uFRr7JmyX1nsyFHZdXZyjBRFhCRLpFI8YmPAyZS0XqNzgAjJbhmNcYP3nv?=
 =?iso-8859-1?Q?NuJDASwoatUpDKaLTTGYHXcr+tBkujq6cG8HMxzmetGo4KyW2o83asKvZs?=
 =?iso-8859-1?Q?xz2y4692X3Ao9wRIxtVD27lFy93W2RZVxjBl9iTT/Q831Xb1Tr8TnBIAbn?=
 =?iso-8859-1?Q?f1gezI8A143coADC/xhtXBQOw7RDnAGSalyEHoU7sHwSTU89L9MycWA4QM?=
 =?iso-8859-1?Q?N011XTniPWbOqW7iPF3T2a4/QUfP5WKaM/2zJ8X0crPeStSwNZRHJnxJYg?=
 =?iso-8859-1?Q?jBP1XSvwwb3YVsKw4fgBJFT+0lNISuT7OQ31EcAwUB5JiVkKln8CWSujK4?=
 =?iso-8859-1?Q?U7Njde//KL4KUV3WL1Gc49Ha7FC8JF5mOam/1IbjwxzXFctfyDtmxF6pjf?=
 =?iso-8859-1?Q?530X1aAP0FK/vXXqQ/Kh0c6DNKuDkZaZsMlzrY2LFdFPrVVbeEz1mbOwLe?=
 =?iso-8859-1?Q?3y/LuIHdtEn1Tx1aloFhInnxRuqHZRenWtPErwdZ3cfvtwq8hM6YQ2P9Hk?=
 =?iso-8859-1?Q?9ZtySFUXURWYjl/pTvF9uu3TrVdtOrQuV3Teeey2hS43QujT+W5QulI7qr?=
 =?iso-8859-1?Q?MwylM1eG+YSPu8BLZUEtl2cOnCFpHlseq4h4AU6G91E/64HGeWyB7vTlz4?=
 =?iso-8859-1?Q?jGyHcqtNBe2ycxRTUpes6JE6oVXc3C8Lpvi4dbruX2PqK1hHm27koW66fF?=
 =?iso-8859-1?Q?tlz1N1uIfmROgqZPvTaDWnkcoY8h2e+jyYN/xVODguiBqJq015AJcfLyJY?=
 =?iso-8859-1?Q?CYf3pp9+dMhBsZCvVpsCjJuNBpJdphjVxjSklMszAdyGSVfhtYxqv9ZwEf?=
 =?iso-8859-1?Q?UfHFN81Dx3Get+erIHzlBVr2Lemy3DmUddlM5toOOThMHjjcqawmdgAyea?=
 =?iso-8859-1?Q?+zSZZEKxTkS6PpLFTyiKn2fsmD1TzycDt23rWoVfGpRIqqK2pQuN1U12is?=
 =?iso-8859-1?Q?q33aAM6qN0MlgQ+MJP3Z5eJzbPrtma0on1un0ctwIzJZHyeEp6vpI4QAWg?=
 =?iso-8859-1?Q?F8tf50HA/CLSmCqN2z/jG7456sE6blafkxM8TbB9AdE+exNfbDBORI2e7G?=
 =?iso-8859-1?Q?GBUWj4OzU8hRkZ4Ely7Z+d8kZ7ECqTyw0ik2MoftqiMBnHCdqnIAockfao?=
 =?iso-8859-1?Q?TqZysPXnqrZXzJqZ6cV9wSkrH3EPlwkHkSKIimNeGqCssQWT5WXOJcd0DD?=
 =?iso-8859-1?Q?FqRP70ZEgFn2LvcGlgyD2Ot7ARyQbJSazyd1NCy0rYN5o7CEp9vZ5+6fLt?=
 =?iso-8859-1?Q?5xG88UCTCHOZNXW4SxbyBXaT5wLhO+oeFfT54lmfy8P9DJTw0d8DwKQDrS?=
 =?iso-8859-1?Q?zydMUyG/bA9/lAWg2ZDu2ElYA2eY5L/6xzVJP35Q3FEQkIsuxby3NCBoZC?=
 =?iso-8859-1?Q?G45+h5ItvClDG3vkaib2n8kVWBBVw4T656t2o862prtPf0URXFEl0LsVhu?=
 =?iso-8859-1?Q?LjFdo1raPquEzvUaKbDSCfPLSPv7SE1O44IuoeFdpZswsUpIV7AEIwsdOC?=
 =?iso-8859-1?Q?YlW0nTyDnwlB9K3xECrcDzot2TqpgWW+LSIgSP7f9yt1P+kgzhR1dUbkYN?=
 =?iso-8859-1?Q?SgR/W0dBHXmTHFa0NQm3WjHTYp1dIDdjldmUVAE2iIepzBKuWOCKUNdiZ4?=
 =?iso-8859-1?Q?YYuK5rUL57XcsMSrTgw=3D?=
X-MS-Exchange-CrossTenant-Network-Message-Id: c04f7f20-0795-43f7-5587-08dc36af6947
X-MS-Exchange-CrossTenant-AuthSource: MN0PR11MB6231.namprd11.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Feb 2024 09:43:39.3928
 (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: KfwuGqrZEP8hTD9l4V3pTkYn/OoGKdjpUMBI04T+y0SfwOQa6+ID2lbo8QIGFSQRqm+CfRqIyYIVSHaxn1s3Xot+e4kDIlwy5oZKP8tKp4w=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY5PR11MB6140
X-OriginatorOrg: intel.com

On 2024-02-23 at 13:18:22 -0800, Reinette Chatre wrote:
>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)

Okay, will do.

>
>>  	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()?

Okay, I'll set it to NULL here.

>
>Reinette

-- 
Kind regards
Maciej Wiecz?r-Retman