iwpmd fixes
cover iwpmd fixes
This is a series of Portmapper fixes.
Tatyana Nikolova (2):
iwpmd: Start the service if IPv4 or IPv6 is available
iwpmd: Remove IP address checking per mapping
iwpmd/iwarp_pm_common.c | 2 +- iwpmd/iwarp_pm_helper.c | 89 +---------------------------------------- iwpmd/iwarp_pm_server.c | 82 +++++++++++++++++++++---------------- 3 files changed, 50 insertions(+), 123 deletions(-)
Signature · 1 line
2.32.0
PATCH 1/2 iwpmd: Start the service if IPv4 or IPv6 is available
From: Tatyana Nikolova <[email protected]>
Currently the iwpmd fails to start if IPv6 isn't enabled.
systemd: Starting iWarp Port Mapper... iwpmd[118194]: create_iwpm_socket_v6: Unable to create socket. Address family not supported by protocol. iwpmd[118194]: main: Couldn't start iWarp Port Mapper
systemd: iwpmd.service: main process exited, code=exited, status=1/FAILURE
This isn't necessary because iwpmd can use IPv4 for all its functions.
This fix allows iwpmd to start if either IPv6 or IPv4 is available.
--- iwpmd/iwarp_pm_common.c | 2 +- iwpmd/iwarp_pm_server.c | 82 +++++++++++++++++++++++------------------ 2 files changed, 48 insertions(+), 36 deletions(-)
iwpmd/iwarp_pm_common.c +1 -1
@@ -264,7 +264,7 @@ create_nl_socket_exit:*/ void destroy_iwpm_socket (int pm_sock) { -if (pm_sock >0 ) +if (pm_sock >=0 )close (pm_sock); pm_sock =-1 ; }
iwpmd/iwarp_pm_server.c +47 -35
123 lines not on this page · raw message
Signature · 1 line
2.32.0
PATCH 2/2 iwpmd: Remove IP address checking per mapping
In reply to Sindhu DevaleFrom: Tatyana Nikolova <[email protected]>
IP address checking per mapping is redundant, because the IP address has already been checked in the rdma_bind_addr() in kernel before the IP address is passed to the iwpmd.
Without removing this logic, the system call getifaddrs() could take long time and cause mapping requests to timeout.
--- iwpmd/iwarp_pm_helper.c | 89 +---------------------------------------- 1 file changed, 2 insertions(+), 87 deletions(-)
iwpmd/iwarp_pm_helper.c +2 -87
@@ -172,83 +172,6 @@ int send_iwpm_msg(void (*form_msg_type)(iwpm_wire_msg *, iwpm_msg_parms *),return add_iwpm_pending_msg (&send_msg); } -/** -* check_iwpm_ip_addr - Check if the local IP address is valid -* @local_addr: local IP address to verify -* -* Check if the local IP address is used by the host ethernet interfaces -*/ -static int check_iwpm_ip_addr (struct sockaddr_storage *local_addr) -{ -struct ifaddrs ifa; -struct ifaddrs *ifap = &ifa; -struct ifaddrs **ifa_list = &ifap; -struct ifaddrs *ifa_current; -int found_addr =0 ; -int ret = -EINVAL ; - -/* get a list of host ethernet interfaces */ -if ((ret =getifaddrs (ifa_list)) <0 ) { -syslog (LOG_WARNING ,"check_iwpm_ip_addr: Unable to get the list of interfaces (%s).\n" , -strerror (errno)); -return ret; - } -/* go through the list to make sure local IP address is valid */ - ifa_current = *ifa_list; -while (ifa_current !=NULL && !found_addr) { -if (local_addr->ss_family == ifa_current->ifa_addr->sa_family) { -switch (ifa_current->ifa_addr->sa_family) { -case AF_INET : { -if (!memcmp (&((struct sockaddr_in *) - ifa_current->ifa_addr)->sin_addr.s_addr, - &((struct sockaddr_in *)local_addr)->sin_addr.s_addr, -IWARP_PM_IPV4_ADDR )) { - - found_addr =1 ; - } -break ; - } -case AF_INET6 : { -if (!memcmp (&((struct sockaddr_in6 *) - ifa_current->ifa_addr)->sin6_addr.s6_addr, - &((struct sockaddr_in6 *)local_addr)->sin6_addr.s6_addr, -INET6_ADDRSTRLEN )) - - found_addr =1 ; -break ; - } -default : -break ; - } - } - ifa_current = ifa_current->ifa_next; - } -if (found_addr) - ret =0 ; - -freeifaddrs (*ifa_list); -return ret; -} - -/** -* get_iwpm_ip_addr - Get a mapped IP address -* @local_addr: local IP address to map -* @mapped_addr: to store the mapped local IP address -* -* Currently, don't map the local IP address -*/ -static int get_iwpm_ip_addr (struct sockaddr_storage *local_addr, -struct sockaddr_storage *mapped_addr) -{ -int ret =check_iwpm_ip_addr (local_addr); -if (!ret) -memcpy (mapped_addr, local_addr,sizeof (struct sockaddr_storage )); -else -iwpm_debug (IWARP_PM_ALL_DBG ,"get_iwpm_ip_addr: Invalid local IP address.\n" ); - -return ret; -} -/** * get_iwpm_tcp_port - Get a new TCP port from the host stack * @addr_family: should be valid AF_INET or AF_INET6
@@ -358,18 +281,14 @@ iwpm_mapped_port *create_iwpm_mapped_port(struct sockaddr_storage *local_addr, istruct sockaddr_storage mapped_addr;int new_sd; -/* check the local IP address */ -if (get_iwpm_ip_addr (local_addr, &mapped_addr)) - goto create_mapped_port_error; +memcpy (&mapped_addr, local_addr,sizeof (mapped_addr));/* get a tcp port from the host net stack */ if (flags &IWPM_FLAGS_NO_PORT_MAP ) { - mapped_addr = *local_addr; new_sd =-1 ; }else {if (get_iwpm_tcp_port (local_addr->ss_family,0 , &mapped_addr, &new_sd)) goto create_mapped_port_error; } - iwpm_port =get_iwpm_port (client_idx, local_addr, &mapped_addr, new_sd);return iwpm_port;
@@ -391,11 +310,7 @@ iwpm_mapped_port *reopen_iwpm_mapped_port(struct sockaddr_storage *local_addr,iwpm_mapped_port *iwpm_port;int new_sd =-1 ;const char *str_err ="" ; -int ret =check_iwpm_ip_addr (local_addr); -if (ret) { - str_err ="Invalid local IP address" ; - goto reopen_mapped_port_error; - } +if (local_addr->ss_family != mapped_addr->ss_family) { str_err ="Different local and mapped sockaddr families" ; goto reopen_mapped_port_error;
Signature · 1 line
2.32.0
Leon Romanovsky
AppliedQuoted 10 lines · Sindhu Devale
This is a series of Portmapper fixes.
Tatyana Nikolova (2):
iwpmd: Start the service if IPv4 or IPv6 is available
iwpmd: Remove IP address checking per mappingiwpmd/iwarp_pm_common.c | 2 +- iwpmd/iwarp_pm_helper.c | 89 +---------------------------------------- iwpmd/iwarp_pm_server.c | 82 +++++++++++++++++++++---------------- 3 files changed, 50 insertions(+), 123 deletions(-)
Thanks, applied.
https://github.com/linux-rdma/rdma-core/pull/1037
Quoted 4 lines
Signature · 2 lines
-- 2.32.0