From nobody Mon Apr 7 01:29:12 2025 X-Original-To: dev-commits-src-branches@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 4ZWBSn1Xz6z5sNh9; Mon, 07 Apr 2025 01:29:13 +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 4ZWBSm4QJVz3wm5; Mon, 07 Apr 2025 01:29:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1743989352; 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=Fr8KylIaEboVRvAhm26ndjVvXzQHcY7cIeKpzwYrCz8=; b=SFrBMhpnZVv3ERfeumixe1GfsraLZpJPvpzxak+kMeNAEgF5zhNB9OCWD+rS7PLgNtgHwR y7PEKl4pU8gNdQsWm43ZMeoE8scoc7ubve+tc19UogScgAVhUQu/I3faq0vSrnYQiRyEXa TtVQsB883No78VqkSDOiCkUGW+K5hNCWi1NGpfHvxfVo5WnbDTS3dXhq7NRbzOY1B9nJbv 8CHzyqqoUOd0A3DwZVpMQGxSTTPHw5PsIXy6aoXed8z9G+nJ5SwBMs8uvZzz3CqXrAzLYu w+76HBRZiurgx1BixG8lUEdKtQpJ5blcjUCEsMmNO6R4CW6YJuR1vPCtVjTHtw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1743989352; a=rsa-sha256; cv=none; b=gZzLspdGWSAvL1qbP0zSOFfNlGURhqVMoD/cZT61M/wHCx0rLvmgiS2ypWXBOFhUjiCaQT 14kCLduI7IVQnpUM/9We9o+qONyNGqkruyCcymP5UEz0EYaQimDQCUZk6RCZNlxOBRjGcK wv0uLgzkod86+8vfqB4Uo98/ZHoxM6YfOC1qXO3uKq9mpvOf0iPxJl1ea4Eg6Y2zv22rQd ZVMinsjbXuY+zc5wORL9U8xdE9lCCuL2NgfbVupNwPUnaOBXJPYIn50M6BOsoHYq6fu34G 9Coc8qkh2sMOPcKZE9yC1GZdefPnDhhf6d9xR9DC1+VgO3+i2Z1l1oxqyLNq9g== 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=1743989352; 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=Fr8KylIaEboVRvAhm26ndjVvXzQHcY7cIeKpzwYrCz8=; b=s3V/2V4DFapoI1oMHC+tuXvfULyaRiwuk22/bLHcgIhSaz8YKFtVY/6K54E6whkQOv7e/X i1fM+gRfofYq4rOSs63T4GRL0nCxbZjYrZqJaReeAZh+FjLH8GK6VwRyvGqFj+EeWogdFo xh3Q3aNd0/1URZkC+dsQF8fGDjL6sMsW6ZmBKy0OXM7yL1eGlfHPHvSK+lGlxKlCLp4225 fGDgndAMhkaqwvREqPMmOY+kA2m4AsLGGrq8L3gxj/NM2+GeU7L2P2P6WIGGJvnoatEOcQ Mmf1YYWVTxiZyWwHcf3cMnpwDtPrDEOPkNsKMnVjM0m5bC1zyGow58ES3B+gaQ== 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 4ZWBSm3Rzjz955; Mon, 07 Apr 2025 01:29:12 +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 5371TCfM063298; Mon, 7 Apr 2025 01:29:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5371TCNb063295; Mon, 7 Apr 2025 01:29:12 GMT (envelope-from git) Date: Mon, 7 Apr 2025 01:29:12 GMT Message-Id: <202504070129.5371TCNb063295@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 6c0c6ad350c9 - stable/14 - libprocstat: add knowledge about NT_PROCSTAT_KQUEUES core file section List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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/stable/14 X-Git-Reftype: branch X-Git-Commit: 6c0c6ad350c9e35291d0fb1eda8f889eef655f83 Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=6c0c6ad350c9e35291d0fb1eda8f889eef655f83 commit 6c0c6ad350c9e35291d0fb1eda8f889eef655f83 Author: Konstantin Belousov AuthorDate: 2025-03-13 23:06:05 +0000 Commit: Konstantin Belousov CommitDate: 2025-04-07 01:28:22 +0000 libprocstat: add knowledge about NT_PROCSTAT_KQUEUES core file section (cherry picked from commit 1c3d6532ca29c7aa7d26edd4074bc91671ac1bc2) --- 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 a3e500367920..f74303cdb876 100644 --- a/lib/libprocstat/core.c +++ b/lib/libprocstat/core.c @@ -110,6 +110,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 a59dff84f242..bd314f481e32 100644 --- a/lib/libprocstat/libprocstat.c +++ b/lib/libprocstat/libprocstat.c @@ -2883,6 +2883,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"); @@ -2891,8 +2894,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);