Revert "selftests/net: add zerocopy support for PF_RDS test case"

This reverts commit dfb8434.

There is no support for RDS_CMSG_ZCOPY_COOKIE in UEK. So we revert
selftest code related to that. This avoids the selftest from compilation
failure.

Orabug: 37006889

Conflicts:
	tools/testing/selftests/net/msg_zerocopy.c
        Minor code rearrangement due to space.

Signed-off-by: Samasth Norway Ananda <[email protected]>
Reviewed-by: Gerd Rausch <[email protected]>

Author: samasth-norway

tools/testing/selftests/net/msg_zerocopy.c

@@ -169,39 +169,17 @@ static int do_accept(int fd)
 	return fd;
 }
 
-static void add_zcopy_cookie(struct msghdr *msg, uint32_t cookie)
-{
-	struct cmsghdr *cm;
-
-	if (!msg->msg_control)
-		error(1, errno, "NULL cookie");
-	cm = (void *)msg->msg_control;
-	cm->cmsg_len = CMSG_LEN(sizeof(cookie));
-	cm->cmsg_level = SOL_RDS;
-	cm->cmsg_type = RDS_CMSG_ZCOPY_COOKIE;
-	memcpy(CMSG_DATA(cm), &cookie, sizeof(cookie));
-}
-
-static bool do_sendmsg(int fd, struct msghdr *msg, bool do_zerocopy, int domain)
+static bool do_sendmsg(int fd, struct msghdr *msg, bool do_zerocopy)
 {
 	int ret, len, i, flags;
-	static uint32_t cookie;
-	char ckbuf[CMSG_SPACE(sizeof(cookie))];
 
 	len = 0;
 	for (i = 0; i < msg->msg_iovlen; i++)
 		len += msg->msg_iov[i].iov_len;
 
 	flags = MSG_DONTWAIT;
-	if (do_zerocopy) {
+	if (do_zerocopy)
 		flags |= MSG_ZEROCOPY;
-		if (domain == PF_RDS) {
-			memset(&msg->msg_control, 0, sizeof(msg->msg_control));
-			msg->msg_controllen = CMSG_SPACE(sizeof(cookie));
-			msg->msg_control = (struct cmsghdr *)ckbuf;
-			add_zcopy_cookie(msg, ++cookie);
-		}
-	}
 
 	ret = sendmsg(fd, msg, flags);
 	if (ret == -1 && errno == EAGAIN)
@@ -218,10 +196,6 @@ static bool do_sendmsg(int fd, struct msghdr *msg, bool do_zerocopy, int domain)
 		if (do_zerocopy && ret)
 			expected_completions++;
 	}
-	if (do_zerocopy && domain == PF_RDS) {
-		msg->msg_control = NULL;
-		msg->msg_controllen = 0;
-	}
 
 	return true;
 }
@@ -248,9 +222,7 @@ static void do_sendmsg_corked(int fd, struct msghdr *msg)
 		msg->msg_iov[0].iov_len = payload_len + extra_len;
 		extra_len = 0;
 
-		do_sendmsg(fd, msg, do_zerocopy,
-			   (cfg_dst_addr.ss_family == AF_INET ?
-			    PF_INET : PF_INET6));
+		do_sendmsg(fd, msg, do_zerocopy);
 	}
 
 	do_setsockopt(fd, IPPROTO_UDP, UDP_CORK, 0);
@@ -376,7 +348,6 @@ static bool do_recv_completion(int fd)
 		      cm->cmsg_level, cm->cmsg_type);
 
 	serr = (void *) CMSG_DATA(cm);
-
 	if (serr->ee_origin != SO_EE_ORIGIN_ZEROCOPY)
 		error(1, 0, "serr: wrong origin: %u", serr->ee_origin);
 	if (serr->ee_errno != 0)
@@ -502,7 +473,7 @@ static void do_tx(int domain, int type, int protocol)
 		if (cfg_cork)
 			do_sendmsg_corked(fd, &msg);
 		else
-			do_sendmsg(fd, &msg, cfg_zerocopy, domain);
+			do_sendmsg(fd, &msg, cfg_zerocopy);
 
 		if (cfg_zerocopy && sends_since_notify >= cfg_notification_limit)
 			do_recv_completions(fd);