From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-ej1-f49.google.com (mail-ej1-f49.google.com [209.85.218.49]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 9289C13AA2D for ; Thu, 5 Mar 2026 01:39:01 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.49 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772674743; cv=none; b=s5LZ/d3xQCZZn/KBZBQIwPhcDV4Mw3NyW9htcbBwcG9GxhLw5ykOOluOiM6r2ovr/ffx/gLJWtbCnQFIkVhabFVTLEXpQuGnaKav/K/JBnGOUjAldXYVNg9Aw3WbPCXh+r1lO9l24VK8PSoJobbibKhRMf+4IKUssYa0/HHqh0Y= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772674743; c=relaxed/simple; bh=vxfBLb7BQUWoM9Ys6hCqlQ6NnkecLhqabKld5ofnj9A=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=tC75KImsZn6jsnCFIrdC/N83VT22Qr5nkjyJLYrOwGMm9Ec/C3qVS+kc1x0OQ3JWmIX1l5hf9wrMycMGpFnSRvAsA5CRM12yTkKSFi5/WuHf+4WCP8VrWveD0mz9E1kSZnTNR0/6u1n+eROfj9oJmddZnow7krNHeM3UeQN8AR0= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=DZp8/3Gd; arc=none smtp.client-ip=209.85.218.49 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="DZp8/3Gd" Received: by mail-ej1-f49.google.com with SMTP id a640c23a62f3a-b9381e78a31so950592466b.2 for ; Wed, 04 Mar 2026 17:39:01 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1772674740; x=1773279540; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=MPe/PdNhewixqGNFlxS/EUh6KoFNNg0LbtLcJ3DSR9g=; b=DZp8/3GddCQljKBUYChKQDSDTUlVdhFVrAtc2YOU2/5W1s9q/PEtsZVHheFFXUUgTu x/rahm+znTuJD6QzGSPidF8Ix/v21RH9In1WTmOoaHToOtuxakx3P1HEE1wp4R16thS2 IErh/6Tcc87ltwlG+hI1iJ7SIKHSvMHQzK8yZVKGTRA+7SjbHm245pavm31Jm+zkr7W0 z++YUQmYmSvZhoc0G2DMj62LWa0TLhXruuT1i5FlrcRckSebpF5PAO9Lyzw353d+2gcJ DNAVk4K/Y6BWrjYsD8gDtSqx00TXDRAbSkmTu7XhZcTIbKIJLcBmB+H6GVjOdISUTt9/ Yggg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1772674740; x=1773279540; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=MPe/PdNhewixqGNFlxS/EUh6KoFNNg0LbtLcJ3DSR9g=; b=mqLOEj47+dBupGvLF3n9lvKi+mTma0dXoTbQLjCNpygy5BdjWCpLlHfi+PBnOT+3r6 DqXsgO4uOHrsNhAPke96olW7NqIwMUXoM4qM8nD1kVfNe0S27D/UCaKh+pp8SHTpA+y+ 7FFHDrM62wIOyzqmzWuafyppatRnFn8r0iLy6uCssLg7ajLGgLnp9OEFs4ohshwrtCWf i44G94HsY7lY0MttHX3OXsBROmz2BiAscAqdP/TIXLnVBonbCU/f8R5G/w3hh7x5aNuo KS3hTXx8w5GJxEIPu0NC/2gF7T5rjiRSsVmfSloguWHkbTBKuvH4Mk4oD4IsL5oFyOJw lbDQ== X-Forwarded-Encrypted: i=1; AJvYcCWe/EUFmm0TFiwaVAQ1qZRyVnHwgq/wERqqvoIWRBZZpCvEZO6kArT3Qll9IIl3kETKfVU3UBE=@vger.kernel.org X-Gm-Message-State: AOJu0YxH43k2HQydG5ODizpPgQvx8YEi3LfM2pB1x1/phm/zhC0CVJih Uh1+7SK/s87WXJxClKzzw6rh1uOpl72hULTMSpUwzRRMSTuwYT9qEoMC X-Gm-Gg: ATEYQzwyDNE83hX5n0c4/IYLL16fUT/GkM+Fxve7xI/gt1WtBELyBHu0gVOle05/TCb h4yzReohZwL0WM9Jctetz5CCqGhKzn43e8usnkMcto4hy3+G9GR86UHFfQVL0iqHX47zDoLaRPz lLe4xH0wJ7xXiiMV4K0B2k/ICONF/HChBaZt9CO30bGsjJTObatvNj+y5rRTYGOd6rr1sWHQPSm nOAvu+SvQ1RbJxxhY1L/R0PVscLihQZv0AOsdCBuD9axpHBFVZsHyB3K2VpqYgHMbC4TjL81iKX M0tgJ2qz3e+WjrHfLfXXvRplT44baKMxaoiHU2S1rMXEhELIC8MXXFu8NzTuTWPhbFlW4BTX+uW FT+Y0GaOs8zvo6SXax8zDvcPBP+CGj+g6ZsSLLkkd+dvJcKQ8GDAk4RphlKlTDAIjBc17IFWRda H0+Ek= X-Received: by 2002:a17:907:5c3:b0:b8e:d260:cb20 with SMTP id a640c23a62f3a-b93f11c5470mr240587366b.18.1772674739524; Wed, 04 Mar 2026 17:38:59 -0800 (PST) Received: from gmail.com ([2a09:bac5:4e22:2705::3e3:31]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-b93cc1e538fsm345604466b.15.2026.03.04.17.38.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 04 Mar 2026 17:38:58 -0800 (PST) From: Qingfang Deng To: linux-ppp@vger.kernel.org, Michal Ostrowski , Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , David Ahern , Simon Horman , netdev@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Felix Fietkau Subject: [PATCH net-next v5] net: pppoe: implement GRO/GSO support Date: Thu, 5 Mar 2026 09:38:52 +0800 Message-ID: <20260305013852.3769-1-dqfext@gmail.com> X-Mailer: git-send-email 2.43.0 Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Felix Fietkau Only handles packets where the pppoe header length field matches the exact packet length. Significantly improves rx throughput. When running NAT traffic through a MediaTek MT7621 devices from a host behind PPPoE to a host directly connected via ethernet, the TCP throughput that the device is able to handle improves from ~130 Mbit/s to ~630 Mbit/s, using fraglist GRO. Signed-off-by: Felix Fietkau Signed-off-by: Qingfang Deng --- v5: - remove skb_is_gso() check from pppoe_rcv(), as the pppoe length field is updated in pppoe_gro_complete() to indicate the gso size. - fix length check in pppoe_gro_receive(). - remove unnecessary check after pppoe_hdr_proto(). - remove some unnecessary const qualifiers. https://lore.kernel.org/all/20260228032317.146855-1-dqfext@gmail.com/ drivers/net/ppp/pppoe.c | 163 ++++++++++++++++++++++++++++++++++++++++ net/ipv4/af_inet.c | 2 + net/ipv6/ip6_offload.c | 2 + 3 files changed, 167 insertions(+) diff --git a/drivers/net/ppp/pppoe.c b/drivers/net/ppp/pppoe.c index 1ac61c273b28..7908262ff2cd 100644 --- a/drivers/net/ppp/pppoe.c +++ b/drivers/net/ppp/pppoe.c @@ -77,6 +77,7 @@ #include #include #include +#include #include @@ -1097,6 +1098,166 @@ static struct pernet_operations pppoe_net_ops = { .size = sizeof(struct pppoe_net), }; +static u16 +compare_pppoe_header(const struct pppoe_hdr *phdr, + const struct pppoe_hdr *phdr2) +{ + __be16 proto = *(const __be16 *)(phdr + 1); + __be16 proto2 = *(const __be16 *)(phdr2 + 1); + + return (__force u16)((phdr->sid ^ phdr2->sid) | (proto ^ proto2)); +} + +static __be16 pppoe_hdr_proto(const struct pppoe_hdr *phdr) +{ + __be16 proto = *(const __be16 *)(phdr + 1); + + switch (proto) { + case cpu_to_be16(PPP_IP): + return cpu_to_be16(ETH_P_IP); + case cpu_to_be16(PPP_IPV6): + return cpu_to_be16(ETH_P_IPV6); + default: + return 0; + } +} + +static struct sk_buff *pppoe_gro_receive(struct list_head *head, + struct sk_buff *skb) +{ + const struct packet_offload *ptype; + unsigned int hlen, off_pppoe; + const struct pppoe_hdr *phdr; + struct sk_buff *pp = NULL; + struct sk_buff *p; + int flush = 1; + __be16 type; + + off_pppoe = skb_gro_offset(skb); + hlen = off_pppoe + sizeof(*phdr); + phdr = skb_gro_header(skb, hlen + 2, off_pppoe); + if (unlikely(!phdr)) + goto out; + + /* filter for session packets (type:1, ver:1, code:0) */ + if (*(const __be16 *)phdr != cpu_to_be16(0x1100)) + goto out; + + /* ignore packets with padding or invalid length */ + if (skb_gro_len(skb) != be16_to_cpu(phdr->length) + sizeof(*phdr)) + goto out; + + type = pppoe_hdr_proto(phdr); + ptype = gro_find_receive_by_type(type); + if (!ptype) + goto out; + + flush = 0; + + list_for_each_entry(p, head, list) { + const struct pppoe_hdr *phdr2; + + if (!NAPI_GRO_CB(p)->same_flow) + continue; + + phdr2 = (const struct pppoe_hdr *)(p->data + off_pppoe); + if (compare_pppoe_header(phdr, phdr2)) + NAPI_GRO_CB(p)->same_flow = 0; + } + + skb_gro_pull(skb, sizeof(*phdr) + 2); + skb_gro_postpull_rcsum(skb, phdr, sizeof(*phdr) + 2); + + pp = indirect_call_gro_receive_inet(ptype->callbacks.gro_receive, + ipv6_gro_receive, inet_gro_receive, + head, skb); + +out: + skb_gro_flush_final(skb, pp, flush); + + return pp; +} + +static int pppoe_gro_complete(struct sk_buff *skb, int nhoff) +{ + struct pppoe_hdr *phdr = (struct pppoe_hdr *)(skb->data + nhoff); + __be16 type = pppoe_hdr_proto(phdr); + struct packet_offload *ptype; + int len, err; + + ptype = gro_find_complete_by_type(type); + if (!ptype) + return -ENOENT; + + err = INDIRECT_CALL_INET(ptype->callbacks.gro_complete, + ipv6_gro_complete, inet_gro_complete, + skb, nhoff + sizeof(*phdr) + 2); + if (err) + return err; + + len = skb->len - (nhoff + sizeof(*phdr)); + phdr->length = cpu_to_be16(len); + + return 0; +} + +static struct sk_buff *pppoe_gso_segment(struct sk_buff *skb, + netdev_features_t features) +{ + unsigned int pppoe_hlen = sizeof(struct pppoe_hdr) + 2; + struct sk_buff *segs = ERR_PTR(-EINVAL); + u16 mac_offset = skb->mac_header; + struct packet_offload *ptype; + u16 mac_len = skb->mac_len; + struct pppoe_hdr *phdr; + __be16 orig_type, type; + int len, nhoff; + + skb_reset_network_header(skb); + nhoff = skb_network_header(skb) - skb_mac_header(skb); + + if (unlikely(!pskb_may_pull(skb, pppoe_hlen))) + goto out; + + phdr = (struct pppoe_hdr *)skb_network_header(skb); + type = pppoe_hdr_proto(phdr); + ptype = gro_find_complete_by_type(type); + if (!ptype) + goto out; + + orig_type = skb->protocol; + __skb_pull(skb, pppoe_hlen); + segs = ptype->callbacks.gso_segment(skb, features); + if (IS_ERR_OR_NULL(segs)) { + skb_gso_error_unwind(skb, orig_type, pppoe_hlen, mac_offset, + mac_len); + goto out; + } + + skb = segs; + do { + phdr = (struct pppoe_hdr *)(skb_mac_header(skb) + nhoff); + len = skb->len - (nhoff + sizeof(*phdr)); + phdr->length = cpu_to_be16(len); + skb->network_header = (u8 *)phdr - skb->head; + skb->protocol = orig_type; + skb_reset_mac_len(skb); + } while ((skb = skb->next)); + +out: + return segs; +} + +static struct packet_offload pppoe_packet_offload __read_mostly = { + .type = cpu_to_be16(ETH_P_PPP_SES), + .priority = 20, + .callbacks = { + .gro_receive = pppoe_gro_receive, + .gro_complete = pppoe_gro_complete, + .gso_segment = pppoe_gso_segment, + }, +}; + static int __init pppoe_init(void) { int err; @@ -1113,6 +1274,7 @@ static int __init pppoe_init(void) if (err) goto out_unregister_pppoe_proto; + dev_add_offload(&pppoe_packet_offload); dev_add_pack(&pppoes_ptype); dev_add_pack(&pppoed_ptype); register_netdevice_notifier(&pppoe_notifier); @@ -1132,6 +1294,7 @@ static void __exit pppoe_exit(void) unregister_netdevice_notifier(&pppoe_notifier); dev_remove_pack(&pppoed_ptype); dev_remove_pack(&pppoes_ptype); + dev_remove_offload(&pppoe_packet_offload); unregister_pppox_proto(PX_PROTO_OE); proto_unregister(&pppoe_sk_proto); unregister_pernet_device(&pppoe_net_ops); diff --git a/net/ipv4/af_inet.c b/net/ipv4/af_inet.c index babcd75a08e2..aa3324d819b3 100644 --- a/net/ipv4/af_inet.c +++ b/net/ipv4/af_inet.c @@ -1532,6 +1532,7 @@ struct sk_buff *inet_gro_receive(struct list_head *head, struct sk_buff *skb) return pp; } +EXPORT_INDIRECT_CALLABLE(inet_gro_receive); static struct sk_buff *ipip_gro_receive(struct list_head *head, struct sk_buff *skb) @@ -1617,6 +1618,7 @@ int inet_gro_complete(struct sk_buff *skb, int nhoff) out: return err; } +EXPORT_INDIRECT_CALLABLE(inet_gro_complete); static int ipip_gro_complete(struct sk_buff *skb, int nhoff) { diff --git a/net/ipv6/ip6_offload.c b/net/ipv6/ip6_offload.c index bd7f780e37a5..32ba4739cef9 100644 --- a/net/ipv6/ip6_offload.c +++ b/net/ipv6/ip6_offload.c @@ -297,6 +297,7 @@ INDIRECT_CALLABLE_SCOPE struct sk_buff *ipv6_gro_receive(struct list_head *head, return pp; } +EXPORT_INDIRECT_CALLABLE(ipv6_gro_receive); static struct sk_buff *sit_ip6ip6_gro_receive(struct list_head *head, struct sk_buff *skb) @@ -359,6 +360,7 @@ INDIRECT_CALLABLE_SCOPE int ipv6_gro_complete(struct sk_buff *skb, int nhoff) out: return err; } +EXPORT_INDIRECT_CALLABLE(ipv6_gro_complete); static int sit_gro_complete(struct sk_buff *skb, int nhoff) { -- 2.43.0