Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

net: fixup for tracepoint napi:napi_poll

The recent change to tracepoint napi:napi_poll changed the order of
the parameters that perf scripts sees, the printk was correct. The
problem was that the new parameters (work and budget) were pushed
in front of dev_name.

The new parameters obviously need to be appended to keep backward
compatible.

Fixes: 1db19db7f5ff ("net: tracepoint napi:napi_poll add work and budget")
Signed-off-by: Jesper Dangaard Brouer <brouer@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

authored by

Jesper Dangaard Brouer and committed by
David S. Miller
02a19877 362899b8

+2 -2
+2 -2
include/trace/events/napi.h
··· 18 18 19 19 TP_STRUCT__entry( 20 20 __field( struct napi_struct *, napi) 21 + __string( dev_name, napi->dev ? napi->dev->name : NO_DEV) 21 22 __field( int, work) 22 23 __field( int, budget) 23 - __string( dev_name, napi->dev ? napi->dev->name : NO_DEV) 24 24 ), 25 25 26 26 TP_fast_assign( 27 27 __entry->napi = napi; 28 + __assign_str(dev_name, napi->dev ? napi->dev->name : NO_DEV); 28 29 __entry->work = work; 29 30 __entry->budget = budget; 30 - __assign_str(dev_name, napi->dev ? napi->dev->name : NO_DEV); 31 31 ), 32 32 33 33 TP_printk("napi poll on napi struct %p for device %s work %d budget %d",