From: Reinette Chatre <reinette.chatre@intel.com>
To: Sai Praneeth Prakhya <sai.praneeth.prakhya@intel.com>,
shuah@kernel.org, linux-kselftest@vger.kernel.org
Cc: tglx@linutronix.de, mingo@redhat.com, bp@alien8.de,
tony.luck@intel.com, babu.moger@amd.com, james.morse@arm.com,
ravi.v.shankar@intel.com, fenghua.yu@intel.com, x86@kernel.org,
linux-kernel@vger.kernel.org
Subject: Re: [PATCH V1 09/13] selftests/resctrl: Modularize fill_buf for new CAT test case
Date: Tue, 10 Mar 2020 14:59:39 -0700 [thread overview]
Message-ID: <4c84be1d-8839-2c85-b294-7e3c454240bb@intel.com> (raw)
In-Reply-To: <43b368952bb006ee973311d9c9ae0eb53d8e7f60.1583657204.git.sai.praneeth.prakhya@intel.com>
Hi Sai,
On 3/6/2020 7:40 PM, Sai Praneeth Prakhya wrote:
> Currently fill_buf (in-built benchmark) runs as a separate process and it
> runs indefinitely looping around given buffer either reading it or writing
> to it. But, some future test cases might want to start and stop looping
> around the buffer as they see fit. So, modularize fill_buf to support this
> use case.
>
> Signed-off-by: Sai Praneeth Prakhya <sai.praneeth.prakhya@intel.com>
> ---
> tools/testing/selftests/resctrl/fill_buf.c | 66 ++++++++++++++++++++----------
> 1 file changed, 44 insertions(+), 22 deletions(-)
>
> diff --git a/tools/testing/selftests/resctrl/fill_buf.c b/tools/testing/selftests/resctrl/fill_buf.c
> index 9ede7b63f059..204ae8870a32 100644
> --- a/tools/testing/selftests/resctrl/fill_buf.c
> +++ b/tools/testing/selftests/resctrl/fill_buf.c
> @@ -23,7 +23,7 @@
> #define PAGE_SIZE (4 * 1024)
> #define MB (1024 * 1024)
>
> -static unsigned char *startptr;
> +static unsigned char *startptr, *endptr;
>
> static void sb(void)
> {
> @@ -82,13 +82,13 @@ static void *malloc_and_init_memory(size_t s)
> return p;
> }
>
> -static int fill_one_span_read(unsigned char *start_ptr, unsigned char *end_ptr)
> +static int fill_one_span_read(void)
> {
> unsigned char sum, *p;
>
> sum = 0;
> - p = start_ptr;
> - while (p < end_ptr) {
> + p = startptr;
> + while (p < endptr) {
> sum += *p;
> p += (CL_SIZE / 2);
> }
> @@ -96,26 +96,24 @@ static int fill_one_span_read(unsigned char *start_ptr, unsigned char *end_ptr)
> return sum;
> }
>
> -static
> -void fill_one_span_write(unsigned char *start_ptr, unsigned char *end_ptr)
> +static void fill_one_span_write(void)
> {
> unsigned char *p;
>
> - p = start_ptr;
> - while (p < end_ptr) {
> + p = startptr;
> + while (p < endptr) {
> *p = '1';
> p += (CL_SIZE / 2);
> }
> }
>
> -static int fill_cache_read(unsigned char *start_ptr, unsigned char *end_ptr,
> - char *resctrl_val)
> +static int fill_cache_read(char *resctrl_val)
> {
> int ret = 0;
> FILE *fp;
>
> while (1) {
> - ret = fill_one_span_read(start_ptr, end_ptr);
> + ret = fill_one_span_read();
> if (!strcmp(resctrl_val, "cat"))
> break;
> }
> @@ -130,11 +128,10 @@ static int fill_cache_read(unsigned char *start_ptr, unsigned char *end_ptr,
> return 0;
> }
>
> -static int fill_cache_write(unsigned char *start_ptr, unsigned char *end_ptr,
> - char *resctrl_val)
> +static int fill_cache_write(char *resctrl_val)
> {
> while (1) {
> - fill_one_span_write(start_ptr, end_ptr);
> + fill_one_span_write();
> if (!strcmp(resctrl_val, "cat"))
> break;
> }
> @@ -142,24 +139,25 @@ static int fill_cache_write(unsigned char *start_ptr, unsigned char *end_ptr,
> return 0;
> }
>
> -static int
> -fill_cache(unsigned long long buf_size, int malloc_and_init, int memflush,
> - int op, char *resctrl_val)
> +static
> +int init_buffer(unsigned long long buf_size, int malloc_and_init, int memflush)
> {
> unsigned char *start_ptr, *end_ptr;
> unsigned long long i;
> - int ret;
>
> if (malloc_and_init)
> start_ptr = malloc_and_init_memory(buf_size);
> else
> start_ptr = malloc(buf_size);
>
> - if (!start_ptr)
> + if (!start_ptr) {
> + printf("Failed to allocate memory to buffer\n");
> return -1;
> + }
>
> - startptr = start_ptr;
> end_ptr = start_ptr + buf_size;
> + endptr = end_ptr;
> + startptr = start_ptr;
>
> /*
> * It's better to touch the memory once to avoid any compiler
> @@ -176,16 +174,40 @@ fill_cache(unsigned long long buf_size, int malloc_and_init, int memflush,
> if (memflush)
> mem_flush(start_ptr, buf_size);
>
> + return 0;
> +}
> +
> +static int use_buffer_forever(int op, char *resctrl_val)
> +{
> + int ret;
> +
> if (op == 0)
> - ret = fill_cache_read(start_ptr, end_ptr, resctrl_val);
> + ret = fill_cache_read(resctrl_val);
> else
> - ret = fill_cache_write(start_ptr, end_ptr, resctrl_val);
> + ret = fill_cache_write(resctrl_val);
>
> if (ret) {
> printf("\n Errror in fill cache read/write...\n");
> return -1;
> }
>
> + return 0;
> +}
> +
> +static int
> +fill_cache(unsigned long long buf_size, int malloc_and_init, int memflush,
> + int op, char *resctrl_val)
> +{
> + int ret;
> +
> + ret = init_buffer(buf_size, malloc_and_init, memflush);
> + if (ret)
> + return ret;
> +
> + ret = use_buffer_forever(op, resctrl_val);
> + if (ret)
> + return ret;
Should buffer be freed on this error path?
I think the asymmetrical nature of the memory allocation and release
creates traps like this.
It may be less error prone to have the pointer returned by init_buffer
and the acted on and released within fill_cache(), passed to
"use_buffer_forever()" as a parameter. The buffer size is known here,
there is no need to keep an "end pointer" around.
> +
> free(startptr);
>
> return 0;
>
Reinette
next prev parent reply other threads:[~2020-03-10 21:59 UTC|newest]
Thread overview: 41+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-07 3:40 [PATCH V1 00/13] Miscellaneous fixes for resctrl selftests Sai Praneeth Prakhya
2020-03-07 3:40 ` [PATCH V1 01/13] selftests/resctrl: Fix feature detection Sai Praneeth Prakhya
2020-03-09 21:44 ` Reinette Chatre
2020-03-09 22:22 ` Prakhya, Sai Praneeth
2020-03-09 22:33 ` Reinette Chatre
2020-03-09 22:51 ` Prakhya, Sai Praneeth
2020-03-11 18:06 ` Reinette Chatre
2020-03-11 18:22 ` Sai Praneeth Prakhya
2020-03-11 18:45 ` Reinette Chatre
2020-03-11 18:54 ` Sai Praneeth Prakhya
2020-03-07 3:40 ` [PATCH V1 02/13] selftests/resctrl: Fix typo Sai Praneeth Prakhya
2020-03-07 3:40 ` [PATCH V1 03/13] selftests/resctrl: Fix typo in help text Sai Praneeth Prakhya
2020-03-07 3:40 ` [PATCH V1 04/13] selftests/resctrl: Ensure sibling CPU is not same as original CPU Sai Praneeth Prakhya
2020-03-07 3:40 ` [PATCH V1 05/13] selftests/resctrl: Fix missing options "-n" and "-p" Sai Praneeth Prakhya
2020-03-07 3:40 ` [PATCH V1 06/13] selftests/resctrl: Fix MBA/MBM results reporting format Sai Praneeth Prakhya
2020-03-07 3:40 ` [PATCH V1 07/13] selftests/resctrl: Don't use variable argument list for setup function Sai Praneeth Prakhya
2020-03-07 3:40 ` [PATCH V1 08/13] selftests/resctrl: Fix typos Sai Praneeth Prakhya
2020-03-07 3:40 ` [PATCH V1 09/13] selftests/resctrl: Modularize fill_buf for new CAT test case Sai Praneeth Prakhya
2020-03-10 21:59 ` Reinette Chatre [this message]
2020-03-11 1:04 ` Sai Praneeth Prakhya
[not found] ` <50cb755f-e112-5d71-11fa-a7cbc951d91e@intel.com>
2020-03-11 17:45 ` Sai Praneeth Prakhya
2020-03-11 18:10 ` Reinette Chatre
2020-03-11 18:14 ` Sai Praneeth Prakhya
2020-03-07 3:40 ` [PATCH V1 10/13] selftests/resctrl: Change Cache Allocation Technology (CAT) test Sai Praneeth Prakhya
2020-03-10 22:14 ` Reinette Chatre
2020-03-11 1:59 ` Sai Praneeth Prakhya
2020-03-11 17:03 ` Reinette Chatre
2020-03-11 19:14 ` Sai Praneeth Prakhya
2020-03-11 20:22 ` Reinette Chatre
2020-03-11 20:55 ` Sai Praneeth Prakhya
2020-03-07 3:40 ` [PATCH V1 11/13] selftests/resctrl: Change Cache Quality Monitoring (CQM) test Sai Praneeth Prakhya
2020-03-10 22:18 ` Reinette Chatre
2020-03-11 2:46 ` Sai Praneeth Prakhya
2020-03-11 17:19 ` Reinette Chatre
2020-03-11 17:33 ` Sai Praneeth Prakhya
2020-03-11 18:03 ` Reinette Chatre
2020-03-11 18:07 ` Sai Praneeth Prakhya
2020-03-07 3:40 ` [PATCH V1 12/13] selftests/resctrl: Dynamically select buffer size for CAT test Sai Praneeth Prakhya
2020-03-10 22:19 ` Reinette Chatre
2020-03-11 2:52 ` Sai Praneeth Prakhya
2020-03-07 3:40 ` [PATCH V1 13/13] selftests/resctrl: Cleanup fill_buff after changing " Sai Praneeth Prakhya
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4c84be1d-8839-2c85-b294-7e3c454240bb@intel.com \
--to=reinette.chatre@intel.com \
--cc=babu.moger@amd.com \
--cc=bp@alien8.de \
--cc=fenghua.yu@intel.com \
--cc=james.morse@arm.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-kselftest@vger.kernel.org \
--cc=mingo@redhat.com \
--cc=ravi.v.shankar@intel.com \
--cc=sai.praneeth.prakhya@intel.com \
--cc=shuah@kernel.org \
--cc=tglx@linutronix.de \
--cc=tony.luck@intel.com \
--cc=x86@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).