2024-04-25 16:08:10

by Colin Ian King

[permalink] [raw]
Subject: [PATCH][next] ALSA: kunit: make read-only array buf_samples static const

Don't populate the read-only array buf_samples on the stack at
run time, instead make it static const.

Signed-off-by: Colin Ian King <[email protected]>
---
sound/core/sound_kunit.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sound/core/sound_kunit.c b/sound/core/sound_kunit.c
index eb90f62228c0..e34c4317f5eb 100644
--- a/sound/core/sound_kunit.c
+++ b/sound/core/sound_kunit.c
@@ -167,7 +167,7 @@ static void _test_fill_silence(struct kunit *test, struct snd_format_test_data *

static void test_format_fill_silence(struct kunit *test)
{
- u32 buf_samples[] = { 10, 20, 32, 64, 129, SILENCE_BUFFER_MAX_FRAMES };
+ static const u32 buf_samples[] = { 10, 20, 32, 64, 129, SILENCE_BUFFER_MAX_FRAMES };
u8 *buffer;
u32 i, j;

--
2.39.2



2024-04-25 23:23:22

by Takashi Sakamoto

[permalink] [raw]
Subject: Re: [PATCH][next] ALSA: kunit: make read-only array buf_samples static const

Hi,

On Thu, Apr 25, 2024 at 05:07:54PM +0100, Colin Ian King wrote:
> Don't populate the read-only array buf_samples on the stack at
> run time, instead make it static const.
>
> Signed-off-by: Colin Ian King <[email protected]>
> ---
> sound/core/sound_kunit.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/sound/core/sound_kunit.c b/sound/core/sound_kunit.c
> index eb90f62228c0..e34c4317f5eb 100644
> --- a/sound/core/sound_kunit.c
> +++ b/sound/core/sound_kunit.c
> @@ -167,7 +167,7 @@ static void _test_fill_silence(struct kunit *test, struct snd_format_test_data *
>
> static void test_format_fill_silence(struct kunit *test)
> {
> - u32 buf_samples[] = { 10, 20, 32, 64, 129, SILENCE_BUFFER_MAX_FRAMES };
> + static const u32 buf_samples[] = { 10, 20, 32, 64, 129, SILENCE_BUFFER_MAX_FRAMES };
> u8 *buffer;
> u32 i, j;

Reviewed-by: Takashi Sakamoto <[email protected]>

We can see the other similar cases in the kunit file. I'll post the fix
later.


Thanks

Takashi Sakamoto

2024-04-26 10:28:53

by Ivan Orlov

[permalink] [raw]
Subject: Re: [PATCH][next] ALSA: kunit: make read-only array buf_samples static const

On 4/25/24 17:07, Colin Ian King wrote:
> Don't populate the read-only array buf_samples on the stack at
> run time, instead make it static const.
>
> Signed-off-by: Colin Ian King <[email protected]>
> ---
> sound/core/sound_kunit.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/sound/core/sound_kunit.c b/sound/core/sound_kunit.c
> index eb90f62228c0..e34c4317f5eb 100644
> --- a/sound/core/sound_kunit.c
> +++ b/sound/core/sound_kunit.c
> @@ -167,7 +167,7 @@ static void _test_fill_silence(struct kunit *test, struct snd_format_test_data *
>
> static void test_format_fill_silence(struct kunit *test)
> {
> - u32 buf_samples[] = { 10, 20, 32, 64, 129, SILENCE_BUFFER_MAX_FRAMES };
> + static const u32 buf_samples[] = { 10, 20, 32, 64, 129, SILENCE_BUFFER_MAX_FRAMES };
> u8 *buffer;
> u32 i, j;
>

Hi Colin,

Thank you for fixing this issue.

Acked-by: Ivan Orlov <[email protected]>

--
Kind regards,
Ivan Orlov


2024-04-26 12:06:07

by Ivan Orlov

[permalink] [raw]
Subject: Re: [PATCH][next] ALSA: kunit: make read-only array buf_samples static const

On 4/26/24 00:22, Takashi Sakamoto wrote:
> Hi,
>
> On Thu, Apr 25, 2024 at 05:07:54PM +0100, Colin Ian King wrote:
>> Don't populate the read-only array buf_samples on the stack at
>> run time, instead make it static const.
>>
>> Signed-off-by: Colin Ian King <[email protected]>
>> ---
>> sound/core/sound_kunit.c | 2 +-
>> 1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/sound/core/sound_kunit.c b/sound/core/sound_kunit.c
>> index eb90f62228c0..e34c4317f5eb 100644
>> --- a/sound/core/sound_kunit.c
>> +++ b/sound/core/sound_kunit.c
>> @@ -167,7 +167,7 @@ static void _test_fill_silence(struct kunit *test, struct snd_format_test_data *
>>
>> static void test_format_fill_silence(struct kunit *test)
>> {
>> - u32 buf_samples[] = { 10, 20, 32, 64, 129, SILENCE_BUFFER_MAX_FRAMES };
>> + static const u32 buf_samples[] = { 10, 20, 32, 64, 129, SILENCE_BUFFER_MAX_FRAMES };
>> u8 *buffer;
>> u32 i, j;
>
> Reviewed-by: Takashi Sakamoto <[email protected]>
>
> We can see the other similar cases in the kunit file. I'll post the fix
> later.
>

Hi Takashi,

Hmm, correct me if I'm wrong, but I don't see any other significant
allocations on the stack in the test.

--
Kind regards,
Ivan Orlov


2024-04-26 15:08:37

by Takashi Iwai

[permalink] [raw]
Subject: Re: [PATCH][next] ALSA: kunit: make read-only array buf_samples static const

On Thu, 25 Apr 2024 18:07:54 +0200,
Colin Ian King wrote:
>
> Don't populate the read-only array buf_samples on the stack at
> run time, instead make it static const.
>
> Signed-off-by: Colin Ian King <[email protected]>

Thanks, applied now.


Takashi

2024-04-26 15:09:29

by Takashi Iwai

[permalink] [raw]
Subject: Re: [PATCH][next] ALSA: kunit: make read-only array buf_samples static const

On Fri, 26 Apr 2024 14:05:34 +0200,
Ivan Orlov wrote:
>
> On 4/26/24 00:22, Takashi Sakamoto wrote:
> > Hi,
> >
> > On Thu, Apr 25, 2024 at 05:07:54PM +0100, Colin Ian King wrote:
> >> Don't populate the read-only array buf_samples on the stack at
> >> run time, instead make it static const.
> >>
> >> Signed-off-by: Colin Ian King <[email protected]>
> >> ---
> >> sound/core/sound_kunit.c | 2 +-
> >> 1 file changed, 1 insertion(+), 1 deletion(-)
> >>
> >> diff --git a/sound/core/sound_kunit.c b/sound/core/sound_kunit.c
> >> index eb90f62228c0..e34c4317f5eb 100644
> >> --- a/sound/core/sound_kunit.c
> >> +++ b/sound/core/sound_kunit.c
> >> @@ -167,7 +167,7 @@ static void _test_fill_silence(struct kunit *test, struct snd_format_test_data *
> >> static void test_format_fill_silence(struct kunit *test)
> >> {
> >> - u32 buf_samples[] = { 10, 20, 32, 64, 129, SILENCE_BUFFER_MAX_FRAMES };
> >> + static const u32 buf_samples[] = { 10, 20, 32, 64, 129, SILENCE_BUFFER_MAX_FRAMES };
> >> u8 *buffer;
> >> u32 i, j;
> >
> > Reviewed-by: Takashi Sakamoto <[email protected]>
> >
> > We can see the other similar cases in the kunit file. I'll post the fix
> > later.
> >
>
> Hi Takashi,
>
> Hmm, correct me if I'm wrong, but I don't see any other significant
> allocations on the stack in the test.

I guess he meant slightly different ones
https://lore.kernel.org/r/[email protected]


Takashi

2024-04-26 23:22:53

by Ivan Orlov

[permalink] [raw]
Subject: Re: [PATCH][next] ALSA: kunit: make read-only array buf_samples static const

On 4/26/24 16:08, Takashi Iwai wrote:
> On Fri, 26 Apr 2024 14:05:34 +0200,
> Ivan Orlov wrote:
>>
>> On 4/26/24 00:22, Takashi Sakamoto wrote:
>>> Hi,
>>>
>>> On Thu, Apr 25, 2024 at 05:07:54PM +0100, Colin Ian King wrote:
>>>> Don't populate the read-only array buf_samples on the stack at
>>>> run time, instead make it static const.
>>>>
>>>> Signed-off-by: Colin Ian King <[email protected]>
>>>> ---
>>>> sound/core/sound_kunit.c | 2 +-
>>>> 1 file changed, 1 insertion(+), 1 deletion(-)
>>>>
>>>> diff --git a/sound/core/sound_kunit.c b/sound/core/sound_kunit.c
>>>> index eb90f62228c0..e34c4317f5eb 100644
>>>> --- a/sound/core/sound_kunit.c
>>>> +++ b/sound/core/sound_kunit.c
>>>> @@ -167,7 +167,7 @@ static void _test_fill_silence(struct kunit *test, struct snd_format_test_data *
>>>> static void test_format_fill_silence(struct kunit *test)
>>>> {
>>>> - u32 buf_samples[] = { 10, 20, 32, 64, 129, SILENCE_BUFFER_MAX_FRAMES };
>>>> + static const u32 buf_samples[] = { 10, 20, 32, 64, 129, SILENCE_BUFFER_MAX_FRAMES };
>>>> u8 *buffer;
>>>> u32 i, j;
>>>
>>> Reviewed-by: Takashi Sakamoto <[email protected]>
>>>
>>> We can see the other similar cases in the kunit file. I'll post the fix
>>> later.
>>>
>>
>> Hi Takashi,
>>
>> Hmm, correct me if I'm wrong, but I don't see any other significant
>> allocations on the stack in the test.
>
> I guess he meant slightly different ones
> https://lore.kernel.org/r/[email protected]
>

Ah, alright, found it. Thank you!

--
Kind regards,
Ivan Orlov