Re: [PATCH] net: add net namespace inode for all net_dev events
On Wed, Mar 10, 2021 at 11:31:12AM -0500, Steven Rostedt wrote: > On Wed, 10 Mar 2021 17:03:40 +0800 > Tony Lu wrote: > > > I use pahole to read vmlinux.o directly with defconfig and > > CONFIG_DEBUG_INFO enabled, the result shows 22 structs prefixed with > > trace_event_raw_ that have at least one hole. > > I was thinking of pahole too ;-) > > But the information can also be captured from the format files with simple > scripts as well. And perhaps be more tuned to see if there's actually a fix > for them, and ignore reporting it if there is no fix, as all trace events > are 4 byte aligned, and if we are off by one, sometimes it doesn't matter. I am going to send a patch to fix this issue later. There are many events have more than 1 holes, I am trying to pick up the events that are really to be fixed. Cheers, Tony Lu > > -- Steve
Re: [PATCH] net: add net namespace inode for all net_dev events
On Wed, 10 Mar 2021 17:03:40 +0800 Tony Lu wrote: > On Tue, Mar 09, 2021 at 12:40:11PM -0500, Steven Rostedt wrote: > > The above shows 10 bytes wasted for this event. > > > > I use pahole to read vmlinux.o directly with defconfig and > CONFIG_DEBUG_INFO enabled, the result shows 22 structs prefixed with > trace_event_raw_ that have at least one hole. > > > pahole shows there are 5 holes with 10 bytes in net_dev_start_xmit event. > Oh, an I'm glad that my analysis matched with pahole ;-) -- Steve
Re: [PATCH] net: add net namespace inode for all net_dev events
On Wed, 10 Mar 2021 17:03:40 +0800 Tony Lu wrote: > I use pahole to read vmlinux.o directly with defconfig and > CONFIG_DEBUG_INFO enabled, the result shows 22 structs prefixed with > trace_event_raw_ that have at least one hole. I was thinking of pahole too ;-) But the information can also be captured from the format files with simple scripts as well. And perhaps be more tuned to see if there's actually a fix for them, and ignore reporting it if there is no fix, as all trace events are 4 byte aligned, and if we are off by one, sometimes it doesn't matter. -- Steve
Re: [PATCH] net: add net namespace inode for all net_dev events
On Wed, Mar 10, 2021 at 09:22:34AM +, Lorenz Bauer wrote:
> On Tue, 9 Mar 2021 at 20:12, Eric Dumazet wrote:
> >
> > On 3/9/21 5:43 AM, Tony Lu wrote:
> > > There are lots of net namespaces on the host runs containers like k8s.
> > > It is very common to see the same interface names among different net
> > > namespaces, such as eth0. It is not possible to distinguish them without
> > > net namespace inode.
> > >
> > > This adds net namespace inode for all net_dev events, help us
> > > distinguish between different net devices.
> > >
> > > Output:
> > > -0 [006] ..s. 133.306989: net_dev_xmit:
> > > net_inum=4026531992 dev=eth0 skbaddr=11a87c68 len=54 rc=0
> > >
> > > Signed-off-by: Tony Lu
> > > ---
> > >
> >
> > There was a proposal from Lorenz to use netns cookies (SO_NETNS_COOKIE)
> > instead.
> >
> > They have a guarantee of being not reused.
> >
> > After 3d368ab87cf6681f9 ("net: initialize net->net_cookie at netns setup")
> > net->net_cookie is directly available.
>
> The patch set is at
> https://lore.kernel.org/bpf/20210219154330.93615-1-...@cloudflare.com/
> but I decided to abandon it. I can work around my issue by comparing
> the netns inode of two processes, which is "good enough" for now.
Without the patch set, it is impossible to get net_cookie from
userspace, except bpf prog. AFAIK, netns inode has been widely used to
distinguish different netns, it is easy to use for docker
(/proc/${container_pid}/ns/net). It would be better to provide a unified
approach to do so.
Cheers,
Tony Lu
>
> --
> Lorenz Bauer | Systems Engineer
> 6th Floor, County Hall/The Riverside Building, SE1 7PB, UK
>
> www.cloudflare.com
Re: [PATCH] net: add net namespace inode for all net_dev events
On Tue, Mar 09, 2021 at 09:12:45PM +0100, Eric Dumazet wrote:
>
>
> On 3/9/21 5:43 AM, Tony Lu wrote:
> > There are lots of net namespaces on the host runs containers like k8s.
> > It is very common to see the same interface names among different net
> > namespaces, such as eth0. It is not possible to distinguish them without
> > net namespace inode.
> >
> > This adds net namespace inode for all net_dev events, help us
> > distinguish between different net devices.
> >
> > Output:
> > -0 [006] ..s. 133.306989: net_dev_xmit: net_inum=4026531992
> > dev=eth0 skbaddr=11a87c68 len=54 rc=0
> >
> > Signed-off-by: Tony Lu
> > ---
> >
>
> There was a proposal from Lorenz to use netns cookies (SO_NETNS_COOKIE)
> instead.
>
> They have a guarantee of being not reused.
>
> After 3d368ab87cf6681f9 ("net: initialize net->net_cookie at netns setup")
> net->net_cookie is directly available.
It looks better to identify ns with net_cookie rather than inode, and
get the value with NS_GET_COOKIE. I will switch net_inum to net_cookie
in the next patch.
Cheers,
Tony Lu
>
Re: [PATCH] net: add net namespace inode for all net_dev events
On Tue, 9 Mar 2021 at 20:12, Eric Dumazet wrote:
>
> On 3/9/21 5:43 AM, Tony Lu wrote:
> > There are lots of net namespaces on the host runs containers like k8s.
> > It is very common to see the same interface names among different net
> > namespaces, such as eth0. It is not possible to distinguish them without
> > net namespace inode.
> >
> > This adds net namespace inode for all net_dev events, help us
> > distinguish between different net devices.
> >
> > Output:
> > -0 [006] ..s. 133.306989: net_dev_xmit: net_inum=4026531992
> > dev=eth0 skbaddr=11a87c68 len=54 rc=0
> >
> > Signed-off-by: Tony Lu
> > ---
> >
>
> There was a proposal from Lorenz to use netns cookies (SO_NETNS_COOKIE)
> instead.
>
> They have a guarantee of being not reused.
>
> After 3d368ab87cf6681f9 ("net: initialize net->net_cookie at netns setup")
> net->net_cookie is directly available.
The patch set is at
https://lore.kernel.org/bpf/20210219154330.93615-1-...@cloudflare.com/
but I decided to abandon it. I can work around my issue by comparing
the netns inode of two processes, which is "good enough" for now.
--
Lorenz Bauer | Systems Engineer
6th Floor, County Hall/The Riverside Building, SE1 7PB, UK
www.cloudflare.com
Re: [PATCH] net: add net namespace inode for all net_dev events
On Tue, Mar 09, 2021 at 12:40:11PM -0500, Steven Rostedt wrote: > On Tue, 9 Mar 2021 12:43:50 +0800 > Tony Lu wrote: > > > There are lots of net namespaces on the host runs containers like k8s. > > It is very common to see the same interface names among different net > > namespaces, such as eth0. It is not possible to distinguish them without > > net namespace inode. > > > > This adds net namespace inode for all net_dev events, help us > > distinguish between different net devices. > > > > Output: > > -0 [006] ..s. 133.306989: net_dev_xmit: net_inum=4026531992 > > dev=eth0 skbaddr=11a87c68 len=54 rc=0 > > > > Signed-off-by: Tony Lu > > --- > > include/trace/events/net.h | 35 +-- > > 1 file changed, 25 insertions(+), 10 deletions(-) > > > > diff --git a/include/trace/events/net.h b/include/trace/events/net.h > > index 2399073c3afc..a52f90d83411 100644 > > --- a/include/trace/events/net.h > > +++ b/include/trace/events/net.h > > @@ -35,6 +35,7 @@ TRACE_EVENT(net_dev_start_xmit, > > __field(u16,gso_size) > > __field(u16,gso_segs) > > __field(u16,gso_type) > > + __field(unsigned int, net_inum) > > ), > > This patch made me take a look at the net_dev_start_xmit trace event, and I > see it's very "holy". That is, it has lots of holes in the structure. > > TP_STRUCT__entry( > __string( name, dev->name ) > __field(u16,queue_mapping ) > __field(const void *, skbaddr ) > __field(bool, vlan_tagged ) > __field(u16,vlan_proto ) > __field(u16,vlan_tci) > __field(u16,protocol) > __field(u8, ip_summed ) > __field(unsigned int, len ) > __field(unsigned int, data_len) > __field(int,network_offset ) > __field(bool, transport_offset_valid) > __field(int,transport_offset) > __field(u8, tx_flags) > __field(u16,gso_size) > __field(u16,gso_segs) > __field(u16,gso_type) > __field(unsigned int, net_inum) > ), > > If you look at /sys/kernel/tracing/events/net/net_dev_start_xmit/format > > name: net_dev_start_xmit > ID: 1581 > format: > field:unsigned short common_type; offset:0; size:2; > signed:0; > field:unsigned char common_flags; offset:2; size:1; > signed:0; > field:unsigned char common_preempt_count; offset:3; size:1; > signed:0; > field:int common_pid; offset:4; size:4; signed:1; > > field:__data_loc char[] name; offset:8; size:4; signed:1; > field:u16 queue_mapping;offset:12; size:2; signed:0; > field:const void * skbaddr; offset:16; size:8; signed:0; > > Notice, queue_mapping is 2 bytes at offset 12 (ends at offset 14), but > skbaddr starts at offset 16. That means there's two bytes wasted. > > field:bool vlan_tagged; offset:24; size:1; signed:0; > field:u16 vlan_proto; offset:26; size:2; signed:0; > > Another byte missing above (24 + 1 != 26) > > field:u16 vlan_tci; offset:28; size:2; signed:0; > field:u16 protocol; offset:30; size:2; signed:0; > field:u8 ip_summed; offset:32; size:1; signed:0; > field:unsigned int len; offset:36; size:4; signed:0; > > Again another three bytes missing (32 + 1 != 36) > > field:unsigned int data_len;offset:40; size:4; signed:0; > field:int network_offset; offset:44; size:4; signed:1; > field:bool transport_offset_valid; offset:48; size:1; > signed:0; > field:int transport_offset; offset:52; size:4; signed:1; > > Again, another 3 bytes missing (48 + 1 != 52) > > field:u8 tx_flags; offset:56; size:1; signed:0; > field:u16 gso_size; offset:58; size:2; signed:0; > > Another byte missing (56 + 1 != 58) > > field:u16 gso_segs; offset:60; size:2; signed:0; > field:u16 gso_type; offset:62; size:2; signed:0; > field:unsigned int net_inum;offset:64; size:4; signed:0; > > The above shows 10
Re: [PATCH] net: add net namespace inode for all net_dev events
On Tue, Mar 9, 2021 at 12:37 PM Steven Rostedt wrote: > > The size of the fields and order changes all the time in various events. I > recommend doing so *all the time*. If you upgrade a kernel, then all the bpf > programs you have for that kernel should also be updated. You can't rely on > fields being the same, size or order. The best you can do is expect the > field to continue to exist, and that's not even a guarantee. +1. Tracing bpf progs already do that. Old style tracing progs do it based on the kernel version. New style is using CO-RE.
Re: [PATCH] net: add net namespace inode for all net_dev events
On Tue, 9 Mar 2021 13:17:23 -0700
David Ahern wrote:
> On 3/9/21 1:02 PM, Steven Rostedt wrote:
> > On Tue, 9 Mar 2021 12:53:37 -0700
> > David Ahern wrote:
> >
> >> Changing the order of the fields will impact any bpf programs expecting
> >> the existing format
> >
> > I thought bpf programs were not API. And why are they not parsing this
> > information? They have these offsets hard coded Why would they do that!
> > The information to extract the data where ever it is has been there from
> > day 1! Way before BPF ever had access to trace events.
>
> BPF programs attached to a tracepoint are passed a context - a structure
> based on the format for the tracepoint. To take an in-tree example, look
> at samples/bpf/offwaketime_kern.c:
>
> ...
>
> /* taken from /sys/kernel/debug/tracing/events/sched/sched_switch/format */
> struct sched_switch_args {
> unsigned long long pad;
> char prev_comm[16];
> int prev_pid;
> int prev_prio;
> long long prev_state;
> char next_comm[16];
> int next_pid;
> int next_prio;
> };
> SEC("tracepoint/sched/sched_switch")
> int oncpu(struct sched_switch_args *ctx)
> {
>
> ...
>
> Production systems do not typically have toolchains installed, so
> dynamic generation of the program based on the 'format' file on the
> running system is not realistic. That means creating the programs on a
> development machine and installing on the production box. Further, there
> is an expectation that a bpf program compiled against version X works on
> version Y. Changing the order of the fields will break such programs in
> non-obvious ways.
The size of the fields and order changes all the time in various events. I
recommend doing so *all the time*. If you upgrade a kernel, then all the bpf
programs you have for that kernel should also be updated. You can't rely on
fields being the same, size or order. The best you can do is expect the
field to continue to exist, and that's not even a guarantee.
I'm not sure how that sample is used. I can't find "oncpu()" anywhere in
that directory besides where it is defined, and I wouldn't think a bpf
program would just blindly map the fields without verifying them.
-- Steve
Re: [PATCH] net: add net namespace inode for all net_dev events
On Tue, Mar 9, 2021 at 12:18 PM David Ahern wrote:
>
> On 3/9/21 1:02 PM, Steven Rostedt wrote:
> > On Tue, 9 Mar 2021 12:53:37 -0700
> > David Ahern wrote:
> >
> >> Changing the order of the fields will impact any bpf programs expecting
> >> the existing format
> >
> > I thought bpf programs were not API. And why are they not parsing this
> > information? They have these offsets hard coded Why would they do that!
> > The information to extract the data where ever it is has been there from
> > day 1! Way before BPF ever had access to trace events.
>
> BPF programs attached to a tracepoint are passed a context - a structure
> based on the format for the tracepoint. To take an in-tree example, look
> at samples/bpf/offwaketime_kern.c:
>
> ...
>
> /* taken from /sys/kernel/debug/tracing/events/sched/sched_switch/format */
> struct sched_switch_args {
> unsigned long long pad;
> char prev_comm[16];
> int prev_pid;
> int prev_prio;
> long long prev_state;
> char next_comm[16];
> int next_pid;
> int next_prio;
> };
> SEC("tracepoint/sched/sched_switch")
> int oncpu(struct sched_switch_args *ctx)
> {
>
> ...
>
> Production systems do not typically have toolchains installed, so
> dynamic generation of the program based on the 'format' file on the
> running system is not realistic. That means creating the programs on a
> development machine and installing on the production box. Further, there
> is an expectation that a bpf program compiled against version X works on
> version Y.
This is not true.
Re: [PATCH] net: add net namespace inode for all net_dev events
On Tue, Mar 9, 2021 at 12:03 PM Steven Rostedt wrote: > > On Tue, 9 Mar 2021 12:53:37 -0700 > David Ahern wrote: > > > Changing the order of the fields will impact any bpf programs expecting > > the existing format > > I thought bpf programs were not API. That is correct.
Re: [PATCH] net: add net namespace inode for all net_dev events
On 3/9/21 1:02 PM, Steven Rostedt wrote:
> On Tue, 9 Mar 2021 12:53:37 -0700
> David Ahern wrote:
>
>> Changing the order of the fields will impact any bpf programs expecting
>> the existing format
>
> I thought bpf programs were not API. And why are they not parsing this
> information? They have these offsets hard coded Why would they do that!
> The information to extract the data where ever it is has been there from
> day 1! Way before BPF ever had access to trace events.
BPF programs attached to a tracepoint are passed a context - a structure
based on the format for the tracepoint. To take an in-tree example, look
at samples/bpf/offwaketime_kern.c:
...
/* taken from /sys/kernel/debug/tracing/events/sched/sched_switch/format */
struct sched_switch_args {
unsigned long long pad;
char prev_comm[16];
int prev_pid;
int prev_prio;
long long prev_state;
char next_comm[16];
int next_pid;
int next_prio;
};
SEC("tracepoint/sched/sched_switch")
int oncpu(struct sched_switch_args *ctx)
{
...
Production systems do not typically have toolchains installed, so
dynamic generation of the program based on the 'format' file on the
running system is not realistic. That means creating the programs on a
development machine and installing on the production box. Further, there
is an expectation that a bpf program compiled against version X works on
version Y. Changing the order of the fields will break such programs in
non-obvious ways.
Re: [PATCH] net: add net namespace inode for all net_dev events
On 3/9/21 5:43 AM, Tony Lu wrote:
> There are lots of net namespaces on the host runs containers like k8s.
> It is very common to see the same interface names among different net
> namespaces, such as eth0. It is not possible to distinguish them without
> net namespace inode.
>
> This adds net namespace inode for all net_dev events, help us
> distinguish between different net devices.
>
> Output:
> -0 [006] ..s. 133.306989: net_dev_xmit: net_inum=4026531992
> dev=eth0 skbaddr=11a87c68 len=54 rc=0
>
> Signed-off-by: Tony Lu
> ---
>
There was a proposal from Lorenz to use netns cookies (SO_NETNS_COOKIE) instead.
They have a guarantee of being not reused.
After 3d368ab87cf6681f9 ("net: initialize net->net_cookie at netns setup")
net->net_cookie is directly available.
Re: [PATCH] net: add net namespace inode for all net_dev events
On Tue, 9 Mar 2021 12:53:37 -0700 David Ahern wrote: > Changing the order of the fields will impact any bpf programs expecting > the existing format I thought bpf programs were not API. And why are they not parsing this information? They have these offsets hard coded Why would they do that! The information to extract the data where ever it is has been there from day 1! Way before BPF ever had access to trace events. Please, STOP HARD CODING FIELD OFFSETS This is why people do not want to use trace points in the first place. Because tools do stupid things. -- Steve
Re: [PATCH] net: add net namespace inode for all net_dev events
On 3/9/21 10:40 AM, Steven Rostedt wrote: > The order of the fields is important. Don't worry about breaking API by > fixing it. The parsing code uses this output to find where the binary data > is. Changing the order of the fields will impact any bpf programs expecting the existing format.
Re: [PATCH] net: add net namespace inode for all net_dev events
On Tue, 9 Mar 2021 12:43:50 +0800 Tony Lu wrote: > There are lots of net namespaces on the host runs containers like k8s. > It is very common to see the same interface names among different net > namespaces, such as eth0. It is not possible to distinguish them without > net namespace inode. > > This adds net namespace inode for all net_dev events, help us > distinguish between different net devices. > > Output: > -0 [006] ..s. 133.306989: net_dev_xmit: net_inum=4026531992 > dev=eth0 skbaddr=11a87c68 len=54 rc=0 > > Signed-off-by: Tony Lu > --- > include/trace/events/net.h | 35 +-- > 1 file changed, 25 insertions(+), 10 deletions(-) > > diff --git a/include/trace/events/net.h b/include/trace/events/net.h > index 2399073c3afc..a52f90d83411 100644 > --- a/include/trace/events/net.h > +++ b/include/trace/events/net.h > @@ -35,6 +35,7 @@ TRACE_EVENT(net_dev_start_xmit, > __field(u16,gso_size) > __field(u16,gso_segs) > __field(u16,gso_type) > + __field(unsigned int, net_inum) > ), This patch made me take a look at the net_dev_start_xmit trace event, and I see it's very "holy". That is, it has lots of holes in the structure. TP_STRUCT__entry( __string( name, dev->name ) __field(u16,queue_mapping ) __field(const void *, skbaddr ) __field(bool, vlan_tagged ) __field(u16,vlan_proto ) __field(u16,vlan_tci) __field(u16,protocol) __field(u8, ip_summed ) __field(unsigned int, len ) __field(unsigned int, data_len) __field(int,network_offset ) __field(bool, transport_offset_valid) __field(int,transport_offset) __field(u8, tx_flags) __field(u16,gso_size) __field(u16,gso_segs) __field(u16,gso_type) __field(unsigned int, net_inum) ), If you look at /sys/kernel/tracing/events/net/net_dev_start_xmit/format name: net_dev_start_xmit ID: 1581 format: field:unsigned short common_type; offset:0; size:2; signed:0; field:unsigned char common_flags; offset:2; size:1; signed:0; field:unsigned char common_preempt_count; offset:3; size:1; signed:0; field:int common_pid; offset:4; size:4; signed:1; field:__data_loc char[] name; offset:8; size:4; signed:1; field:u16 queue_mapping;offset:12; size:2; signed:0; field:const void * skbaddr; offset:16; size:8; signed:0; Notice, queue_mapping is 2 bytes at offset 12 (ends at offset 14), but skbaddr starts at offset 16. That means there's two bytes wasted. field:bool vlan_tagged; offset:24; size:1; signed:0; field:u16 vlan_proto; offset:26; size:2; signed:0; Another byte missing above (24 + 1 != 26) field:u16 vlan_tci; offset:28; size:2; signed:0; field:u16 protocol; offset:30; size:2; signed:0; field:u8 ip_summed; offset:32; size:1; signed:0; field:unsigned int len; offset:36; size:4; signed:0; Again another three bytes missing (32 + 1 != 36) field:unsigned int data_len;offset:40; size:4; signed:0; field:int network_offset; offset:44; size:4; signed:1; field:bool transport_offset_valid; offset:48; size:1; signed:0; field:int transport_offset; offset:52; size:4; signed:1; Again, another 3 bytes missing (48 + 1 != 52) field:u8 tx_flags; offset:56; size:1; signed:0; field:u16 gso_size; offset:58; size:2; signed:0; Another byte missing (56 + 1 != 58) field:u16 gso_segs; offset:60; size:2; signed:0; field:u16 gso_type; offset:62; size:2; signed:0; field:unsigned int net_inum;offset:64; size:4; signed:0; The above shows 10 bytes wasted for this event. The order of the fields is important. Don't worry about breaking API by fixing it. The parsing code uses this output to find where the binary data is.
[PATCH] net: add net namespace inode for all net_dev events
There are lots of net namespaces on the host runs containers like k8s.
It is very common to see the same interface names among different net
namespaces, such as eth0. It is not possible to distinguish them without
net namespace inode.
This adds net namespace inode for all net_dev events, help us
distinguish between different net devices.
Output:
-0 [006] ..s. 133.306989: net_dev_xmit: net_inum=4026531992
dev=eth0 skbaddr=11a87c68 len=54 rc=0
Signed-off-by: Tony Lu
---
include/trace/events/net.h | 35 +--
1 file changed, 25 insertions(+), 10 deletions(-)
diff --git a/include/trace/events/net.h b/include/trace/events/net.h
index 2399073c3afc..a52f90d83411 100644
--- a/include/trace/events/net.h
+++ b/include/trace/events/net.h
@@ -35,6 +35,7 @@ TRACE_EVENT(net_dev_start_xmit,
__field(u16,gso_size)
__field(u16,gso_segs)
__field(u16,gso_type)
+ __field(unsigned int, net_inum)
),
TP_fast_assign(
@@ -56,10 +57,12 @@ TRACE_EVENT(net_dev_start_xmit,
__entry->gso_size = skb_shinfo(skb)->gso_size;
__entry->gso_segs = skb_shinfo(skb)->gso_segs;
__entry->gso_type = skb_shinfo(skb)->gso_type;
+ __entry->net_inum = dev_net(skb->dev)->ns.inum;
),
- TP_printk("dev=%s queue_mapping=%u skbaddr=%p vlan_tagged=%d
vlan_proto=0x%04x vlan_tci=0x%04x protocol=0x%04x ip_summed=%d len=%u
data_len=%u network_offset=%d transport_offset_valid=%d transport_offset=%d
tx_flags=%d gso_size=%d gso_segs=%d gso_type=%#x",
- __get_str(name), __entry->queue_mapping, __entry->skbaddr,
+ TP_printk("net_inum=%u dev=%s queue_mapping=%u skbaddr=%p
vlan_tagged=%d vlan_proto=0x%04x vlan_tci=0x%04x protocol=0x%04x ip_summed=%d
len=%u data_len=%u network_offset=%d transport_offset_valid=%d
transport_offset=%d tx_flags=%d gso_size=%d gso_segs=%d gso_type=%#x",
+ __entry->net_inum, __get_str(name), __entry->queue_mapping,
+ __entry->skbaddr,
__entry->vlan_tagged, __entry->vlan_proto, __entry->vlan_tci,
__entry->protocol, __entry->ip_summed, __entry->len,
__entry->data_len,
@@ -82,6 +85,7 @@ TRACE_EVENT(net_dev_xmit,
__field(unsigned int, len )
__field(int,rc )
__string( name, dev->name )
+ __field(unsigned int, net_inum)
),
TP_fast_assign(
@@ -89,10 +93,12 @@ TRACE_EVENT(net_dev_xmit,
__entry->len = skb_len;
__entry->rc = rc;
__assign_str(name, dev->name);
+ __entry->net_inum = dev_net(skb->dev)->ns.inum;
),
- TP_printk("dev=%s skbaddr=%p len=%u rc=%d",
- __get_str(name), __entry->skbaddr, __entry->len, __entry->rc)
+ TP_printk("net_inum=%u dev=%s skbaddr=%p len=%u rc=%d",
+ __entry->net_inum, __get_str(name), __entry->skbaddr,
+ __entry->len, __entry->rc)
);
TRACE_EVENT(net_dev_xmit_timeout,
@@ -106,16 +112,19 @@ TRACE_EVENT(net_dev_xmit_timeout,
__string( name, dev->name )
__string( driver, netdev_drivername(dev))
__field(int,queue_index )
+ __field(unsigned int, net_inum)
),
TP_fast_assign(
__assign_str(name, dev->name);
__assign_str(driver, netdev_drivername(dev));
__entry->queue_index = queue_index;
+ __entry->net_inum = dev_net(dev)->ns.inum;
),
- TP_printk("dev=%s driver=%s queue=%d",
- __get_str(name), __get_str(driver), __entry->queue_index)
+ TP_printk("net_inum=%u dev=%s driver=%s queue=%d",
+ __entry->net_inum, __get_str(name), __get_str(driver),
+ __entry->queue_index)
);
DECLARE_EVENT_CLASS(net_dev_template,
@@ -128,16 +137,19 @@ DECLARE_EVENT_CLASS(net_dev_template,
__field(void *, skbaddr )
__field(unsigned int, len )
__string( name, skb->dev->name )
+ __field(unsigned int, net_inum)
),
TP_fast_assign(
__entry->skbaddr = skb;
__entry->len = skb->len;
__assign_str(name, skb->dev->name);
+ __entry->net_inum = dev_net(skb->dev)->ns.inum;
),
- TP_printk("dev=%s skbaddr=%p len=%u",
- __get_str(name), __entry->skbaddr, __entry->len)
+
