[PATCH RESEND 0/2] ring-buffer/selftest: Meta-page testing improvements

[PATCH RESEND 0/2] ring-buffer/selftest: Meta-page testing improvements

[Vincent Donnefort]

Following the comments on the original patch [1] here's a set of 2 patches to
improve the selftest.

[1] https://lore.kernel.org/all/20240628104611.1443542-1-vdonnefort@google.com/

Vincent Donnefort (2):
  ring-buffer/selftest: Verify the entire meta-page padding
  ring-buffer/selftest: Handle meta-page bigger than the system

 tools/testing/selftests/ring-buffer/map_test.c | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)


base-commit: 2fcd5aff92aab479a9a89cfce2dbc9c6a9455b4f
-- 
2.46.0.598.g6f2099f65c-goog

[PATCH RESEND 1/2] ring-buffer/selftest: Verify the entire meta-page padding

[Vincent Donnefort]

Improve the ring-buffer meta-page test coverage by checking for the
entire padding region to be 0 instead of just looking at the first 4
bytes.

Cc: Shuah Khan <skhan@linuxfoundation.org>
Cc: linux-kselftest@vger.kernel.org
Signed-off-by: Vincent Donnefort <vdonnefort@google.com>

diff --git a/tools/testing/selftests/ring-buffer/map_test.c b/tools/testing/selftests/ring-buffer/map_test.c
index 4bb0192e43f3..ba12fd31de87 100644
--- a/tools/testing/selftests/ring-buffer/map_test.c
+++ b/tools/testing/selftests/ring-buffer/map_test.c
@@ -231,15 +231,15 @@ TEST_F(map, data_mmap)
 
 	/* Verify meta-page padding */
 	if (desc->meta->meta_page_size > getpagesize()) {
-		void *addr;
-
 		data_len = desc->meta->meta_page_size;
 		data = mmap(NULL, data_len,
 			    PROT_READ, MAP_SHARED, desc->cpu_fd, 0);
 		ASSERT_NE(data, MAP_FAILED);
 
-		addr = (void *)((unsigned long)data + getpagesize());
-		ASSERT_EQ(*((int *)addr), 0);
+		for (int i = desc->meta->meta_struct_len;
+		     i < desc->meta->meta_page_size; i += sizeof(int))
+			ASSERT_EQ(*(int *)(data + i), 0);
+
 		munmap(data, data_len);
 	}
 }
-- 
2.46.0.598.g6f2099f65c-goog

[PATCH RESEND 2/2] ring-buffer/selftest: Handle meta-page bigger than the system

[Vincent Donnefort]

Handle the case where the meta-page content is bigger than the system
page-size. This prepares the ground for extending features covered by
the meta-page.

Cc: Shuah Khan <skhan@linuxfoundation.org>
Cc: linux-kselftest@vger.kernel.org
Signed-off-by: Vincent Donnefort <vdonnefort@google.com>

diff --git a/tools/testing/selftests/ring-buffer/map_test.c b/tools/testing/selftests/ring-buffer/map_test.c
index ba12fd31de87..d10a847130fb 100644
--- a/tools/testing/selftests/ring-buffer/map_test.c
+++ b/tools/testing/selftests/ring-buffer/map_test.c
@@ -92,12 +92,22 @@ int tracefs_cpu_map(struct tracefs_cpu_map_desc *desc, int cpu)
 	if (desc->cpu_fd < 0)
 		return -ENODEV;
 
+again:
 	map = mmap(NULL, page_size, PROT_READ, MAP_SHARED, desc->cpu_fd, 0);
 	if (map == MAP_FAILED)
 		return -errno;
 
 	desc->meta = (struct trace_buffer_meta *)map;
 
+	/* the meta-page is bigger than the original mapping */
+	if (page_size < desc->meta->meta_struct_len) {
+		int meta_page_size = desc->meta->meta_page_size;
+
+		munmap(desc->meta, page_size);
+		page_size = meta_page_size;
+		goto again;
+	}
+
 	return 0;
 }
 
-- 
2.46.0.598.g6f2099f65c-goog

Re: [PATCH RESEND 0/2] ring-buffer/selftest: Meta-page testing improvements

[Steven Rostedt]

