Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) client-ip=2620:137:e000::3:7;
MIME-Version: 1.0
References: <ZWomqO8m4vVcW+ro@debian.debian> <656b3a1bcd212_1a6a2c294db@willemb.c.googlers.com.notmuch>
In-Reply-To: <656b3a1bcd212_1a6a2c294db@willemb.c.googlers.com.notmuch>
From:   Yan Zhai <yan@cloudflare.com>
Date:   Sat, 2 Dec 2023 20:50:11 -0600
Message-ID: <CAO3-PboYVv6pGm6ZhNs4ArK=3W-V4XY6EJxcYXGyX=YHwdHW6g@mail.gmail.com>
Subject: Re: [PATCH v3 net-next] packet: add a generic drop reason for receive
To:     Willem de Bruijn <willemdebruijn.kernel@gmail.com>
Cc:     netdev@vger.kernel.org, "David S. Miller" <davem@davemloft.net>,
        Eric Dumazet <edumazet@google.com>,
        Jakub Kicinski <kuba@kernel.org>,
        Paolo Abeni <pabeni@redhat.com>,
        Weongyo Jeong <weongyo.linux@gmail.com>,
        linux-kernel@vger.kernel.org, kernel-team@cloudflare.com,
        Jesper Brouer <jesper@cloudflare.com>
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable
Precedence: bulk

On Sat, Dec 2, 2023 at 8:07=E2=80=AFAM Willem de Bruijn
<willemdebruijn.kernel@gmail.com> wrote:
>
> Yan Zhai wrote:
> > Commit da37845fdce2 ("packet: uses kfree_skb() for errors.") switches
> > from consume_skb to kfree_skb to improve error handling. However, this
> > could bring a lot of noises when we monitor real packet drops in
> > kfree_skb[1], because in tpacket_rcv or packet_rcv only packet clones
> > can be freed, not actual packets.
> >
> > Adding a generic drop reason to allow distinguish these "clone drops".
> >
> > [1]: https://lore.kernel.org/netdev/CABWYdi00L+O30Q=3DZah28QwZ_5RU-xcxL=
FUK2Zj08A8MrLk9jzg@mail.gmail.com/
> > Fixes: da37845fdce2 ("packet: uses kfree_skb() for errors.")
> > Suggested-by: Eric Dumazet <edumazet@google.com>
> > Signed-off-by: Yan Zhai <yan@cloudflare.com>
> > ---
> > v2->v3: removed an unused variable
> > v1->v2: fixups suggested by Eric Dumazet
> > v2: https://lore.kernel.org/netdev/ZWobMUp22oTpP3FW@debian.debian/
> > v1: https://lore.kernel.org/netdev/ZU3EZKQ3dyLE6T8z@debian.debian/
> > ---
> >  include/net/dropreason-core.h |  6 ++++++
> >  net/packet/af_packet.c        | 26 +++++++++++++-------------
> >  2 files changed, 19 insertions(+), 13 deletions(-)
> >
> > diff --git a/include/net/dropreason-core.h b/include/net/dropreason-cor=
e.h
> > index 3c70ad53a49c..278e4c7d465c 100644
> > --- a/include/net/dropreason-core.h
> > +++ b/include/net/dropreason-core.h
> > @@ -86,6 +86,7 @@
> >       FN(IPV6_NDISC_NS_OTHERHOST)     \
> >       FN(QUEUE_PURGE)                 \
> >       FN(TC_ERROR)                    \
> > +     FN(PACKET_SOCK_ERROR)           \
> >       FNe(MAX)
> >
> >  /**
> > @@ -378,6 +379,11 @@ enum skb_drop_reason {
> >       SKB_DROP_REASON_QUEUE_PURGE,
> >       /** @SKB_DROP_REASON_TC_ERROR: generic internal tc error. */
> >       SKB_DROP_REASON_TC_ERROR,
> > +     /**
> > +      * @SKB_DROP_REASON_PACKET_SOCK_ERROR: generic packet socket erro=
rs
> > +      * after its filter matches an incoming packet.
> > +      */
> > +     SKB_DROP_REASON_PACKET_SOCK_ERROR,
> >       /**
> >        * @SKB_DROP_REASON_MAX: the maximum of core drop reasons, which
> >        * shouldn't be used as a real 'reason' - only for tracing code g=
en
> > diff --git a/net/packet/af_packet.c b/net/packet/af_packet.c
> > index a84e00b5904b..933fdfaacc44 100644
> > --- a/net/packet/af_packet.c
> > +++ b/net/packet/af_packet.c
> > @@ -2127,7 +2127,7 @@ static int packet_rcv(struct sk_buff *skb, struct=
 net_device *dev,
> >       u8 *skb_head =3D skb->data;
> >       int skb_len =3D skb->len;
> >       unsigned int snaplen, res;
> > -     bool is_drop_n_account =3D false;
> > +     enum skb_drop_reason drop_reason =3D SKB_CONSUMED;
>
> Reverse xmas tree
>
oh I didn't know we have requirements on variable ordering. Will pay
attention in future.

> >
> >       if (skb->pkt_type =3D=3D PACKET_LOOPBACK)
> >               goto drop;
> > @@ -2161,6 +2161,10 @@ static int packet_rcv(struct sk_buff *skb, struc=
t net_device *dev,
> >       res =3D run_filter(skb, sk, snaplen);
> >       if (!res)
> >               goto drop_n_restore;
> > +
> > +     /* skb will only be "consumed" not "dropped" before this */
> > +     drop_reason =3D SKB_DROP_REASON_PACKET_SOCK_ERROR;
> > +
>
> This can be set in drop_n_account, rather than the common path.
>
> Same in tpacket_rcv.

Sure, let me shoot a v4 to move it.