Skip to contentSkip to conversation

selftests-acct-share-netlink-helpers.patch removed from -mm tree

merged mm-nonmm-stable Andrew Morton 1 participant 1 message Aug 4

lore
Share & tools
lore

Andrew Morton

author tree notice Applied
#0 lore raw

The quilt patch titled
Subject: selftests/acct: share netlink helpers
has been removed from the -mm tree. Its filename was
selftests-acct-share-netlink-helpers.patch

This patch was dropped because it was merged into the mm-nonmm-stable branch of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm

------------------------------------------------------
From: Yiyang Chen <[email protected]>
Subject: selftests/acct: share netlink helpers
Date: Mon, 13 Jul 2026 01:13:31 +0800

Extract the duplicated generic netlink boilerplate (netlink_open, send_request, get_family_id, and NLA walker macros) from cgroupstats.c and taskstats_fill_stats_tgid.c into a shared netlink_helper.{h,c}.

---

 tools/testing/selftests/acct/.gitignore                  |    1 
 tools/testing/selftests/acct/Makefile                    |   10 
 tools/testing/selftests/acct/cgroupstats.c               |  133 ---------
 tools/testing/selftests/acct/netlink_helper.c            |  116 ++++++++
 tools/testing/selftests/acct/netlink_helper.h            |   44 +++
 tools/testing/selftests/acct/taskstats_fill_stats_tgid.c |  134 ----------
 6 files changed, 184 insertions(+), 254 deletions(-)
tools/testing/selftests/acct/cgroupstats.c renamed from tools/testing/selftests/acct/cgroupstats.c~selftests-acct-share-netlink-helpers +5 -128
@@ -6,139 +6,19 @@
 #include <linux/cgroupstats.h>
 #include <linux/genetlink.h>
 #include <linux/netlink.h>
+#include <stdbool.h>
 #include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <sys/mount.h>
 #include <sys/socket.h>
 #include <sys/types.h>
-#include <sys/mount.h>
-#include <time.h>
 #include <unistd.h>
 
+#include "netlink_helper.h"
 #include "kselftest.h"
 
