After commit 4f36c2d85ced ("tracing: Increase tracing map KEYS_MAX size"),
'keys' supports up to three fields.

Signed-off-by: Zheng Yejian <zhengyejian1@huawei.com>
---
 Documentation/trace/histogram.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Documentation/trace/histogram.rst b/Documentation/trace/histogram.rst
index c1b685a38f6b..87bd772836c0 100644
--- a/Documentation/trace/histogram.rst
+++ b/Documentation/trace/histogram.rst
@@ -39,7 +39,7 @@ Documentation written by Tom Zanussi
   will use the event's kernel stacktrace as the key.  The keywords
   'keys' or 'key' can be used to specify keys, and the keywords
   'values', 'vals', or 'val' can be used to specify values.  Compound
-  keys consisting of up to two fields can be specified by the 'keys'
+  keys consisting of up to three fields can be specified by the 'keys'
   keyword.  Hashing a compound key produces a unique entry in the
   table for each unique combination of component keys, and can be
   useful for providing more fine-grained summaries of event data.
-- 
2.25.1

On Mon, 17 Oct 2022 10:38:06 +0000
Zheng Yejian <zhengyejian1@huawei.com> wrote:

> After commit 4f36c2d85ced ("tracing: Increase tracing map KEYS_MAX size"),
> 'keys' supports up to three fields.

This looks good to me.

Acked-by: Masami Hiramatsu (Google) <mhiramat@kernel.org>

Steve, do you this this document fix should go into the stable trees?

Thank you,

> 
> Signed-off-by: Zheng Yejian <zhengyejian1@huawei.com>
> ---
>  Documentation/trace/histogram.rst | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/Documentation/trace/histogram.rst b/Documentation/trace/histogram.rst
> index c1b685a38f6b..87bd772836c0 100644
> --- a/Documentation/trace/histogram.rst
> +++ b/Documentation/trace/histogram.rst
> @@ -39,7 +39,7 @@ Documentation written by Tom Zanussi
>    will use the event's kernel stacktrace as the key.  The keywords
>    'keys' or 'key' can be used to specify keys, and the keywords
>    'values', 'vals', or 'val' can be used to specify values.  Compound
> -  keys consisting of up to two fields can be specified by the 'keys'
> +  keys consisting of up to three fields can be specified by the 'keys'
>    keyword.  Hashing a compound key produces a unique entry in the
>    table for each unique combination of component keys, and can be
>    useful for providing more fine-grained summaries of event data.
> -- 
> 2.25.1
> 


-- 
Masami Hiramatsu (Google) <mhiramat@kernel.org>

On Wed, 19 Oct 2022 00:31:34 +0900
Masami Hiramatsu (Google) <mhiramat@kernel.org> wrote:

> On Mon, 17 Oct 2022 10:38:06 +0000
> Zheng Yejian <zhengyejian1@huawei.com> wrote:
> 
> > After commit 4f36c2d85ced ("tracing: Increase tracing map KEYS_MAX size"),
> > 'keys' supports up to three fields.  
> 
> This looks good to me.
> 
> Acked-by: Masami Hiramatsu (Google) <mhiramat@kernel.org>

Thanks Masami.

> 
> Steve, do you this this document fix should go into the stable trees?

We could label it as stable. Sure.

Jon, do you want to tag this for stable and pull it through your tree?

Should probably add a Fixes tag with the above commit.

-- Steve


> 
> Thank you,
> 
> > 
> > Signed-off-by: Zheng Yejian <zhengyejian1@huawei.com>
> > ---
> >  Documentation/trace/histogram.rst | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> > 
> > diff --git a/Documentation/trace/histogram.rst b/Documentation/trace/histogram.rst
> > index c1b685a38f6b..87bd772836c0 100644
> > --- a/Documentation/trace/histogram.rst
> > +++ b/Documentation/trace/histogram.rst
> > @@ -39,7 +39,7 @@ Documentation written by Tom Zanussi
> >    will use the event's kernel stacktrace as the key.  The keywords
> >    'keys' or 'key' can be used to specify keys, and the keywords
> >    'values', 'vals', or 'val' can be used to specify values.  Compound
> > -  keys consisting of up to two fields can be specified by the 'keys'
> > +  keys consisting of up to three fields can be specified by the 'keys'
> >    keyword.  Hashing a compound key produces a unique entry in the
> >    table for each unique combination of component keys, and can be
> >    useful for providing more fine-grained summaries of event data.
> > -- 
> > 2.25.1
> >   
> 
>

Steven Rostedt <rostedt@goodmis.org> writes:

> On Wed, 19 Oct 2022 00:31:34 +0900
> Masami Hiramatsu (Google) <mhiramat@kernel.org> wrote:
>
>> On Mon, 17 Oct 2022 10:38:06 +0000
>> Zheng Yejian <zhengyejian1@huawei.com> wrote:
>> 
>> > After commit 4f36c2d85ced ("tracing: Increase tracing map KEYS_MAX size"),
>> > 'keys' supports up to three fields.  
>> 
>> This looks good to me.
>> 
>> Acked-by: Masami Hiramatsu (Google) <mhiramat@kernel.org>
>
> Thanks Masami.
>
>> 
>> Steve, do you this this document fix should go into the stable trees?
>
> We could label it as stable. Sure.
>
> Jon, do you want to tag this for stable and pull it through your tree?

Sure, I can do that.

Thanks,

jon

On Tue, 18 Oct 2022 09:49:51 -0600
Jonathan Corbet <corbet@lwn.net> wrote:

> > Jon, do you want to tag this for stable and pull it through your tree?  
> 
> Sure, I can do that.

Thanks Jon!

-- Steve