RE: [PATCH v14 01/22] tracing: Update some tracing_map constants and comments

[åæéå / HIRAMATUïMASAMI]

Hi Tom,

From: Tom Zanussi [mailto:tom.zanussi@xxxxxxxxxxxxxxx]
>
>Make it clear exactly how many keys and values are supported through
>better defines, and add 1 to the vals count, since normally clients
>want support for at least a hitcount and two other values.

OK, but would that (increment the vals count) be possible to apply
later patch? I think we'd better make this a cleanup patch.

Thank you,

>
>Also, note the error return value for tracing_map_add_key/val_field()
>in the comments.
>
>Signed-off-by: Tom Zanussi <tom.zanussi@xxxxxxxxxxxxxxx>
>---
> kernel/trace/tracing_map.c | 4 ++--
> kernel/trace/tracing_map.h | 5 +++--
> 2 files changed, 5 insertions(+), 4 deletions(-)
>
>diff --git a/kernel/trace/tracing_map.c b/kernel/trace/tracing_map.c
>index dd6401d..e0f1729 100644
>--- a/kernel/trace/tracing_map.c
>+++ b/kernel/trace/tracing_map.c
>@@ -163,7 +163,7 @@ static int tracing_map_add_field(struct tracing_map *map,
>  * tracing_map_update_sum() or reading it via tracing_map_read_sum().
>  *
>  * Return: The index identifying the field in the map and associated
>- * tracing_map_elts.
>+ * tracing_map_elts, or -EINVAL on error.
>  */
> int tracing_map_add_sum_field(struct tracing_map *map)
> {
>@@ -184,7 +184,7 @@ int tracing_map_add_sum_field(struct tracing_map *map)
>  * the key referenced by this key field resides.
>  *
>  * Return: The index identifying the field in the map and associated
>- * tracing_map_elts.
>+ * tracing_map_elts, or -EINVAL on error.
>  */
> int tracing_map_add_key_field(struct tracing_map *map,
> 			      unsigned int offset,
>diff --git a/kernel/trace/tracing_map.h b/kernel/trace/tracing_map.h
>index 7571825..b575d0b 100644
>--- a/kernel/trace/tracing_map.h
>+++ b/kernel/trace/tracing_map.h
>@@ -5,9 +5,10 @@
> #define TRACING_MAP_BITS_MAX		17
> #define TRACING_MAP_BITS_MIN		7
>
>-#define TRACING_MAP_FIELDS_MAX		4
> #define TRACING_MAP_KEYS_MAX		2
>-
>+#define TRACING_MAP_VALS_MAX		3
>+#define TRACING_MAP_FIELDS_MAX		(TRACING_MAP_KEYS_MAX + \
>+					 TRACING_MAP_VALS_MAX)
> #define TRACING_MAP_SORT_KEYS_MAX	2
>
> typedef int (*tracing_map_cmp_fn_t) (void *val_a, void *val_b);
>--
>1.9.3