Skip to content

Commit dfb8434

Browse files
sowminivdavem330
authored andcommitted
selftests/net: add zerocopy support for PF_RDS test case
Send a cookie with sendmsg() on PF_RDS sockets, and process the returned batched cookies in do_recv_completion() Signed-off-by: Sowmini Varadhan <[email protected]> Acked-by: Willem de Bruijn <[email protected]> Signed-off-by: David S. Miller <[email protected]>
1 parent b16ac92 commit dfb8434

File tree

1 file changed

+64
-4
lines changed

1 file changed

+64
-4
lines changed

tools/testing/selftests/net/msg_zerocopy.c

Lines changed: 64 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -168,17 +168,39 @@ static int do_accept(int fd)
168168
return fd;
169169
}
170170

171-
static bool do_sendmsg(int fd, struct msghdr *msg, bool do_zerocopy)
171+
static void add_zcopy_cookie(struct msghdr *msg, uint32_t cookie)
172+
{
173+
struct cmsghdr *cm;
174+
175+
if (!msg->msg_control)
176+
error(1, errno, "NULL cookie");
177+
cm = (void *)msg->msg_control;
178+
cm->cmsg_len = CMSG_LEN(sizeof(cookie));
179+
cm->cmsg_level = SOL_RDS;
180+
cm->cmsg_type = RDS_CMSG_ZCOPY_COOKIE;
181+
memcpy(CMSG_DATA(cm), &cookie, sizeof(cookie));
182+
}
183+
184+
static bool do_sendmsg(int fd, struct msghdr *msg, bool do_zerocopy, int domain)
172185
{
173186
int ret, len, i, flags;
187+
static uint32_t cookie;
188+
char ckbuf[CMSG_SPACE(sizeof(cookie))];
174189

175190
len = 0;
176191
for (i = 0; i < msg->msg_iovlen; i++)
177192
len += msg->msg_iov[i].iov_len;
178193

179194
flags = MSG_DONTWAIT;
180-
if (do_zerocopy)
195+
if (do_zerocopy) {
181196
flags |= MSG_ZEROCOPY;
197+
if (domain == PF_RDS) {
198+
memset(&msg->msg_control, 0, sizeof(msg->msg_control));
199+
msg->msg_controllen = CMSG_SPACE(sizeof(cookie));
200+
msg->msg_control = (struct cmsghdr *)ckbuf;
201+
add_zcopy_cookie(msg, ++cookie);
202+
}
203+
}
182204

183205
ret = sendmsg(fd, msg, flags);
184206
if (ret == -1 && errno == EAGAIN)
@@ -194,6 +216,10 @@ static bool do_sendmsg(int fd, struct msghdr *msg, bool do_zerocopy)
194216
if (do_zerocopy && ret)
195217
expected_completions++;
196218
}
219+
if (do_zerocopy && domain == PF_RDS) {
220+
msg->msg_control = NULL;
221+
msg->msg_controllen = 0;
222+
}
197223

198224
return true;
199225
}
@@ -220,7 +246,9 @@ static void do_sendmsg_corked(int fd, struct msghdr *msg)
220246
msg->msg_iov[0].iov_len = payload_len + extra_len;
221247
extra_len = 0;
222248

223-
do_sendmsg(fd, msg, do_zerocopy);
249+
do_sendmsg(fd, msg, do_zerocopy,
250+
(cfg_dst_addr.ss_family == AF_INET ?
251+
PF_INET : PF_INET6));
224252
}
225253

226254
do_setsockopt(fd, IPPROTO_UDP, UDP_CORK, 0);
@@ -316,6 +344,26 @@ static int do_setup_tx(int domain, int type, int protocol)
316344
return fd;
317345
}
318346

347+
static int do_process_zerocopy_cookies(struct sock_extended_err *serr,
348+
uint32_t *ckbuf, size_t nbytes)
349+
{
350+
int ncookies, i;
351+
352+
if (serr->ee_errno != 0)
353+
error(1, 0, "serr: wrong error code: %u", serr->ee_errno);
354+
ncookies = serr->ee_data;
355+
if (ncookies > SO_EE_ORIGIN_MAX_ZCOOKIES)
356+
error(1, 0, "Returned %d cookies, max expected %d\n",
357+
ncookies, SO_EE_ORIGIN_MAX_ZCOOKIES);
358+
if (nbytes != ncookies * sizeof(uint32_t))
359+
error(1, 0, "Expected %d cookies, got %ld\n",
360+
ncookies, nbytes/sizeof(uint32_t));
361+
for (i = 0; i < ncookies; i++)
362+
if (cfg_verbose >= 2)
363+
fprintf(stderr, "%d\n", ckbuf[i]);
364+
return ncookies;
365+
}
366+
319367
static bool do_recv_completion(int fd)
320368
{
321369
struct sock_extended_err *serr;
@@ -324,10 +372,17 @@ static bool do_recv_completion(int fd)
324372
uint32_t hi, lo, range;
325373
int ret, zerocopy;
326374
char control[100];
375+
uint32_t ckbuf[SO_EE_ORIGIN_MAX_ZCOOKIES];
376+
struct iovec iov;
327377

328378
msg.msg_control = control;
329379
msg.msg_controllen = sizeof(control);
330380

381+
iov.iov_base = ckbuf;
382+
iov.iov_len = (SO_EE_ORIGIN_MAX_ZCOOKIES * sizeof(ckbuf[0]));
383+
msg.msg_iov = &iov;
384+
msg.msg_iovlen = 1;
385+
331386
ret = recvmsg(fd, &msg, MSG_ERRQUEUE);
332387
if (ret == -1 && errno == EAGAIN)
333388
return false;
@@ -346,6 +401,11 @@ static bool do_recv_completion(int fd)
346401
cm->cmsg_level, cm->cmsg_type);
347402

348403
serr = (void *) CMSG_DATA(cm);
404+
405+
if (serr->ee_origin == SO_EE_ORIGIN_ZCOOKIE) {
406+
completions += do_process_zerocopy_cookies(serr, ckbuf, ret);
407+
return true;
408+
}
349409
if (serr->ee_origin != SO_EE_ORIGIN_ZEROCOPY)
350410
error(1, 0, "serr: wrong origin: %u", serr->ee_origin);
351411
if (serr->ee_errno != 0)
@@ -470,7 +530,7 @@ static void do_tx(int domain, int type, int protocol)
470530
if (cfg_cork)
471531
do_sendmsg_corked(fd, &msg);
472532
else
473-
do_sendmsg(fd, &msg, cfg_zerocopy);
533+
do_sendmsg(fd, &msg, cfg_zerocopy, domain);
474534

475535
while (!do_poll(fd, POLLOUT)) {
476536
if (cfg_zerocopy)

0 commit comments

Comments
 (0)