-#ifndef NLA_ALIGN
-#define NLA_ALIGNTO 4
-#define NLA_ALIGN(len) (((len) + NLA_ALIGNTO - 1) & ~(NLA_ALIGNTO - 1))
-#define NLA_HDRLEN ((int)NLA_ALIGN(sizeof(struct nlattr)))
-#endif
-
-#define RECV_TIMEOUT_SEC 2
-
-static void *nla_data(const struct nlattr *na)
-{
-	return (void *)((char *)na + NLA_HDRLEN);
-}
-
-static int netlink_open(void)
-{
-	struct timeval tv = { .tv_sec = RECV_TIMEOUT_SEC };
-	struct sockaddr_nl addr = {
-		.nl_family = AF_NETLINK,
-		.nl_pid = getpid(),
-	};
-	int fd;
-
-	fd = socket(AF_NETLINK, SOCK_RAW, NETLINK_GENERIC);
-	if (fd < 0)
-		return -errno;
-
-	/*
-	 * Ensure that a missing kernel reply fails the individual test
-	 * case instead of hanging the whole test binary.
-	 */
-	if (setsockopt(fd, SOL_SOCKET, SO_RCVTIMEO, &tv, sizeof(tv)) < 0) {
-		int err = -errno;
-
-		close(fd);
-		return err;
-	}
-
-	if (bind(fd, (struct sockaddr *)&addr, sizeof(addr)) < 0) {
-		int err = -errno;
-
-		close(fd);
-		return err;
-	}
-
-	return fd;
-}
-
-static int send_request(int fd, void *buf, size_t len)
-{
-	struct sockaddr_nl addr = {
-		.nl_family = AF_NETLINK,
-	};
-
-	if (sendto(fd, buf, len, 0, (struct sockaddr *)&addr, sizeof(addr)) < 0)
-		return -errno;
-
-	return 0;
-}
-
-static int get_family_id(int fd, const char *name)
-{
-	struct {
-		struct nlmsghdr nlh;
-		struct genlmsghdr genl;
-		char buf[256];
-	} req = { 0 };
-	char resp[8192];
-	struct nlmsghdr *nlh;
-	struct genlmsghdr *genl;
-	struct nlattr *na;
-	int len;
-	int rem;
-	int ret;
-
-	req.nlh.nlmsg_len = NLMSG_LENGTH(GENL_HDRLEN);
-	req.nlh.nlmsg_type = GENL_ID_CTRL;
-	req.nlh.nlmsg_flags = NLM_F_REQUEST;
-	req.nlh.nlmsg_seq = 1;
-	req.nlh.nlmsg_pid = getpid();
-
-	req.genl.cmd = CTRL_CMD_GETFAMILY;
-	req.genl.version = 1;
-
-	na = (struct nlattr *)((char *)&req + NLMSG_ALIGN(req.nlh.nlmsg_len));
-	na->nla_type = CTRL_ATTR_FAMILY_NAME;
-	na->nla_len = NLA_HDRLEN + strlen(name) + 1;
-	memcpy(nla_data(na), name, strlen(name) + 1);
-	req.nlh.nlmsg_len = NLMSG_ALIGN(req.nlh.nlmsg_len) + NLA_ALIGN(na->nla_len);
-
-	ret = send_request(fd, &req, req.nlh.nlmsg_len);
-	if (ret)
-		return ret;
-
-	len = recv(fd, resp, sizeof(resp), 0);
-	if (len < 0)
-		return -errno;
-
-	for (nlh = (struct nlmsghdr *)resp; NLMSG_OK(nlh, len);
-	     nlh = NLMSG_NEXT(nlh, len)) {
-		if (nlh->nlmsg_type == NLMSG_ERROR) {
-			struct nlmsgerr *err = NLMSG_DATA(nlh);
-
-			return err->error ? err->error : -ENOENT;
-		}
-
-		genl = (struct genlmsghdr *)NLMSG_DATA(nlh);
-		rem = nlh->nlmsg_len - NLMSG_HDRLEN - GENL_HDRLEN;
-		na = (struct nlattr *)((char *)genl + GENL_HDRLEN);
-		while (rem >= (int)sizeof(*na) &&
-		       na->nla_len >= (int)sizeof(*na) &&
-		       na->nla_len <= rem) {
-			if (na->nla_type == CTRL_ATTR_FAMILY_ID)
-				return *(uint16_t *)nla_data(na);
-			rem -= NLA_ALIGN(na->nla_len);
-			na = (struct nlattr *)((char *)na + NLA_ALIGN(na->nla_len));
-		}
-	}
-
-	return -ENOENT;
-}
-
 static int send_cgroupstats_cmd(int fd, int family_id, uint32_t cgroup_fd,
 				int flags)
 {
@@ -203,15 +83,12 @@ static int recv_cgroupstats_response(int
 
 		rem = nlh->nlmsg_len - NLMSG_HDRLEN - GENL_HDRLEN;
 		na = (struct nlattr *)((char *)genl + GENL_HDRLEN);
-		while (rem >= (int)sizeof(*na) &&
-		       na->nla_len >= (int)sizeof(*na) &&
-		       na->nla_len <= rem) {
+		while (nla_ok(na, rem)) {
 			if (na->nla_type == CGROUPSTATS_TYPE_CGROUP_STATS) {
 				memcpy(stats, nla_data(na), sizeof(*stats));
 				return 0;
 			}
-			rem -= NLA_ALIGN(na->nla_len);
-			na = (struct nlattr *)((char *)na + NLA_ALIGN(na->nla_len));
+			na = nla_next(na, &rem);
 		}
 	}
 
tools/testing/selftests/acct/.gitignore renamed from tools/testing/selftests/acct/.gitignore~selftests-acct-share-netlink-helpers +1 -0
@@ -1,4 +1,5 @@
 acct_syscall
 taskstats_fill_stats_tgid
+cgroupstats
 config
 process_log
tools/testing/selftests/acct/Makefile renamed from tools/testing/selftests/acct/Makefile~selftests-acct-share-netlink-helpers +10 -0
@@ -3,7 +3,17 @@ TEST_GEN_PROGS := acct_syscall
 TEST_GEN_PROGS += taskstats_fill_stats_tgid
 TEST_GEN_PROGS += cgroupstats
 
+NETLINK_HELPER_PROGS := cgroupstats taskstats_fill_stats_tgid
+
 CFLAGS += -Wall
 LDLIBS += -lpthread
 
 include ../lib.mk
+
+$(NETLINK_HELPER_PROGS): %: %.c netlink_helper.c netlink_helper.h
+	$(call msg,CC,,$@)
+	$(Q)$(LINK.c) $< netlink_helper.c $(LDLIBS) -o $@
+
+$(addprefix $(OUTPUT)/,$(NETLINK_HELPER_PROGS)): $(OUTPUT)/%: %.c netlink_helper.c netlink_helper.h
+	$(call msg,CC,,$@)
+	$(Q)$(LINK.c) $< netlink_helper.c $(LDLIBS) -o $@
tools/testing/selftests/acct/netlink_helper.c new file +116 -0

116 lines not on this page · raw message

tools/testing/selftests/acct/netlink_helper.h new file +44 -0

44 lines not on this page · raw message

tools/testing/selftests/acct/taskstats_fill_stats_tgid.c renamed from tools/testing/selftests/acct/taskstats_fill_stats_tgid.c~selftests-acct-share-netlink-helpers +8 -126

175 lines not on this page · raw message

_

Patches currently in -mm which might be from [email protected] are