lkml.org 
[lkml]   [2022]   [Jul]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.15 077/201] net: socket: rename SKB_DROP_REASON_SOCKET_FILTER
    Date
    From: Menglong Dong <imagedong@tencent.com>

    [ Upstream commit 364df53c081d93fcfd6b91085ff2650c7f17b3c7 ]

    Rename SKB_DROP_REASON_SOCKET_FILTER, which is used
    as the reason of skb drop out of socket filter before
    it's part of a released kernel. It will be used for
    more protocols than just TCP in future series.

    Signed-off-by: Menglong Dong <imagedong@tencent.com>
    Reviewed-by: David Ahern <dsahern@kernel.org>
    Link: https://lore.kernel.org/all/20220127091308.91401-2-imagedong@tencent.com/
    Signed-off-by: Jakub Kicinski <kuba@kernel.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    include/linux/skbuff.h | 2 +-
    include/trace/events/skb.h | 2 +-
    net/ipv4/tcp_ipv4.c | 2 +-
    3 files changed, 3 insertions(+), 3 deletions(-)

    diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h
    index 66aac2006868..f92f05c9d72d 100644
    --- a/include/linux/skbuff.h
    +++ b/include/linux/skbuff.h
    @@ -315,7 +315,7 @@ enum skb_drop_reason {
    SKB_DROP_REASON_NO_SOCKET,
    SKB_DROP_REASON_PKT_TOO_SMALL,
    SKB_DROP_REASON_TCP_CSUM,
    - SKB_DROP_REASON_TCP_FILTER,
    + SKB_DROP_REASON_SOCKET_FILTER,
    SKB_DROP_REASON_UDP_CSUM,
    SKB_DROP_REASON_MAX,
    };
    diff --git a/include/trace/events/skb.h b/include/trace/events/skb.h
    index 3e042ca2cedb..a8a64b97504d 100644
    --- a/include/trace/events/skb.h
    +++ b/include/trace/events/skb.h
    @@ -14,7 +14,7 @@
    EM(SKB_DROP_REASON_NO_SOCKET, NO_SOCKET) \
    EM(SKB_DROP_REASON_PKT_TOO_SMALL, PKT_TOO_SMALL) \
    EM(SKB_DROP_REASON_TCP_CSUM, TCP_CSUM) \
    - EM(SKB_DROP_REASON_TCP_FILTER, TCP_FILTER) \
    + EM(SKB_DROP_REASON_SOCKET_FILTER, SOCKET_FILTER) \
    EM(SKB_DROP_REASON_UDP_CSUM, UDP_CSUM) \
    EMe(SKB_DROP_REASON_MAX, MAX)

    diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c
    index d901858aa440..235ae91bfd5a 100644
    --- a/net/ipv4/tcp_ipv4.c
    +++ b/net/ipv4/tcp_ipv4.c
    @@ -2098,7 +2098,7 @@ int tcp_v4_rcv(struct sk_buff *skb)
    nf_reset_ct(skb);

    if (tcp_filter(sk, skb)) {
    - drop_reason = SKB_DROP_REASON_TCP_FILTER;
    + drop_reason = SKB_DROP_REASON_SOCKET_FILTER;
    goto discard_and_relse;
    }
    th = (const struct tcphdr *)skb->data;
    --
    2.35.1


    \
     
     \ /
      Last update: 2022-07-27 19:14    [W:4.152 / U:0.060 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site