Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:18 as permitted sender) client-ip=2620:137:e000::1:18;
Content-Type: text/plain;
        charset=us-ascii
Mime-Version: 1.0 (Mac OS X Mail 14.0 \(3654.120.0.1.13\))
Subject: Re: [PATCH V2] testing/selftests/mqueue: Fix mq_perf_tests to free
 the allocated cpu set
From:   Athira Rajeev <atrajeev@linux.vnet.ibm.com>
In-Reply-To: <e9c8a8c7-9a0d-09be-343d-038b7f791b98@linuxfoundation.org>
Date:   Fri, 8 Apr 2022 12:55:46 +0530
Cc:     shuah@kernel.org, linux-kselftest@vger.kernel.org,
        disgoel@linux.vnet.ibm.com,
        Arnaldo Carvalho de Melo <acme@kernel.org>,
        Jiri Olsa <jolsa@kernel.org>,
        Michael Ellerman <mpe@ellerman.id.au>,
        linux-perf-users@vger.kernel.org, linuxppc-dev@lists.ozlabs.org,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        maddy@linux.vnet.ibm.com, kajoljain <kjain@linux.ibm.com>,
        Srikar Dronamraju <srikar@linux.vnet.ibm.com>
Content-Transfer-Encoding: quoted-printable
Message-Id: <03A2A043-D434-49F2-B5D0-0886493B6627@linux.vnet.ibm.com>
References: <20220407184008.93879-1-atrajeev@linux.vnet.ibm.com>
 <e9c8a8c7-9a0d-09be-343d-038b7f791b98@linuxfoundation.org>
To:     Shuah Khan <skhan@linuxfoundation.org>
Precedence: bulk


> On 08-Apr-2022, at 12:31 AM, Shuah Khan <skhan@linuxfoundation.org> =
wrote:
>=20
> On 4/7/22 12:40 PM, Athira Rajeev wrote:
>> The selftest "mqueue/mq_perf_tests.c" use CPU_ALLOC to allocate
>> CPU set. This cpu set is used further in pthread_attr_setaffinity_np
>> and by pthread_create in the code. But in current code, allocated
>> cpu set is not freed.
>> Fix this issue by adding CPU_FREE in the "shutdown" function which
>> is called in most of the error/exit path for the cleanup. Also add
>> CPU_FREE in some of the error paths where shutdown is not called.
>> Fixes: 7820b0715b6f ("tools/selftests: add mq_perf_tests")
>> Signed-off-by: Athira Rajeev <atrajeev@linux.vnet.ibm.com>
>> ---
>> Changelog:
>> =46rom v1 -> v2:
>>  Addressed review comment from Shuah Khan to add
>>  CPU_FREE in other exit paths where it is needed
>=20
> Thank you. I have a couple of comments on making the error
> paths simpler. Please see below.
>=20
>>  tools/testing/selftests/mqueue/mq_perf_tests.c | 10 +++++++++-
>>  1 file changed, 9 insertions(+), 1 deletion(-)
>> diff --git a/tools/testing/selftests/mqueue/mq_perf_tests.c =
b/tools/testing/selftests/mqueue/mq_perf_tests.c
>> index b019e0b8221c..182434c7898d 100644
>> --- a/tools/testing/selftests/mqueue/mq_perf_tests.c
>> +++ b/tools/testing/selftests/mqueue/mq_perf_tests.c
>> @@ -180,6 +180,9 @@ void shutdown(int exit_val, char *err_cause, int =
line_no)
>>  	if (in_shutdown++)
>>  		return;
>>  +	/* Free the cpu_set allocated using CPU_ALLOC in main function =
*/
>> +	CPU_FREE(cpu_set);
>> +
>>  	for (i =3D 0; i < num_cpus_to_pin; i++)
>>  		if (cpu_threads[i]) {
>>  			pthread_kill(cpu_threads[i], SIGUSR1);
>> @@ -589,6 +592,7 @@ int main(int argc, char *argv[])
>>  						cpu_set)) {
>>  					fprintf(stderr, "Any given CPU =
may "
>>  						"only be given =
once.\n");
>> +					CPU_FREE(cpu_set);
>=20
> This could be done in a common error path handling.
>=20
>>  					exit(1);
>>  				} else
>>  					CPU_SET_S(cpus_to_pin[cpu],
>> @@ -607,6 +611,7 @@ int main(int argc, char *argv[])
>>  				queue_path =3D malloc(strlen(option) + =
2);
>>  				if (!queue_path) {
>>  					perror("malloc()");
>> +					CPU_FREE(cpu_set);
>=20
> This could be done in a common error path handling.
>=20
>>  					exit(1);
>>  				}
>>  				queue_path[0] =3D '/';
>> @@ -619,6 +624,7 @@ int main(int argc, char *argv[])
>>  	}
>>    	if (continuous_mode && num_cpus_to_pin =3D=3D 0) {
>> +		CPU_FREE(cpu_set);
>=20
> This could be done in a common error path handling.
>=20
>>  		fprintf(stderr, "Must pass at least one CPU to =
continuous "
>>  			"mode.\n");
>>  		poptPrintUsage(popt_context, stderr, 0);
>> @@ -628,10 +634,12 @@ int main(int argc, char *argv[])
>>  		cpus_to_pin[0] =3D cpus_online - 1;
>>  	}
>>  -	if (getuid() !=3D 0)
>> +	if (getuid() !=3D 0) {
>> +		CPU_FREE(cpu_set);
>>  		ksft_exit_skip("Not running as root, but almost all =
tests "
>>  			"require root in order to modify\nsystem =
settings.  "
>>  			"Exiting.\n");
>> +	}
>> =20
>=20
> Why not move this check before CPU_ALLOC and make this the very first
> check in main()?
>=20
> With this change the other places where CPU_FREE is added right before
> exit(1). Something like this:
>=20
> err_code:
> 	CPU_FREE(cpu_set);
> 	exit(code)
Hi Shuah

Thanks for the comments. Addressed these in V3

Athira
>=20
>>  	max_msgs =3D fopen(MAX_MSGS, "r+");
>>  	max_msgsize =3D fopen(MAX_MSGSIZE, "r+");
>=20
> thanks,
> -- Shuah