* [PATCH net-next] bpf: fix the printing of ifindex
@ 2017-08-02 15:43 William Tu
2017-08-02 15:53 ` Daniel Borkmann
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: William Tu @ 2017-08-02 15:43 UTC (permalink / raw)
To: netdev
Save the ifindex before it gets zeroed so the invalid
ifindex can be printed out.
Signed-off-by: William Tu <u9012063@gmail.com>
---
net/core/filter.c | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/net/core/filter.c b/net/core/filter.c
index 7e9708653c6f..78d00933dbe7 100644
--- a/net/core/filter.c
+++ b/net/core/filter.c
@@ -2509,15 +2509,16 @@ int xdp_do_redirect(struct net_device *dev, struct xdp_buff *xdp,
{
struct redirect_info *ri = this_cpu_ptr(&redirect_info);
struct net_device *fwd;
+ u32 index = ri->ifindex;
if (ri->map)
return xdp_do_redirect_map(dev, xdp, xdp_prog);
- fwd = dev_get_by_index_rcu(dev_net(dev), ri->ifindex);
+ fwd = dev_get_by_index_rcu(dev_net(dev), index);
ri->ifindex = 0;
ri->map = NULL;
if (unlikely(!fwd)) {
- bpf_warn_invalid_xdp_redirect(ri->ifindex);
+ bpf_warn_invalid_xdp_redirect(index);
return -EINVAL;
}
@@ -2531,11 +2532,12 @@ int xdp_do_generic_redirect(struct net_device *dev, struct sk_buff *skb)
{
struct redirect_info *ri = this_cpu_ptr(&redirect_info);
unsigned int len;
+ u32 index = ri->ifindex;
- dev = dev_get_by_index_rcu(dev_net(dev), ri->ifindex);
+ dev = dev_get_by_index_rcu(dev_net(dev), index);
ri->ifindex = 0;
if (unlikely(!dev)) {
- bpf_warn_invalid_xdp_redirect(ri->ifindex);
+ bpf_warn_invalid_xdp_redirect(index);
goto err;
}
--
2.7.4
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH net-next] bpf: fix the printing of ifindex
2017-08-02 15:43 [PATCH net-next] bpf: fix the printing of ifindex William Tu
@ 2017-08-02 15:53 ` Daniel Borkmann
2017-08-02 16:06 ` John Fastabend
2017-08-03 16:25 ` David Miller
2 siblings, 0 replies; 4+ messages in thread
From: Daniel Borkmann @ 2017-08-02 15:53 UTC (permalink / raw)
To: William Tu; +Cc: netdev, john.fastabend
On 08/02/2017 05:43 PM, William Tu wrote:
> Save the ifindex before it gets zeroed so the invalid
> ifindex can be printed out.
>
> Signed-off-by: William Tu <u9012063@gmail.com>
Acked-by: Daniel Borkmann <daniel@iogearbox.net>
> net/core/filter.c | 10 ++++++----
> 1 file changed, 6 insertions(+), 4 deletions(-)
>
> diff --git a/net/core/filter.c b/net/core/filter.c
> index 7e9708653c6f..78d00933dbe7 100644
> --- a/net/core/filter.c
> +++ b/net/core/filter.c
> @@ -2509,15 +2509,16 @@ int xdp_do_redirect(struct net_device *dev, struct xdp_buff *xdp,
> {
> struct redirect_info *ri = this_cpu_ptr(&redirect_info);
> struct net_device *fwd;
> + u32 index = ri->ifindex;
>
> if (ri->map)
> return xdp_do_redirect_map(dev, xdp, xdp_prog);
>
> - fwd = dev_get_by_index_rcu(dev_net(dev), ri->ifindex);
> + fwd = dev_get_by_index_rcu(dev_net(dev), index);
> ri->ifindex = 0;
> ri->map = NULL;
Unrelated, but setting ri->map to NULL is not really needed here
given we have the ri->map test earlier.
> if (unlikely(!fwd)) {
> - bpf_warn_invalid_xdp_redirect(ri->ifindex);
> + bpf_warn_invalid_xdp_redirect(index);
> return -EINVAL;
> }
>
> @@ -2531,11 +2532,12 @@ int xdp_do_generic_redirect(struct net_device *dev, struct sk_buff *skb)
> {
> struct redirect_info *ri = this_cpu_ptr(&redirect_info);
> unsigned int len;
> + u32 index = ri->ifindex;
>
> - dev = dev_get_by_index_rcu(dev_net(dev), ri->ifindex);
> + dev = dev_get_by_index_rcu(dev_net(dev), index);
> ri->ifindex = 0;
> if (unlikely(!dev)) {
> - bpf_warn_invalid_xdp_redirect(ri->ifindex);
> + bpf_warn_invalid_xdp_redirect(index);
> goto err;
> }
>
>
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH net-next] bpf: fix the printing of ifindex
2017-08-02 15:43 [PATCH net-next] bpf: fix the printing of ifindex William Tu
2017-08-02 15:53 ` Daniel Borkmann
@ 2017-08-02 16:06 ` John Fastabend
2017-08-03 16:25 ` David Miller
2 siblings, 0 replies; 4+ messages in thread
From: John Fastabend @ 2017-08-02 16:06 UTC (permalink / raw)
To: William Tu, netdev
On 08/02/2017 08:43 AM, William Tu wrote:
> Save the ifindex before it gets zeroed so the invalid
> ifindex can be printed out.
>
> Signed-off-by: William Tu <u9012063@gmail.com>
> ---
Thanks!
Acked-by: John Fastabend <john.fastabend@gmail.com>
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH net-next] bpf: fix the printing of ifindex
2017-08-02 15:43 [PATCH net-next] bpf: fix the printing of ifindex William Tu
2017-08-02 15:53 ` Daniel Borkmann
2017-08-02 16:06 ` John Fastabend
@ 2017-08-03 16:25 ` David Miller
2 siblings, 0 replies; 4+ messages in thread
From: David Miller @ 2017-08-03 16:25 UTC (permalink / raw)
To: u9012063; +Cc: netdev
From: William Tu <u9012063@gmail.com>
Date: Wed, 2 Aug 2017 08:43:52 -0700
> Save the ifindex before it gets zeroed so the invalid
> ifindex can be printed out.
>
> Signed-off-by: William Tu <u9012063@gmail.com>
Applied, thanks.
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2017-08-03 16:25 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-08-02 15:43 [PATCH net-next] bpf: fix the printing of ifindex William Tu
2017-08-02 15:53 ` Daniel Borkmann
2017-08-02 16:06 ` John Fastabend
2017-08-03 16:25 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).