leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

IB/rxe: Remove a pointless indirection layer

Browse Source 
Neither rxe->ifc_ops nor any of the function pointers in struct
struct rxe_ifc_ops ever change. Hence remove the rxe->ifc_ops
indirection mechanism.

Signed-off-by: Bart Van Assche <bart.vanassche@sandisk.com>
Reviewed-by: Leon Romanovsky <leonro@mellanox.com>
Reviewed-by: Andrew Boyer <andrew.boyer@dell.com>
Cc: Moni Shoua <monis@mellanox.com>
Signed-off-by: Doug Ledford <dledford@redhat.com>
This commit is contained in:
Bart Van Assche 2017-01-10 11:15:53 -08:00 committed by Doug Ledford
parent ab17654476
commit 839f5ac0d8
8 changed files with 42 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -178,7 +178,7 @@ static int rxe_init_ports(struct rxe_dev *rxe)
return -ENOMEM; return -ENOMEM;
port->pkey_tbl[0] = 0xffff; port->pkey_tbl[0] = 0xffff;
port->port_guid = rxe->ifc_ops->port_guid(rxe); port->port_guid = rxe_port_guid(rxe);
spin_lock_init(&port->port_lock); spin_lock_init(&port->port_lock);

20
drivers/infiniband/sw/rxe/rxe_loc.h
View File

