Message ID | 20220407062052.15907-4-imagedong@tencent.com (mailing list archive) |
---|---|
State | Accepted |
Commit | 41a95a00ebeffd4d735977d8c602d77fb6b3eed2 |
Delegated to: | Netdev Maintainers |
Headers | show |
Series | net: icmp: add skb drop reasons to icmp | expand |
Context | Check | Description |
---|---|---|
netdev/tree_selection | success | Clearly marked for net-next, async |
netdev/fixes_present | success | Fixes tag not required for -next series |
netdev/subject_prefix | success | Link |
netdev/cover_letter | success | Series has a cover letter |
netdev/patch_count | success | Link |
netdev/header_inline | success | No static functions without inline keyword in header files |
netdev/build_32bit | success | Errors and warnings before: 2 this patch: 2 |
netdev/cc_maintainers | success | CCed 6 of 6 maintainers |
netdev/build_clang | success | Errors and warnings before: 9 this patch: 9 |
netdev/module_param | success | Was 0 now: 0 |
netdev/verify_signedoff | success | Signed-off-by tag matches author and committer |
netdev/verify_fixes | success | No Fixes tag |
netdev/build_allmodconfig_warn | success | Errors and warnings before: 2 this patch: 2 |
netdev/checkpatch | success | total: 0 errors, 0 warnings, 0 checks, 29 lines checked |
netdev/kdoc | success | Errors and warnings before: 0 this patch: 0 |
netdev/source_inline | success | Was 0 now: 0 |
On 4/7/22 12:20 AM, menglong8.dong@gmail.com wrote: > From: Menglong Dong <imagedong@tencent.com> > > In order to avoid to change the return value of ping_queue_rcv_skb(), > introduce the function __ping_queue_rcv_skb(), which is able to report > the reasons of skb drop as its return value, as Paolo suggested. > > Meanwhile, make ping_queue_rcv_skb() a simple call to > __ping_queue_rcv_skb(). > > The kfree_skb() and sock_queue_rcv_skb() used in ping_queue_rcv_skb() > are replaced with kfree_skb_reason() and sock_queue_rcv_skb_reason() > now. > > Reviewed-by: Hao Peng <flyingpeng@tencent.com> > Reviewed-by: Jiang Biao <benbjiang@tencent.com> > Signed-off-by: Menglong Dong <imagedong@tencent.com> > --- > v4: > - fix the return value problem of ping_queue_rcv_skb() > > v3: > - fix aligenment problem > > v2: > - introduce __ping_queue_rcv_skb() instead of change the return value > of ping_queue_rcv_skb() > --- > net/ipv4/ping.c | 18 +++++++++++++----- > 1 file changed, 13 insertions(+), 5 deletions(-) > Reviewed-by: David Ahern <dsahern@kernel.org>
diff --git a/net/ipv4/ping.c b/net/ipv4/ping.c index 3ee947557b88..877270ad17c9 100644 --- a/net/ipv4/ping.c +++ b/net/ipv4/ping.c @@ -934,16 +934,24 @@ int ping_recvmsg(struct sock *sk, struct msghdr *msg, size_t len, int noblock, } EXPORT_SYMBOL_GPL(ping_recvmsg); -int ping_queue_rcv_skb(struct sock *sk, struct sk_buff *skb) +static enum skb_drop_reason __ping_queue_rcv_skb(struct sock *sk, + struct sk_buff *skb) { + enum skb_drop_reason reason; + pr_debug("ping_queue_rcv_skb(sk=%p,sk->num=%d,skb=%p)\n", inet_sk(sk), inet_sk(sk)->inet_num, skb); - if (sock_queue_rcv_skb(sk, skb) < 0) { - kfree_skb(skb); + if (sock_queue_rcv_skb_reason(sk, skb, &reason) < 0) { + kfree_skb_reason(skb, reason); pr_debug("ping_queue_rcv_skb -> failed\n"); - return -1; + return reason; } - return 0; + return SKB_NOT_DROPPED_YET; +} + +int ping_queue_rcv_skb(struct sock *sk, struct sk_buff *skb) +{ + return __ping_queue_rcv_skb(sk, skb) ? -1 : 0; } EXPORT_SYMBOL_GPL(ping_queue_rcv_skb);