Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.31 as permitted sender) client-ip=23.128.96.31;
Message-ID: <4176a620-4cec-5d57-42a3-a15c0fe3eb73@intel.com>
Date:   Tue, 12 Sep 2023 15:06:17 -0700
User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:102.0) Gecko/20100101
 Firefox/102.0 Thunderbird/102.15.0
Subject: Re: [PATCH 1/5] selftests/resctrl: Extend signal handler coverage to
 unmount on receiving signal
Content-Language: en-US
To:     =?UTF-8?Q?Ilpo_J=c3=a4rvinen?= <ilpo.jarvinen@linux.intel.com>,
        Shuah Khan <shuah@kernel.org>,
        Shuah Khan <skhan@linuxfoundation.org>,
        <linux-kselftest@vger.kernel.org>,
        =?UTF-8?Q?Maciej_Wiecz=c3=b3r-Retman?= 
        <maciej.wieczor-retman@intel.com>
CC:     <linux-kernel@vger.kernel.org>,
        Shaopeng Tan <tan.shaopeng@jp.fujitsu.com>,
        <stable@vger.kernel.org>
References: <20230911111930.16088-1-ilpo.jarvinen@linux.intel.com>
 <20230911111930.16088-2-ilpo.jarvinen@linux.intel.com>
From:   Reinette Chatre <reinette.chatre@intel.com>
In-Reply-To: <20230911111930.16088-2-ilpo.jarvinen@linux.intel.com>
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: 8bit
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?VG1idXVyVDkzbmkzaWJiV1dNbElTbVdRSUhFM2lSeEJxR3RqMEJTRDlZNUxj?=
 =?utf-8?B?bjZlcXV6QzBBdDRYZ0l0NmZSK0kwRVpRakw2YWRGd0RlNFNBKzFvcWRpMGZD?=
 =?utf-8?B?Q1BvTXhWa3dvZmhlbHRucStXUUFXUmx4WFcreHB1cFQvR2NzK3M3T2VmSEhH?=
 =?utf-8?B?anQxTWtBQzZyMTB0RjhSY0lIYUIwalArbzdVbllSM0hVZDRUUzA2TWMvNWdw?=
 =?utf-8?B?RW14VWc4WFZDTTExa0ZmcGlQeDcvWUhGQ2dKaEFYV3FjRWVWaU80LzlJVFVj?=
 =?utf-8?B?bCs4VEU4bmRVSVk1UUpmYlNMakc5Y1ZoTlFBeUpVSExWTUFPczJrNlo0VjhR?=
 =?utf-8?B?R3p5U1NPbHVPdkJFYjZpSHZtN0x0aHlaTjl2Qm11MENCMXEwN2dYci9yNTla?=
 =?utf-8?B?RXByK1J3NzlSMnpIMkRJOUpYUUtHdWVPUDhvR0h1YUYwak1EZEIyMGV0a1BB?=
 =?utf-8?B?ZzhweWw0c2dyUlBSY1JCdUhVVTZYRFFsVUNDNkRZRExJVnVDd0hYNXRkQm1x?=
 =?utf-8?B?TlRsMVNyRm9qVkpKUW5RN2NqMVNEVEN4bE1SSmx0VFAxVG9TZGtTLzVhdG5L?=
 =?utf-8?B?TmJCanBneVkxTzR6UUZPVkFWOE5abDFXYm9Id3ZGSG9NaUl0Yjk1dnV3V21p?=
 =?utf-8?B?YXdpWFdFakNjTzROUitPS003L2tiYTVmdEdwbUEyZUV0dG50SC9xOUxDYktF?=
 =?utf-8?B?NjNpR09hK2t4OXl5ZVhTUmpxcEZscExPVHpYRFNQL21pcGhJemlJTHNkbU5u?=
 =?utf-8?B?Qk1GU2d2TzJiTDU3TVlPVGd4c21WSEJsWTJHWnFWeHZmeXErU091Z21EeFph?=
 =?utf-8?B?dklIRDJFc1phYTJSOUVDK1oyTW9qKzJsalJOOElNY1QwWFIvcmphMEt0cTIx?=
 =?utf-8?B?aDR1V2UxOG9YS3ZSSitsUFV4Y01JYzRvczRoSy9KSnlDeStFaGlSVmtycUV6?=
 =?utf-8?B?elkvQXhndXFOUUlaWnpNVis3My9mOUpaa29KdEt2OXBERUtiMlBOeGxvWmRB?=
 =?utf-8?B?bTJkQ3I1eWpTWnRSRkM5T05jRGo2Rmg0Q0RkRHFTaVVYZkxVYzlRbFdYWHhP?=
 =?utf-8?B?bktDQnNsZ1VrOHl3MFIvbWdiL1pXV2QyeTE5TDZ5eWZvY1huQ1ppb1BYQ0Iv?=
 =?utf-8?B?VzFIUWpHRmFRVG1nVHJNRDZqYlJQSkg3VHJCRVpKbFh4elBnZ1N3d21Jd3l4?=
 =?utf-8?B?enNhaFJ1TTJ5R0o0bGU3dDM3NEowNmFPT05SUjRheDUrSm9TOWxZbjRHT3Rh?=
 =?utf-8?B?SDNJZGlQcStCb1UraGR1ZGRFR2d1eGFhU3Q5eDMwK2V2TysrdkZBd28zd2xI?=
 =?utf-8?B?T1VsN0x2ZjJjNCtlcDF3K0MxL052Z1JhV2VrWmNQNEQvWXR6RzBDbThRTUVo?=
 =?utf-8?B?dzZ4NTVzWVpMN0xacHFKTUpSaExra09GRWxkSEQ1TkFZcjJOWWJXbUgwSUxs?=
 =?utf-8?B?NmRlQS9URjkxRXlxT0ZlR1dadDcrek9qUmVNNGtLSlZCNnJreXRjMTAyMktq?=
 =?utf-8?B?N2s1NEhnOHZQY1FRTVFRd0ZocGo3T0pMeTd4bE5NaWRPWTZKY20yaEM4Y0t1?=
 =?utf-8?B?b1NuMmJ6SnNjTFpjK2tlWk03ZFhSNFBjU2VwTVErWE5LZW16QTh2SDhoOGlY?=
 =?utf-8?B?aXhsYnllVTVJS2owWFBmZWxzcmxld0kxdkd1MU53U3dhakhKUEJ2TWFVWDRl?=
 =?utf-8?B?NnhBb2svcWFkaFQ1QmcxeUVQSlJJOHAwYmNOTzJXaEJETTQ5TEc5cWQ1K0NE?=
 =?utf-8?B?Wk5WV0d4ZWJONVBpakd5ZW85eEhpZmxIOG5MdU1WZmRzaDdTUTVCUTladXhT?=
 =?utf-8?B?RkY2VmQrUmJBcjdtbUo1OXNkTzNiNlZEM0ZXS0lZYU1adjhlVUdMc2xCMkhy?=
 =?utf-8?B?aWExQ2k5bkVqNzB4bFJDZWVML2N5RFNBKzlDL3ZibmFIdEFsS0xydkYvdXc1?=
 =?utf-8?B?WFpZUDBOVXp1ZFJFUE1La1RtUUdubms1ejNLNU1jUElRZVgrcTZ2aThreGJn?=
 =?utf-8?B?TlU4Y3I3alB4UXhKZ0p6OUUwemswbThWaDAwTy9SUjBldElWVlY1S0RoaEw0?=
 =?utf-8?B?b3gxalFqSGpNdnZjUmk3b2MvUmtzZzkyRjlONWVqcFkvSjczUlAwRHUrWjAx?=
 =?utf-8?B?dHRxdjVPaWRoTGx0SWU2OHR5cWl6ZDdWbHdGWm44UTZXaUF0anNmaUNvbXVR?=
 =?utf-8?B?ekE9PQ==?=
X-MS-Exchange-CrossTenant-Network-Message-Id: c8c88d1a-6b87-4005-d1d6-08dbb3dc7ea4
X-MS-Exchange-CrossTenant-AuthSource: SJ2PR11MB7573.namprd11.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Sep 2023 22:06:20.3225
 (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: lEcgMLmo78k9m1QdXKgFi6/pF/iJ3KdO8EDkUesHQExwizbeJei3cZyk58IA/5d0m+NIEvOs/CjCsAYEF0ugHRCPugXV81BPJc417dfrEXM=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA1PR11MB6516
X-OriginatorOrg: intel.com
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org
X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (morse.vger.email [0.0.0.0]); Tue, 12 Sep 2023 15:07:12 -0700 (PDT)
X-Spam-Status: No, score=-2.3 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED,
	DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,
	MAILING_LIST_MULTI,NICE_REPLY_A,SPF_HELO_NONE,SPF_PASS
	autolearn=unavailable autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on morse.vger.email

Hi Ilpo,

On 9/11/2023 4:19 AM, Ilpo Järvinen wrote:
> Unmounting resctrl FS has been moved into the per test functions in
> resctrl_tests.c by commit caddc0fbe495 ("selftests/resctrl: Move
> resctrl FS mount/umount to higher level"). In case a signal (SIGINT,
> SIGTERM, or SIGHUP) is received, the running selftest is aborted by
> ctrlc_handler() which then unmounts resctrl fs before exiting. The
> current section between signal_handler_register() and
> signal_handler_unregister(), however, does not cover the entire
> duration when resctrl FS is mounted.
> 
> Move signal_handler_register() and signal_handler_unregister() call
> into the test functions in resctrl_tests.c to properly unmount resctrl
> fs. Adjust child process kill() call in ctrlc_handler() to only be
> invoked if the child was already forked.

Thank you for catching this.

> 
> Fixes: caddc0fbe495 ("selftests/resctrl: Move resctrl FS mount/umount to higher level")
> Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>
> Cc: <stable@vger.kernel.org>
> ---
>  tools/testing/selftests/resctrl/cat_test.c    |  8 -------
>  .../testing/selftests/resctrl/resctrl_tests.c | 24 +++++++++++++++++++
>  tools/testing/selftests/resctrl/resctrl_val.c | 22 ++++++++---------
>  3 files changed, 34 insertions(+), 20 deletions(-)
> 
> diff --git a/tools/testing/selftests/resctrl/cat_test.c b/tools/testing/selftests/resctrl/cat_test.c
> index 97b87285ab2a..224ba8544d8a 100644
> --- a/tools/testing/selftests/resctrl/cat_test.c
> +++ b/tools/testing/selftests/resctrl/cat_test.c
> @@ -167,12 +167,6 @@ int cat_perf_miss_val(int cpu_no, int n, char *cache_type)
>  		strcpy(param.filename, RESULT_FILE_NAME1);
>  		param.num_of_runs = 0;
>  		param.cpu_no = sibling_cpu_no;
> -	} else {
> -		ret = signal_handler_register();
> -		if (ret) {
> -			kill(bm_pid, SIGKILL);
> -			goto out;
> -		}
>  	}
>  
>  	remove(param.filename);
> @@ -209,10 +203,8 @@ int cat_perf_miss_val(int cpu_no, int n, char *cache_type)
>  		}
>  		close(pipefd[0]);
>  		kill(bm_pid, SIGKILL);
> -		signal_handler_unregister();
>  	}
>  
> -out:
>  	cat_test_cleanup();
>  
>  	return ret;
> diff --git a/tools/testing/selftests/resctrl/resctrl_tests.c b/tools/testing/selftests/resctrl/resctrl_tests.c
> index 823672a20a43..3d66fbdc2df3 100644
> --- a/tools/testing/selftests/resctrl/resctrl_tests.c
> +++ b/tools/testing/selftests/resctrl/resctrl_tests.c
> @@ -73,8 +73,13 @@ static void run_mbm_test(const char * const *benchmark_cmd, int cpu_no)
>  
>  	ksft_print_msg("Starting MBM BW change ...\n");
>  
> +	res = signal_handler_register();
> +	if (res)
> +		return;
> +
>  	res = mount_resctrlfs();
>  	if (res) {
> +		signal_handler_unregister();
>  		ksft_exit_fail_msg("Failed to mount resctrl FS\n");
>  		return;
>  	}
> @@ -91,6 +96,7 @@ static void run_mbm_test(const char * const *benchmark_cmd, int cpu_no)
>  
>  umount:
>  	umount_resctrlfs();
> +	signal_handler_unregister();
>  }
>  
>  static void run_mba_test(const char * const *benchmark_cmd, int cpu_no)
> @@ -99,8 +105,13 @@ static void run_mba_test(const char * const *benchmark_cmd, int cpu_no)
>  
>  	ksft_print_msg("Starting MBA Schemata change ...\n");
>  
> +	res = signal_handler_register();
> +	if (res)
> +		return;
> +
>  	res = mount_resctrlfs();
>  	if (res) {
> +		signal_handler_unregister();
>  		ksft_exit_fail_msg("Failed to mount resctrl FS\n");
>  		return;
>  	}
> @@ -115,6 +126,7 @@ static void run_mba_test(const char * const *benchmark_cmd, int cpu_no)
>  
>  umount:
>  	umount_resctrlfs();
> +	signal_handler_unregister();
>  }
>  

This adds more duplicated code for every test. Have you considered a
single test setup function that can be used to mount resctrl FS and setup
the signal handler paired with a single test teardown function?

Reinette