This has bugged me for a long, long time: rename btl_openib_iwarp.* ->
btl_openib_ip.*. The routines in these files are not specific to iwarp -- they are specific to IP interfaces used with IBV devices (even IB or IBoE/RoCEE/whatever devices). This commit was SVN r22718.
Этот коммит содержится в:
Jeff Squyres
родитель
a4a81698c2
Коммит
2e91de0bdd
@ -52,8 +52,8 @@ sources = \
|
||||
btl_openib_xrc.h \
|
||||
btl_openib_fd.h \
|
||||
btl_openib_fd.c \
|
||||
btl_openib_iwarp.h \
|
||||
btl_openib_iwarp.c \
|
||||
btl_openib_ip.h \
|
||||
btl_openib_ip.c \
|
||||
connect/base.h \
|
||||
connect/btl_openib_connect_base.c \
|
||||
connect/btl_openib_connect_oob.c \
|
||||
|
||||
@ -88,7 +88,7 @@ const char *ibv_get_sysfs_path(void);
|
||||
#include "btl_openib_async.h"
|
||||
#endif
|
||||
#include "connect/base.h"
|
||||
#include "btl_openib_iwarp.h"
|
||||
#include "btl_openib_ip.h"
|
||||
#include "ompi/runtime/params.h"
|
||||
|
||||
/*
|
||||
@ -592,7 +592,7 @@ static int init_one_port(opal_list_t *btl_list, mca_btl_openib_device_t *device,
|
||||
that member, then we're < OFED v1.2, and it can only be IB. */
|
||||
#if defined(HAVE_STRUCT_IBV_DEVICE_TRANSPORT_TYPE)
|
||||
if (IBV_TRANSPORT_IWARP == device->ib_dev->transport_type) {
|
||||
subnet_id = mca_btl_openib_get_iwarp_subnet_id(device->ib_dev, port_num);
|
||||
subnet_id = mca_btl_openib_get_ip_subnet_id(device->ib_dev, port_num);
|
||||
BTL_VERBOSE(("my iWARP subnet_id is %016" PRIx64, subnet_id));
|
||||
} else {
|
||||
memset(&gid, 0, sizeof(gid));
|
||||
@ -604,7 +604,7 @@ static int init_one_port(opal_list_t *btl_list, mca_btl_openib_device_t *device,
|
||||
|
||||
#ifdef OMPI_HAVE_RDMAOE
|
||||
if (IBV_LINK_LAYER_ETHERNET == ib_port_attr->link_layer) {
|
||||
subnet_id = mca_btl_openib_get_iwarp_subnet_id(device->ib_dev,
|
||||
subnet_id = mca_btl_openib_get_ip_subnet_id(device->ib_dev,
|
||||
port_num);
|
||||
} else {
|
||||
subnet_id = ntoh64(gid.global.subnet_prefix);
|
||||
|
||||
@ -27,7 +27,7 @@
|
||||
#endif
|
||||
/* Always want to include this file */
|
||||
#include "btl_openib_endpoint.h"
|
||||
#include "btl_openib_iwarp.h"
|
||||
#include "btl_openib_ip.h"
|
||||
#if OMPI_HAVE_RDMACM
|
||||
|
||||
/*
|
||||
@ -84,15 +84,15 @@ static char *stringify(uint32_t addr)
|
||||
* precisely specify which addresses are used (e.g., to effect
|
||||
* specific subnet routing).
|
||||
*/
|
||||
uint64_t mca_btl_openib_get_iwarp_subnet_id(struct ibv_device *ib_dev,
|
||||
uint8_t port)
|
||||
uint64_t mca_btl_openib_get_ip_subnet_id(struct ibv_device *ib_dev,
|
||||
uint8_t port)
|
||||
{
|
||||
opal_list_item_t *item;
|
||||
|
||||
/* In the off chance that the user forces non-rdmacm cpc and
|
||||
* iwarp, the list will be uninitialized. Return 0 to prevent
|
||||
* crashes, and the lack of it actually working will be caught at
|
||||
* a later stage.
|
||||
/* In the off chance that the user forces a non-RDMACM CPC and an
|
||||
* IP-based mechanism, the list will be uninitialized. Return 0
|
||||
* to prevent crashes, and the lack of it actually working will be
|
||||
* caught at a later stage.
|
||||
*/
|
||||
if (NULL == myaddrs) {
|
||||
return 0;
|
||||
@ -116,7 +116,7 @@ uint64_t mca_btl_openib_get_iwarp_subnet_id(struct ibv_device *ib_dev,
|
||||
* not necessitate having to do a list look up). Unfortunately, the
|
||||
* subnet and IP address look up needs to match or there could be a
|
||||
* mismatch if IP Aliases are being used. For more information on
|
||||
* this, please read comment above mca_btl_openib_get_iwarp_subnet_id.
|
||||
* this, please read comment above mca_btl_openib_get_ip_subnet_id.
|
||||
*/
|
||||
uint32_t mca_btl_openib_rdma_get_ipv4addr(struct ibv_context *verbs,
|
||||
uint8_t port)
|
||||
@ -421,7 +421,7 @@ void mca_btl_openib_free_rdma_addr_list(void)
|
||||
#else
|
||||
/* !OMPI_HAVE_RDMACM case */
|
||||
|
||||
uint64_t mca_btl_openib_get_iwarp_subnet_id(struct ibv_device *ib_dev,
|
||||
uint64_t mca_btl_openib_get_ip_subnet_id(struct ibv_device *ib_dev,
|
||||
uint8_t port)
|
||||
{
|
||||
return 0;
|
||||
@ -9,34 +9,34 @@
|
||||
* @file
|
||||
*/
|
||||
|
||||
#ifndef MCA_BTL_OPENIB_IWARP_H
|
||||
#define MCA_BTL_OPENIB_IWARP_H
|
||||
#ifndef MCA_BTL_OPENIB_IP_H
|
||||
#define MCA_BTL_OPENIB_IP_H
|
||||
|
||||
#include "ompi_config.h"
|
||||
|
||||
BEGIN_C_DECLS
|
||||
|
||||
/**
|
||||
* Get an iWARP equivalent of a subnet ID.
|
||||
* Get an IP equivalent of a subnet ID.
|
||||
*
|
||||
* @param ib_dev (IN) IB/iWARP device
|
||||
* @param ib_dev (IN) IBV device
|
||||
* @return Value of the IPv4 Address bitwise-and'ed with the Netmask
|
||||
*/
|
||||
extern uint64_t mca_btl_openib_get_iwarp_subnet_id(struct ibv_device *ib_dev,
|
||||
extern uint64_t mca_btl_openib_get_ip_subnet_id(struct ibv_device *ib_dev,
|
||||
uint8_t port);
|
||||
|
||||
/**
|
||||
* Get the IPv4 address of the specified HCA/RNIC device and physical port.
|
||||
*
|
||||
* @param verbs (IN) cm_id verbs of the IB/iWARP device
|
||||
* @param port (IN) physical port of the IB/iWARP device
|
||||
* @param verbs (IN) cm_id verbs of the IBV device
|
||||
* @param port (IN) physical port of the IBV device
|
||||
* @return IPv4 Address
|
||||
*/
|
||||
extern uint32_t mca_btl_openib_rdma_get_ipv4addr(struct ibv_context *verbs,
|
||||
uint8_t port);
|
||||
|
||||
/**
|
||||
* Create a list of all available IB and iWARP devices and each device's
|
||||
* Create a list of all available IBV devices and each device's
|
||||
* relevant information. This is necessary for
|
||||
* mca_btl_openib_rdma_get_ipv4addr to work.
|
||||
*
|
||||
@ -45,7 +45,7 @@ extern uint32_t mca_btl_openib_rdma_get_ipv4addr(struct ibv_context *verbs,
|
||||
extern int mca_btl_openib_build_rdma_addr_list(void);
|
||||
|
||||
/**
|
||||
* Free the list of all available IB and iWARP devices created by
|
||||
* Free the list of all available IBV devices created by
|
||||
* mca_btl_openib_build_rdma_addr_list.
|
||||
*/
|
||||
extern void mca_btl_openib_free_rdma_addr_list(void);
|
||||
@ -38,7 +38,7 @@
|
||||
#include "btl_openib_proc.h"
|
||||
#include "btl_openib_endpoint.h"
|
||||
#include "connect/connect.h"
|
||||
#include "btl_openib_iwarp.h"
|
||||
#include "btl_openib_ip.h"
|
||||
#include "btl_openib_ini.h"
|
||||
|
||||
/* JMS to be removed: see #1264 */
|
||||
@ -1697,7 +1697,7 @@ static int ipaddrcheck(id_context_t *context,
|
||||
* up). Unfortunately, the subnet and IP address look up needs to match or
|
||||
* there could be a mismatch if IP Aliases are being used. For more
|
||||
* information on this, please read comment above
|
||||
* mca_btl_openib_get_iwarp_subnet_id in btl_openib_iwarp.c
|
||||
* mca_btl_openib_get_ip_subnet_id in btl_openib_ip.c
|
||||
*/
|
||||
ipaddr =
|
||||
mca_btl_openib_rdma_get_ipv4addr(openib_btl->device->ib_dev_context,
|
||||
|
||||
Загрузка…
Ссылка в новой задаче
Block a user