Macro TO_CS_QUEUE_NR definition has a typo, which uses 'trace_id_chan'
as its parameter, this doesn't match with its definition body which uses
'trace_chan_id'. So renames the parameter to 'trace_chan_id'.
It's luck to have a local variable 'trace_chan_id' in the function
cs_etm__setup_queue(), even we wrongly define the macro TO_CS_QUEUE_NR,
the local variable 'trace_chan_id' is used rather than the macro's
parameter 'trace_id_chan'; so the compiler doesn't complain for this
before.
After renaming the parameter, it leads to a compiling error due
cs_etm__setup_queue() has no variable 'trace_id_chan'. This patch uses
the variable 'trace_chan_id' for the macro so that fixes the compiling
error.
Signed-off-by: Leo Yan <[email protected]>
---
tools/perf/util/cs-etm.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/tools/perf/util/cs-etm.c b/tools/perf/util/cs-etm.c
index 4ba0f871f086..f5f855fff412 100644
--- a/tools/perf/util/cs-etm.c
+++ b/tools/perf/util/cs-etm.c
@@ -110,7 +110,7 @@ static int cs_etm__decode_data_block(struct cs_etm_queue *etmq);
* encode the etm queue number as the upper 16 bit and the channel as
* the lower 16 bit.
*/
-#define TO_CS_QUEUE_NR(queue_nr, trace_id_chan) \
+#define TO_CS_QUEUE_NR(queue_nr, trace_chan_id) \
(queue_nr << 16 | trace_chan_id)
#define TO_QUEUE_NR(cs_queue_nr) (cs_queue_nr >> 16)
#define TO_TRACE_CHAN_ID(cs_queue_nr) (cs_queue_nr & 0x0000ffff)
@@ -819,7 +819,7 @@ static int cs_etm__setup_queue(struct cs_etm_auxtrace *etm,
* Note that packets decoded above are still in the traceID's packet
* queue and will be processed in cs_etm__process_queues().
*/
- cs_queue_nr = TO_CS_QUEUE_NR(queue_nr, trace_id_chan);
+ cs_queue_nr = TO_CS_QUEUE_NR(queue_nr, trace_chan_id);
ret = auxtrace_heap__add(&etm->heap, cs_queue_nr, timestamp);
out:
return ret;
--
2.17.1
On Mon, 21 Oct 2019 at 01:48, Leo Yan <[email protected]> wrote:
>
> Macro TO_CS_QUEUE_NR definition has a typo, which uses 'trace_id_chan'
> as its parameter, this doesn't match with its definition body which uses
> 'trace_chan_id'. So renames the parameter to 'trace_chan_id'.
>
> It's luck to have a local variable 'trace_chan_id' in the function
> cs_etm__setup_queue(), even we wrongly define the macro TO_CS_QUEUE_NR,
> the local variable 'trace_chan_id' is used rather than the macro's
> parameter 'trace_id_chan'; so the compiler doesn't complain for this
> before.
>
> After renaming the parameter, it leads to a compiling error due
> cs_etm__setup_queue() has no variable 'trace_id_chan'. This patch uses
> the variable 'trace_chan_id' for the macro so that fixes the compiling
> error.
>
> Signed-off-by: Leo Yan <[email protected]>
> ---
> tools/perf/util/cs-etm.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/tools/perf/util/cs-etm.c b/tools/perf/util/cs-etm.c
> index 4ba0f871f086..f5f855fff412 100644
> --- a/tools/perf/util/cs-etm.c
> +++ b/tools/perf/util/cs-etm.c
> @@ -110,7 +110,7 @@ static int cs_etm__decode_data_block(struct cs_etm_queue *etmq);
> * encode the etm queue number as the upper 16 bit and the channel as
> * the lower 16 bit.
> */
> -#define TO_CS_QUEUE_NR(queue_nr, trace_id_chan) \
> +#define TO_CS_QUEUE_NR(queue_nr, trace_chan_id) \
> (queue_nr << 16 | trace_chan_id)
> #define TO_QUEUE_NR(cs_queue_nr) (cs_queue_nr >> 16)
> #define TO_TRACE_CHAN_ID(cs_queue_nr) (cs_queue_nr & 0x0000ffff)
> @@ -819,7 +819,7 @@ static int cs_etm__setup_queue(struct cs_etm_auxtrace *etm,
> * Note that packets decoded above are still in the traceID's packet
> * queue and will be processed in cs_etm__process_queues().
> */
> - cs_queue_nr = TO_CS_QUEUE_NR(queue_nr, trace_id_chan);
> + cs_queue_nr = TO_CS_QUEUE_NR(queue_nr, trace_chan_id);
> ret = auxtrace_heap__add(&etm->heap, cs_queue_nr, timestamp);
> out:
> return ret;
Really good catch - Arnaldo please consider.
Reviewed-by: Mathieu Poirier <[email protected]>
> --
> 2.17.1
>
Em Mon, Oct 21, 2019 at 11:42:21AM -0600, Mathieu Poirier escreveu:
> On Mon, 21 Oct 2019 at 01:48, Leo Yan <[email protected]> wrote:
> >
> > Macro TO_CS_QUEUE_NR definition has a typo, which uses 'trace_id_chan'
> > as its parameter, this doesn't match with its definition body which uses
> > 'trace_chan_id'. So renames the parameter to 'trace_chan_id'.
> >
> > It's luck to have a local variable 'trace_chan_id' in the function
> > cs_etm__setup_queue(), even we wrongly define the macro TO_CS_QUEUE_NR,
> > the local variable 'trace_chan_id' is used rather than the macro's
> > parameter 'trace_id_chan'; so the compiler doesn't complain for this
> > before.
> >
> > After renaming the parameter, it leads to a compiling error due
> > cs_etm__setup_queue() has no variable 'trace_id_chan'. This patch uses
> > the variable 'trace_chan_id' for the macro so that fixes the compiling
> > error.
> >
> > Signed-off-by: Leo Yan <[email protected]>
> > ---
> > tools/perf/util/cs-etm.c | 4 ++--
> > 1 file changed, 2 insertions(+), 2 deletions(-)
> >
> > diff --git a/tools/perf/util/cs-etm.c b/tools/perf/util/cs-etm.c
> > index 4ba0f871f086..f5f855fff412 100644
> > --- a/tools/perf/util/cs-etm.c
> > +++ b/tools/perf/util/cs-etm.c
> > @@ -110,7 +110,7 @@ static int cs_etm__decode_data_block(struct cs_etm_queue *etmq);
> > * encode the etm queue number as the upper 16 bit and the channel as
> > * the lower 16 bit.
> > */
> > -#define TO_CS_QUEUE_NR(queue_nr, trace_id_chan) \
> > +#define TO_CS_QUEUE_NR(queue_nr, trace_chan_id) \
> > (queue_nr << 16 | trace_chan_id)
> > #define TO_QUEUE_NR(cs_queue_nr) (cs_queue_nr >> 16)
> > #define TO_TRACE_CHAN_ID(cs_queue_nr) (cs_queue_nr & 0x0000ffff)
> > @@ -819,7 +819,7 @@ static int cs_etm__setup_queue(struct cs_etm_auxtrace *etm,
> > * Note that packets decoded above are still in the traceID's packet
> > * queue and will be processed in cs_etm__process_queues().
> > */
> > - cs_queue_nr = TO_CS_QUEUE_NR(queue_nr, trace_id_chan);
> > + cs_queue_nr = TO_CS_QUEUE_NR(queue_nr, trace_chan_id);
> > ret = auxtrace_heap__add(&etm->heap, cs_queue_nr, timestamp);
> > out:
> > return ret;
>
> Really good catch - Arnaldo please consider.
>
> Reviewed-by: Mathieu Poirier <[email protected]>
Thanks, applied.
- Arnaldo
The following commit has been merged into the perf/core branch of tip:
Commit-ID: 9d604aad4bb022e848dec80d6fe5f73fe87061a2
Gitweb: https://git.kernel.org/tip/9d604aad4bb022e848dec80d6fe5f73fe87061a2
Author: Leo Yan <[email protected]>
AuthorDate: Mon, 21 Oct 2019 15:48:08 +08:00
Committer: Arnaldo Carvalho de Melo <[email protected]>
CommitterDate: Wed, 06 Nov 2019 15:43:05 -03:00
perf cs-etm: Fix definition of macro TO_CS_QUEUE_NR
Macro TO_CS_QUEUE_NR definition has a typo, which uses 'trace_id_chan'
as its parameter, this doesn't match with its definition body which uses
'trace_chan_id'. So renames the parameter to 'trace_chan_id'.
It's luck to have a local variable 'trace_chan_id' in the function
cs_etm__setup_queue(), even we wrongly define the macro TO_CS_QUEUE_NR,
the local variable 'trace_chan_id' is used rather than the macro's
parameter 'trace_id_chan'; so the compiler doesn't complain for this
before.
After renaming the parameter, it leads to a compiling error due
cs_etm__setup_queue() has no variable 'trace_id_chan'. This patch uses
the variable 'trace_chan_id' for the macro so that fixes the compiling
error.
Signed-off-by: Leo Yan <[email protected]>
Reviewed-by: Mathieu Poirier <[email protected]>
Cc: Alexander Shishkin <[email protected]>
Cc: Jiri Olsa <[email protected]>
Cc: Mark Rutland <[email protected]>
Cc: Namhyung Kim <[email protected]>
Cc: Peter Zijlstra <[email protected]>
Cc: Suzuki Poulouse <[email protected]>
Cc: coresight ml <[email protected]>
Cc: [email protected]
Link: http://lore.kernel.org/lkml/[email protected]
Signed-off-by: Arnaldo Carvalho de Melo <[email protected]>
---
tools/perf/util/cs-etm.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/tools/perf/util/cs-etm.c b/tools/perf/util/cs-etm.c
index 4ba0f87..f5f855f 100644
--- a/tools/perf/util/cs-etm.c
+++ b/tools/perf/util/cs-etm.c
@@ -110,7 +110,7 @@ static int cs_etm__decode_data_block(struct cs_etm_queue *etmq);
* encode the etm queue number as the upper 16 bit and the channel as
* the lower 16 bit.
*/
-#define TO_CS_QUEUE_NR(queue_nr, trace_id_chan) \
+#define TO_CS_QUEUE_NR(queue_nr, trace_chan_id) \
(queue_nr << 16 | trace_chan_id)
#define TO_QUEUE_NR(cs_queue_nr) (cs_queue_nr >> 16)
#define TO_TRACE_CHAN_ID(cs_queue_nr) (cs_queue_nr & 0x0000ffff)
@@ -819,7 +819,7 @@ static int cs_etm__setup_queue(struct cs_etm_auxtrace *etm,
* Note that packets decoded above are still in the traceID's packet
* queue and will be processed in cs_etm__process_queues().
*/
- cs_queue_nr = TO_CS_QUEUE_NR(queue_nr, trace_id_chan);
+ cs_queue_nr = TO_CS_QUEUE_NR(queue_nr, trace_chan_id);
ret = auxtrace_heap__add(&etm->heap, cs_queue_nr, timestamp);
out:
return ret;