From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gladkov.alexey@gmail.com>
X-Spam-Checker-Version: SpamAssassin 3.4.1 (2015-04-28) on
sa.local.altlinux.org
X-Spam-Level:
X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED,
DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM autolearn=ham autolearn_force=no
version=3.4.1
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=gmail.com; s=20221208; t=1686851983; x=1689443983;
h=content-transfer-encoding:mime-version:references:in-reply-to
:message-id:date:subject:to:from:from:to:cc:subject:date:message-id
:reply-to; bh=F0E2VuMmq5/z49Zwq/gDRGQkrH8fu4e9dLADTy9QqtA=;
b=eqyU3yqKPjRF2L9zm5FxSOG2YE5wIrhjRdKECenppuwjDRIQrur52w+RN9sCifQbr3
xc/npETt5P9pY+XDZt5yQGT7gpVvLxlAVn2WhvOYOfwQrXeSfd9rpbtrubK+ToWigk1+
1kOR55Qf6RzUPvu1CemspwON5zYkhtGX4EUoDnnGwfG3cmD1IzDv9X0W8G/f+J67olxz
5k+KRSotde0nOOFCDFPMgZAPvknZauEL2kqMVG/krpoTUTljVT/N0JVK+7+KiwTs1ekH
BVvrx3L9hh/anuiOBCYKSwe0CUyVyDHw409KUg53DujybTwwkG83X0Wjk5zxp8SW9nY8
jOXQ==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20221208; t=1686851983; x=1689443983;
h=content-transfer-encoding:mime-version:references:in-reply-to
:message-id:date:subject:to:from:x-gm-message-state:from:to:cc
:subject:date:message-id:reply-to;
bh=F0E2VuMmq5/z49Zwq/gDRGQkrH8fu4e9dLADTy9QqtA=;
b=FDirlqMrkpZWLedC+Mn8DXrX3Kln4ICJCBdFUWXTivYH9Ysa6vfXmnV2rEyTQh4m6/
ttKDtPXL9kaZwUwbSUh6f2q7ZnXm/5OpoEB33A9WSlZTFgttnWokzbViaSk6A6auIXKQ
poZguFzx+/Xkvf63K1hVzVy21I5TDuZFfF+UXdQYMW0d2hKcIW22dGGPfrc1fvtPY3Tb
JKKYgG7b7RLA4K6p2v3SW0GH6JAEV+K3p1pu9e8L+Q7XTzW8ZnM7xPxpR1SBwWoQ/Iyv
h2FQPViWHiwqfByCoGBpfNvFcMMatiqz2s0BdffZ5BCl3t+dp53eKbWD6PxFbWUK2Mil
Jo8g==
X-Gm-Message-State: AC+VfDxTMwYOWdlKqWsgMLPbFZxUuMex3mc0qIXRRlQQh2oO4Q17MtVI
g0YSRAaS/219vxeGXCdlXlYG/9eGYPw=
X-Google-Smtp-Source: ACHHUZ64q1UUBAmghVyD/QglIAmpUlrvXT5jCS9pA1FkLv34+h5fGoO9CVK6yOfsIUbNjdG7+3AnKw==
X-Received: by 2002:a05:600c:2295:b0:3f7:5e3:c1f2 with SMTP id
21-20020a05600c229500b003f705e3c1f2mr40257wmf.8.1686851983050;
Thu, 15 Jun 2023 10:59:43 -0700 (PDT)
From: Alexey Gladkov <gladkov.alexey@gmail.com>
To: make-initrd@lists.altlinux.org
Date: Thu, 15 Jun 2023 19:59:14 +0200
Message-Id: <3ba27a32bfb13c42047525048da76b26f87df669.1686851829.git.gladkov.alexey@gmail.com>
X-Mailer: git-send-email 2.33.8
In-Reply-To: <cover.1686851829.git.gladkov.alexey@gmail.com>
References: <cover.1686851829.git.gladkov.alexey@gmail.com>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Subject: [make-initrd] [PATCH v1 05/11] feature/procacct: Use msgtemplate
instead of custom struct
X-BeenThere: make-initrd@lists.altlinux.org
X-Mailman-Version: 2.1.12
Precedence: list
Reply-To: make-initrd@lists.altlinux.org
List-Id: <make-initrd.lists.altlinux.org>
List-Unsubscribe: <https://lists.altlinux.org/mailman/options/make-initrd>,
<mailto:make-initrd-request@lists.altlinux.org?subject=unsubscribe>
List-Archive: <http://lists.altlinux.org/pipermail/make-initrd>
List-Post: <mailto:make-initrd@lists.altlinux.org>
List-Help: <mailto:make-initrd-request@lists.altlinux.org?subject=help>
List-Subscribe: <https://lists.altlinux.org/mailman/listinfo/make-initrd>,
<mailto:make-initrd-request@lists.altlinux.org?subject=subscribe>
X-List-Received-Date: Thu, 15 Jun 2023 17:59:45 -0000
Archived-At: <http://lore.altlinux.org/make-initrd/3ba27a32bfb13c42047525048da76b26f87df669.1686851829.git.gladkov.alexey@gmail.com/>
List-Archive: <http://lore.altlinux.org/make-initrd/>
Signed-off-by: Alexey Gladkov <gladkov.alexey@gmail.com>
---
features/debug-procacct/src/procacct.c | 35 ++++++++++++--------------
1 file changed, 16 insertions(+), 19 deletions(-)
diff --git a/features/debug-procacct/src/procacct.c b/features/debug-procacct/src/procacct.c
index 522a82f1..0ff9030f 100644
--- a/features/debug-procacct/src/procacct.c
+++ b/features/debug-procacct/src/procacct.c
@@ -47,7 +47,7 @@
#include "rd/memory.h"
/* Maximum size of response requested or message sent */
-#define MAX_MSG_SIZE 1024
+#define MAX_MSG_SIZE 2048
/* Maximum number of cpus expected to be specified in a cpumask */
#define MAX_CPUS 64
@@ -213,35 +213,32 @@ ssize_t send_cmd(int fd, uint16_t nlmsg_type, uint8_t genl_cmd, uint16_t nla_typ
*/
uint16_t get_family_id(int fd)
{
- struct {
- struct nlmsghdr n;
- struct genlmsghdr g;
- char buf[256];
- } ans;
-
- strcpy(name, TASKSTATS_GENL_NAME);
+ struct msgtemplate msg;
ssize_t ret = send_cmd(fd, GENL_ID_CTRL, CTRL_CMD_GETFAMILY,
- CTRL_ATTR_FAMILY_NAME, name, strlen(TASKSTATS_GENL_NAME) + 1);
+ CTRL_ATTR_FAMILY_NAME,
+ (char *) TASKSTATS_GENL_NAME, sizeof(TASKSTATS_GENL_NAME));
if (ret < 0)
return 0;
- ret = recv(fd, &ans, sizeof(ans), 0);
+ ret = recv(fd, &msg, sizeof(msg), 0);
+ if (ret < 0)
+ rd_fatal("receive NETLINK family: %m");
- if (ans.n.nlmsg_type == NLMSG_ERROR || (ret < 0) || !NLMSG_OK((&ans.n), ret))
- return 0;
+ if (msg.n.nlmsg_type == NLMSG_ERROR || !NLMSG_OK((&msg.n), ret)) {
+ struct nlmsgerr *err = NLMSG_DATA(&msg);
+ rd_fatal("receive NETLINK family: %s (errno=%d)", strerror(-err->error), err->error);
+ }
struct nlattr *na;
- na = (struct nlattr *) GENLMSG_DATA(&ans);
+ na = (struct nlattr *) GENLMSG_DATA(&msg);
na = (struct nlattr *) ((char *) na + NLA_ALIGN(na->nla_len));
- uint16_t id = 0;
-
- if (na->nla_type == CTRL_ATTR_FAMILY_ID)
- id = *(uint16_t *) NLA_DATA(na);
+ if (na->nla_type != CTRL_ATTR_FAMILY_ID)
+ rd_fatal("unexpected family id");
- return id;
+ return *(uint16_t *) NLA_DATA(na);
}
void print_procacct(int fd, struct taskstats *t)
@@ -375,7 +372,7 @@ int process_netlink_events(struct fd_handler *el)
if (msg.n.nlmsg_type == NLMSG_ERROR || !NLMSG_OK((&msg.n), ret)) {
struct nlmsgerr *err = NLMSG_DATA(&msg);
- rd_fatal("fatal reply error, errno=%d", err->error);
+ rd_fatal("reply error: %s (errno=%d)", strerror(-err->error), err->error);
}
ret = GENLMSG_PAYLOAD(&msg.n);
--
2.33.8