@ -141,6 +141,22 @@ void rxe_mem_cleanup(struct rxe_pool_entry *arg);
int advance_dma_data(struct rxe_dma_info *dma, unsigned int length); int advance_dma_data(struct rxe_dma_info *dma, unsigned int length);
/* rxe_net.c */
int rxe_loopback(struct sk_buff *skb);
int rxe_send(struct rxe_dev *rxe, struct rxe_pkt_info *pkt,
struct sk_buff *skb);
__be64 rxe_port_guid(struct rxe_dev *rxe);
struct sk_buff *rxe_init_packet(struct rxe_dev *rxe, struct rxe_av *av,
int paylen, struct rxe_pkt_info *pkt);
int rxe_prepare(struct rxe_dev *rxe, struct rxe_pkt_info *pkt,
struct sk_buff *skb, u32 *crc);
enum rdma_link_layer rxe_link_layer(struct rxe_dev *rxe, unsigned int port_num);
const char *rxe_parent_name(struct rxe_dev *rxe, unsigned int port_num);
struct device *rxe_dma_device(struct rxe_dev *rxe);
__be64 rxe_node_guid(struct rxe_dev *rxe);
int rxe_mcast_add(struct rxe_dev *rxe, union ib_gid *mgid);
int rxe_mcast_delete(struct rxe_dev *rxe, union ib_gid *mgid);
/* rxe_qp.c */ /* rxe_qp.c */
int rxe_qp_chk_init(struct rxe_dev *rxe, struct ib_qp_init_attr *init); int rxe_qp_chk_init(struct rxe_dev *rxe, struct ib_qp_init_attr *init);
@ -257,9 +273,9 @@ static inline int rxe_xmit_packet(struct rxe_dev *rxe, struct rxe_qp *qp,
if (pkt->mask & RXE_LOOPBACK_MASK) { if (pkt->mask & RXE_LOOPBACK_MASK) {
memcpy(SKB_TO_PKT(skb), pkt, sizeof(*pkt)); memcpy(SKB_TO_PKT(skb), pkt, sizeof(*pkt));
err = rxe->ifc_ops->loopback(skb); err = rxe_loopback(skb);
} else { } else {
err = rxe->ifc_ops->send(rxe, pkt, skb); err = rxe_send(rxe, pkt, skb);
} }
if (err) { if (err) {

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

@ -61,7 +61,7 @@ int rxe_mcast_get_grp(struct rxe_dev *rxe, union ib_gid *mgid,
rxe_add_key(grp, mgid); rxe_add_key(grp, mgid);
err = rxe->ifc_ops->mcast_add(rxe, mgid); err = rxe_mcast_add(rxe, mgid);
if (err) if (err)
goto err2; goto err2;
@ -186,5 +186,5 @@ void rxe_mc_cleanup(struct rxe_pool_entry *arg)
struct rxe_dev *rxe = grp->rxe; struct rxe_dev *rxe = grp->rxe;
rxe_drop_key(grp); rxe_drop_key(grp);
rxe->ifc_ops->mcast_delete(rxe, &grp->mgid); rxe_mcast_delete(rxe, &grp->mgid);
} }

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

@ -102,17 +102,17 @@ static __be64 rxe_mac_to_eui64(struct net_device *ndev)
return eui64; return eui64;
} }
static __be64 node_guid(struct rxe_dev *rxe) __be64 rxe_node_guid(struct rxe_dev *rxe)
{ {
return rxe_mac_to_eui64(rxe->ndev); return rxe_mac_to_eui64(rxe->ndev);
} }
static __be64 port_guid(struct rxe_dev *rxe) __be64 rxe_port_guid(struct rxe_dev *rxe)
{ {
return rxe_mac_to_eui64(rxe->ndev); return rxe_mac_to_eui64(rxe->ndev);
} }
static struct device *dma_device(struct rxe_dev *rxe) struct device *rxe_dma_device(struct rxe_dev *rxe)
{ {
struct net_device *ndev; struct net_device *ndev;
@ -124,7 +124,7 @@ static struct device *dma_device(struct rxe_dev *rxe)
return ndev->dev.parent; return ndev->dev.parent;
} }
static int mcast_add(struct rxe_dev *rxe, union ib_gid *mgid) int rxe_mcast_add(struct rxe_dev *rxe, union ib_gid *mgid)
{ {
int err; int err;
unsigned char ll_addr[ETH_ALEN]; unsigned char ll_addr[ETH_ALEN];
@ -135,7 +135,7 @@ static int mcast_add(struct rxe_dev *rxe, union ib_gid *mgid)
return err; return err;
} }
static int mcast_delete(struct rxe_dev *rxe, union ib_gid *mgid) int rxe_mcast_delete(struct rxe_dev *rxe, union ib_gid *mgid)
{ {
int err; int err;
unsigned char ll_addr[ETH_ALEN]; unsigned char ll_addr[ETH_ALEN];
@ -397,8 +397,8 @@ static int prepare6(struct rxe_dev *rxe, struct rxe_pkt_info *pkt,
return 0; return 0;
} }
static int prepare(struct rxe_dev *rxe, struct rxe_pkt_info *pkt, int rxe_prepare(struct rxe_dev *rxe, struct rxe_pkt_info *pkt,
struct sk_buff *skb, u32 *crc) struct sk_buff *skb, u32 *crc)
{ {
int err = 0; int err = 0;
struct rxe_av *av = rxe_get_av(pkt); struct rxe_av *av = rxe_get_av(pkt);
@ -424,8 +424,7 @@ static void rxe_skb_tx_dtor(struct sk_buff *skb)
rxe_run_task(&qp->req.task, 1); rxe_run_task(&qp->req.task, 1);
} }
static int send(struct rxe_dev *rxe, struct rxe_pkt_info *pkt, int rxe_send(struct rxe_dev *rxe, struct rxe_pkt_info *pkt, struct sk_buff *skb)
struct sk_buff *skb)
{ {
struct sk_buff *nskb; struct sk_buff *nskb;
struct rxe_av *av; struct rxe_av *av;
@ -461,7 +460,7 @@ static int send(struct rxe_dev *rxe, struct rxe_pkt_info *pkt,
return 0; return 0;
} }
static int loopback(struct sk_buff *skb) int rxe_loopback(struct sk_buff *skb)
{ {
return rxe_rcv(skb); return rxe_rcv(skb);
} }
@ -471,8 +470,8 @@ static inline int addr_same(struct rxe_dev *rxe, struct rxe_av *av)
return rxe->port.port_guid == av->grh.dgid.global.interface_id; return rxe->port.port_guid == av->grh.dgid.global.interface_id;
} }
static struct sk_buff *init_packet(struct rxe_dev *rxe, struct rxe_av *av, struct sk_buff *rxe_init_packet(struct rxe_dev *rxe, struct rxe_av *av,
int paylen, struct rxe_pkt_info *pkt) int paylen, struct rxe_pkt_info *pkt)
{ {
unsigned int hdr_len; unsigned int hdr_len;
struct sk_buff *skb; struct sk_buff *skb;
@ -511,31 +510,16 @@ static struct sk_buff *init_packet(struct rxe_dev *rxe, struct rxe_av *av,
* this is required by rxe_cfg to match rxe devices in * this is required by rxe_cfg to match rxe devices in
* /sys/class/infiniband up with their underlying ethernet devices * /sys/class/infiniband up with their underlying ethernet devices
*/ */
static char *parent_name(struct rxe_dev *rxe, unsigned int port_num) const char *rxe_parent_name(struct rxe_dev *rxe, unsigned int port_num)
{ {
return rxe->ndev->name; return rxe->ndev->name;
} }
static enum rdma_link_layer link_layer(struct rxe_dev *rxe, enum rdma_link_layer rxe_link_layer(struct rxe_dev *rxe, unsigned int port_num)
unsigned int port_num)
{ {
return IB_LINK_LAYER_ETHERNET; return IB_LINK_LAYER_ETHERNET;
} }
static struct rxe_ifc_ops ifc_ops = {
.node_guid = node_guid,
.port_guid = port_guid,
.dma_device = dma_device,
.mcast_add = mcast_add,
.mcast_delete = mcast_delete,
.prepare = prepare,
.send = send,
.loopback = loopback,
.init_packet = init_packet,
.parent_name = parent_name,
.link_layer = link_layer,
};
struct rxe_dev *rxe_net_add(struct net_device *ndev) struct rxe_dev *rxe_net_add(struct net_device *ndev)
{ {
int err; int err;
@ -545,7 +529,6 @@ struct rxe_dev *rxe_net_add(struct net_device *ndev)
if (!rxe) if (!rxe)
return NULL; return NULL;
rxe->ifc_ops = &ifc_ops;
rxe->ndev = ndev; rxe->ndev = ndev;
err = rxe_add(rxe, ndev->mtu); err = rxe_add(rxe, ndev->mtu);

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

@ -404,7 +404,7 @@ static struct sk_buff *init_req_packet(struct rxe_qp *qp,
/* init skb */ /* init skb */
av = rxe_get_av(pkt); av = rxe_get_av(pkt);
skb = rxe->ifc_ops->init_packet(rxe, av, paylen, pkt); skb = rxe_init_packet(rxe, av, paylen, pkt);
if (unlikely(!skb)) if (unlikely(!skb))
return NULL; return NULL;
@ -475,7 +475,7 @@ static int fill_packet(struct rxe_qp *qp, struct rxe_send_wqe *wqe,
u32 *p; u32 *p;
int err; int err;
err = rxe->ifc_ops->prepare(rxe, pkt, skb, &crc); err = rxe_prepare(rxe, pkt, skb, &crc);
if (err) if (err)
return err; return err;

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

@ -608,7 +608,7 @@ static struct sk_buff *prepare_ack_packet(struct rxe_qp *qp,
pad = (-payload) & 0x3; pad = (-payload) & 0x3;
paylen = rxe_opcode[opcode].length + payload + pad + RXE_ICRC_SIZE; paylen = rxe_opcode[opcode].length + payload + pad + RXE_ICRC_SIZE;
skb = rxe->ifc_ops->init_packet(rxe, &qp->pri_av, paylen, ack); skb = rxe_init_packet(rxe, &qp->pri_av, paylen, ack);
if (!skb) if (!skb)
return NULL; return NULL;
@ -637,7 +637,7 @@ static struct sk_buff *prepare_ack_packet(struct rxe_qp *qp,
if (ack->mask & RXE_ATMACK_MASK) if (ack->mask & RXE_ATMACK_MASK)
atmack_set_orig(ack, qp->resp.atomic_orig); atmack_set_orig(ack, qp->resp.atomic_orig);
err = rxe->ifc_ops->prepare(rxe, ack, skb, &crc); err = rxe_prepare(rxe, ack, skb, &crc);
if (err) { if (err) {
kfree_skb(skb); kfree_skb(skb);
return NULL; return NULL;

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

@ -234,7 +234,7 @@ static enum rdma_link_layer rxe_get_link_layer(struct ib_device *dev,
{ {
struct rxe_dev *rxe = to_rdev(dev); struct rxe_dev *rxe = to_rdev(dev);
return rxe->ifc_ops->link_layer(rxe, port_num); return rxe_link_layer(rxe, port_num);
} }
static struct ib_ucontext *rxe_alloc_ucontext(struct ib_device *dev, static struct ib_ucontext *rxe_alloc_ucontext(struct ib_device *dev,
@ -1209,10 +1209,8 @@ static ssize_t rxe_show_parent(struct device *device,
{ {
struct rxe_dev *rxe = container_of(device, struct rxe_dev, struct rxe_dev *rxe = container_of(device, struct rxe_dev,
ib_dev.dev); ib_dev.dev);
char *name;
name = rxe->ifc_ops->parent_name(rxe, 1); return snprintf(buf, 16, "%s\n", rxe_parent_name(rxe, 1));
return snprintf(buf, 16, "%s\n", name);
} }
static DEVICE_ATTR(parent, S_IRUGO, rxe_show_parent, NULL); static DEVICE_ATTR(parent, S_IRUGO, rxe_show_parent, NULL);
@ -1234,9 +1232,9 @@ int rxe_register_device(struct rxe_dev *rxe)
dev->node_type = RDMA_NODE_IB_CA; dev->node_type = RDMA_NODE_IB_CA;
dev->phys_port_cnt = 1; dev->phys_port_cnt = 1;
dev->num_comp_vectors = RXE_NUM_COMP_VECTORS; dev->num_comp_vectors = RXE_NUM_COMP_VECTORS;
dev->dma_device = rxe->ifc_ops->dma_device(rxe); dev->dma_device = rxe_dma_device(rxe);
dev->local_dma_lkey = 0; dev->local_dma_lkey = 0;
dev->node_guid = rxe->ifc_ops->node_guid(rxe); dev->node_guid = rxe_node_guid(rxe);
dev->dma_ops = &rxe_dma_mapping_ops; dev->dma_ops = &rxe_dma_mapping_ops;
dev->uverbs_abi_ver = RXE_UVERBS_ABI_VERSION; dev->uverbs_abi_ver = RXE_UVERBS_ABI_VERSION;

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

@ -372,26 +372,6 @@ struct rxe_port {
u32 qp_gsi_index; u32 qp_gsi_index;
}; };
/* callbacks from rdma_rxe to network interface layer */
struct rxe_ifc_ops {
void (*release)(struct rxe_dev *rxe);
__be64 (*node_guid)(struct rxe_dev *rxe);
__be64 (*port_guid)(struct rxe_dev *rxe);
struct device *(*dma_device)(struct rxe_dev *rxe);
int (*mcast_add)(struct rxe_dev *rxe, union ib_gid *mgid);
int (*mcast_delete)(struct rxe_dev *rxe, union ib_gid *mgid);
int (*prepare)(struct rxe_dev *rxe, struct rxe_pkt_info *pkt,
struct sk_buff *skb, u32 *crc);
int (*send)(struct rxe_dev *rxe, struct rxe_pkt_info *pkt,
struct sk_buff *skb);
int (*loopback)(struct sk_buff *skb);
struct sk_buff *(*init_packet)(struct rxe_dev *rxe, struct rxe_av *av,
int paylen, struct rxe_pkt_info *pkt);
char *(*parent_name)(struct rxe_dev *rxe, unsigned int port_num);
enum rdma_link_layer (*link_layer)(struct rxe_dev *rxe,
unsigned int port_num);
};
struct rxe_dev { struct rxe_dev {
struct ib_device ib_dev; struct ib_device ib_dev;
struct ib_device_attr attr; struct ib_device_attr attr;
@ -400,8 +380,6 @@ struct rxe_dev {
struct kref ref_cnt; struct kref ref_cnt;
struct mutex usdev_lock; struct mutex usdev_lock;
struct rxe_ifc_ops *ifc_ops;
struct net_device *ndev; struct net_device *ndev;
int xmit_errors; int xmit_errors;