ipv6: honor per-interface proxy_ndp in forward and NA paths
Subsystems (3)
ndisc_recv_ns() has always checked both devconf_all and idev->cnf for proxy_ndp, but ip6_forward() and ndisc_recv_na() only looked at the global setting.
Honor per-interface proxy_ndp in both places to match the NS path and allow setups that only enable proxy_ndp on specific interfaces.
--- net/ipv6/ip6_output.c | 4 ++-- net/ipv6/ndisc.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-)
net/ipv6/ip6_output.c +2 -2
@@ -579,8 +579,8 @@ int ip6_forward(struct sk_buff *skb)return -ETIMEDOUT ; } -/* XXX: idev->cnf.proxy_ndp? */ -if (READ_ONCE (net->ipv6.devconf_all->proxy_ndp) && +if ((READ_ONCE (net->ipv6.devconf_all->proxy_ndp) || + (idev &&READ_ONCE (idev->cnf.proxy_ndp))) &&pneigh_lookup (&nd_tbl, net, &hdr->daddr, skb->dev)) {int proxied =ip6_forward_proxy_check (skb);
net/ipv6/ndisc.c +2 -2
@@ -1096,9 +1096,9 @@ static enum skb_drop_reason ndisc_recv_na(struct sk_buff *skb)*/ if (lladdr && !memcmp (lladdr, dev->dev_addr, dev->addr_len) &&READ_ONCE (net->ipv6.devconf_all->forwarding) && -READ_ONCE (net->ipv6.devconf_all->proxy_ndp) && + (READ_ONCE (net->ipv6.devconf_all->proxy_ndp) || + (idev &&READ_ONCE (idev->cnf.proxy_ndp))) &&pneigh_lookup (&nd_tbl, net, &msg->target, dev)) { -/* XXX: idev->cnf.proxy_ndp */ goto out; }
Signature · 1 line
2.25.1
Ido Schimmel
maintainerSubject prefix is incorrect. See:
https://docs.kernel.org/process/maintainer-netdev.html
Quoted 9 lines · Chenguang Zhao
ndisc_recv_ns()has always checked bothdevconf_allandidev->cnfforproxy_ndp, butip6_forward()andndisc_recv_na()only looked at the global setting.Honor per-interface
proxy_ndpin both places to match the NS path and allow setups that only enableproxy_ndpon specific interfaces.Fixes fbea49e1e240 ("[IPV6] NDISC: Add proxy_ndp sysctl.")Signed-off-by Chenguang Zhao <[email protected]>
Given that this never worked and that the patch changes a 20 years old user-visible behavior, I prefer that you target it at net-next (without the Fixes tag) when it opens next week.
Also, did you look into why these "XXX" comments were added in the original commit from 2006? I *assume* that it's because back then both ndisc_recv_na() and ip6_forward() were missing an idev, unlike ndisc_recv_ns().
Quoted 10 lines
--- net/ipv6/ip6_output.c | 4 ++-- net/ipv6/ndisc.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-)net/ipv6/ip6_output.c +0
-0
net/ipv6/ip6_output.c int ip6_forward(struct sk_buff *skb) · line 584
Quoted 8 lines
net/ipv6/ip6_output.c +2
-2@@ -579,8 +579,8 @@ int ip6_forward(struct sk_buff *skb)return -ETIMEDOUT ; } -/* XXX: idev->cnf.proxy_ndp? */ -if (READ_ONCE (net->ipv6.devconf_all->proxy_ndp) && +if ((READ_ONCE (net->ipv6.devconf_all->proxy_ndp) || + (idev &&READ_ONCE (idev->cnf.proxy_ndp))) &&pneigh_lookup (&nd_tbl, net, &hdr->daddr, skb->dev)) {
Note that idev doesn't necessarily correspond to the device with which the neighbour lookup is performed (skb->dev). See 0857d6f8c759d.
vrf_ip6_rcv() does not modify skb->dev for neighbour discovery packets, so this happens to be OK in this case, but you need to explain this in the commit message.
Quoted 21 lines
net/ipv6/ip6_output.c +0
-0int proxied =ip6_forward_proxy_check (skb);net/ipv6/ndisc.c +2
-2@@ -1096,9 +1096,9 @@ static enum skb_drop_reason ndisc_recv_na(struct sk_buff *skb)*/ if (lladdr && !memcmp (lladdr, dev->dev_addr, dev->addr_len) &&READ_ONCE (net->ipv6.devconf_all->forwarding) && -READ_ONCE (net->ipv6.devconf_all->proxy_ndp) && + (READ_ONCE (net->ipv6.devconf_all->proxy_ndp) || + (idev &&READ_ONCE (idev->cnf.proxy_ndp))) &&pneigh_lookup (&nd_tbl, net, &msg->target, dev)) { -/* XXX: idev->cnf.proxy_ndp */ goto out; }Signature · 1 line
2.25.1
PATCH v2 1/1 ipv6: honor per-interface proxy_ndp in forward and NA paths
In reply to Chenguang Zhaondisc_recv_ns() has always checked both devconf_all and idev->cnf for proxy_ndp, but ip6_forward() and ndisc_recv_na() only looked at the global setting. The original commit left XXX comments in these paths likely because idev was not available there at the time; ip6_forward() now obtains idev from IP6CB(skb)->iif.
Honor per-interface proxy_ndp in both places to match the NS path and allow setups that only enable proxy_ndp on specific interfaces.
In ip6_forward(), idev is looked up via the ingress interface (iif) while pneigh_lookup() uses skb->dev. For ND packets this is correct because vrf_ip6_rcv() does not modify skb->dev for neighbour discovery frames, so both refer to the ingress interface.
---
v2:
Per Ido's review, the following changes were made in v2:
- Target net-next instead of net
- Drop Fixes tag
- Expand commit message: XXX comment history, idev vs skb->dev for ND packets
- Fix subject prefix
v1:
- https://lore.kernel.org/all/[email protected]/
net/ipv6/ip6_output.c | 4 ++-- net/ipv6/ndisc.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-)
net/ipv6/ip6_output.c +2 -2
@@ -579,8 +579,8 @@ int ip6_forward(struct sk_buff *skb)return -ETIMEDOUT ; } -/* XXX: idev->cnf.proxy_ndp? */ -if (READ_ONCE (net->ipv6.devconf_all->proxy_ndp) && +if ((READ_ONCE (net->ipv6.devconf_all->proxy_ndp) || + (idev &&READ_ONCE (idev->cnf.proxy_ndp))) &&pneigh_lookup (&nd_tbl, net, &hdr->daddr, skb->dev)) {int proxied =ip6_forward_proxy_check (skb);
net/ipv6/ndisc.c +2 -2
@@ -1096,9 +1096,9 @@ static enum skb_drop_reason ndisc_recv_na(struct sk_buff *skb)*/ if (lladdr && !memcmp (lladdr, dev->dev_addr, dev->addr_len) &&READ_ONCE (net->ipv6.devconf_all->forwarding) && -READ_ONCE (net->ipv6.devconf_all->proxy_ndp) && + (READ_ONCE (net->ipv6.devconf_all->proxy_ndp) || + (idev &&READ_ONCE (idev->cnf.proxy_ndp))) &&pneigh_lookup (&nd_tbl, net, &msg->target, dev)) { -/* XXX: idev->cnf.proxy_ndp */ goto out; }
Signature · 1 line
2.25.1
Le 29/06/2026 à 08:18, Chenguang Zhao a écrit :
Quoted 35 lines
ndisc_recv_ns()has always checked bothdevconf_allandidev->cnfforproxy_ndp, butip6_forward()andndisc_recv_na()only looked at the global setting. The original commit left XXX comments in these paths likely because idev was not available there at the time;ip6_forward()now obtains idev from IP6CB(skb)->iif.Honor per-interface
proxy_ndpin both places to match the NS path and allow setups that only enableproxy_ndpon specific interfaces.In
ip6_forward(), idev is looked up via the ingress interface (iif) whilepneigh_lookup()usesskb->dev. For ND packets this is correct becausevrf_ip6_rcv()does not modifyskb->devfor neighbour discovery frames, so both refer to the ingress interface.Signed-off-by Chenguang Zhao <[email protected]>---
v2:
Per Ido's review, the following changes were made in v2:
- Target net-next instead of net
- Drop Fixes tag
- Expand commit message: XXX comment history, idev vsskb->devfor ND packets
- Fix subject prefixv1:
- https://lore.kernel.org/all/[email protected]/net/ipv6/ip6_output.c | 4 ++-- net/ipv6/ndisc.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-)net/ipv6/ip6_output.c +0
-0
net/ipv6/ip6_output.c int ip6_forward(struct sk_buff *skb) · line 583
Quoted 7 lines
net/ipv6/ip6_output.c +2
-2@@ -579,8 +579,8 @@ int ip6_forward(struct sk_buff *skb)return -ETIMEDOUT ; } -/* XXX: idev->cnf.proxy_ndp? */ - if (READ_ONCE(net->ipv6.devconf_all->proxy_ndp) && + if ((READ_ONCE(net->ipv6.devconf_all->proxy_ndp) || + (idev && READ_ONCE(idev->cnf.proxy_ndp))) &&
As stated by Ido, this changes a 20 years old user-visible behavior. It suddenly may enable proxy NDP on a system.
I was thinking that this kind of change was prohibited.
Regards,
Nicolas
Jakub Kicinski
maintainerQuoted 39 lines · On Mon, 29 Jun 2026 15:59:00 +0200 Nicolas Dichtel wrote:
Le 29/06/2026 à 08:18, Chenguang Zhao a écrit :
Quoted 38 lines
ndisc_recv_ns()has always checked bothdevconf_allandidev->cnfforproxy_ndp, butip6_forward()andndisc_recv_na()only looked at the global setting. The original commit left XXX comments in these paths likely because idev was not available there at the time;ip6_forward()now obtains idev from IP6CB(skb)->iif.Honor per-interface
proxy_ndpin both places to match the NS path and allow setups that only enableproxy_ndpon specific interfaces.In
ip6_forward(), idev is looked up via the ingress interface (iif) whilepneigh_lookup()usesskb->dev. For ND packets this is correct becausevrf_ip6_rcv()does not modifyskb->devfor neighbour discovery frames, so both refer to the ingress interface.Signed-off-by Chenguang Zhao <[email protected]>---
v2:
Per Ido's review, the following changes were made in v2:
- Target net-next instead of net
- Drop Fixes tag
- Expand commit message: XXX comment history, idev vsskb->devfor ND packets
- Fix subject prefixv1:
- https://lore.kernel.org/all/[email protected]/net/ipv6/ip6_output.c | 4 ++-- net/ipv6/ndisc.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-)net/ipv6/ip6_output.c +0
-0@@ -579,8 +579,8 @@ int ip6_forward(struct sk_buff *skb)return -ETIMEDOUT ; }
Quoted 7 lines
net/ipv6/ip6_output.c int ip6_forward(struct sk_buff *skb) · line 583
Quoted 4 lines
net/ipv6/ip6_output.c +2
-2-/* XXX: idev->cnf.proxy_ndp? */ - if (READ_ONCE(net->ipv6.devconf_all->proxy_ndp) && + if ((READ_ONCE(net->ipv6.devconf_all->proxy_ndp) || + (idev && READ_ONCE(idev->cnf.proxy_ndp))) &&As stated by Ido, this changes a 20 years old user-visible behavior. It suddenly may enable proxy NDP on a system.
I was thinking that this kind of change was prohibited.
Chenguang Zhao, is this a change you find useful or are you just acting on an AI-generated port about inconsistency in behavior? Could you please explain your use case / deployment scenario?
Thanks for the question.
Yes, I do find this useful; it is not only about cleaning up an inconsistency found by tooling.
The common deployment for proxy NDP is to enable it only on the upstream/WAN interface, not globally, for example:
# host with eth0 (WAN) and eth1 (LAN / containers / VPN) sysctl -w net.ipv6.conf.eth0.proxy_ndp=1 ip -6 neigh add proxy 2001:db8::10 dev eth0
This is what Documentation and most guides describe (ndppd, Docker IPv6, VPN/VPS setups that need to answer NS for addresses that live behind another interface). Operators usually avoid net.ipv6.conf.all.proxy_ndp=1 so proxying is not enabled on every interface.
With that setup today:
- ndisc_recv_ns() already honors idev->cnf.proxy_ndp, so NS replies work as expected;
- ip6_forward() / ndisc_recv_na() only look at net->ipv6.devconf_all->proxy_ndp, so the forward/local-delivery and NA handling for proxied addresses still require the global knob.
So per-interface proxy_ndp is only half-effective unless all.proxy_ndp is also set. The XXX comments look like that gap was known when proxy_ndp was introduced; idev is available on these paths now, so I want the remaining paths to match the NS path and the documented per-interface usage.
I did use code review assistance while looking at IPv6 NDP, but the motivation for sending the patch is the incomplete per-interface behavior above, not just "make the checks look the same".
Applying this patch only adds per-interface control for IPv6 proxy NDP
to enable finer-grained configuration, and it should have negligible
impact on existing systems with the global IPv6 proxy NDP enabled.
Chenguang
Thanks
Quoted 50 lines · Jakub Kicinski
Quoted 39 lines · On Mon, 29 Jun 2026 15:59:00 +0200 Nicolas Dichtel wrote:
Le 29/06/2026 à 08:18, Chenguang Zhao a écrit :
Quoted 38 lines
ndisc_recv_ns()has always checked bothdevconf_allandidev->cnfforproxy_ndp, butip6_forward()andndisc_recv_na()only looked at the global setting. The original commit left XXX comments in these paths likely because idev was not available there at the time;ip6_forward()now obtains idev from IP6CB(skb)->iif.Honor per-interface
proxy_ndpin both places to match the NS path and allow setups that only enableproxy_ndpon specific interfaces.In
ip6_forward(), idev is looked up via the ingress interface (iif) whilepneigh_lookup()usesskb->dev. For ND packets this is correct becausevrf_ip6_rcv()does not modifyskb->devfor neighbour discovery frames, so both refer to the ingress interface.Signed-off-by Chenguang Zhao <[email protected]>---
v2:
Per Ido's review, the following changes were made in v2:
- Target net-next instead of net
- Drop Fixes tag
- Expand commit message: XXX comment history, idev vsskb->devfor ND packets
- Fix subject prefixv1:
- https://lore.kernel.org/all/[email protected]/net/ipv6/ip6_output.c | 4 ++-- net/ipv6/ndisc.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-)net/ipv6/ip6_output.c +0
-0@@ -579,8 +579,8 @@ int ip6_forward(struct sk_buff *skb)return -ETIMEDOUT ; }Quoted 7 lines
net/ipv6/ip6_output.c int ip6_forward(struct sk_buff *skb) · line 583
Quoted 4 lines
net/ipv6/ip6_output.c +2
-2-/* XXX: idev->cnf.proxy_ndp? */ - if (READ_ONCE(net->ipv6.devconf_all->proxy_ndp) && + if ((READ_ONCE(net->ipv6.devconf_all->proxy_ndp) || + (idev && READ_ONCE(idev->cnf.proxy_ndp))) &&As stated by Ido, this changes a 20 years old user-visible behavior. It suddenly may enable proxy NDP on a system.
I was thinking that this kind of change was prohibited.Chenguang Zhao, is this a change you find useful or are you just acting on an AI-generated port about inconsistency in behavior? Could you please explain your use case / deployment scenario?