Skip to content

Commit fe2b401

Browse files
committed
svcrdma: Allocate new transports on device's NUMA node
The physical device's NUMA node ID is available when allocating an svc_xprt for an incoming connection. Use that value to ensure the svc_xprt structure is allocated on the NUMA node closest to the device. Signed-off-by: Chuck Lever <[email protected]>
1 parent 665e89a commit fe2b401

File tree

1 file changed

+9
-9
lines changed

1 file changed

+9
-9
lines changed

net/sunrpc/xprtrdma/svc_rdma_transport.c

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@
6464
#define RPCDBG_FACILITY RPCDBG_SVCXPRT
6565

6666
static struct svcxprt_rdma *svc_rdma_create_xprt(struct svc_serv *serv,
67-
struct net *net);
67+
struct net *net, int node);
6868
static struct svc_xprt *svc_rdma_create(struct svc_serv *serv,
6969
struct net *net,
7070
struct sockaddr *sa, int salen,
@@ -123,14 +123,14 @@ static void qp_event_handler(struct ib_event *event, void *context)
123123
}
124124

125125
static struct svcxprt_rdma *svc_rdma_create_xprt(struct svc_serv *serv,
126-
struct net *net)
126+
struct net *net, int node)
127127
{
128-
struct svcxprt_rdma *cma_xprt = kzalloc(sizeof *cma_xprt, GFP_KERNEL);
128+
struct svcxprt_rdma *cma_xprt;
129129

130-
if (!cma_xprt) {
131-
dprintk("svcrdma: failed to create new transport\n");
130+
cma_xprt = kzalloc_node(sizeof(*cma_xprt), GFP_KERNEL, node);
131+
if (!cma_xprt)
132132
return NULL;
133-
}
133+
134134
svc_xprt_init(net, &svc_rdma_class, &cma_xprt->sc_xprt, serv);
135135
INIT_LIST_HEAD(&cma_xprt->sc_accept_q);
136136
INIT_LIST_HEAD(&cma_xprt->sc_rq_dto_q);
@@ -193,9 +193,9 @@ static void handle_connect_req(struct rdma_cm_id *new_cma_id,
193193
struct svcxprt_rdma *newxprt;
194194
struct sockaddr *sa;
195195

196-
/* Create a new transport */
197196
newxprt = svc_rdma_create_xprt(listen_xprt->sc_xprt.xpt_server,
198-
listen_xprt->sc_xprt.xpt_net);
197+
listen_xprt->sc_xprt.xpt_net,
198+
ibdev_to_node(new_cma_id->device));
199199
if (!newxprt)
200200
return;
201201
newxprt->sc_cm_id = new_cma_id;
@@ -304,7 +304,7 @@ static struct svc_xprt *svc_rdma_create(struct svc_serv *serv,
304304

305305
if (sa->sa_family != AF_INET && sa->sa_family != AF_INET6)
306306
return ERR_PTR(-EAFNOSUPPORT);
307-
cma_xprt = svc_rdma_create_xprt(serv, net);
307+
cma_xprt = svc_rdma_create_xprt(serv, net, NUMA_NO_NODE);
308308
if (!cma_xprt)
309309
return ERR_PTR(-ENOMEM);
310310
set_bit(XPT_LISTENER, &cma_xprt->sc_xprt.xpt_flags);

0 commit comments

Comments
 (0)