From: Menglong Dong <menglong8.dong@gmail.com>
Date: Fri, 30 Aug 2024 09:59:54 +0800
> Make vxlan_remcsum() support skb drop reasons by changing the return
> value type of it from bool to enum skb_drop_reason.
>
> The only drop reason in vxlan_remcsum() comes from pskb_may_pull_reason(),
> so we just return it.
>
> Signed-off-by: Menglong Dong <dongml2@chinatelecom.cn>
> ---
> drivers/net/vxlan/vxlan_core.c | 13 ++++++++-----
> 1 file changed, 8 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/net/vxlan/vxlan_core.c b/drivers/net/vxlan/vxlan_core.c
> index fcd224a1d0c0..76b217d166ef 100644
> --- a/drivers/net/vxlan/vxlan_core.c
> +++ b/drivers/net/vxlan/vxlan_core.c
> @@ -1551,9 +1551,11 @@ static void vxlan_sock_release(struct vxlan_dev *vxlan)
> #endif
> }
>
> -static bool vxlan_remcsum(struct vxlanhdr *unparsed,
> - struct sk_buff *skb, u32 vxflags)
> +static enum skb_drop_reason vxlan_remcsum(struct vxlanhdr *unparsed,
> + struct sk_buff *skb,
> + u32 vxflags)
> {
> + enum skb_drop_reason reason;
> size_t start, offset;
>
> if (!(unparsed->vx_flags & VXLAN_HF_RCO) || skb->remcsum_offload)
> @@ -1562,15 +1564,16 @@ static bool vxlan_remcsum(struct vxlanhdr *unparsed,
> start = vxlan_rco_start(unparsed->vx_vni);
> offset = start + vxlan_rco_offset(unparsed->vx_vni);
>
> - if (!pskb_may_pull(skb, offset + sizeof(u16)))
> - return false;
> + reason = pskb_may_pull_reason(skb, offset + sizeof(u16));
> + if (reason)
> + return reason;
>
> skb_remcsum_process(skb, (void *)(vxlan_hdr(skb) + 1), start, offset,
> !!(vxflags & VXLAN_F_REMCSUM_NOPARTIAL));
> out:
> unparsed->vx_flags &= ~VXLAN_HF_RCO;
> unparsed->vx_vni &= VXLAN_VNI_MASK;
> - return true;
Also an empty newline before return.
> + return SKB_NOT_DROPPED_YET;
> }
>
> static void vxlan_parse_gbp_hdr(struct vxlanhdr *unparsed,
Thanks,
Olek