Message ID | 20220126072306.3218272-1-imagedong@tencent.com (mailing list archive) |
---|---|
State | Superseded |
Delegated to: | Netdev Maintainers |
Headers | show |
Series | [v2,net-next] net: drop_monitor: support drop reason | expand |
On Wed, 26 Jan 2022 15:23:06 +0800 menglong8.dong@gmail.com wrote: > @@ -606,12 +610,17 @@ static int net_dm_packet_report_in_port_put(struct sk_buff *msg, int ifindex, > static int net_dm_packet_report_fill(struct sk_buff *msg, struct sk_buff *skb, > size_t payload_len) > { > - u64 pc = (u64)(uintptr_t) NET_DM_SKB_CB(skb)->pc; > + struct net_dm_skb_cb *cb = NET_DM_SKB_CB(skb); > char buf[NET_DM_MAX_SYMBOL_LEN]; > + enum skb_drop_reason reason; > struct nlattr *attr; > void *hdr; > + u64 pc; > int rc; > > + pc = (u64)(uintptr_t)cb->pc; > + reason = cb->reason; > + > hdr = genlmsg_put(msg, 0, 0, &net_drop_monitor_family, 0, > NET_DM_CMD_PACKET_ALERT); > if (!hdr) > @@ -623,6 +632,9 @@ static int net_dm_packet_report_fill(struct sk_buff *msg, struct sk_buff *skb, > if (nla_put_u64_64bit(msg, NET_DM_ATTR_PC, pc, NET_DM_ATTR_PAD)) > goto nla_put_failure; > > + if (nla_put_u32(msg, NET_DM_ATTR_REASON, reason)) Why the temporary variable instead of referring to cb->reason directly? > + goto nla_put_failure;
On Thu, Jan 27, 2022 at 10:48 AM Jakub Kicinski <kuba@kernel.org> wrote: > > On Wed, 26 Jan 2022 15:23:06 +0800 menglong8.dong@gmail.com wrote: > > @@ -606,12 +610,17 @@ static int net_dm_packet_report_in_port_put(struct sk_buff *msg, int ifindex, > > static int net_dm_packet_report_fill(struct sk_buff *msg, struct sk_buff *skb, > > size_t payload_len) > > { > > - u64 pc = (u64)(uintptr_t) NET_DM_SKB_CB(skb)->pc; > > + struct net_dm_skb_cb *cb = NET_DM_SKB_CB(skb); > > char buf[NET_DM_MAX_SYMBOL_LEN]; > > + enum skb_drop_reason reason; > > struct nlattr *attr; > > void *hdr; > > + u64 pc; > > int rc; > > > > + pc = (u64)(uintptr_t)cb->pc; > > + reason = cb->reason; > > + > > hdr = genlmsg_put(msg, 0, 0, &net_drop_monitor_family, 0, > > NET_DM_CMD_PACKET_ALERT); > > if (!hdr) > > @@ -623,6 +632,9 @@ static int net_dm_packet_report_fill(struct sk_buff *msg, struct sk_buff *skb, > > if (nla_put_u64_64bit(msg, NET_DM_ATTR_PC, pc, NET_DM_ATTR_PAD)) > > goto nla_put_failure; > > > > + if (nla_put_u32(msg, NET_DM_ATTR_REASON, reason)) > > Why the temporary variable instead of referring to cb->reason directly? Good question......v3 is coming > > > + goto nla_put_failure;
diff --git a/include/uapi/linux/net_dropmon.h b/include/uapi/linux/net_dropmon.h index 66048cc5d7b3..b2815166dbc2 100644 --- a/include/uapi/linux/net_dropmon.h +++ b/include/uapi/linux/net_dropmon.h @@ -93,6 +93,7 @@ enum net_dm_attr { NET_DM_ATTR_SW_DROPS, /* flag */ NET_DM_ATTR_HW_DROPS, /* flag */ NET_DM_ATTR_FLOW_ACTION_COOKIE, /* binary */ + NET_DM_ATTR_REASON, /* u32 */ __NET_DM_ATTR_MAX, NET_DM_ATTR_MAX = __NET_DM_ATTR_MAX - 1 diff --git a/net/core/drop_monitor.c b/net/core/drop_monitor.c index 7b288a121a41..b5d8e19ccc1d 100644 --- a/net/core/drop_monitor.c +++ b/net/core/drop_monitor.c @@ -126,6 +126,7 @@ struct net_dm_skb_cb { struct devlink_trap_metadata *hw_metadata; void *pc; }; + enum skb_drop_reason reason; }; #define NET_DM_SKB_CB(__skb) ((struct net_dm_skb_cb *)&((__skb)->cb[0])) @@ -498,6 +499,7 @@ static void net_dm_packet_trace_kfree_skb_hit(void *ignore, { ktime_t tstamp = ktime_get_real(); struct per_cpu_dm_data *data; + struct net_dm_skb_cb *cb; struct sk_buff *nskb; unsigned long flags; @@ -508,7 +510,9 @@ static void net_dm_packet_trace_kfree_skb_hit(void *ignore, if (!nskb) return; - NET_DM_SKB_CB(nskb)->pc = location; + cb = NET_DM_SKB_CB(nskb); + cb->reason = reason; + cb->pc = location; /* Override the timestamp because we care about the time when the * packet was dropped. */ @@ -606,12 +610,17 @@ static int net_dm_packet_report_in_port_put(struct sk_buff *msg, int ifindex, static int net_dm_packet_report_fill(struct sk_buff *msg, struct sk_buff *skb, size_t payload_len) { - u64 pc = (u64)(uintptr_t) NET_DM_SKB_CB(skb)->pc; + struct net_dm_skb_cb *cb = NET_DM_SKB_CB(skb); char buf[NET_DM_MAX_SYMBOL_LEN]; + enum skb_drop_reason reason; struct nlattr *attr; void *hdr; + u64 pc; int rc; + pc = (u64)(uintptr_t)cb->pc; + reason = cb->reason; + hdr = genlmsg_put(msg, 0, 0, &net_drop_monitor_family, 0, NET_DM_CMD_PACKET_ALERT); if (!hdr) @@ -623,6 +632,9 @@ static int net_dm_packet_report_fill(struct sk_buff *msg, struct sk_buff *skb, if (nla_put_u64_64bit(msg, NET_DM_ATTR_PC, pc, NET_DM_ATTR_PAD)) goto nla_put_failure; + if (nla_put_u32(msg, NET_DM_ATTR_REASON, reason)) + goto nla_put_failure; + snprintf(buf, sizeof(buf), "%pS", NET_DM_SKB_CB(skb)->pc); if (nla_put_string(msg, NET_DM_ATTR_SYMBOL, buf)) goto nla_put_failure;