[PATCH 2/4] perf cs-etm: Use previous thread for branch sample source IP

[Leo Yan]

On Thu, Jun 08, 2023 at 10:34:42AM +0100, James Clark wrote:

[...]

> >>> @@ -616,6 +618,8 @@ static void cs_etm__packet_swap(struct cs_etm_auxtrace *etm,
> >>>  		tmp = tidq->packet;
> >>>  		tidq->packet = tidq->prev_packet;
> >>>  		tidq->prev_packet = tmp;
> >>> +		thread__put(tidq->prev_thread);
> >>> +		tidq->prev_thread = thread__get(tidq->thread);
> >>
> >> Maybe cs_etm__packet_swap() is not the best place to update
> >> "tidq->prev_thread", since swapping packet doesn't mean it's necessarily
> >> thread switching; can we move this change into the cs_etm__set_thread()?
> >>
> > 
> > Yeah that might make more sense. I can move it there if we decide to
> > keep this change.
> > 
> 
> Unfortunately I don't think I can make this change. It seems like
> putting the previous thread swap in  cs_etm__set_thread() has different
> semantics to keeping all the swaps together in cs_etm__packet_swap().

Thanks for trying this.

> This is because if you swap the thread in cs_etm__packet_swap() the
> previous packet and next packet can have the _same_ thread if there
> happened to be no change. However if you only swap previous thread in
> cs_etm__set_thread(), that means that the previous thread is always
> different to the next one. This has a huge difference on the decoding
> because two adjacent packets on the same thread will say they branched
> from the previous thread that ran, not the previous thread on the
> previous packet.

Seems to me, this is a synchronization issue between the field
'tidq->prev_thread' and 'tidq->prev_packet'.

It's still hard for me to understand "two adjacent packets on the same
thread will say they branched from the previous thread that ran", IIUC,
even we move thread swapping into cs_etm__set_thread(), if the two
adjacent packets are in the same thread context, we can skip to update
fields 'tidq->prev_thread' and 'tidq->prev_packet'.

So I am curious if below cs_etm__set_thread() works or not?

static void cs_etm__set_thread(struct cs_etm_auxtrace *etm,
			       struct cs_etm_traceid_queue *tidq, pid_t tid)
{
	struct machine *machine = &etm->session->machines.host;

	/* No context switching, bail out */
	if ((tidq->thread->tid != tid)
		return;

	/* If tid is -1, we simply use idle thread context */
	if (tid == -1)
		goto find_idle_thread;

	/*
	 * The new incoming tid is different from current thread,
	 * so it's to switch to the next thread context.
	 */

	/* Swap thread contexts */
	thread__put(tidq->prev_thread);
	tidq->prev_thread = thread__get(tidq->thread);

	/* Find thread context for new tid */
	thread__zput(tidq->thread);
	tidq->thread = machine__find_thread(machine, -1, tid);

find_idle_thread:
	/* Couldn't find a known thread */
	if (!tidq->thread)
		tidq->thread = machine__idle_thread(machine);
}

Thanks,
Leo