On Tue, 10 Sep 2024 17:23:33 +0100
Vincent Donnefort <vdonnefort@google.com> wrote:

> Following the comments on the original patch [1] here's a set of 2 patches to
> improve the selftest.
> 
> [1] https://lore.kernel.org/all/20240628104611.1443542-1-vdonnefort@google.com/
> 
> Vincent Donnefort (2):
>   ring-buffer/selftest: Verify the entire meta-page padding
>   ring-buffer/selftest: Handle meta-page bigger than the system
> 
>  tools/testing/selftests/ring-buffer/map_test.c | 18 ++++++++++++++----
>  1 file changed, 14 insertions(+), 4 deletions(-)
> 
> 
> base-commit: 2fcd5aff92aab479a9a89cfce2dbc9c6a9455b4f

Ah, you just Cc'd the patches. OK, I can work with that.

-- Steve

Re: [PATCH RESEND 1/2] ring-buffer/selftest: Verify the entire meta-page padding

[Steven Rostedt]

Shuah,

Can you take this through your tree?

Acked-by: Steven Rostedt (Google) <rostedt@goodmis.org>

-- Steve


On Tue, 10 Sep 2024 17:23:34 +0100
Vincent Donnefort <vdonnefort@google.com> wrote:

> Improve the ring-buffer meta-page test coverage by checking for the
> entire padding region to be 0 instead of just looking at the first 4
> bytes.
> 
> Cc: Shuah Khan <skhan@linuxfoundation.org>
> Cc: linux-kselftest@vger.kernel.org
> Signed-off-by: Vincent Donnefort <vdonnefort@google.com>
> 
> diff --git a/tools/testing/selftests/ring-buffer/map_test.c b/tools/testing/selftests/ring-buffer/map_test.c
> index 4bb0192e43f3..ba12fd31de87 100644
> --- a/tools/testing/selftests/ring-buffer/map_test.c
> +++ b/tools/testing/selftests/ring-buffer/map_test.c
> @@ -231,15 +231,15 @@ TEST_F(map, data_mmap)
>  
>  	/* Verify meta-page padding */
>  	if (desc->meta->meta_page_size > getpagesize()) {
> -		void *addr;
> -
>  		data_len = desc->meta->meta_page_size;
>  		data = mmap(NULL, data_len,
>  			    PROT_READ, MAP_SHARED, desc->cpu_fd, 0);
>  		ASSERT_NE(data, MAP_FAILED);
>  
> -		addr = (void *)((unsigned long)data + getpagesize());
> -		ASSERT_EQ(*((int *)addr), 0);
> +		for (int i = desc->meta->meta_struct_len;
> +		     i < desc->meta->meta_page_size; i += sizeof(int))
> +			ASSERT_EQ(*(int *)(data + i), 0);
> +
>  		munmap(data, data_len);
>  	}
>  }

Re: [PATCH RESEND 2/2] ring-buffer/selftest: Handle meta-page bigger than the system

[Steven Rostedt]

Shuah,

Can you take this through your tree?

Acked-by: Steven Rostedt (Google) <rostedt@goodmis.org>

-- Steve

On Tue, 10 Sep 2024 17:23:35 +0100
Vincent Donnefort <vdonnefort@google.com> wrote:

> Handle the case where the meta-page content is bigger than the system
> page-size. This prepares the ground for extending features covered by
> the meta-page.
> 
> Cc: Shuah Khan <skhan@linuxfoundation.org>
> Cc: linux-kselftest@vger.kernel.org
> Signed-off-by: Vincent Donnefort <vdonnefort@google.com>
> 
> diff --git a/tools/testing/selftests/ring-buffer/map_test.c b/tools/testing/selftests/ring-buffer/map_test.c
> index ba12fd31de87..d10a847130fb 100644
> --- a/tools/testing/selftests/ring-buffer/map_test.c
> +++ b/tools/testing/selftests/ring-buffer/map_test.c
> @@ -92,12 +92,22 @@ int tracefs_cpu_map(struct tracefs_cpu_map_desc *desc, int cpu)
>  	if (desc->cpu_fd < 0)
>  		return -ENODEV;
>  
> +again:
>  	map = mmap(NULL, page_size, PROT_READ, MAP_SHARED, desc->cpu_fd, 0);
>  	if (map == MAP_FAILED)
>  		return -errno;
>  
>  	desc->meta = (struct trace_buffer_meta *)map;
>  
> +	/* the meta-page is bigger than the original mapping */
> +	if (page_size < desc->meta->meta_struct_len) {
> +		int meta_page_size = desc->meta->meta_page_size;
> +
> +		munmap(desc->meta, page_size);
> +		page_size = meta_page_size;
> +		goto again;
> +	}
> +
>  	return 0;
>  }
>  

