Revert "selftests/net: reap zerocopy completions passed up as ancillary data."

This reverts commit 6f3899e to remove test
code related to a feature that is not supported in UEK's RDS.

Orabug: 33863259

Signed-off-by: William Kucharski <[email protected]>
Reviewed-by: Gerd Rausch <[email protected]>

Orabug: 33863259

LUCI => v6.10-rc7

Conflict:
	tools/testing/selftests/net/msg_zerocopy.c
	- Upstream addition of line of code to do_recv_completions()
	  prevented clean application of patch
	- Additional usage of do_recv_remaining_completions() needed
	  to be reverted to UEK syntax

Signed-off-by: William Kucharski <[email protected]>
Reviewed-by: Gerd Rausch <[email protected]>

Author: William Kucharski

tools/testing/selftests/net/msg_zerocopy.c

@@ -346,53 +346,7 @@ static int do_setup_tx(int domain, int type, int protocol)
 	return fd;
 }
 
-static uint32_t do_process_zerocopy_cookies(struct rds_zcopy_cookies *ck)
-{
-	int i;
-
-	if (ck->num > RDS_MAX_ZCOOKIES)
-		error(1, 0, "Returned %d cookies, max expected %d\n",
-		      ck->num, RDS_MAX_ZCOOKIES);
-	for (i = 0; i < ck->num; i++)
-		if (cfg_verbose >= 2)
-			fprintf(stderr, "%d\n", ck->cookies[i]);
-	return ck->num;
-}
-
-static bool do_recvmsg_completion(int fd)
-{
-	char cmsgbuf[CMSG_SPACE(sizeof(struct rds_zcopy_cookies))];
-	struct rds_zcopy_cookies *ck;
-	struct cmsghdr *cmsg;
-	struct msghdr msg;
-	bool ret = false;
-
-	memset(&msg, 0, sizeof(msg));
-	msg.msg_control = cmsgbuf;
-	msg.msg_controllen = sizeof(cmsgbuf);
-
-	if (recvmsg(fd, &msg, MSG_DONTWAIT))
-		return ret;
-
-	if (msg.msg_flags & MSG_CTRUNC)
-		error(1, errno, "recvmsg notification: truncated");
-
-	for (cmsg = CMSG_FIRSTHDR(&msg); cmsg; cmsg = CMSG_NXTHDR(&msg, cmsg)) {
-		if (cmsg->cmsg_level == SOL_RDS &&
-		    cmsg->cmsg_type == RDS_CMSG_ZCOPY_COMPLETION) {
-
-			ck = (struct rds_zcopy_cookies *)CMSG_DATA(cmsg);
-			completions += do_process_zerocopy_cookies(ck);
-			ret = true;
-			break;
-		}
-		error(0, 0, "ignoring cmsg at level %d type %d\n",
-			    cmsg->cmsg_level, cmsg->cmsg_type);
-	}
-	return ret;
-}
-
-static bool do_recv_completion(int fd, int domain)
+static bool do_recv_completion(int fd)
 {
 	struct sock_extended_err *serr;
 	struct msghdr msg = {};
@@ -401,9 +355,6 @@ static bool do_recv_completion(int fd, int domain)
 	int ret, zerocopy;
 	char control[100];
 
-	if (domain == PF_RDS)
-		return do_recvmsg_completion(fd);
-
 	msg.msg_control = control;
 	msg.msg_controllen = sizeof(control);
 
@@ -460,21 +411,21 @@ static bool do_recv_completion(int fd, int domain)
 }
 
 /* Read all outstanding messages on the errqueue */
-static void do_recv_completions(int fd, int domain)
+static void do_recv_completions(int fd)
 {
-	while (do_recv_completion(fd, domain)) {}
+	while (do_recv_completion(fd)) {}
 	sends_since_notify = 0;
 }
 
 /* Wait for all remaining completions on the errqueue */
-static void do_recv_remaining_completions(int fd, int domain)
+static void do_recv_remaining_completions(int fd)
 {
 	int64_t tstop = gettimeofday_ms() + cfg_waittime_ms;
 
 	while (completions < expected_completions &&
 	       gettimeofday_ms() < tstop) {
-		if (do_poll(fd, domain == PF_RDS ? POLLIN : POLLERR))
-			do_recv_completions(fd, domain);
+		if (do_poll(fd, POLLERR))
+			do_recv_completions(fd);
 	}
 
 	if (completions < expected_completions)
@@ -554,17 +505,17 @@ static void do_tx(int domain, int type, int protocol)
 			do_sendmsg(fd, &msg, cfg_zerocopy, domain);
 
 		if (cfg_zerocopy && sends_since_notify >= cfg_notification_limit)
-			do_recv_completions(fd, domain);
+			do_recv_completions(fd);
 
 		while (!do_poll(fd, POLLOUT)) {
 			if (cfg_zerocopy)
-				do_recv_completions(fd, domain);
+				do_recv_completions(fd);
 		}
 
 	} while (gettimeofday_ms() < tstop);
 
 	if (cfg_zerocopy)
-		do_recv_remaining_completions(fd, domain);
+		do_recv_remaining_completions(fd);
 
 	if (close(fd))
 		error(1, errno, "close");