On 1/27/22 2:13 AM, menglong8.dong@xxxxxxxxx wrote:
> From: Menglong Dong <imagedong@xxxxxxxxxxx>
>
> Introduce SKB_DROP_REASON_SOCKET_FILTER, which is used as the reason
> of skb drop out of socket filter. Meanwhile, replace
> SKB_DROP_REASON_TCP_FILTER with it.
>
> Signed-off-by: Menglong Dong <imagedong@xxxxxxxxxxx>
> ---
> 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 bf11e1fbd69b..8a636e678902 100644
> --- a/include/linux/skbuff.h
> +++ b/include/linux/skbuff.h
> @@ -318,7 +318,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 b3f34e366b27..938b59636578 100644
> --- a/net/ipv4/tcp_ipv4.c
> +++ b/net/ipv4/tcp_ipv4.c
> @@ -2095,7 +2095,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;
This should go to net, not net-next.
Reviewed-by: David Ahern <dsahern@xxxxxxxxxx>