Re: [PATCH RESEND 1/2] ring-buffer/selftest: Verify the entire meta-page padding

[Shuah Khan]

On 9/10/24 10:45, Steven Rostedt wrote:
> 
> Shuah,
> 
> Can you take this through your tree?
> 
> Acked-by: Steven Rostedt (Google) <rostedt@goodmis.org>

I can take this through my tree.

> 
> -- Steve
> 
> 
> On Tue, 10 Sep 2024 17:23:34 +0100
> Vincent Donnefort <vdonnefort@google.com> wrote:
> 
>> Improve the ring-buffer meta-page test coverage by checking for the
>> entire padding region to be 0 instead of just looking at the first 4
>> bytes.
>>
>> Cc: Shuah Khan <skhan@linuxfoundation.org>
>> Cc: linux-kselftest@vger.kernel.org
>> Signed-off-by: Vincent Donnefort <vdonnefort@google.com>

Vincent,

Can you please rebase these on linux-kselftest next branch and
resend.  This patch doesn't apply.

Also please fix the subject to say:

selfttests/ring-buffer

Re: [PATCH RESEND 2/2] ring-buffer/selftest: Handle meta-page bigger than the system

[Shuah Khan]

On 9/10/24 10:45, Steven Rostedt wrote:
> 
> Shuah,
> 
> Can you take this through your tree?
> 
> Acked-by: Steven Rostedt (Google) <rostedt@goodmis.org>

Yes I can take it through my tree.

> 
> -- Steve
> 
> On Tue, 10 Sep 2024 17:23:35 +0100
> Vincent Donnefort <vdonnefort@google.com> wrote:
> 
>> Handle the case where the meta-page content is bigger than the system
>> page-size. This prepares the ground for extending features covered by
>> the meta-page.
>>
>> Cc: Shuah Khan <skhan@linuxfoundation.org>
>> Cc: linux-kselftest@vger.kernel.org
>> Signed-off-by: Vincent Donnefort <vdonnefort@google.com>

Vincent,

Can you please rebase these on linux-kselftest next branch and
resend. This patch doesn't apply.

Also please fix the subject to say:

selfttests/ring-buffer

thanks,
-- Shuah

Re: [PATCH RESEND 1/2] ring-buffer/selftest: Verify the entire meta-page padding

[Vincent Donnefort]

On Tue, Sep 10, 2024 at 12:49:58PM -0600, Shuah Khan wrote:
> On 9/10/24 10:45, Steven Rostedt wrote:
> > 
> > Shuah,
> > 
> > Can you take this through your tree?
> > 
> > Acked-by: Steven Rostedt (Google) <rostedt@goodmis.org>
> 
> I can take this through my tree.
> 
> > 
> > -- Steve
> > 
> > 
> > On Tue, 10 Sep 2024 17:23:34 +0100
> > Vincent Donnefort <vdonnefort@google.com> wrote:
> > 
> > > Improve the ring-buffer meta-page test coverage by checking for the
> > > entire padding region to be 0 instead of just looking at the first 4
> > > bytes.
> > > 
> > > Cc: Shuah Khan <skhan@linuxfoundation.org>
> > > Cc: linux-kselftest@vger.kernel.org
> > > Signed-off-by: Vincent Donnefort <vdonnefort@google.com>
> 
> Vincent,
> 
> Can you please rebase these on linux-kselftest next branch and
> resend.  This patch doesn't apply.
> 
> Also please fix the subject to say:
> 
> selfttests/ring-buffer

Will do, but it depends linux-trace/ring-buffer/for-next which hasn't make it
yet to linux-next.

Re: [PATCH RESEND 1/2] ring-buffer/selftest: Verify the entire meta-page padding

[Shuah Khan]

