From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-ed1-f49.google.com (mail-ed1-f49.google.com [209.85.208.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 D9C3B262FEC for ; Sat, 28 Feb 2026 03:23:25 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.49 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772249007; cv=none; b=TE3rlQ+TYUtTjgwS4DIALLIS3+jgCcS+0B2A5H8JLG1fvheHJ+r86jJuJjWmfLfmrvWjwrUQFisgslIJJrrjl63s6zjq6hymN74Q6QEUOLBWdIb3lqZJBtltIVmOQWbts1uxxGM1vRt528JWtNbr8FXdVLNjJS7H3BdIYzO4fdc= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772249007; c=relaxed/simple; bh=2VJAOsbOXN64VK52QrdpFYnvXwbZL9fJZhXNnjkZROU=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=mPdc33Nf5HUTrmNjhCaTgmF6/15UkIO9EU2lUlJo9awx2RGyXXOrMfDAOretScUk3ofx+dczYHMOu5PjpwAAJWiGuzExkiV/4FLmThH/4rfaPXaQ8rokKa7kyqtYZ+g3OSLPYiUGTR2bROTTCLBl80jzym3K8X9eA8mOESoIi3I= 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=aqx+oLir; arc=none smtp.client-ip=209.85.208.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="aqx+oLir" Received: by mail-ed1-f49.google.com with SMTP id 4fb4d7f45d1cf-65fb991d7e7so3844906a12.1 for ; Fri, 27 Feb 2026 19:23:25 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1772249004; x=1772853804; 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=S0ZchPbAREZAzkXthv+xzhxFLPbamh8n6hQVVuKvb3g=; b=aqx+oLirmtrf047cB/nsQNydvCa9ehfIZ5e07rBt6fA1TDKxq9SjxYYSy2CbojBupo UM31OsRTK/ZYmlaRT8sfhM97046NV3lD5oPIj+PKWjMlR9Jsut5c3gbD6VPzP/fUkpaG idHlPRYVCtnNp0K4bSct8qzOj6OG9rvPJjgOdgx06YId0NG2nnfJtgYDc0LJgE3t3NQ1 Nf2dPqVWdyJRyuoSfyQgE/Sl1nYpsW/fQ7GM4j7NsHMenUt/wREGdheCJSWcddUdJEBn u2reGIOvGZpUXFeDULeRQU9A8Rd7h8vurve6kW71fR8tiCB7mf2906fGQZAr2wGF1wCa Lh3w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1772249004; x=1772853804; 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=S0ZchPbAREZAzkXthv+xzhxFLPbamh8n6hQVVuKvb3g=; b=rk4YlgFrTbK8c7tKSKsiKqKOdOpOkSENAf1Iii2nEAIOKbVHJW5vtx2JQh33crnXt8 gTIXBkLMNvQB1Kvk22B9Nm5PtUd4s8RmgI+fY9NUuDCi3bAaabAnWuu6uewgZNkC71t9 YdeL65gmZCReOOYGm4LgE4JUCEzqU0rR2ddjvDI3vOza9fx/XhO9Y7KJgRLWjX9oof5R koXF54/xmMoHsC/Qc5K8YbD0tBxvMIFF2X6n1EOZJkYiyrAZkVZc0a7YgI297pSv+nEb cJqFZ/HQumAT2rW7TQ4JfOjLyJhI/xAE9LkeIcE6wXmYDsEDHh/bOHnxidT7xgf338vB 2YEA== X-Forwarded-Encrypted: i=1; AJvYcCXH5O8k48beAIE5+UUyNoPzLDCj/wD6zmKedu8HzIHQo3bTnH9KaaK3do6RvE20tp7sLtJbW2o=@vger.kernel.org X-Gm-Message-State: AOJu0Yx4xgbNsdUL7DTRodGjurMNR89FZAxzmW9ApafY5VBgCLzNsjGT 0ASi63L4EYy0DWJcbOyt/H92gbj2JLz9uqXLFSmsigJrptrL2Pl8UAzl X-Gm-Gg: ATEYQzxP4XYp8RhJxOn/xmWyIFLw+/+lKPpXL5d/TdW2qBhgJd+ha20CAQYzTJOeAeS uxXisFaM/dPBnp7trbW6BSfvGlqxaqVeqDpa6B0XRwEGBz+xbq7fRZSPkxRTieSs6wF0S/eYLK4 iLN32zruLmUdVyM5vX66oIDl+p+ynu1L+0sFV5Sv7jgoGH1clIOs19yCAo6zxGrIB8++Q/02hOV VfgeuunBIkWAU9b126PlATyDaNXhljU7+mtObOizAAypdsr/ec3X2Hxju+TSx4vRWNIBUu8/vJf /8zs2KSRj0vBhY1J+OjJJrf5g81a21IpTFcbKX6T382aYRsaGBilkep9fpOW5tjWK2d4ZaAt42K JLUfFpUFfbQxCLe3nqOCUkiLxmaksNAXKD79puTClQXNCMGbnV0VnZSwbhqFUU2ucKWd/hCC7 X-Received: by 2002:a17:907:3d51:b0:b8f:96f3:de05 with SMTP id a640c23a62f3a-b93765878e0mr300835866b.60.1772249003792; Fri, 27 Feb 2026 19:23:23 -0800 (PST) Received: from gmail.com ([2a09:bac1:5520::20a:ca]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-b935ac70b01sm203031266b.23.2026.02.27.19.23.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 27 Feb 2026 19:23:23 -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 v4] net: pppoe: implement GRO/GSO support Date: Sat, 28 Feb 2026 11:23:17 +0800 Message-ID: <20260228032317.146855-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 --- v4: - fetch ppp proto without using tag_type - filter for session packets (type:1, ver:1, code:0) - constify some parameters v3: https://lore.kernel.org/netdev/20250811095734.71019-1-nbd@nbd.name/ - increase priority value - implement GSO support - use INDIRECT_CALL_INET - update pppoe length field - remove unnecessary network_offsets update drivers/net/ppp/pppoe.c | 168 +++++++++++++++++++++++++++++++++++++++- net/ipv4/af_inet.c | 2 + net/ipv6/ip6_offload.c | 2 + 3 files changed, 171 insertions(+), 1 deletion(-) diff --git a/drivers/net/ppp/pppoe.c b/drivers/net/ppp/pppoe.c index 1ac61c273b28..920d9015b4b4 100644 --- a/drivers/net/ppp/pppoe.c +++ b/drivers/net/ppp/pppoe.c @@ -77,6 +77,7 @@ #include #include #include +#include #include @@ -403,7 +404,7 @@ static int pppoe_rcv(struct sk_buff *skb, struct net_device *dev, if (skb->len < len) goto drop; - if (pskb_trim_rcsum(skb, len)) + if (!skb_is_gso(skb) && pskb_trim_rcsum(skb, len)) goto drop; ph = pppoe_hdr(skb); @@ -1097,6 +1098,169 @@ 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) +{ + const __be16 proto = *(const __be16 *)(phdr + 1); + const __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) +{ + const __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) + hlen) + goto out; + + type = pppoe_hdr_proto(phdr); + if (!type) + goto out; + + 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 +1277,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 +1297,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 8036e76aa1e4..b98e0b180955 100644 --- a/net/ipv4/af_inet.c +++ b/net/ipv4/af_inet.c @@ -1537,6 +1537,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) @@ -1622,6 +1623,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