| Message ID | 20180820005425.2604-1-bhole_prashant_q7@lab.ntt.co.jp |
|---|---|
| State | Accepted, archived |
| Delegated to: | BPF Maintainers |
| Headers | show |
| Series | [bpf] xsk: fix return value of xdp_umem_assign_dev() | expand |
On Sun, Aug 19, 2018 at 5:54 PM, Prashant Bhole <bhole_prashant_q7@lab.ntt.co.jp> wrote: > s/ENOTSUPP/EOPNOTSUPP/ in function umem_assign_dev(). > This function's return value is directly returned by xsk_bind(). > EOPNOTSUPP is bind()'s possible return value. > > Fixes: f734607e819b ("xsk: refactor xdp_umem_assign_dev()") > Signed-off-by: Prashant Bhole <bhole_prashant_q7@lab.ntt.co.jp> Acked-by: Song Liu <songliubraving@fb.com> > --- > net/xdp/xdp_umem.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/net/xdp/xdp_umem.c b/net/xdp/xdp_umem.c > index 911ca6d3cb5a..bfe2dbea480b 100644 > --- a/net/xdp/xdp_umem.c > +++ b/net/xdp/xdp_umem.c > @@ -74,14 +74,14 @@ int xdp_umem_assign_dev(struct xdp_umem *umem, struct net_device *dev, > return 0; > > if (!dev->netdev_ops->ndo_bpf || !dev->netdev_ops->ndo_xsk_async_xmit) > - return force_zc ? -ENOTSUPP : 0; /* fail or fallback */ > + return force_zc ? -EOPNOTSUPP : 0; /* fail or fallback */ > > bpf.command = XDP_QUERY_XSK_UMEM; > > rtnl_lock(); > err = xdp_umem_query(dev, queue_id); > if (err) { > - err = err < 0 ? -ENOTSUPP : -EBUSY; > + err = err < 0 ? -EOPNOTSUPP : -EBUSY; > goto err_rtnl_unlock; > } > > -- > 2.17.1 > >
Den mån 20 aug. 2018 kl 02:58 skrev Prashant Bhole <bhole_prashant_q7@lab.ntt.co.jp>: > > s/ENOTSUPP/EOPNOTSUPP/ in function umem_assign_dev(). > This function's return value is directly returned by xsk_bind(). > EOPNOTSUPP is bind()'s possible return value. > > Fixes: f734607e819b ("xsk: refactor xdp_umem_assign_dev()") > Signed-off-by: Prashant Bhole <bhole_prashant_q7@lab.ntt.co.jp> > --- > net/xdp/xdp_umem.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/net/xdp/xdp_umem.c b/net/xdp/xdp_umem.c > index 911ca6d3cb5a..bfe2dbea480b 100644 > --- a/net/xdp/xdp_umem.c > +++ b/net/xdp/xdp_umem.c > @@ -74,14 +74,14 @@ int xdp_umem_assign_dev(struct xdp_umem *umem, struct net_device *dev, > return 0; > > if (!dev->netdev_ops->ndo_bpf || !dev->netdev_ops->ndo_xsk_async_xmit) > - return force_zc ? -ENOTSUPP : 0; /* fail or fallback */ > + return force_zc ? -EOPNOTSUPP : 0; /* fail or fallback */ > > bpf.command = XDP_QUERY_XSK_UMEM; > > rtnl_lock(); > err = xdp_umem_query(dev, queue_id); > if (err) { > - err = err < 0 ? -ENOTSUPP : -EBUSY; > + err = err < 0 ? -EOPNOTSUPP : -EBUSY; > goto err_rtnl_unlock; > } > > -- > 2.17.1 > > Acked-by: Björn Töpel <bjorn.topel@intel.com>
On 08/20/2018 10:31 AM, Björn Töpel wrote: > Den mån 20 aug. 2018 kl 02:58 skrev Prashant Bhole > <bhole_prashant_q7@lab.ntt.co.jp>: >> >> s/ENOTSUPP/EOPNOTSUPP/ in function umem_assign_dev(). >> This function's return value is directly returned by xsk_bind(). >> EOPNOTSUPP is bind()'s possible return value. >> >> Fixes: f734607e819b ("xsk: refactor xdp_umem_assign_dev()") >> Signed-off-by: Prashant Bhole <bhole_prashant_q7@lab.ntt.co.jp> Applied to bpf, thanks!
On Mon, 20 Aug 2018 09:54:25 +0900, Prashant Bhole wrote: > s/ENOTSUPP/EOPNOTSUPP/ in function umem_assign_dev(). > This function's return value is directly returned by xsk_bind(). > EOPNOTSUPP is bind()'s possible return value. > > Fixes: f734607e819b ("xsk: refactor xdp_umem_assign_dev()") > Signed-off-by: Prashant Bhole <bhole_prashant_q7@lab.ntt.co.jp> FWIW the refactoring commit just cleaned up the code, is it worth submitting a patch to stable to correct 4.18 as well?
On 08/23/2018 08:29 PM, Jakub Kicinski wrote: > On Mon, 20 Aug 2018 09:54:25 +0900, Prashant Bhole wrote: >> s/ENOTSUPP/EOPNOTSUPP/ in function umem_assign_dev(). >> This function's return value is directly returned by xsk_bind(). >> EOPNOTSUPP is bind()'s possible return value. >> >> Fixes: f734607e819b ("xsk: refactor xdp_umem_assign_dev()") >> Signed-off-by: Prashant Bhole <bhole_prashant_q7@lab.ntt.co.jp> > > FWIW the refactoring commit just cleaned up the code, is it worth > submitting a patch to stable to correct 4.18 as well? Yep, lets do that once it lands in mainline. Thanks!
diff --git a/net/xdp/xdp_umem.c b/net/xdp/xdp_umem.c index 911ca6d3cb5a..bfe2dbea480b 100644 --- a/net/xdp/xdp_umem.c +++ b/net/xdp/xdp_umem.c @@ -74,14 +74,14 @@ int xdp_umem_assign_dev(struct xdp_umem *umem, struct net_device *dev, return 0; if (!dev->netdev_ops->ndo_bpf || !dev->netdev_ops->ndo_xsk_async_xmit) - return force_zc ? -ENOTSUPP : 0; /* fail or fallback */ + return force_zc ? -EOPNOTSUPP : 0; /* fail or fallback */ bpf.command = XDP_QUERY_XSK_UMEM; rtnl_lock(); err = xdp_umem_query(dev, queue_id); if (err) { - err = err < 0 ? -ENOTSUPP : -EBUSY; + err = err < 0 ? -EOPNOTSUPP : -EBUSY; goto err_rtnl_unlock; }
s/ENOTSUPP/EOPNOTSUPP/ in function umem_assign_dev(). This function's return value is directly returned by xsk_bind(). EOPNOTSUPP is bind()'s possible return value. Fixes: f734607e819b ("xsk: refactor xdp_umem_assign_dev()") Signed-off-by: Prashant Bhole <bhole_prashant_q7@lab.ntt.co.jp> --- net/xdp/xdp_umem.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)