RDMA/rxe: Fix failure during driver load
Subsystems (2)
PATCH 1/1 RDMA/rxe: Fix failure during driver load
To avoid the following failure when trying to load the rdma_rxe module while IPv6 is disabled, add a check for EAFNOSUPPORT to ignore the failure, also delete the needless debug print from rxe_setup_udp_tunnel().
$ modprobe rdma_rxe modprobe: ERROR: could not insert 'rdma_rxe': Operation not permitted
--- drivers/infiniband/sw/rxe/rxe_net.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-)
drivers/infiniband/sw/rxe/rxe_net.c +7 -3
@@ -207,10 +207,8 @@ static struct socket *rxe_setup_udp_tunnel(struct net *net, __be16 port,/* Create UDP socket */ err =udp_sock_create (net, &udp_cfg, &sock); -if (err <0 ) { -pr_err ("failed to create udp socket. err = %d\n" , err); +if (err <0 )return ERR_PTR (err); - } tnl_cfg.encap_type =1 ; tnl_cfg.encap_rcv = rxe_udp_encap_recv;
@@ -619,6 +617,12 @@ static int rxe_net_ipv6_init(void) recv_sockets.sk6 =rxe_setup_udp_tunnel (&init_net,htons (ROCE_V2_UDP_DPORT ), true); +if (PTR_ERR (recv_sockets.sk6) == -EAFNOSUPPORT ) { + recv_sockets.sk6 =NULL ; +pr_warn ("IPv6 is not supported can not create UDP socket\n" ); +return 0 ; + } +if (IS_ERR (recv_sockets.sk6)) { recv_sockets.sk6 =NULL ;pr_err ("Failed to create IPv6 UDP tunnel\n" );
Signature · 1 line
2.26.3
Quoted 30 lines · Kamal Heib
To avoid the following failure when trying to load the
rdma_rxemodule while IPv6 is disabled, add a check for EAFNOSUPPORT to ignore the failure, also delete the needless debug print fromrxe_setup_udp_tunnel().$ modprobe rdma_rxe modprobe: ERROR: could not insert 'rdma_rxe': Operation not permittedFixes dfdd6158ca2c ("IB/rxe: Fix kernel panic in udp_setup_tunnel")Signed-off-by Kamal Heib <[email protected]>---
drivers/infiniband/sw/rxe/rxe_net.c| 10 +++++++---1 file changed, 7 insertions(+), 3 deletions(-)drivers/infiniband/sw/rxe/rxe_net.c +1
-3@@ -207,10 +207,8 @@ static struct socket *rxe_setup_udp_tunnel(struct net *net, __be16 port,/* Create UDP socket */ err =udp_sock_create (net, &udp_cfg, &sock); -if (err <0 ) { -pr_err ("failed to create udp socket. err = %d\n" , err); +if (err <0 )return ERR_PTR (err); - } tnl_cfg.encap_type =1 ; tnl_cfg.encap_rcv = rxe_udp_encap_recv;
drivers/infiniband/sw/rxe/rxe_net.c static int rxe_net_ipv6_init(void) · line 622
Quoted 6 lines
drivers/infiniband/sw/rxe/rxe_net.c +3
-0@@ -619,6 +617,12 @@ static int rxe_net_ipv6_init(void) recv_sockets.sk6 =rxe_setup_udp_tunnel (&init_net,htons (ROCE_V2_UDP_DPORT ), true); +if (PTR_ERR (recv_sockets.sk6) == -EAFNOSUPPORT ) { + recv_sockets.sk6 =NULL ; +pr_warn ("IPv6 is not supported can not create UDP socket\n" );
This warning doesn't read smoothly.
Zhu Yanjun
Quoted 8 lines
drivers/infiniband/sw/rxe/rxe_net.c +3
-0+return 0 ; + } +if (IS_ERR (recv_sockets.sk6)) { recv_sockets.sk6 =NULL ;pr_err ("Failed to create IPv6 UDP tunnel\n" );Signature · 1 line
2.26.3
Jason Gunthorpe
maintainerQuoted 4 lines · Kamal Heib
To avoid the following failure when trying to load the
rdma_rxemodule while IPv6 is disabled, add a check for EAFNOSUPPORT to ignore the failure, also delete the needless debug print fromrxe_setup_udp_tunnel().
Quoted 8 lines
$ modprobe rdma_rxe modprobe: ERROR: could not insert 'rdma_rxe': Operation not permittedFixes dfdd6158ca2c ("IB/rxe: Fix kernel panic in udp_setup_tunnel")Signed-off-by Kamal Heib <[email protected]>--
drivers/infiniband/sw/rxe/rxe_net.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-)
I tidied the pr_warn english and put this to for-next
It has been broken for so long, and in such a small way, I can't see this as a -rc fix.
Thanks,
Jason
Quoted 14 lines · Jason Gunthorpe
Quoted 4 lines · Kamal Heib
To avoid the following failure when trying to load the
rdma_rxemodule while IPv6 is disabled, add a check for EAFNOSUPPORT to ignore the failure, also delete the needless debug print fromrxe_setup_udp_tunnel().Quoted 8 lines
$ modprobe rdma_rxe modprobe: ERROR: could not insert 'rdma_rxe': Operation not permittedFixes dfdd6158ca2c ("IB/rxe: Fix kernel panic in udp_setup_tunnel")Signed-off-by Kamal Heib <[email protected]>--
drivers/infiniband/sw/rxe/rxe_net.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-)
Quoted 7 lines
I tidied the
pr_warnenglish and put this to for-nextIt has been broken for so long, and in such a small way, I can't see this as a -rc fix.
Thanks,
Jason
Thanks a lot Jason.
Could you please add the reported-by tag to this patch? - I've missed it, Sorry :-(.
Thanks,
Kamal