korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-12-12 05:24:12 +08:00
Code Issues Packages Projects Releases Wiki Activity

rdma_rxe: Use netlink messages to add/delete links

Browse Source 
Add support for the RDMA_NLDEV_CMD_NEWLINK/DELLINK messages which allow
dynamically adding new RXE links.  Deprecate the old module options for
now.

Cc: Moni Shoua <monis@mellanox.com>
Reviewed-by: Yanjun Zhu <yanjun.zhu@oracle.com>
Signed-off-by: Steve Wise <swise@opengridcomputing.com>
Signed-off-by: Jason Gunthorpe <jgg@mellanox.com>
This commit is contained in:
Steve Wise 2019-02-15 11:03:57 -08:00 committed by Jason Gunthorpe
parent 3856ec4b93
commit 66920e1b25
8 changed files with 46 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
drivers/infiniband/sw/rxe/rxe.c
View File

@ -31,6 +31,7 @@
* SOFTWARE. * SOFTWARE.
*/ */
#include <rdma/rdma_netlink.h>
#include <net/addrconf.h> #include <net/addrconf.h>
#include "rxe.h" #include "rxe.h"
#include "rxe_loc.h" #include "rxe_loc.h"
@ -301,7 +302,7 @@ void rxe_set_mtu(struct rxe_dev *rxe, unsigned int ndev_mtu)
/* called by ifc layer to create new rxe device. /* called by ifc layer to create new rxe device.
* The caller should allocate memory for rxe by calling ib_alloc_device. * The caller should allocate memory for rxe by calling ib_alloc_device.
*/ */
int rxe_add(struct rxe_dev *rxe, unsigned int mtu) int rxe_add(struct rxe_dev *rxe, unsigned int mtu, const char *ibdev_name)
{ {
int err; int err;
@ -311,9 +312,36 @@ int rxe_add(struct rxe_dev *rxe, unsigned int mtu)
rxe_set_mtu(rxe, mtu); rxe_set_mtu(rxe, mtu);
return rxe_register_device(rxe); return rxe_register_device(rxe, ibdev_name);
} }
static int rxe_newlink(const char *ibdev_name, struct net_device *ndev)
{
struct rxe_dev *exists;
int err = 0;
exists = rxe_get_dev_from_net(ndev);
if (exists) {
ib_device_put(&exists->ib_dev);
pr_err("already configured on %s\n", ndev->name);
err = -EEXIST;
goto err;
}
err = rxe_net_add(ibdev_name, ndev);
if (err) {
pr_err("failed to add %s\n", ndev->name);
goto err;
}
err:
return err;
}
static struct rdma_link_ops rxe_link_ops = {
.type = "rxe",
.newlink = rxe_newlink,
};
static int __init rxe_module_init(void) static int __init rxe_module_init(void)
{ {
int err; int err;
@ -329,12 +357,14 @@ static int __init rxe_module_init(void)
if (err) if (err)
return err; return err;
rdma_link_register(&rxe_link_ops);
pr_info("loaded\n"); pr_info("loaded\n");
return 0; return 0;
} }
static void __exit rxe_module_exit(void) static void __exit rxe_module_exit(void)
{ {
rdma_link_unregister(&rxe_link_ops);
ib_unregister_driver(RDMA_DRIVER_RXE); ib_unregister_driver(RDMA_DRIVER_RXE);
rxe_net_exit(); rxe_net_exit();
rxe_cache_exit(); rxe_cache_exit();
@ -344,3 +374,5 @@ static void __exit rxe_module_exit(void)
late_initcall(rxe_module_init); late_initcall(rxe_module_init);
module_exit(rxe_module_exit); module_exit(rxe_module_exit);
MODULE_ALIAS_RDMA_LINK("rxe");

2
drivers/infiniband/sw/rxe/rxe.h
View File

@ -95,7 +95,7 @@ static inline u32 rxe_crc32(struct rxe_dev *rxe,
void rxe_set_mtu(struct rxe_dev *rxe, unsigned int dev_mtu); void rxe_set_mtu(struct rxe_dev *rxe, unsigned int dev_mtu);
int rxe_add(struct rxe_dev *rxe, unsigned int mtu); int rxe_add(struct rxe_dev *rxe, unsigned int mtu, const char *ibdev_name);
void rxe_rcv(struct sk_buff *skb); void rxe_rcv(struct sk_buff *skb);

4
drivers/infiniband/sw/rxe/rxe_net.c
View File

@ -517,7 +517,7 @@ enum rdma_link_layer rxe_link_layer(struct rxe_dev *rxe, unsigned int port_num)
return IB_LINK_LAYER_ETHERNET; return IB_LINK_LAYER_ETHERNET;
} }
int rxe_net_add(struct net_device *ndev) int rxe_net_add(const char *ibdev_name, struct net_device *ndev)
{ {
int err; int err;
struct rxe_dev *rxe = NULL; struct rxe_dev *rxe = NULL;
@ -528,7 +528,7 @@ int rxe_net_add(struct net_device *ndev)
rxe->ndev = ndev; rxe->ndev = ndev;
err = rxe_add(rxe, ndev->mtu); err = rxe_add(rxe, ndev->mtu, ibdev_name);
if (err) { if (err) {
ib_dealloc_device(&rxe->ib_dev); ib_dealloc_device(&rxe->ib_dev);
return err; return err;

2
drivers/infiniband/sw/rxe/rxe_net.h
View File

@ -43,7 +43,7 @@ struct rxe_recv_sockets {
struct socket *sk6; struct socket *sk6;
}; };
int rxe_net_add(struct net_device *ndev); int rxe_net_add(const char *ibdev_name, struct net_device *ndev);
int rxe_net_init(void); int rxe_net_init(void);
void rxe_net_exit(void); void rxe_net_exit(void);

3
drivers/infiniband/sw/rxe/rxe_param.h
View File

@ -78,7 +78,8 @@ enum rxe_device_param {
| IB_DEVICE_SYS_IMAGE_GUID | IB_DEVICE_SYS_IMAGE_GUID
| IB_DEVICE_RC_RNR_NAK_GEN | IB_DEVICE_RC_RNR_NAK_GEN
| IB_DEVICE_SRQ_RESIZE | IB_DEVICE_SRQ_RESIZE
| IB_DEVICE_MEM_MGT_EXTENSIONS, | IB_DEVICE_MEM_MGT_EXTENSIONS
| IB_DEVICE_ALLOW_USER_UNREG,
RXE_MAX_SGE = 32, RXE_MAX_SGE = 32,
RXE_MAX_SGE_RD = 32, RXE_MAX_SGE_RD = 32,
RXE_MAX_CQ = 16384, RXE_MAX_CQ = 16384,

6
drivers/infiniband/sw/rxe/rxe_sysfs.c
View File

@ -81,7 +81,7 @@ static int rxe_param_set_add(const char *val, const struct kernel_param *kp)
goto err; goto err;
} }
err = rxe_net_add(ndev); err = rxe_net_add("rxe%d", ndev);
if (err) { if (err) {
pr_err("failed to add %s\n", intf); pr_err("failed to add %s\n", intf);
goto err; goto err;
@ -130,6 +130,6 @@ static const struct kernel_param_ops rxe_remove_ops = {
}; };
module_param_cb(add, &rxe_add_ops, NULL, 0200); module_param_cb(add, &rxe_add_ops, NULL, 0200);
MODULE_PARM_DESC(add, "Create RXE device over network interface"); MODULE_PARM_DESC(add, "DEPRECATED. Create RXE device over network interface");
module_param_cb(remove, &rxe_remove_ops, NULL, 0200); module_param_cb(remove, &rxe_remove_ops, NULL, 0200);
MODULE_PARM_DESC(remove, "Remove RXE device over network interface"); MODULE_PARM_DESC(remove, "DEPRECATED. Remove RXE device over network interface");

4
drivers/infiniband/sw/rxe/rxe_verbs.c
View File

@ -1182,7 +1182,7 @@ static const struct ib_device_ops rxe_dev_ops = {
INIT_RDMA_OBJ_SIZE(ib_pd, rxe_pd, ibpd), INIT_RDMA_OBJ_SIZE(ib_pd, rxe_pd, ibpd),
}; };
int rxe_register_device(struct rxe_dev *rxe) int rxe_register_device(struct rxe_dev *rxe, const char *ibdev_name)
{ {
int err; int err;
struct ib_device *dev = &rxe->ib_dev; struct ib_device *dev = &rxe->ib_dev;
@ -1251,7 +1251,7 @@ int rxe_register_device(struct rxe_dev *rxe)
rdma_set_device_sysfs_group(dev, &rxe_attr_group); rdma_set_device_sysfs_group(dev, &rxe_attr_group);
dev->driver_id = RDMA_DRIVER_RXE; dev->driver_id = RDMA_DRIVER_RXE;
err = ib_register_device(dev, "rxe%d"); err = ib_register_device(dev, ibdev_name);
if (err) if (err)
pr_warn("%s failed with error %d\n", __func__, err); pr_warn("%s failed with error %d\n", __func__, err);

2
drivers/infiniband/sw/rxe/rxe_verbs.h
View File

@ -464,7 +464,7 @@ static inline struct rxe_mem *to_rmw(struct ib_mw *mw)
return mw ? container_of(mw, struct rxe_mem, ibmw) : NULL; return mw ? container_of(mw, struct rxe_mem, ibmw) : NULL;
} }
int rxe_register_device(struct rxe_dev *rxe); int rxe_register_device(struct rxe_dev *rxe, const char *ibdev_name);
void rxe_mc_cleanup(struct rxe_pool_entry *arg); void rxe_mc_cleanup(struct rxe_pool_entry *arg);