* [PATCH bpf] xsk: fix return value of xdp_umem_assign_dev()
@ 2018-08-20 0:54 Prashant Bhole
2018-08-20 5:11 ` Song Liu
` (2 more replies)
0 siblings, 3 replies; 6+ messages in thread
From: Prashant Bhole @ 2018-08-20 0:54 UTC (permalink / raw)
To: Alexei Starovoitov, Daniel Borkmann
Cc: Prashant Bhole, Björn Töpel, Magnus Karlsson,
David S . Miller, netdev
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
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH bpf] xsk: fix return value of xdp_umem_assign_dev()
2018-08-20 0:54 [PATCH bpf] xsk: fix return value of xdp_umem_assign_dev() Prashant Bhole
@ 2018-08-20 5:11 ` Song Liu
2018-08-20 8:31 ` Björn Töpel
2018-08-23 18:29 ` Jakub Kicinski
2 siblings, 0 replies; 6+ messages in thread
From: Song Liu @ 2018-08-20 5:11 UTC (permalink / raw)
To: Prashant Bhole
Cc: Alexei Starovoitov, Daniel Borkmann, Björn Töpel,
Magnus Karlsson, David S . Miller, Networking
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
>
>
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH bpf] xsk: fix return value of xdp_umem_assign_dev()
2018-08-20 0:54 [PATCH bpf] xsk: fix return value of xdp_umem_assign_dev() Prashant Bhole
2018-08-20 5:11 ` Song Liu
@ 2018-08-20 8:31 ` Björn Töpel
2018-08-21 20:12 ` Daniel Borkmann
2018-08-23 18:29 ` Jakub Kicinski
2 siblings, 1 reply; 6+ messages in thread
From: Björn Töpel @ 2018-08-20 8:31 UTC (permalink / raw)
To: bhole_prashant_q7
Cc: ast, Daniel Borkmann, Björn Töpel, Karlsson, Magnus,
David Miller, Netdev
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>
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH bpf] xsk: fix return value of xdp_umem_assign_dev()
2018-08-20 8:31 ` Björn Töpel
@ 2018-08-21 20:12 ` Daniel Borkmann
0 siblings, 0 replies; 6+ messages in thread
From: Daniel Borkmann @ 2018-08-21 20:12 UTC (permalink / raw)
To: Björn Töpel, bhole_prashant_q7
Cc: ast, Björn Töpel, Karlsson, Magnus, David Miller,
Netdev
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!
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH bpf] xsk: fix return value of xdp_umem_assign_dev()
2018-08-20 0:54 [PATCH bpf] xsk: fix return value of xdp_umem_assign_dev() Prashant Bhole
2018-08-20 5:11 ` Song Liu
2018-08-20 8:31 ` Björn Töpel
@ 2018-08-23 18:29 ` Jakub Kicinski
2018-08-23 23:10 ` Daniel Borkmann
2 siblings, 1 reply; 6+ messages in thread
From: Jakub Kicinski @ 2018-08-23 18:29 UTC (permalink / raw)
To: Prashant Bhole
Cc: Alexei Starovoitov, Daniel Borkmann, Björn Töpel,
Magnus Karlsson, David S . Miller, netdev
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?
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH bpf] xsk: fix return value of xdp_umem_assign_dev()
2018-08-23 18:29 ` Jakub Kicinski
@ 2018-08-23 23:10 ` Daniel Borkmann
0 siblings, 0 replies; 6+ messages in thread
From: Daniel Borkmann @ 2018-08-23 23:10 UTC (permalink / raw)
To: Jakub Kicinski, Prashant Bhole
Cc: Alexei Starovoitov, Björn Töpel, Magnus Karlsson,
David S . Miller, netdev
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!
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2018-08-24 2:42 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-08-20 0:54 [PATCH bpf] xsk: fix return value of xdp_umem_assign_dev() Prashant Bhole
2018-08-20 5:11 ` Song Liu
2018-08-20 8:31 ` Björn Töpel
2018-08-21 20:12 ` Daniel Borkmann
2018-08-23 18:29 ` Jakub Kicinski
2018-08-23 23:10 ` Daniel Borkmann
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox