From nobody Thu Jun 1 21:02:27 2023 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 4QXJVW2JFPz4YD8S; Thu, 1 Jun 2023 21:02:27 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QXJVW1tx8z493x; Thu, 1 Jun 2023 21:02:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1685653347; 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=l3dU+BUYwNgtZj6smtesLUX113MPlUHtFdT0Mgcrgdg=; b=TnZvQnVD0URD+s7DXDZ+1CNMrIUFM+Vumk/xjWgN5n29XvHQiIAErOV8i+uwYmdsoaNHiZ qiMrCQP3MZoEr7WulFWbhE9b3VNtLVlfn0cNx02/vYT+axOB/gejTUkLzTe+AXmq2ezIKB 7VgkP9KuhQPUYA0dIQy5QdCK7sQs3kF9C2SkKSMAkysTG2Sj9hPbQlxfBmoabJM6O1DTfk GLKBvGdWtccLMfYut73yGTd4eWFmKuo1NL/ATRbPr6JD3NLEPMONYEJp3TxltWY1iGuPH6 azLUHnTE/YIkBNn56GMfmuG9nk+EnficfdjqUa9j9zuEpHKEE8bNFR1Pvi0avQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1685653347; 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=l3dU+BUYwNgtZj6smtesLUX113MPlUHtFdT0Mgcrgdg=; b=mAtZ2gJS1Bl4EPEZmIbRTasI7sM+skLpCTn9H3xkyM6jUlDkPjoJQ7E4qefF76855JP7gr 6DTSr+E7fW97qN29SpkLZaXaAAaZCz0Q5Vvp/N56oaFPt00k41ZGWoonwAIjTnjbiIsXWV S+cWNRi+IVfCKRYiKL9Qc4Ib9DccqGpyZlw6guXXW0Op1kgeBKeGOnGjyx/YNobbBso3Gl D6vVFmie+gS+AjSJxfUjita2nlTCzsBpsP7QJcoK/xFjbHQL43q0SC5afH8m1oNjVvIIbM AA3RWpmi7FS7bnVODHCGL/LjJJiijuOlrt7PruVW5Yx130V/KY5mXk57WAtPNw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1685653347; a=rsa-sha256; cv=none; b=M99Jj5Fvjyi1yMTc32et8D16j5tTNojerFd4b7MEx+//EOHl4QNmyOjKKkqIY8Ri2gap2s YxHEdk4oH0rFOFdrEmfXxab0Xx/qydDntHimVfZz7xoBf+itkfmpk7OEKQpw2i1hF28xzW jS1dskmv43qTepk6r+F0hGbuwxSM1/BqmG6zmmMiIHJuWmNu+Uis7fs++oAvk2U4dlE5Wh vu8mMnXVQLCsQK0VzBcZAt2seQuCe4qvF/6kWzFboR1LnwnkHzrctwTErfo/h+q6FLh3Zv 42Aiyeg59ZDvE7PewGqebAIpFahxntb17crPekClJ7xNa/rlJv16pi6rKrlngg== 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 4QXJVW0yjPzXVw; Thu, 1 Jun 2023 21:02:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 351L2RmL061478; Thu, 1 Jun 2023 21:02:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 351L2RW5061477; Thu, 1 Jun 2023 21:02:27 GMT (envelope-from git) Date: Thu, 1 Jun 2023 21:02:27 GMT Message-Id: <202306012102.351L2RW5061477@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Baptiste Daroussin Subject: git: afbb26b58b93 - main - devctl: allow to register a hook to receive the events 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bapt X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: afbb26b58b93bddf0e8720698cd712eac7f8c13d Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=afbb26b58b93bddf0e8720698cd712eac7f8c13d commit afbb26b58b93bddf0e8720698cd712eac7f8c13d Author: Baptiste Daroussin AuthorDate: 2023-06-01 21:01:40 +0000 Commit: Baptiste Daroussin CommitDate: 2023-06-01 21:01:40 +0000 devctl: allow to register a hook to receive the events In preparation for netlink sysvent add a function that allow registering a function to hook the events and also send it via another kernel module (nlsysvent will be that module). Prepare a static list of known existing events in the kernel that will be used to prepopulate nlsysvent multicast group (one per event) Reviewed by: imp Differential Revision: https://reviews.freebsd.org/D37573 --- sys/kern/kern_devctl.c | 38 ++++++++++++++++++++++++++++++++++++++ sys/sys/devctl.h | 28 ++++++++++++++++++++++++++++ 2 files changed, 66 insertions(+) diff --git a/sys/kern/kern_devctl.c b/sys/kern/kern_devctl.c index d40559bba8f1..b51b135c38dc 100644 --- a/sys/kern/kern_devctl.c +++ b/sys/kern/kern_devctl.c @@ -134,6 +134,10 @@ static struct filterops devctl_rfiltops = { static struct cdev *devctl_dev; static void devaddq(const char *type, const char *what, device_t dev); +static struct devctlbridge { + send_event_f *send_f; +} devctl_notify_hook = { .send_f = NULL }; + static void devctl_init(void) { @@ -435,6 +439,8 @@ devctl_notify(const char *system, const char *subsystem, const char *type, if (system == NULL || subsystem == NULL || type == NULL) return; + if (devctl_notify_hook.send_f != NULL) + devctl_notify_hook.send_f(system, subsystem, type, data); dei = devctl_alloc_dei_sb(&sb); if (dei == NULL) return; @@ -478,6 +484,7 @@ devaddq(const char *type, const char *what, device_t dev) struct dev_event_info *dei; const char *parstr; struct sbuf sb; + size_t beginlen; dei = devctl_alloc_dei_sb(&sb); if (dei == NULL) @@ -485,6 +492,7 @@ devaddq(const char *type, const char *what, device_t dev) sbuf_cpy(&sb, type); sbuf_cat(&sb, what); sbuf_cat(&sb, " at "); + beginlen = sbuf_len(&sb); /* Add in the location */ bus_child_location(dev, &sb); @@ -503,6 +511,23 @@ devaddq(const char *type, const char *what, device_t dev) sbuf_putc(&sb, '\n'); if (sbuf_finish(&sb) != 0) goto bad; + if (devctl_notify_hook.send_f != NULL) { + const char *t; + + switch (*type) { + case '+': + t = "ATTACH"; + break; + case '-': + t = "DETACH"; + break; + default: + t = "NOMATCH"; + break; + } + devctl_notify_hook.send_f("device", + what, t, sbuf_data(&sb) + beginlen); + } devctl_queue(dei); return; bad: @@ -568,3 +593,16 @@ devctl_safe_quote_sb(struct sbuf *sb, const char *src) sbuf_putc(sb, *src++); } } + +void +devctl_set_notify_hook(send_event_f *hook) +{ + devctl_notify_hook.send_f = hook; +} + +void +devctl_unset_notify_hook(void) +{ + devctl_notify_hook.send_f = NULL; +} + diff --git a/sys/sys/devctl.h b/sys/sys/devctl.h index b72cd28dfce8..5b613cf427df 100644 --- a/sys/sys/devctl.h +++ b/sys/sys/devctl.h @@ -12,11 +12,39 @@ * devctl hooks. Typically one should use the devctl_notify * hook to send the message. */ + +static const char *devctl_systems[] = { + "ACPI", + "AEON", + "CAM", + "CARP", + "coretemp", + "DEVFS", + "device", + "ETHERNET", + "GEOM", + "HYPERV_NIC_VF", + "IFNET", + "INFINIBAND", + "KERNEL", + "nvme", + "PMU", + "RCTL", + "USB", + "VFS", + "VT", + "ZFS", +}; + bool devctl_process_running(void); void devctl_notify(const char *__system, const char *__subsystem, const char *__type, const char *__data); struct sbuf; void devctl_safe_quote_sb(struct sbuf *__sb, const char *__src); +typedef void send_event_f(const char *system, const char *subsystem, + const char *type, const char *data); +void devctl_set_notify_hook(send_event_f *hook); +void devctl_unset_notify_hook(void); #endif #endif /* _SYS_DEVCTL_H_ */