From: Ido Schimmel <idosch@idosch.org>
To: menglong8.dong@gmail.com
Cc: kuba@kernel.org, rostedt@goodmis.org, nhorman@tuxdriver.com,
davem@davemloft.net, netdev@vger.kernel.org,
linux-kernel@vger.kernel.org, dsahern@kernel.org,
Menglong Dong <imagedong@tencent.com>
Subject: Re: [PATCH v4 net-next] net: drop_monitor: support drop reason
Date: Sun, 30 Jan 2022 11:12:19 +0200 [thread overview]
Message-ID: <YfZWcxX/3eDM+x/5@shredder> (raw)
In-Reply-To: <20220128045727.910974-1-imagedong@tencent.com>
On Fri, Jan 28, 2022 at 12:57:27PM +0800, menglong8.dong@gmail.com wrote:
> #define NET_DM_SKB_CB(__skb) ((struct net_dm_skb_cb *)&((__skb)->cb[0]))
> @@ -498,6 +509,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 +520,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,7 +620,7 @@ 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];
> struct nlattr *attr;
> void *hdr;
> @@ -620,10 +634,15 @@ static int net_dm_packet_report_fill(struct sk_buff *msg, struct sk_buff *skb,
> if (nla_put_u16(msg, NET_DM_ATTR_ORIGIN, NET_DM_ORIGIN_SW))
> goto nla_put_failure;
>
> - if (nla_put_u64_64bit(msg, NET_DM_ATTR_PC, pc, NET_DM_ATTR_PAD))
> + if (nla_put_u64_64bit(msg, NET_DM_ATTR_PC, (u64)(uintptr_t)cb->pc,
> + NET_DM_ATTR_PAD))
> + goto nla_put_failure;
> +
> + if (nla_put_string(msg, NET_DM_ATTR_REASON,
> + drop_reasons[cb->reason]))
> goto nla_put_failure;
Need to take the size into account when performing the allocation in
net_dm_packet_report_size()
>
> - snprintf(buf, sizeof(buf), "%pS", NET_DM_SKB_CB(skb)->pc);
> + snprintf(buf, sizeof(buf), "%pS", cb->pc);
> if (nla_put_string(msg, NET_DM_ATTR_SYMBOL, buf))
> goto nla_put_failure;
>
> --
> 2.27.0
>
prev parent reply other threads:[~2022-01-30 9:12 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-01-28 4:57 [PATCH v4 net-next] net: drop_monitor: support drop reason menglong8.dong
2022-01-30 9:12 ` Ido Schimmel [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=YfZWcxX/3eDM+x/5@shredder \
--to=idosch@idosch.org \
--cc=davem@davemloft.net \
--cc=dsahern@kernel.org \
--cc=imagedong@tencent.com \
--cc=kuba@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=menglong8.dong@gmail.com \
--cc=netdev@vger.kernel.org \
--cc=nhorman@tuxdriver.com \
--cc=rostedt@goodmis.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox