From nobody Mon Mar 24 02:24:56 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ZLcMY6T8zz5r9rn; Mon, 24 Mar 2025 02:24:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZLcMY1Bvfz49gT; Mon, 24 Mar 2025 02:24:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742783097; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GePSJlPrmBNXj1Iem6scMA9HCYwJ75+wx0iXf3GolbA=; b=ebLTln8DFn3h6/U0ED/Mnskg5SHoXpN8et5hJcZYcjTPINhQLQJhLpPJ9pekTLbmeRoLHN mV09ZKXvD6k0yecWp1bvf/x8Zy/TO1qHy/liOxM8GQ0a859vyLFdZLtxITfbcccP7xxb2U z1NxHijZ+1KVBC2sAqrcduhob9ZEIZ4y2TBQhPu2OTy62P2Xq4P4Xk5Qwi9DP0xgie/cs3 xtevtAOF8acgz3cXoQYZXDiZVk39m3Zm/wRYlYgojLGpMInnycVcLvkw3s4HSusXCoR1vd zdJ4mcTNCj1Wi4Nu95BWRAZO2BONHujG1sNOZxcgBo/aIH4gKaFLSw+dmlIbeA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1742783097; a=rsa-sha256; cv=none; b=E/6lR5GwV/HnrUt6S3KVNIHO+IyVjAYDoY40E/PNPx/kH5wP4ISEzgP5A4Jv7bYGyUYKkb jforFRqD63KQGA50GOWAYs8PJsD378K4g1/moAaQOUMu9yGrKP+sI6IRwIn3raFFTOn5ey 0kD3dJKXWJn4iLnNbe4Vj+nTN0NIrDaq4lm5HZcLCo5ioeukp4C+LiZBZ9RcFKARhO/gSz 4q+NwaP0WsotiNmMY9e7AIkfnclnUuI5uowyS/itrcHvfFl0xBDmGrFBmF7cltDB1BB+eF FkO7nZ87SQe4wmLU1xDxpCiHnyp7aFAA7yu1OxttX3Ch/Ag4N9O135lWv1JhTQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742783097; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GePSJlPrmBNXj1Iem6scMA9HCYwJ75+wx0iXf3GolbA=; b=VUDcFoBocPnCXY2rEKht5ZuOeM7rNWSFCsQfDDmK7FFdCQo7B0T912WwHGTsICDQEbFX+R 1WKl5IMtXC0mFaery/1lHD1Ur4tBYRPC3MukhNruYq0WguqMVNsAqOuDZZWrT8XrN53npd LaGUixa+TdBwRINWdxnKzcfJKJSgAmluLabNLJQoRI7UZqxCMULB0A/byce+ivniIyaCnO t4d8PqWubuXTofilz6iqE5whh7+2BIe2B15AJ4iyZfFeRDxxhit+EMYpnTXO46kkVDxuT7 ZYxBwb8nRasdKHKBnZO0Jp6XI7xkJMXPCD4Bu0A+pZQ/379pUVJMnrq1hnRK5w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZLcMY026lzbV2; Mon, 24 Mar 2025 02:24:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 52O2OucD069987; Mon, 24 Mar 2025 02:24:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52O2OuiC069984; Mon, 24 Mar 2025 02:24:56 GMT (envelope-from git) Date: Mon, 24 Mar 2025 02:24:56 GMT Message-Id: <202503240224.52O2OuiC069984@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 1c3d6532ca29 - main - libprocstat: add knowledge about NT_PROCSTAT_KQUEUES core file section List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1c3d6532ca29c7aa7d26edd4074bc91671ac1bc2 Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=1c3d6532ca29c7aa7d26edd4074bc91671ac1bc2 commit 1c3d6532ca29c7aa7d26edd4074bc91671ac1bc2 Author: Konstantin Belousov AuthorDate: 2025-03-13 23:06:05 +0000 Commit: Konstantin Belousov CommitDate: 2025-03-24 02:24:14 +0000 libprocstat: add knowledge about NT_PROCSTAT_KQUEUES core file section Reviewed by: markj Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D49372 --- lib/libprocstat/core.c | 4 ++++ lib/libprocstat/core.h | 1 + lib/libprocstat/libprocstat.c | 33 +++++++++++++++++++++++++++++++-- 3 files changed, 36 insertions(+), 2 deletions(-) diff --git a/lib/libprocstat/core.c b/lib/libprocstat/core.c index 37ea9b7bb912..b27b35de3bab 100644 --- a/lib/libprocstat/core.c +++ b/lib/libprocstat/core.c @@ -109,6 +109,10 @@ static const struct psc_type_info { .n_type = NT_PTLWPINFO, .structsize = sizeof(struct ptrace_lwpinfo) }, + [PSC_TYPE_KQUEUES] = { + .n_type = NT_PROCSTAT_KQUEUES, + .structsize = sizeof(struct kinfo_knote) + }, }; static bool core_offset(struct procstat_core *core, off_t offset); diff --git a/lib/libprocstat/core.h b/lib/libprocstat/core.h index 8f6aa40192da..f4276fbdf09e 100644 --- a/lib/libprocstat/core.h +++ b/lib/libprocstat/core.h @@ -43,6 +43,7 @@ enum psc_type { PSC_TYPE_ENVV, PSC_TYPE_AUXV, PSC_TYPE_PTLWPINFO, + PSC_TYPE_KQUEUES, PSC_TYPE_MAX }; diff --git a/lib/libprocstat/libprocstat.c b/lib/libprocstat/libprocstat.c index 3c70c939ff7e..29f464ef6414 100644 --- a/lib/libprocstat/libprocstat.c +++ b/lib/libprocstat/libprocstat.c @@ -2862,6 +2862,9 @@ struct kinfo_knote * procstat_get_kqueue_info(struct procstat *procstat, struct kinfo_proc *kp, int kqfd, unsigned int *count, char *errbuf) { + struct kinfo_knote *kn, *k, *res, *rn; + size_t len, kqn; + switch (procstat->type) { case PROCSTAT_KVM: warnx("kvm method is not supported"); @@ -2870,8 +2873,34 @@ procstat_get_kqueue_info(struct procstat *procstat, return (procstat_get_kqueue_info_sysctl(kp->ki_pid, kqfd, count, errbuf)); case PROCSTAT_CORE: - warnx("core method is not supported"); - return (NULL); + k = procstat_core_get(procstat->core, PSC_TYPE_KQUEUES, + NULL, &len); + if (k == NULL) { + snprintf(errbuf, _POSIX2_LINE_MAX, + "getting NT_PROCSTAT_KQUEUES note failed"); + *count = 0; + return (NULL); + } + for (kqn = 0, kn = k; kn < k + len / sizeof(*kn); kn++) { + if (kn->knt_kq_fd == kqfd) + kqn++; + } + res = calloc(kqn, sizeof(*res)); + if (res == NULL) { + free(k); + snprintf(errbuf, _POSIX2_LINE_MAX, + "no memory"); + return (NULL); + } + for (kn = k, rn = res; kn < k + len / sizeof(*kn); kn++) { + if (kn->knt_kq_fd != kqfd) + continue; + *rn = *kn; + rn++; + } + *count = kqn; + free(k); + return (res); default: warnx("unknown access method: %d", procstat->type); return (NULL);