diff mbox series

[net,v4] ipv6: fib6_rules: flush route cache when rule is changed

Message ID 09f2ab1b7946339da5092e10aa216e07c579c60b.camel@mediatek.com (mailing list archive)
State Changes Requested
Delegated to: Netdev Maintainers
Headers show
Series [net,v4] ipv6: fib6_rules: flush route cache when rule is changed | expand

Checks

Context Check Description
netdev/tree_selection success Clearly marked for net
netdev/apply fail Patch does not apply to net

Commit Message

Lena Wang (王娜) March 1, 2024, 2:39 p.m. UTC 
From: Shiming Cheng <shiming.cheng@mediatek.com>

When rule policy is changed, ipv6 socket cache is not refreshed.
The sock's skb still uses a outdated route cache and was sent to
a wrong interface.

To avoid this error we should update fib node's version when
rule is changed. Then skb's route will be reroute checked as
route cache version is already different with fib node version.
The route cache is refreshed to match the latest rule.

Fixes: 101367c2f8c4 ("[IPV6]: Policy Routing Rules")
Signed-off-by: Shiming Cheng <shiming.cheng@mediatek.com>
Signed-off-by: Lena Wang <lena.wang@mediatek.com>
---
v4: 
  - add "Fixes:" tag.
  - update subject as requested. 
v3: 
  - update patch description and name format in commit message.
v2: 
  - modify flush function same way as ipv4 flush cache.
  - use tabs to aligh with existing code.
---
---
 net/ipv6/fib6_rules.c | 6 ++++++
 1 file changed, 6 insertions(+)

 	.family			= AF_INET6,
 	.rule_size		= sizeof(struct fib6_rule),