On 9/11/24 01:52, Vincent Donnefort wrote:
> On Tue, Sep 10, 2024 at 12:49:58PM -0600, Shuah Khan wrote:
>> On 9/10/24 10:45, Steven Rostedt wrote:
>>>
>>> Shuah,
>>>
>>> Can you take this through your tree?
>>>
>>> Acked-by: Steven Rostedt (Google) <rostedt@goodmis.org>
>>
>> I can take this through my tree.
>>
>>>
>>> -- Steve
>>>
>>>
>>> On Tue, 10 Sep 2024 17:23:34 +0100
>>> Vincent Donnefort <vdonnefort@google.com> wrote:
>>>
>>>> Improve the ring-buffer meta-page test coverage by checking for the
>>>> entire padding region to be 0 instead of just looking at the first 4
>>>> bytes.
>>>>
>>>> Cc: Shuah Khan <skhan@linuxfoundation.org>
>>>> Cc: linux-kselftest@vger.kernel.org
>>>> Signed-off-by: Vincent Donnefort <vdonnefort@google.com>
>>
>> Vincent,
>>
>> Can you please rebase these on linux-kselftest next branch and
>> resend.  This patch doesn't apply.
>>
>> Also please fix the subject to say:
>>
>> selfttests/ring-buffer
> 
> Will do, but it depends linux-trace/ring-buffer/for-next which hasn't make it
> yet to linux-next.

In which case it has to go through tracing tree.

Steve, This is yours to take due to the dependency on linux-trace/ring-buffer/for-next

Acked-by: Shuah Khan <skhan@linuxfoundation.org>

thanks,
-- Shuah

Re: [PATCH RESEND 2/2] ring-buffer/selftest: Handle meta-page bigger than the system

[Shuah Khan]

On 9/10/24 12:50, Shuah Khan wrote:
> On 9/10/24 10:45, Steven Rostedt wrote:
>>
>> Shuah,
>>
>> Can you take this through your tree?
>>
>> Acked-by: Steven Rostedt (Google) <rostedt@goodmis.org>
> 
> Yes I can take it through my tree.
> 
>>
>> -- Steve
>>
>> On Tue, 10 Sep 2024 17:23:35 +0100
>> Vincent Donnefort <vdonnefort@google.com> wrote:
>>
>>> Handle the case where the meta-page content is bigger than the system
>>> page-size. This prepares the ground for extending features covered by
>>> the meta-page.
>>>
>>> Cc: Shuah Khan <skhan@linuxfoundation.org>
>>> Cc: linux-kselftest@vger.kernel.org
>>> Signed-off-by: Vincent Donnefort <vdonnefort@google.com>
> 
> Vincent,
> 
> Can you please rebase these on linux-kselftest next branch and
> resend. This patch doesn't apply.
> 
> Also please fix the subject to say:
> 
> selfttests/ring-buffer

Once this is fixed:

Steve, This is yours to take due to the dependency on linux-trace/ring-buffer/for-next

Acked-by: Shuah Khan <skhan@linuxfoundation.org>

thanks,
-- Shuah

Re: [PATCH RESEND 1/2] ring-buffer/selftest: Verify the entire meta-page padding

[Steven Rostedt]

On Wed, 11 Sep 2024 08:52:11 +0100
Vincent Donnefort <vdonnefort@google.com> wrote:

> > selfttests/ring-buffer  
> 
> Will do, but it depends linux-trace/ring-buffer/for-next which hasn't make it
> yet to linux-next.

Ah, I missed that you updated the selftest in one of your other patches.

That should have been a separate patch, as it works with the current
upstream code (just tested it against 6.11-rc7). That's my fault for
missing it in the review.

And after applying these changes on top of it, 6.11-rc7 still works as well.

But since it's in for-next, might as well keep it there as the merge window
is about to open.

-- Steve

Re: [PATCH RESEND 2/2] ring-buffer/selftest: Handle meta-page bigger than the system

[Steven Rostedt]

On Wed, 11 Sep 2024 10:07:40 -0600
Shuah Khan <skhan@linuxfoundation.org> wrote:

> Once this is fixed:
> 
> Steve, This is yours to take due to the dependency on linux-trace/ring-buffer/for-next
> 
> Acked-by: Shuah Khan <skhan@linuxfoundation.org>

Thanks, I'll add it to my for-next queue.

-- Steve