ppp: use IFF_NO_QUEUE in virtual interfaces
Subsystems (5)
PATCH 1/1 ppp: use IFF_NO_QUEUE in virtual interfaces
For PPPoE, PPTP, and PPPoL2TP, the start_xmit() function directly forwards packets to the underlying network stack and never returns anything other than 1. So these interfaces do not require a qdisc, and the IFF_NO_QUEUE flag should be set.
Introduces a direct_xmit flag in struct ppp_channel to indicate when IFF_NO_QUEUE should be applied. The flag is set in ppp_connect_channel() for relevant protocols.
While at it, remove the usused latency member from struct ppp_channel.
---
RFC v3 -> v1: drop RFC, and remove the unused member
drivers/net/ppp/ppp_generic.c | 4 ++++ drivers/net/ppp/pppoe.c | 1 + drivers/net/ppp/pptp.c | 1 + include/linux/ppp_channel.h | 3 +-- net/l2tp/l2tp_ppp.c | 1 + 5 files changed, 8 insertions(+), 2 deletions(-)
drivers/net/ppp/ppp_generic.c +4 -0
@@ -3493,6 +3493,10 @@ ppp_connect_channel(struct channel *pch, int unit) ret = -ENOTCONN ; goto outl; } +if (pch->chan->direct_xmit) + ppp->dev->priv_flags |=IFF_NO_QUEUE ; +else + ppp->dev->priv_flags &= ~IFF_NO_QUEUE ;spin_unlock_bh (&pch->downl);if (pch->file.hdrlen > ppp->file.hdrlen) ppp->file.hdrlen = pch->file.hdrlen;
drivers/net/ppp/pppoe.c +1 -0
@@ -693,6 +693,7 @@ static int pppoe_connect(struct socket *sock, struct sockaddr *uservaddr, po->chan.mtu = dev->mtu -sizeof (struct pppoe_hdr ) -2 ; po->chan.private = sk; po->chan.ops = &pppoe_chan_ops; + po->chan.direct_xmit = true; error =ppp_register_net_channel (dev_net (dev), &po->chan);if (error) {
drivers/net/ppp/pptp.c +1 -0
@@ -465,6 +465,7 @@ static int pptp_connect(struct socket *sock, struct sockaddr *uservaddr, po->chan.mtu -=PPTP_HEADER_OVERHEAD ; po->chan.hdrlen =2 +sizeof (struct pptp_gre_header ); + po->chan.direct_xmit = true; error =ppp_register_channel (&po->chan);if (error) {pr_err ("PPTP: failed to register PPP channel (%d)\n" , error);
include/linux/ppp_channel.h +1 -2
@@ -42,8 +42,7 @@ struct ppp_channel {int hdrlen;/* amount of headroom channel needs */ void *ppp;/* opaque to channel */ int speed;/* transfer rate (bytes/second) */ -/* the following is not used at present */ -int latency;/* overhead time in milliseconds */ +bool direct_xmit;/* no qdisc, xmit directly */ };#ifdef __KERNEL__
net/l2tp/l2tp_ppp.c +1 -0
@@ -806,6 +806,7 @@ static int pppol2tp_connect(struct socket *sock, struct sockaddr *uservaddr, po->chan.private = sk; po->chan.ops = &pppol2tp_chan_ops; po->chan.mtu =pppol2tp_tunnel_mtu (tunnel); + po->chan.direct_xmit = true; error =ppp_register_net_channel (sock_net (sk), &po->chan);if (error) {
Signature · 1 line
2.43.0
Quoted 5 lines · Qingfang Deng
For PPPoE, PPTP, and PPPoL2TP, the
start_xmit()function directly forwards packets to the underlying network stack and never returns anything other than 1. So these interfaces do not require a qdisc, and theIFF_NO_QUEUEflag should be set.
Quoted 7 lines
Introduces a
direct_xmitflag in structppp_channelto indicate whenIFF_NO_QUEUEshould be applied. The flag is set inppp_connect_channel()for relevant protocols.While at it, remove the usused latency member from struct
ppp_channel.Signed-off-by Qingfang Deng <[email protected]>
This patch was applied to netdev/net-next.git (main) by Jakub Kicinski <[email protected]>:
Hello:
This patch was applied to netdev/net-next.git (main) by Jakub Kicinski <[email protected]>:
Quoted 10 lines · On Sat, 1 Mar 2025 21:55:16 +0800 you wrote:
For PPPoE, PPTP, and PPPoL2TP, the
start_xmit()function directly forwards packets to the underlying network stack and never returns anything other than 1. So these interfaces do not require a qdisc, and theIFF_NO_QUEUEflag should be set.Introduces a
direct_xmitflag in structppp_channelto indicate whenIFF_NO_QUEUEshould be applied. The flag is set inppp_connect_channel()for relevant protocols.[...]
Here is the summary with links:
- [net-next] ppp: use IFF_NO_QUEUE in virtual interfaces
https://git.kernel.org/netdev/net-next/c/95d0d094ba26
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html