@@ -461,6 +466,7 @@ static const struct fib_rules_ops __net_initconst
fib6_rules_ops_template = {
 	.compare		= fib6_rule_compare,
 	.fill			= fib6_rule_fill,
 	.nlmsg_payload		= fib6_rule_nlmsg_payload,
+	.flush_cache		= fib6_rule_flush_cache,
 	.nlgroup		= RTNLGRP_IPV6_RULE,
 	.owner			= THIS_MODULE,
 	.fro_net		= &init_net,

Comments

David Ahern March 1, 2024, 3:27 p.m. UTC | #1 
On 3/1/24 7:39 AM, Lena Wang (王娜) wrote:
> From: Shiming Cheng <shiming.cheng@mediatek.com>
> 
> When rule policy is changed, ipv6 socket cache is not refreshed.
> The sock's skb still uses a outdated route cache and was sent to
> a wrong interface.
> 
> To avoid this error we should update fib node's version when
> rule is changed. Then skb's route will be reroute checked as
> route cache version is already different with fib node version.
> The route cache is refreshed to match the latest rule.
> 
> Fixes: 101367c2f8c4 ("[IPV6]: Policy Routing Rules")
> Signed-off-by: Shiming Cheng <shiming.cheng@mediatek.com>
> Signed-off-by: Lena Wang <lena.wang@mediatek.com>
> ---
> v4: 
>   - add "Fixes:" tag.
>   - update subject as requested. 
> v3: 
>   - update patch description and name format in commit message.
> v2: 
>   - modify flush function same way as ipv4 flush cache.
>   - use tabs to aligh with existing code.
> ---
> ---
>  net/ipv6/fib6_rules.c | 6 ++++++
>  1 file changed, 6 insertions(+)
> 

Reviewed-by: David Ahern <dsahern@kernel.org>
Jiri Pirko March 1, 2024, 3:28 p.m. UTC | #2 
Fri, Mar 01, 2024 at 03:39:46PM CET, Lena.Wang@mediatek.com wrote:
>From: Shiming Cheng <shiming.cheng@mediatek.com>
>
>When rule policy is changed, ipv6 socket cache is not refreshed.
>The sock's skb still uses a outdated route cache and was sent to
>a wrong interface.
>
>To avoid this error we should update fib node's version when
>rule is changed. Then skb's route will be reroute checked as
>route cache version is already different with fib node version.
>The route cache is refreshed to match the latest rule.
>
>Fixes: 101367c2f8c4 ("[IPV6]: Policy Routing Rules")
>Signed-off-by: Shiming Cheng <shiming.cheng@mediatek.com>
>Signed-off-by: Lena Wang <lena.wang@mediatek.com>

Reviewed-by: Jiri Pirko <jiri@nvidia.com>
Jakub Kicinski March 5, 2024, 4:45 a.m. UTC | #3 
On Fri, 1 Mar 2024 14:39:46 +0000 Lena Wang (王娜) wrote:
> From: Shiming Cheng <shiming.cheng@mediatek.com>
> 
> When rule policy is changed, ipv6 socket cache is not refreshed.
> The sock's skb still uses a outdated route cache and was sent to
> a wrong interface.
> 
> To avoid this error we should update fib node's version when
> rule is changed. Then skb's route will be reroute checked as
> route cache version is already different with fib node version.
> The route cache is refreshed to match the latest rule.

Doesn't apply, please rebase on top of latest net/main.
Lena Wang (王娜) March 5, 2024, 1:01 p.m. UTC | #4 
On Mon, 2024-03-04 at 20:45 -0800, Jakub Kicinski wrote:
>  	 
> External email : Please do not click links or open attachments until
> you have verified the sender or the content.
>  On Fri, 1 Mar 2024 14:39:46 +0000 Lena Wang (王娜) wrote:
> > From: Shiming Cheng <shiming.cheng@mediatek.com>
> > 
> > When rule policy is changed, ipv6 socket cache is not refreshed.
> > The sock's skb still uses a outdated route cache and was sent to
> > a wrong interface.
> > 
> > To avoid this error we should update fib node's version when
> > rule is changed. Then skb's route will be reroute checked as
> > route cache version is already different with fib node version.
> > The route cache is refreshed to match the latest rule.
> 
> Doesn't apply, please rebase on top of latest net/main.
Hi Jakub,
I use master branch to make this patch. And it seems same with
main branch of kernel/git/netdev/net.git.

Could you tell me which branch should be used?

Thanks
Lena
Simon Horman March 5, 2024, 3:23 p.m. UTC | #5 
On Tue, Mar 05, 2024 at 01:01:24PM +0000, Lena Wang (王娜) wrote:
> On Mon, 2024-03-04 at 20:45 -0800, Jakub Kicinski wrote:
> >  	 
> > External email : Please do not click links or open attachments until
> > you have verified the sender or the content.
> >  On Fri, 1 Mar 2024 14:39:46 +0000 Lena Wang (王娜) wrote:
> > > From: Shiming Cheng <shiming.cheng@mediatek.com>
> > > 
> > > When rule policy is changed, ipv6 socket cache is not refreshed.
> > > The sock's skb still uses a outdated route cache and was sent to
> > > a wrong interface.
> > > 
> > > To avoid this error we should update fib node's version when
> > > rule is changed. Then skb's route will be reroute checked as
> > > route cache version is already different with fib node version.
> > > The route cache is refreshed to match the latest rule.
> > 
> > Doesn't apply, please rebase on top of latest net/main.
> Hi Jakub,
> I use master branch to make this patch. And it seems same with
> main branch of kernel/git/netdev/net.git.
> 
> Could you tell me which branch should be used?
> 
> Thanks
> Lena

Hi Lena,

The primary branch is main these days.
If you are using master than it may well be stale.

For reference, the current HEAD commit is.

4daa873133d3 ("Merge tag 'mlx5-fixes-2024-03-01' of git://git.kernel.org/pub/scm/linux/kernel/git/saeed/linux")
Lena Wang (王娜) March 6, 2024, 7:28 a.m. UTC | #6 
On Tue, 2024-03-05 at 15:23 +0000, Simon Horman wrote:
>  	 
> External email : Please do not click links or open attachments until
> you have verified the sender or the content.
>  On Tue, Mar 05, 2024 at 01:01:24PM +0000, Lena Wang (王娜) wrote:
> > On Mon, 2024-03-04 at 20:45 -0800, Jakub Kicinski wrote:
> > >   
> > > External email : Please do not click links or open attachments
> until
> > > you have verified the sender or the content.
> > >  On Fri, 1 Mar 2024 14:39:46 +0000 Lena Wang (王娜) wrote:
> > > > From: Shiming Cheng <shiming.cheng@mediatek.com>
> > > > 
> > > > When rule policy is changed, ipv6 socket cache is not
> refreshed.
> > > > The sock's skb still uses a outdated route cache and was sent
> to
> > > > a wrong interface.
> > > > 
> > > > To avoid this error we should update fib node's version when
> > > > rule is changed. Then skb's route will be reroute checked as
> > > > route cache version is already different with fib node version.
> > > > The route cache is refreshed to match the latest rule.
> > > 
> > > Doesn't apply, please rebase on top of latest net/main.
> > Hi Jakub,
> > I use master branch to make this patch. And it seems same with
> > main branch of kernel/git/netdev/net.git.
> > 
> > Could you tell me which branch should be used?
> > 
> > Thanks
> > Lena
> 
> Hi Lena,
> 
> The primary branch is main these days.
> If you are using master than it may well be stale.
> 
> For reference, the current HEAD commit is.
> 
> 4daa873133d3 ("Merge tag 'mlx5-fixes-2024-03-01' of
> git://git.kernel.org/pub/scm/linux/kernel/git/saeed/linux")

Hi Simon,
I clone a latest netdev main branch (on the 4daa873133d3) and make a
new patch diff. However it is totally same with PATCH v4.

Could you please help to check where the stale code is? 


Thanks
Lena
Jakub Kicinski March 6, 2024, 3:08 p.m. UTC | #7 
On Wed, 6 Mar 2024 07:28:39 +0000 Lena Wang (王娜) wrote:
> > The primary branch is main these days.
> > If you are using master than it may well be stale.
> > 
> > For reference, the current HEAD commit is.
> > 
> > 4daa873133d3 ("Merge tag 'mlx5-fixes-2024-03-01' of
> > git://git.kernel.org/pub/scm/linux/kernel/git/saeed/linux")  
> 
> Hi Simon,
> I clone a latest netdev main branch (on the 4daa873133d3) and make a
> new patch diff. However it is totally same with PATCH v4.
> 
> Could you please help to check where the stale code is? 

It's not the diff, your email setup corrupted the patch.
Please try resending with git send-email ?
diff mbox series

Patch

diff --git a/net/ipv6/fib6_rules.c b/net/ipv6/fib6_rules.c
index 7523c4baef35..52c04f0ac498 100644
--- a/net/ipv6/fib6_rules.c
+++ b/net/ipv6/fib6_rules.c
@@ -449,6 +449,11 @@  static size_t fib6_rule_nlmsg_payload(struct
fib_rule *rule)
 	       + nla_total_size(16); /* src */
 }
 
+static void fib6_rule_flush_cache(struct fib_rules_ops *ops)
+{
+	rt_genid_bump_ipv6(ops->fro_net);
+}
+
 static const struct fib_rules_ops __net_initconst
fib6_rules_ops_template = {