Skip to content

Commit

Permalink
Merge branch 'neigh-tracepoints'
Browse files Browse the repository at this point in the history 
Roopa Prabhu says:

====================
tracepoints in neighbor subsystem

Roopa Prabhu (2):
  trace: events: add a few neigh tracepoints
  neigh: hook tracepoints in neigh update code
====================

Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
David S. Miller committed Feb 17, 2019
2 parents 9e8ccd8 + 56dd18a commit 3c136c5
Show file tree
Hide file tree
Showing 3 changed files with 223 additions and 0 deletions.
204 changes: 204 additions & 0 deletions include/trace/events/neigh.h
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,204 @@
#undef TRACE_SYSTEM
#define TRACE_SYSTEM neigh

#if !defined(_TRACE_NEIGH_H) || defined(TRACE_HEADER_MULTI_READ)
#define _TRACE_NEIGH_H

#include <linux/skbuff.h>
#include <linux/netdevice.h>
#include <linux/tracepoint.h>
#include <net/neighbour.h>

#define neigh_state_str(state) \
__print_symbolic(state, \
{ NUD_INCOMPLETE, "incomplete" }, \
{ NUD_REACHABLE, "reachable" }, \
{ NUD_STALE, "stale" }, \
{ NUD_DELAY, "delay" }, \
{ NUD_PROBE, "probe" }, \
{ NUD_FAILED, "failed" })

TRACE_EVENT(neigh_update,

TP_PROTO(struct neighbour *n, const u8 *lladdr, u8 new,
u32 flags, u32 nlmsg_pid),

TP_ARGS(n, lladdr, new, flags, nlmsg_pid),

TP_STRUCT__entry(
__field(u32, family)
__string(dev, (n->dev ? n->dev->name : "NULL"))
__array(u8, lladdr, MAX_ADDR_LEN)
__field(u8, lladdr_len)
__field(u8, flags)
__field(u8, nud_state)
__field(u8, type)
__field(u8, dead)
__field(int, refcnt)
__array(__u8, primary_key4, 4)
__array(__u8, primary_key6, 16)
__field(unsigned long, confirmed)
__field(unsigned long, updated)
__field(unsigned long, used)
__array(u8, new_lladdr, MAX_ADDR_LEN)
__field(u8, new_state)
__field(u32, update_flags)
__field(u32, pid)
),

TP_fast_assign(
int lladdr_len = (n->dev ? n->dev->addr_len : MAX_ADDR_LEN);
struct in6_addr *pin6;
__be32 *p32;

__entry->family = n->tbl->family;
__assign_str(dev, (n->dev ? n->dev->name : "NULL"));
__entry->lladdr_len = lladdr_len;
memcpy(__entry->lladdr, n->ha, lladdr_len);
__entry->flags = n->flags;
__entry->nud_state = n->nud_state;
__entry->type = n->type;
__entry->dead = n->dead;
__entry->refcnt = refcount_read(&n->refcnt);
pin6 = (struct in6_addr *)__entry->primary_key6;
p32 = (__be32 *)__entry->primary_key4;

if (n->tbl->family == AF_INET)
*p32 = *(__be32 *)n->primary_key;
else
*p32 = 0;

#if IS_ENABLED(CONFIG_IPV6)
if (n->tbl->family == AF_INET6) {
pin6 = (struct in6_addr *)__entry->primary_key6;
*pin6 = *(struct in6_addr *)n->primary_key;
} else
#endif
{
ipv6_addr_set_v4mapped(*p32, pin6);
}
__entry->confirmed = n->confirmed;
__entry->updated = n->updated;
__entry->used = n->used;
if (lladdr)
memcpy(__entry->new_lladdr, lladdr, lladdr_len);
__entry->new_state = new;
__entry->update_flags = flags;
__entry->pid = nlmsg_pid;
),

TP_printk("family %d dev %s lladdr %s flags %02x nud_state %s type %02x "
"dead %d refcnt %d primary_key4 %pI4 primary_key6 %pI6c "
"confirmed %lu updated %lu used %lu new_lladdr %s "
"new_state %02x update_flags %02x pid %d",
__entry->family, __get_str(dev),
__print_hex_str(__entry->lladdr, __entry->lladdr_len),
__entry->flags, neigh_state_str(__entry->nud_state),
__entry->type, __entry->dead, __entry->refcnt,
__entry->primary_key4, __entry->primary_key6,
__entry->confirmed, __entry->updated, __entry->used,
__print_hex_str(__entry->new_lladdr, __entry->lladdr_len),
__entry->new_state,
__entry->update_flags, __entry->pid)
);

