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 4F6B6286889 for ; Wed, 11 Feb 2026 07:55:56 +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=1770796558; cv=none; b=Vp/mlb2WxVwCPmoTti0wepzx0Xo4Vc+5xnfB3UjT6X+VquKOtKSUCSA9dLw6IVQuZPqz0IqqwzqeImZXdq5yjyLeAiazN1oYYf/nCi8XtyIHybOpIk9iFfLPEMkh2SEvAu74Z+2OQWVqlYEvBw7WNtLfbdeLYfnBQt632yoLiWM= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1770796558; c=relaxed/simple; bh=NBNOVlCllpdYEyndId9bnUd3CjYv1ne/cPHtFJR/oO4=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=U/wXJ0B+Dh7EbO/oKBROVGPDa2N4tyx9KemYZehdU410hZZyr8YlPCKs/TAlbD4HkV9sQb/JJ5Zd1c1oE/SC+RIU/iE6eFmtrH3p4YAN0sSXi0IvavCevayMROUTRJOL3CzOWw/LclRgWrGyc5xb/VOOUnjWDUB2KUylsU5KWOw= 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=HlBFqnmZ; 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="HlBFqnmZ" Received: by mail-ed1-f49.google.com with SMTP id 4fb4d7f45d1cf-65808bb859cso9603003a12.2 for ; Tue, 10 Feb 2026 23:55:56 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1770796555; x=1771401355; 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=HFY74oEhMKgEBwIz79njhA1rP5gdyP3GZa9qdE7Wwkc=; b=HlBFqnmZa3d9FCzUZkU826MB5xAp94A0/4xUnE8xRFNnpsIG1VUfGF6Yq/0/9fDXuk HSsEMD8yG4ZDW3uKKEouyzZWiIsVdXf7742vRGTYYwgSO4403QGewAsOYAd3EargICpY vxParpDjiXmT7Ur4/9WF7ekfMv9/6MM+xL4nUD9lyDyp7JEPi/0SUOefC2ZvoCpMomn9 kccFTCvbNwEkYoJwbZGA5QejXOCotyNyCcho6QkB1d82d3LPB5vDkh2id13a3R9fFxcu BiTqf5Kj4SoucTCNhUXE5jLGcB7zJi03P6BVsSDqMfrNz8GptCzswVv1OWkUeeDKxhDy w4rQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1770796555; x=1771401355; 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=HFY74oEhMKgEBwIz79njhA1rP5gdyP3GZa9qdE7Wwkc=; b=k1UkCIjX7iL6L52/58P1onmzfkkw/YRanoYzRtdpzINFXTBCNgvXasxs0EtvOsKR8m l5stbT/Dp8NbY2pDsPt1eWUHxZchuTiMLAvMAG2oahjKmdoCEWF0X9ESDfu4YMwBmbY7 ZOohE4VD6STN+D9d8uMC53mgkXRMNU6KyhMnlQsdM3VjJCyVb27AFpU+KS8Jc6ss+SNe IbmUG/KX2E1H3U7qGQAXU3wr7Q/UghKiIAXLKxvkJgfGJmbZc/R6/d7bx51lVpKdP8In S1qhN+W7SLmxAaZS+/9OVkwWBWTwjZQBKDS+FrEDU7BeZOUJhnxSuhlsWna0SMmbnvim ryIA== X-Forwarded-Encrypted: i=1; AJvYcCXgUf+rPfu9mVu/c+chXPIuda71uSuKMhZOoNn6VPfK7nXoVSmVSPza41HCVkVsCMEXaXj03M0=@vger.kernel.org X-Gm-Message-State: AOJu0YyIQ7+ZAmWieP2p4PePlf6LKntXETIjl6AFQRZcWWIxbJZ9jEXg 1EZ6MFHUPqA1KMs02DdY/UL3bQb/aaauQxuNtq8Ijmne/mVVn6dpe26t X-Gm-Gg: AZuq6aKENwOEe8Z3uiESbFJx7cXZbBZyMuJ6UhyFAI3hhy8KZYypaWGzKKC0ItGyylP nXVTMlqtjPHQ5d1Y2XvsmIv7hKquCmqJg/hNv6E7AWS+j/PAMAJzwpGTYTDR9jHi3b0/MJ9QaMI BTR9kU8IyvsSeAFJeDVQqe0vbTvHwy5GN2Wmp6zflDou5ns79JBBnUTY2G/Ib+8GzpH001mxv+d udY2i3utdJSRRc9v2KDP6KLMRv0pPW/lS402cMG+J9N62Y8oflKncg3O4GLfVAfgfIi1po7bZRi priw0tc+esBStE+VgVYaGaewgvtsmuNviqMYcsXUJUBHFEAv1aE+oL/xPG/8mmLKIGerRdCLPPu 5RtOODoD+k9Ai64u/mkJR5sDPcSMxOJ/CGyQ0MpNaMbHzgpd6O+Sj+o6Ov9KaGeyE5hX4jIeXBa b+ X-Received: by 2002:a05:6402:388c:b0:659:78ae:7892 with SMTP id 4fb4d7f45d1cf-65a0d1f4b4bmr2704634a12.22.1770796554530; Tue, 10 Feb 2026 23:55:54 -0800 (PST) Received: from gmail.com ([2a09:bac5:4e21:c8::14:2e0]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-65a3cec914dsm483047a12.11.2026.02.10.23.55.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Feb 2026 23:55:53 -0800 (PST) From: Qingfang Deng To: linux-ppp@vger.kernel.org, rp-pppoe@lists.skoll.ca, Michal Ostrowski , Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , James Chapman , Simon Horman , netdev@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Michal Ostrowski , Dianne Skoll , Paul Mackerras , Jaco Kroon , James Carlson , Arnd Bergmann , Guillaume Nault Subject: [PATCH RFC net-next] pppoe: remove unused kernel-mode relay support Date: Wed, 11 Feb 2026 15:55:46 +0800 Message-ID: <20260211075547.138904-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 The kernel-mode PPPoE relay feature and its two associated ioctls (PPPOEIOCSFWD and PPPOEIOCDFWD) are not used by any existing userspace PPPoE implementations. The standard userspace package, rp-pppoe [1], handles relaying entirely in userspace. This legacy code has remained in the driver since its introduction in kernel 2.3.99-pre7 for over two decades, but serves no practical purpose. Remove the unused relay code. [1] https://dianne.skoll.ca/projects/rp-pppoe/ Signed-off-by: Qingfang Deng --- drivers/net/ppp/pppoe.c | 82 ----------------------------------- drivers/net/ppp/pppox.c | 13 ------ drivers/net/ppp/pptp.c | 3 -- include/linux/if_pppox.h | 7 --- include/uapi/linux/if_pppox.h | 10 ----- net/l2tp/l2tp_ppp.c | 3 -- 6 files changed, 118 deletions(-) diff --git a/drivers/net/ppp/pppoe.c b/drivers/net/ppp/pppoe.c index 4275b393a454..a126f804e4dd 100644 --- a/drivers/net/ppp/pppoe.c +++ b/drivers/net/ppp/pppoe.c @@ -237,25 +237,6 @@ static inline struct pppox_sock *get_item(struct pppoe_net *pn, __be16 sid, return po; } -static inline struct pppox_sock *__get_item_by_addr(struct net *net, - struct sockaddr_pppox *sp) -{ - struct net_device *dev; - struct pppoe_net *pn; - struct pppox_sock *pppox_sock = NULL; - - int ifindex; - - dev = dev_get_by_name_rcu(net, sp->sa_addr.pppoe.dev); - if (dev) { - ifindex = dev->ifindex; - pn = pppoe_pernet(net); - pppox_sock = __get_item(pn, sp->sa_addr.pppoe.sid, - sp->sa_addr.pppoe.remote, ifindex); - } - return pppox_sock; -} - static inline void delete_item(struct pppoe_net *pn, __be16 sid, char *addr, int ifindex) { @@ -369,7 +350,6 @@ static struct notifier_block pppoe_notifier = { static int pppoe_rcv_core(struct sock *sk, struct sk_buff *skb) { struct pppox_sock *po = pppox_sk(sk); - struct pppox_sock *relay_po; /* Backlog receive. Semantics of backlog rcv preclude any code from * executing in lock_sock()/release_sock() bounds; meaning sk->sk_state @@ -378,17 +358,6 @@ static int pppoe_rcv_core(struct sock *sk, struct sk_buff *skb) if (sk->sk_state & PPPOX_BOUND) { ppp_input(&po->chan, skb); - } else if (sk->sk_state & PPPOX_RELAY) { - relay_po = __get_item_by_addr(sock_net(sk), - &po->pppoe_relay); - if (relay_po == NULL) - goto abort_kfree; - - if ((sk_pppox(relay_po)->sk_state & PPPOX_CONNECTED) == 0) - goto abort_kfree; - - if (!__pppoe_xmit(sk_pppox(relay_po), skb)) - goto abort_kfree; } else { if (sock_queue_rcv_skb(sk, skb)) goto abort_kfree; @@ -656,7 +625,6 @@ static int pppoe_connect(struct socket *sock, struct sockaddr_unsized *uservaddr po->pppoe_ifindex = 0; memset(&po->pppoe_pa, 0, sizeof(po->pppoe_pa)); - memset(&po->pppoe_relay, 0, sizeof(po->pppoe_relay)); memset(&po->chan, 0, sizeof(po->chan)); po->next = NULL; po->num = 0; @@ -783,53 +751,6 @@ static int pppoe_ioctl(struct socket *sock, unsigned int cmd, err = 0; break; - case PPPOEIOCSFWD: - { - struct pppox_sock *relay_po; - - err = -EBUSY; - if (sk->sk_state & (PPPOX_BOUND | PPPOX_DEAD)) - break; - - err = -ENOTCONN; - if (!(sk->sk_state & PPPOX_CONNECTED)) - break; - - /* PPPoE address from the user specifies an outbound - PPPoE address which frames are forwarded to */ - err = -EFAULT; - if (copy_from_user(&po->pppoe_relay, - (void __user *)arg, - sizeof(struct sockaddr_pppox))) - break; - - err = -EINVAL; - if (po->pppoe_relay.sa_family != AF_PPPOX || - po->pppoe_relay.sa_protocol != PX_PROTO_OE) - break; - - /* Check that the socket referenced by the address - actually exists. */ - rcu_read_lock(); - relay_po = __get_item_by_addr(sock_net(sk), &po->pppoe_relay); - rcu_read_unlock(); - if (!relay_po) - break; - - sk->sk_state |= PPPOX_RELAY; - err = 0; - break; - } - - case PPPOEIOCDFWD: - err = -EALREADY; - if (!(sk->sk_state & PPPOX_RELAY)) - break; - - sk->sk_state &= ~PPPOX_RELAY; - err = 0; - break; - default: err = -ENOTTY; } @@ -1136,9 +1057,6 @@ static const struct proto_ops pppoe_ops = { .recvmsg = pppoe_recvmsg, .mmap = sock_no_mmap, .ioctl = pppox_ioctl, -#ifdef CONFIG_COMPAT - .compat_ioctl = pppox_compat_ioctl, -#endif }; static const struct pppox_proto pppoe_proto = { diff --git a/drivers/net/ppp/pppox.c b/drivers/net/ppp/pppox.c index 08364f10a43f..5ef422a43d70 100644 --- a/drivers/net/ppp/pppox.c +++ b/drivers/net/ppp/pppox.c @@ -17,7 +17,6 @@ #include #include #include -#include #include #include #include @@ -99,18 +98,6 @@ int pppox_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg) EXPORT_SYMBOL(pppox_ioctl); -#ifdef CONFIG_COMPAT -int pppox_compat_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg) -{ - if (cmd == PPPOEIOCSFWD32) - cmd = PPPOEIOCSFWD; - - return pppox_ioctl(sock, cmd, (unsigned long)compat_ptr(arg)); -} - -EXPORT_SYMBOL(pppox_compat_ioctl); -#endif - static int pppox_create(struct net *net, struct socket *sock, int protocol, int kern) { diff --git a/drivers/net/ppp/pptp.c b/drivers/net/ppp/pptp.c index b18acd810561..8838ed93eb70 100644 --- a/drivers/net/ppp/pptp.c +++ b/drivers/net/ppp/pptp.c @@ -634,9 +634,6 @@ static const struct proto_ops pptp_ops = { .recvmsg = sock_no_recvmsg, .mmap = sock_no_mmap, .ioctl = pppox_ioctl, -#ifdef CONFIG_COMPAT - .compat_ioctl = pppox_compat_ioctl, -#endif }; static const struct pppox_proto pppox_pptp_proto = { diff --git a/include/linux/if_pppox.h b/include/linux/if_pppox.h index db45d6f1c4f4..a015afa672b7 100644 --- a/include/linux/if_pppox.h +++ b/include/linux/if_pppox.h @@ -25,8 +25,6 @@ struct pppoe_opt { struct net_device *dev; /* device associated with socket*/ int ifindex; /* ifindex of device associated with socket */ struct pppoe_addr pa; /* what this socket is bound to*/ - struct sockaddr_pppox relay; /* what socket data will be - relayed to (PPPoE relaying) */ struct work_struct padt_work;/* Work item for handling PADT */ }; @@ -53,7 +51,6 @@ struct pppox_sock { #define pppoe_dev proto.pppoe.dev #define pppoe_ifindex proto.pppoe.ifindex #define pppoe_pa proto.pppoe.pa -#define pppoe_relay proto.pppoe.relay static inline struct pppox_sock *pppox_sk(struct sock *sk) { @@ -78,16 +75,12 @@ extern int register_pppox_proto(int proto_num, const struct pppox_proto *pp); extern void unregister_pppox_proto(int proto_num); extern void pppox_unbind_sock(struct sock *sk);/* delete ppp-channel binding */ extern int pppox_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg); -extern int pppox_compat_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg); - -#define PPPOEIOCSFWD32 _IOW(0xB1 ,0, compat_size_t) /* PPPoX socket states */ enum { PPPOX_NONE = 0, /* initial state */ PPPOX_CONNECTED = 1, /* connection established ==TCP_ESTABLISHED */ PPPOX_BOUND = 2, /* bound to ppp device */ - PPPOX_RELAY = 4, /* forwarding is enabled */ PPPOX_DEAD = 16 /* dead, useless, please clean me up!*/ }; diff --git a/include/uapi/linux/if_pppox.h b/include/uapi/linux/if_pppox.h index 9abd80dcc46f..8fdf0a681a4e 100644 --- a/include/uapi/linux/if_pppox.h +++ b/include/uapi/linux/if_pppox.h @@ -103,16 +103,6 @@ struct sockaddr_pppol2tpv3in6 { struct pppol2tpv3in6_addr pppol2tp; } __packed; -/********************************************************************* - * - * ioctl interface for defining forwarding of connections - * - ********************************************************************/ - -#define PPPOEIOCSFWD _IOW(0xB1 ,0, size_t) -#define PPPOEIOCDFWD _IO(0xB1 ,1) -/*#define PPPOEIOCGFWD _IOWR(0xB1,2, size_t)*/ - /* Codes to identify message types */ #define PADI_CODE 0x09 #define PADO_CODE 0x07 diff --git a/net/l2tp/l2tp_ppp.c b/net/l2tp/l2tp_ppp.c index ae4543d5597b..77aa9f5f866d 100644 --- a/net/l2tp/l2tp_ppp.c +++ b/net/l2tp/l2tp_ppp.c @@ -1644,9 +1644,6 @@ static const struct proto_ops pppol2tp_ops = { .recvmsg = pppol2tp_recvmsg, .mmap = sock_no_mmap, .ioctl = pppox_ioctl, -#ifdef CONFIG_COMPAT - .compat_ioctl = pppox_compat_ioctl, -#endif }; static const struct pppox_proto pppol2tp_proto = { -- 2.43.0