From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from CO1PR03CU002.outbound.protection.outlook.com (mail-westus2azon11010005.outbound.protection.outlook.com [52.101.46.5]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A85B7319860 for ; Mon, 13 Jul 2026 02:34:33 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.46.5 ARC-Seal:i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783910078; cv=fail; b=fjGH1SPLI8QHjePsHUes57zSinb97AERUM/UmC+RRLCs3kgDh9QUrVJbGu80I52XF6S1KNhG4d8ERZCgSOJeVjoxFeTcJPyccyW6z27JdxYLzzyUd+qz+oN9g705nVKZi+BNhQUE0WZ4R2BhBcNm+ueUTEpxUwXTMAwLGlBWMjs= ARC-Message-Signature:i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783910078; c=relaxed/simple; bh=+oeYll+K0ldwENeWHpJAhsRXKZbACw3D3co4jXM4VCw=; h=Date:From:To:Cc:Subject:Message-ID:References:Content-Type: Content-Disposition:In-Reply-To:MIME-Version; b=bxgIxOLz/YsvtVk0w/jsm//Joint2HC+2yB51GUP31ELgyNwqsyVNSng3EEKb4PrBfSgDVbYC3s42irGNywkOX2xiPVBOdP0aogrLzsdRBpDya/d0oKDRECP2X6V8Vo2VY1s+4rDVKnTX75Xs9m5jBIEFd5Av3cb1XECPDzFJa8= ARC-Authentication-Results:i=2; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=nvidia.com; spf=fail smtp.mailfrom=nvidia.com; dkim=pass (2048-bit key) header.d=Nvidia.com header.i=@Nvidia.com header.b=Z7Rral/F; arc=fail smtp.client-ip=52.101.46.5 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=nvidia.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=nvidia.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=Nvidia.com header.i=@Nvidia.com header.b="Z7Rral/F" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=g4e0WF0sFUkqwH7hK37jP1aCfNSLDw5S/LvE3Ic57IomgIhnyy11aSS6L1WSnNnJmLySReyxi54CBOT/j4D1+UVPuMDuAAuPAQyd3x97O8YccioSq3UwwQ0PpwuWT45L9Ds+J5WO0ez9vLPwUaZElPtkw71nx0O64YrODut3pZULdbHyJV58mqR1IJvB+N6uy5w7KsCSIavw6qKbGm2VY8I34zB08nRL4/ALj5UkfmxRSvytgJScXU/l17tkUklnDjEDg4jtokC8kqMl2zFGijrCVjVZ9lSyK9EJItSNqP8zKWt7m9GuRNvfRZpfMOn4GGdQq3uzN+NcUvXm2pFrdQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=lywfChbCpyTue16ijzM+GLLqATYcU4q3WSnztqNUaFo=; b=suxE8icTcw33zKVtVkl7IaPwhJnl4Xc/l0Rrc/xOza5utRjIGikgqpeWUPkr4LVSTpXm6Tvh91lNhxqSWQPJg0vXR6YzEvy8bAiwKZZjEvMFY2UL9yfu4LVVlE0h7KoGyy0F2vi+9LYErAKkO9Uwyb+3093XspANKh1FtauI6Z9P2kCwQhE1iRkPpJWrR5cQOVSwOwHc0spagOhf6OE4M5ZGONuXIbSwkVrRTVyQ182tAPG1kooxewmbC7sh4L/ASiZL5rvIke2EArcuUmBZHcGBiKZE6aXZZjd8c3hRWsYQeasWd1xVtAbxyWfx0ZMf5QZKHRIW4ePHYJGn8WXuYQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=nvidia.com; dmarc=pass action=none header.from=nvidia.com; dkim=pass header.d=nvidia.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=lywfChbCpyTue16ijzM+GLLqATYcU4q3WSnztqNUaFo=; b=Z7Rral/FZxbwYZqXXnzcK1DqFtDuwJV3P2HsCsHEKWeZIl+9KKZ507ImAUYKCdFjOIdr/I4qitHwlxFXdRGdmiqRawvXD6bE1zvaL5d2LjQMUS1wQAiHZasuFDVppGPt9ByWZamuj0QwAz+DKxR1oBttTaLQyFhppbiZxD/47cSCTzXTnAJEofZ3ye6oFB+WkEiFUDJSmvvZ9nKyBj+kp8I1N4ZkzREfQnBU/RMTRLd+D+ArW2CYqHMuu4Ygdr24JEQ7kbUdM69Oqa6jQVWoLAm/dpZ4PeJQflxA0NudHOKS1x/NQAXn4Q+IsSQSQQoxbolqcSu9klqthHsDdKcadA== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nvidia.com; Received: from CH2PR12MB5001.namprd12.prod.outlook.com (2603:10b6:610:61::18) by MN0PR12MB5811.namprd12.prod.outlook.com (2603:10b6:208:377::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.202.18; Mon, 13 Jul 2026 02:34:26 +0000 Received: from CH2PR12MB5001.namprd12.prod.outlook.com ([fe80::89e3:6df0:de90:8dfe]) by CH2PR12MB5001.namprd12.prod.outlook.com ([fe80::89e3:6df0:de90:8dfe%3]) with mapi id 15.21.0181.014; Mon, 13 Jul 2026 02:34:26 +0000 Date: Mon, 13 Jul 2026 12:34:21 +1000 From: Balbir Singh To: Yiyang Chen Cc: Andrew Morton , linux-kernel@vger.kernel.org Subject: Re: [PATCH] selftests/acct: share netlink helpers Message-ID: References: Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: X-ClientProxiedBy: MEVPR01CA0048.ausprd01.prod.outlook.com (2603:10c6:220:1fd::19) To CH2PR12MB5001.namprd12.prod.outlook.com (2603:10b6:610:61::18) Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CH2PR12MB5001:EE_|MN0PR12MB5811:EE_ X-MS-Office365-Filtering-Correlation-Id: 803737f3-798b-4749-fe79-08dee0874181 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|376014|366016|23010399003|1800799024|3023799007|18002099003|22082099003|6133799003|11063799006|56012099006; X-Microsoft-Antispam-Message-Info: o9PTYdbkHQ3VpkhIL5+sWEOdKTq+kOo0Fvw2nxi2DZGBfNwHFFH68wPFAqR9rei2OX0jUYZbVvP8Wt1tbqntQyRKkJ+r0r7s7Tu6izL4/0xRMPVjlgJKz0uzfwY6dt9slHTBcjE2FJZJRuEkZb8XBnrXTYhEtLTl5+BUFnTcgb/kPAMc/baJ5puLGpK+eZHW6ivX1N/7ARihxjE3nxS8g8MYxJK+UFOGOFP0gLqGcQMxQHcrnvuYKludkTDMhl1QM1tKUASgzr2HsaaoU2q6zsaDOVNIvda7wYfx5r3lhA0W8N7Nk1cdo+310lk4n0NPT4PWe3ThgbeAapIRiDxo7cv8xyAGpsTKoVc2ujN4YwQ6uHjj1VoE8bVug+VfqI09MJulDTqrG2u5bsNb15wkelPwCQTqGLTdUP04AL0nvZk6KqyStZEi63y87LZlTl76INYgm/vrbd7k8NNtDc+Id60m/HSGpzGrjUMo8/bcEUvrG31kfa1Ucp9hb2vSqjVf+9hU5ljor7oXdi4GueQY+tzdlTC2FD48QwGXy3n1MTCG7C3+J1nV6TA6L+T6T4Dm5j4ktafcUbf6RpxEb1QXgRwEUupcvFOiIbY20d1C7opnOG2ocx2kHfzR2Z25knJuwx7Dzgwqk9pK1EPU38zzhqMuTvmB+e+1tKe3mEMtNuU= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:CH2PR12MB5001.namprd12.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(376014)(366016)(23010399003)(1800799024)(3023799007)(18002099003)(22082099003)(6133799003)(11063799006)(56012099006);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?Ifp52iUwH5e8yIE8S/767rrE3ECH/3eU+lzsHmZLK9uIRcYeIZQVs0hIEFJM?= =?us-ascii?Q?W738I4x/0Y4UAg5n/E3Gg/Tvf9H3Ai4svGimYP4uWbo2uYVeyeXlBCQks8vG?= =?us-ascii?Q?FPVOvIrL5vhbfntBAkcoDKqekWLnPmvv5l3oJv/xubW4qH+/mCTukGYk3Xnv?= =?us-ascii?Q?/mxiaJd+GMSHrJKU2+lGrI8hArsShinpnpEYBpdWlTGaYwa8GYlXk/5huff0?= =?us-ascii?Q?jeMUbzLn0/zA+1u29ETRoRJF1kP3OFHyRsCSb/XEygfKS2S/sGXJGc9T0VCe?= =?us-ascii?Q?tOuZ2dFSRoqgaSkq2RMRl/cp70ASDsXpGI0jxZSjK2cB671qol+uPOWRyWn/?= =?us-ascii?Q?HhXrndnnkSZPCa5Qtp9SfdBgvkvAD/nSvEGb3JkcHHyS+VudZS04fQriBgU9?= =?us-ascii?Q?HrU4BrtgwbHyc7moLKfff2r+dyLg6TRm14QIS1L+4rxXSRSDo4cK57swzRh5?= =?us-ascii?Q?ngf95sZHYYq5ec1G/778WC+zUKz/FUzldiWlsojfQTjEr5qvjO2BLxR9FbgH?= =?us-ascii?Q?N5uUPUqUzg7ISzANkJQR/XOQWWV87Y2A745T0Kl6YOCS3Yu2nKAiejbE8Jte?= =?us-ascii?Q?hADzUCzL7DEWTwMo5oFlThIJahw/suj2Nf/4La4oRt2EglIbkY+4fhQVnBoy?= =?us-ascii?Q?5X46qGV5Bm4RuBiCdradFF2kgxZ7cBMfNG1JHrplNFbwl9njOoRjdRKYkupT?= =?us-ascii?Q?cIcJfjfgpBSTa0UqtSMLPbv/LT1bxciMVgjh5Vnb+I8vm4OQ7LmwbSxoiY8N?= =?us-ascii?Q?rs5mdtwo/zguAuo8l2xdhK6F6HZWUMAMHYcFo6bPy4zbYL4OeRPLOI7P+XmF?= =?us-ascii?Q?qhdsusMhVdrcrsrzv2sVGWL+BNf0taYEJf6KO3+BSxVmSE9Zmu7y4ZOt6vPr?= =?us-ascii?Q?toKhjCwv7zC3HxlnkIYONzSfEfG+m+kLc/IOM2UNBCaEvxus/tLr2zKhvoSZ?= =?us-ascii?Q?Rv8myY/lnbSK1qNe+Aek9h7MWXuWOvvO6/ygpOpUMBqNdjCEPbqxt9IZiSdW?= =?us-ascii?Q?VRg8qLkEqJso3e8xwtGuep2klo+VV0MatpHesdB2iCw5bCUKgu1KxK4VnKD5?= =?us-ascii?Q?qgevKVNvEhg/sw++pslccn7w4YxWnHY2xOSaE0iLY2KVher68aeEihJOvTgn?= =?us-ascii?Q?lof/OVieEKKyTNWzI/574H5WS88gknfVywL0UuOzIEvDz016QHpXOigfKnfe?= =?us-ascii?Q?MXwf63VWOtOqFulMFQc5a/Q0M8TqnNXNYzpIQsBSiIRMQL0DsM/7bP6+Dwo/?= =?us-ascii?Q?xM4enNSsnDi7S6D3clhdmYp4X4jOhlL+oo0lznOiVCDYNfx2UN3IPj1TpaeO?= =?us-ascii?Q?n5aYlk+QCXVcmR33hAva5rhfmxQEk5DQhzGBKRClljoHz3YxHV1wvKEyw8g2?= =?us-ascii?Q?6nqr7tnWi85o6XvJonWCD0WqEPpaGvkcnY43jk/vLHgPL3E1ZLHrJq7rqIsR?= =?us-ascii?Q?HGbLAqONV76F/FyZeSukJEOdq55XlCcaGymtuCnvMYg5gtu0yMHUkAb2Y9Wq?= =?us-ascii?Q?ZVYdhNzc4N8THSBxSrH47Ls9B39xoq/hzatSJ0+alUVNN91ESxYo0o4z1byj?= =?us-ascii?Q?yB9N0QdC8UE9KNhpPzmUtFm9nnZcGTXSNUSG6nVVyFMf6YHO+TshsmlnBEa9?= =?us-ascii?Q?6+yVz4Ra/ws3G4eCWwyX/9wqs5tjcGymZV2P8by/G0GLGUKwjZaO1f1Z4wQZ?= =?us-ascii?Q?nnGcIOdPOsmkYhVrsO221zZK0DItgwrP+Mja1MmQSy83KKQCqStnmfCmN1YK?= =?us-ascii?Q?ruhZfP7AQg=3D=3D?= X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-Network-Message-Id: 803737f3-798b-4749-fe79-08dee0874181 X-MS-Exchange-CrossTenant-AuthSource: CH2PR12MB5001.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Jul 2026 02:34:25.9530 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: GTfAFt6ckZjQWLkSyQIcl+5iu6yVvBJvZCxI2rIahtLjM92pkPJOS6FnFrTxdpwznv4Y5gOZhLHtPpk7Yw7NeQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN0PR12MB5811 On Mon, Jul 13, 2026 at 01:13:31AM +0800, Yiyang Chen wrote: > 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}. > > Suggested-by: Andrew Morton > Signed-off-by: Yiyang Chen > --- > 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 ++++++ > .../acct/taskstats_fill_stats_tgid.c | 134 ++---------------- > 6 files changed, 184 insertions(+), 254 deletions(-) > create mode 100644 tools/testing/selftests/acct/netlink_helper.c > create mode 100644 tools/testing/selftests/acct/netlink_helper.h > > diff --git a/tools/testing/selftests/acct/.gitignore b/tools/testing/selftests/acct/.gitignore > index 9e9c61c5bfd6..fe0896f54e15 100644 > --- a/tools/testing/selftests/acct/.gitignore > +++ b/tools/testing/selftests/acct/.gitignore > @@ -1,4 +1,5 @@ > acct_syscall > taskstats_fill_stats_tgid > +cgroupstats > config > process_log > diff --git a/tools/testing/selftests/acct/Makefile b/tools/testing/selftests/acct/Makefile > index db88d65f5581..93a11a28a636 100644 > --- a/tools/testing/selftests/acct/Makefile > +++ b/tools/testing/selftests/acct/Makefile > @@ -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 $@ > diff --git a/tools/testing/selftests/acct/cgroupstats.c b/tools/testing/selftests/acct/cgroupstats.c > index e2836383ed50..0b421a4ca72b 100644 > --- a/tools/testing/selftests/acct/cgroupstats.c > +++ b/tools/testing/selftests/acct/cgroupstats.c > @@ -6,139 +6,19 @@ > #include > #include > #include > +#include > #include > #include > #include > #include > +#include > #include > #include > -#include > -#include > #include > > +#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 fd, struct cgroupstats *stats) > > 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); > } > } > > diff --git a/tools/testing/selftests/acct/netlink_helper.c b/tools/testing/selftests/acct/netlink_helper.c > new file mode 100644 > index 000000000000..3ed834f0e770 > --- /dev/null > +++ b/tools/testing/selftests/acct/netlink_helper.c > @@ -0,0 +1,116 @@ > +// SPDX-License-Identifier: GPL-2.0 > + > +#include > +#include > +#include > +#include > +#include > +#include > +#include > + > +#include "netlink_helper.h" > + > +int netlink_open(void) > +{ > + struct timeval tv = { .tv_sec = ACCT_RCV_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; > + > + 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; > +} > + > +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; > +} > + > +/* > + * Resolve the generic netlink family ID for @name. > + * Returns the family ID (>= 0) on success, negative errno on failure. > + */ > +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 (nla_ok(na, rem)) { > + if (na->nla_type == CTRL_ATTR_FAMILY_ID) > + return *(uint16_t *)nla_data(na); > + na = nla_next(na, &rem); > + } > + } > + > + return -ENOENT; > +} > diff --git a/tools/testing/selftests/acct/netlink_helper.h b/tools/testing/selftests/acct/netlink_helper.h > new file mode 100644 > index 000000000000..0320729c4c06 > --- /dev/null > +++ b/tools/testing/selftests/acct/netlink_helper.h > @@ -0,0 +1,44 @@ > +/* SPDX-License-Identifier: GPL-2.0 */ > +/* > + * Shared generic netlink helpers for the acct selftests. > + */ > +#ifndef ACSELFTESTS_ACCT_NETLINK_HELPER_H > +#define ACSELFTESTS_ACCT_NETLINK_HELPER_H > + > +#include > +#include > + > +#ifndef NLA_ALIGNTO > +#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 > + > +/* Fail an individual test case instead of hanging the whole binary. */ > +#define ACCT_RCV_TIMEOUT_SEC 2 > + > +static inline void *nla_data(const struct nlattr *na) > +{ > + return (void *)((char *)na + NLA_HDRLEN); > +} > + > +static inline bool nla_ok(const struct nlattr *na, int remaining) > +{ > + return remaining >= (int)sizeof(*na) && > + na->nla_len >= sizeof(*na) && > + na->nla_len <= remaining; > +} > + > +static inline struct nlattr *nla_next(const struct nlattr *na, int *remaining) > +{ > + int aligned_len = NLA_ALIGN(na->nla_len); > + > + *remaining -= aligned_len; > + return (struct nlattr *)((char *)na + aligned_len); > +} > + > +int netlink_open(void); > +int send_request(int fd, void *buf, size_t len); > +int get_family_id(int fd, const char *name); > + > +#endif /* ACSELFTESTS_ACCT_NETLINK_HELPER_H */ > diff --git a/tools/testing/selftests/acct/taskstats_fill_stats_tgid.c b/tools/testing/selftests/acct/taskstats_fill_stats_tgid.c > index d6cab4ae26f2..9a4c1554dee3 100644 > --- a/tools/testing/selftests/acct/taskstats_fill_stats_tgid.c > +++ b/tools/testing/selftests/acct/taskstats_fill_stats_tgid.c > @@ -16,14 +16,9 @@ > #include > #include > > +#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 BUSY_NS (200ULL * 1000 * 1000) > > struct worker_ctx { > @@ -35,26 +30,6 @@ struct worker_ctx { > > static unsigned long busy_sink; > > -static void *taskstats_nla_data(const struct nlattr *na) > -{ > - return (void *)((char *)na + NLA_HDRLEN); > -} > - > -static bool taskstats_nla_ok(const struct nlattr *na, int remaining) > -{ > - return remaining >= (int)sizeof(*na) && > - na->nla_len >= sizeof(*na) && > - na->nla_len <= remaining; > -} > - > -static struct nlattr *taskstats_nla_next(const struct nlattr *na, int *remaining) > -{ > - int aligned_len = NLA_ALIGN(na->nla_len); > - > - *remaining -= aligned_len; > - return (struct nlattr *)((char *)na + aligned_len); > -} > - > static uint64_t timespec_diff_ns(const struct timespec *start, > const struct timespec *end) > { > @@ -84,99 +59,6 @@ static void burn_cpu_for_ns(uint64_t runtime_ns) > busy_sink = acc; > } > > -static int netlink_open(void) > -{ > - 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; > - > - 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(taskstats_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 (taskstats_nla_ok(na, rem)) { > - if (na->nla_type == CTRL_ATTR_FAMILY_ID) > - return *(uint16_t *)taskstats_nla_data(na); > - na = taskstats_nla_next(na, &rem); > - } > - } > - > - return -ENOENT; > -} > - > static int get_taskstats(int fd, int family_id, uint16_t attr_type, uint32_t id, > struct taskstats *stats) > { > @@ -209,7 +91,7 @@ static int get_taskstats(int fd, int family_id, uint16_t attr_type, uint32_t id, > na = (struct nlattr *)((char *)&req + NLMSG_ALIGN(req.nlh.nlmsg_len)); > na->nla_type = attr_type; > na->nla_len = NLA_HDRLEN + sizeof(id); > - memcpy(taskstats_nla_data(na), &id, sizeof(id)); > + memcpy(nla_data(na), &id, sizeof(id)); > req.nlh.nlmsg_len = NLMSG_ALIGN(req.nlh.nlmsg_len) + NLA_ALIGN(na->nla_len); > > ret = send_request(fd, &req, req.nlh.nlmsg_len); > @@ -231,21 +113,21 @@ static int get_taskstats(int fd, int family_id, uint16_t attr_type, uint32_t id, > genl = (struct genlmsghdr *)NLMSG_DATA(nlh); > rem = nlh->nlmsg_len - NLMSG_HDRLEN - GENL_HDRLEN; > na = (struct nlattr *)((char *)genl + GENL_HDRLEN); > - while (taskstats_nla_ok(na, rem)) { > + while (nla_ok(na, rem)) { > if (na->nla_type == TASKSTATS_TYPE_AGGR_PID || > na->nla_type == TASKSTATS_TYPE_AGGR_TGID) { > - nested = (struct nlattr *)taskstats_nla_data(na); > + nested = (struct nlattr *)nla_data(na); > nrem = na->nla_len - NLA_HDRLEN; > - while (taskstats_nla_ok(nested, nrem)) { > + while (nla_ok(nested, nrem)) { > if (nested->nla_type == TASKSTATS_TYPE_STATS) { > - memcpy(stats, taskstats_nla_data(nested), > + memcpy(stats, nla_data(nested), > sizeof(*stats)); > return 0; > } > - nested = taskstats_nla_next(nested, &nrem); > + nested = nla_next(nested, &nrem); > } > } > - na = taskstats_nla_next(na, &rem); > + na = nla_next(na, &rem); > } > } > > -- > 2.43.0 > Thanks makes sense! Acked-by: Balbir Singh