DECLARE_EVENT_CLASS(neigh__update,
TP_PROTO(struct neighbour *n, int err),
TP_ARGS(n, err),
TP_STRUCT__entry(
__field(u32, family)
__string(dev, (n->dev ? n->dev->name : "NULL"))
__array(u8, lladdr, MAX_ADDR_LEN)
__field(u8, lladdr_len)
__field(u8, flags)
__field(u8, nud_state)
__field(u8, type)
__field(u8, dead)
__field(int, refcnt)
__array(__u8, primary_key4, 4)
__array(__u8, primary_key6, 16)
__field(unsigned long, confirmed)
__field(unsigned long, updated)
__field(unsigned long, used)
__field(u32, err)
),

TP_fast_assign(
int lladdr_len = (n->dev ? n->dev->addr_len : MAX_ADDR_LEN);
struct in6_addr *pin6;
__be32 *p32;

__entry->family = n->tbl->family;
__assign_str(dev, (n->dev ? n->dev->name : "NULL"));
__entry->lladdr_len = lladdr_len;
memcpy(__entry->lladdr, n->ha, lladdr_len);
__entry->flags = n->flags;
__entry->nud_state = n->nud_state;
__entry->type = n->type;
__entry->dead = n->dead;
__entry->refcnt = refcount_read(&n->refcnt);
pin6 = (struct in6_addr *)__entry->primary_key6;
p32 = (__be32 *)__entry->primary_key4;

if (n->tbl->family == AF_INET)
*p32 = *(__be32 *)n->primary_key;
else
*p32 = 0;

#if IS_ENABLED(CONFIG_IPV6)
if (n->tbl->family == AF_INET6) {
pin6 = (struct in6_addr *)__entry->primary_key6;
*pin6 = *(struct in6_addr *)n->primary_key;
} else
#endif
{
ipv6_addr_set_v4mapped(*p32, pin6);
}

__entry->confirmed = n->confirmed;
__entry->updated = n->updated;
__entry->used = n->used;
__entry->err = err;
),

TP_printk("family %d dev %s lladdr %s flags %02x nud_state %s type %02x "
"dead %d refcnt %d primary_key4 %pI4 primary_key6 %pI6c "
"confirmed %lu updated %lu used %lu err %d",
__entry->family, __get_str(dev),
__print_hex_str(__entry->lladdr, __entry->lladdr_len),
__entry->flags, neigh_state_str(__entry->nud_state),
__entry->type, __entry->dead, __entry->refcnt,
__entry->primary_key4, __entry->primary_key6,
__entry->confirmed, __entry->updated, __entry->used,
__entry->err)
);

DEFINE_EVENT(neigh__update, neigh_update_done,
TP_PROTO(struct neighbour *neigh, int err),
TP_ARGS(neigh, err)
);

DEFINE_EVENT(neigh__update, neigh_timer_handler,
TP_PROTO(struct neighbour *neigh, int err),
TP_ARGS(neigh, err)
);

DEFINE_EVENT(neigh__update, neigh_event_send_done,
TP_PROTO(struct neighbour *neigh, int err),
TP_ARGS(neigh, err)
);

DEFINE_EVENT(neigh__update, neigh_event_send_dead,
TP_PROTO(struct neighbour *neigh, int err),
TP_ARGS(neigh, err)
);

DEFINE_EVENT(neigh__update, neigh_cleanup_and_release,
TP_PROTO(struct neighbour *neigh, int rc),
TP_ARGS(neigh, rc)
);

#endif /* _TRACE_NEIGH_H */

/* This part must be outside protection */
#include <trace/define_trace.h>
11 changes: 11 additions & 0 deletions net/core/neighbour.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,8 @@
#include <linux/inetdevice.h>
#include <net/addrconf.h>

#include <trace/events/neigh.h>

#define DEBUG
#define NEIGH_DEBUG 1
#define neigh_dbg(level, fmt, ...) \
Expand Down Expand Up @@ -102,6 +104,7 @@ static void neigh_cleanup_and_release(struct neighbour *neigh)
if (neigh->parms->neigh_cleanup)
neigh->parms->neigh_cleanup(neigh);

trace_neigh_cleanup_and_release(neigh, 0);
__neigh_notify(neigh, RTM_DELNEIGH, 0, 0);
call_netevent_notifiers(NETEVENT_NEIGH_UPDATE, neigh);
neigh_release(neigh);
Expand Down Expand Up @@ -1095,6 +1098,8 @@ static void neigh_timer_handler(struct timer_list *t)
if (notify)
neigh_update_notify(neigh, 0);

trace_neigh_timer_handler(neigh, 0);

neigh_release(neigh);
}

Expand Down Expand Up @@ -1165,13 +1170,15 @@ int __neigh_event_send(struct neighbour *neigh, struct sk_buff *skb)
else
write_unlock(&neigh->lock);
local_bh_enable();
trace_neigh_event_send_done(neigh, rc);
return rc;

out_dead:
if (neigh->nud_state & NUD_STALE)
goto out_unlock_bh;
write_unlock_bh(&neigh->lock);
kfree_skb(skb);
trace_neigh_event_send_dead(neigh, 1);
return 1;
}
EXPORT_SYMBOL(__neigh_event_send);
Expand Down Expand Up @@ -1227,6 +1234,8 @@ static int __neigh_update(struct neighbour *neigh, const u8 *lladdr,
struct net_device *dev;
int update_isrouter = 0;

trace_neigh_update(neigh, lladdr, new, flags, nlmsg_pid);

write_lock_bh(&neigh->lock);

dev = neigh->dev;
Expand Down Expand Up @@ -1393,6 +1402,8 @@ static int __neigh_update(struct neighbour *neigh, const u8 *lladdr,
if (notify)
neigh_update_notify(neigh, nlmsg_pid);

trace_neigh_update_done(neigh, err);

return err;
}

Expand Down
8 changes: 8 additions & 0 deletions net/core/net-traces.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,14 @@ EXPORT_TRACEPOINT_SYMBOL_GPL(fdb_delete);
EXPORT_TRACEPOINT_SYMBOL_GPL(br_fdb_update);
#endif

#include <trace/events/neigh.h>
EXPORT_TRACEPOINT_SYMBOL_GPL(neigh_update);
EXPORT_TRACEPOINT_SYMBOL_GPL(neigh_update_done);
EXPORT_TRACEPOINT_SYMBOL_GPL(neigh_timer_handler);
EXPORT_TRACEPOINT_SYMBOL_GPL(neigh_event_send_done);
EXPORT_TRACEPOINT_SYMBOL_GPL(neigh_event_send_dead);
EXPORT_TRACEPOINT_SYMBOL_GPL(neigh_cleanup_and_release);

EXPORT_TRACEPOINT_SYMBOL_GPL(kfree_skb);

EXPORT_TRACEPOINT_SYMBOL_GPL(napi_poll);
Expand Down

0 comments on commit 3c136c5

Please sign in to comment.