From nobody Sun May 31 17:19:56 2026 X-Original-To: dev-commits-src-main@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 4gT3kP0t0zz6gPBl for ; Sun, 31 May 2026 17:19: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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gT3kN42jyz3W01 for ; Sun, 31 May 2026 17:19:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1780247996; 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=+v2h5CAMLgNTTFPWNkMDB2vBCUNUsfrPjfnEOe36qcE=; b=u0RMqnRiNf5UYY6x9JJEimge/TuuntJ9Mix/afD93br43SiyQ+U6VYMnlrrjw4lDDiGX9U jt1IZAsx07x0+mI9czs0k39HxeWEmNgisgYLmYEg5s8tuyYq230GkY55PpjhNlqgAH3Q8B +0VDVRpzZU/dI0ocPhDIbg4gev9GLSVjDcVKDUpAdy4UZwOG2dsVZX6NpVpvOBGl1v4dz9 VKDdHCq9D4Mispu8uqGzM8jDOtrtAkE1LdunlEvDWP2r6mEXeCgTJ4wrhtFJeZmGavMfQ/ Ikf4orUu5u9mVdDC+piysVcxi8HGsg/jsQtJuFaupF6URF9QayehDsE4uYm0EA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1780247996; a=rsa-sha256; cv=none; b=r0CLAupiWTG5YzIJ2OzuUBQ5eJ9QxAF6EKNNz9l3hmqrDDlVM5oWXaquivndeZifZBKRfv qMMLpgG/zUt/00d0o5kVIeVs5D8uB4+ZfTRMGuFpRPP2lh1KV69gKO7cXt5WdFq4b08aJU NcynZKp73840ML4FfrmQttvk5SEnwH5gdfo52u+/De0pmxvt0p9yC3fXzNTqBopFaWaAvp ZRpcp5PyXOKcpYLhPEXGdF1XrJVRstVIClL7WFBMELGMipD434lc07oRUWOP3I0usYWnkM g2b0J51hFO7lycpfNqXNsdY87Yrbw/c3mFDdjxwh0M5+xAB3s5T8GMT8TiR7ew== 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=1780247996; 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=+v2h5CAMLgNTTFPWNkMDB2vBCUNUsfrPjfnEOe36qcE=; b=RnJ+1vVVFFs1s1r6m662WMn0QNuCamSLUE+nksjJ7PvGeY4Y453mlqZlCNZt+zqrmF/dmL Cvy0I5Tzk9UjCtOkybJP9JGSSJr+gakk1Pwpu5NmlOcgnYm16ASa8YerS1YVX55CrWxGR6 UfZ8U7f2u4/Dat7fZrHMvd8PVfG3VuYdFBFbhBwSNs7UMn4+MqxcYkDgHAd3Cnv+Vx1QFD XcxlAnVZQqw5o087qh/7CcunYFfaJrJvG2FEAWxq8E135YloReqdl+PnKgYJP1tzlazHj6 2G6nMW6+OKafQoluifhNhCVd7ADuWeFZIzO9jVET8YliFQMg8Wx/3WFumW71XQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gT3kN3KJzz10w9 for ; Sun, 31 May 2026 17:19:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3e231 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 31 May 2026 17:19:56 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: d0ea3aff9065 - main - ntsync: add kinfo reporting List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list 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: d0ea3aff90655be3cdb34d86a4a97be6fc85d919 Auto-Submitted: auto-generated Date: Sun, 31 May 2026 17:19:56 +0000 Message-Id: <6a1c6dbc.3e231.8af7108@gitrepo.freebsd.org> The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=d0ea3aff90655be3cdb34d86a4a97be6fc85d919 commit d0ea3aff90655be3cdb34d86a4a97be6fc85d919 Author: Konstantin Belousov AuthorDate: 2026-05-18 07:13:31 +0000 Commit: Konstantin Belousov CommitDate: 2026-05-31 17:14:47 +0000 ntsync: add kinfo reporting Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D57038 --- sys/dev/ntsync/ntsync.c | 47 ++++++++++++++++++++++++++++++++++++++++++++--- sys/sys/user.h | 24 ++++++++++++++++++++++++ 2 files changed, 68 insertions(+), 3 deletions(-) diff --git a/sys/dev/ntsync/ntsync.c b/sys/dev/ntsync/ntsync.c index 8b0984d12c75..a7b002de7cb6 100644 --- a/sys/dev/ntsync/ntsync.c +++ b/sys/dev/ntsync/ntsync.c @@ -19,6 +19,7 @@ #include #include #include +#include #include static struct cdev *ntsync_cdev; @@ -484,7 +485,19 @@ static int ntsync_sem_fill_kinfo(struct file *fp, struct kinfo_file *kif, struct filedesc *fdp) { - // XXXKIB + struct ntsync_obj *obj; + struct ntsync_obj_sem *sem; + + MPASS(fp->f_type == DTYPE_NTSYNC); + obj = fp->f_data; + MPASS(obj->type == NTSYNC_OBJ_SEM); + sem = OBJ_TO_SEM(obj); + + kif->kf_type = KF_TYPE_NTSYNC; + kif->kf_un.kf_ntsync.kf_ntsync_type = KF_NTSYNC_TYPE_SEM; + kif->kf_un.kf_ntsync.kf_ntsync_dev = (uintptr_t)obj->owner; + kif->kf_un.kf_ntsync.kf_ntsync_un.kf_ntsync_sem.count = sem->a.count; + kif->kf_un.kf_ntsync.kf_ntsync_un.kf_ntsync_sem.max = sem->a.max; return (0); } @@ -778,7 +791,21 @@ static int ntsync_mutex_fill_kinfo(struct file *fp, struct kinfo_file *kif, struct filedesc *fdp) { - // XXXKIB + struct ntsync_obj *obj; + struct ntsync_obj_mutex *mutex; + + MPASS(fp->f_type == DTYPE_NTSYNC); + obj = fp->f_data; + MPASS(obj->type == NTSYNC_OBJ_MUTEX); + mutex = OBJ_TO_MUTEX(obj); + + kif->kf_type = KF_TYPE_NTSYNC; + kif->kf_un.kf_ntsync.kf_ntsync_type = KF_NTSYNC_TYPE_MUTEX; + kif->kf_un.kf_ntsync.kf_ntsync_dev = (uintptr_t)obj->owner; + kif->kf_un.kf_ntsync.kf_ntsync_un.kf_ntsync_mutex.owner = + mutex->a.owner; + kif->kf_un.kf_ntsync.kf_ntsync_un.kf_ntsync_mutex.count = + mutex->a.count; return (0); } @@ -1053,7 +1080,21 @@ static int ntsync_event_fill_kinfo(struct file *fp, struct kinfo_file *kif, struct filedesc *fdp) { - // XXXKIB + struct ntsync_obj *obj; + struct ntsync_obj_event *event; + + MPASS(fp->f_type == DTYPE_NTSYNC); + obj = fp->f_data; + MPASS(obj->type == NTSYNC_OBJ_EVENT); + event = OBJ_TO_EVENT(obj); + + kif->kf_type = KF_TYPE_NTSYNC; + kif->kf_un.kf_ntsync.kf_ntsync_type = KF_NTSYNC_TYPE_EVENT; + kif->kf_un.kf_ntsync.kf_ntsync_dev = (uintptr_t)obj->owner; + kif->kf_un.kf_ntsync.kf_ntsync_un.kf_ntsync_event.signaled = + event->a.signaled; + kif->kf_un.kf_ntsync.kf_ntsync_un.kf_ntsync_event.manual = + event->a.manual; return (0); } diff --git a/sys/sys/user.h b/sys/sys/user.h index e1a3897cd319..75e76f622c0d 100644 --- a/sys/sys/user.h +++ b/sys/sys/user.h @@ -269,6 +269,7 @@ struct user { #define KF_TYPE_TIMERFD 14 #define KF_TYPE_INOTIFY 15 #define KF_TYPE_JAILDESC 16 +#define KF_TYPE_NTSYNC 17 #define KF_TYPE_UNKNOWN 255 #define KF_VTYPE_VNON 0 @@ -289,6 +290,11 @@ struct user { #define KF_FD_TYPE_TEXT -5 /* Text vnode */ #define KF_FD_TYPE_CTTY -6 /* Controlling terminal */ +#define KF_NTSYNC_TYPE_DEV 1 /* Not reported, reserved */ +#define KF_NTSYNC_TYPE_SEM 2 +#define KF_NTSYNC_TYPE_MUTEX 3 +#define KF_NTSYNC_TYPE_EVENT 4 + #define KF_FLAG_READ 0x00000001 #define KF_FLAG_WRITE 0x00000002 #define KF_FLAG_APPEND 0x00000004 @@ -467,6 +473,24 @@ struct kinfo_file { uint64_t kf_inotify_npending; uint64_t kf_inotify_nbpending; } kf_inotify; + struct { + uint32_t kf_ntsync_type; + uint64_t kf_ntsync_dev; + union { + struct { + uint32_t count; + uint32_t max; + } kf_ntsync_sem; + struct{ + uint32_t owner; + uint32_t count; + } kf_ntsync_mutex; + struct { + uint32_t signaled; + uint32_t manual; + } kf_ntsync_event; + } kf_ntsync_un; + } kf_ntsync; } kf_un; }; uint16_t kf_status; /* Status flags. */