From nobody Fri Jul 4 14:56:00 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 4bYcC46Wv4z61HLb; Fri, 04 Jul 2025 14:56:00 +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 4bYcC42zzZz43HB; Fri, 04 Jul 2025 14:56:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1751640960; 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=2zYfTmJ5PizNBUHIMbQ/1B/Ap8Ovr7+9KWG7mFHFqIY=; b=n64dZreZomRNBBoE/VN+pnh/WQzOf8BqvsQJ9jgUZsWWPEuyAqzY/3gcUXTvIpx5Yhqbt3 zYra/hA/yJj/N5wVGHRpE4CmA6Un4VOF65jWfAblISrEYDsr3ebqCWkV99vT8dJNNOe79H KTbrYZ5CdkKnTRA58fbeqMPQiOvMMD2/i/d+5I62q2I/pds8ug2NN2tYi65pTnDnUKB60b 0ZyAqRlbKtcmRecyCeZlqMzbPS4jNtruq3HmhIctwWN6ZUFSm4VjLHIMv9G1VZuTkpxs7S qAO3cvlSrhn+lOyCFNpZGzeKl2xooSnVeWdTYpWI+rrnGvpZhx5YoRvTOa7nuA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1751640960; 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=2zYfTmJ5PizNBUHIMbQ/1B/Ap8Ovr7+9KWG7mFHFqIY=; b=nfCjaFbNycKEKmG/lQRj7Hp+kAh8NBdhUmvC7kfTvpdYiUDF+0T3PZlh7I0eUwTwvqk8mW CK4VHeeQgHt6yACeTxnAy7+Fj6c/rjfy3kxEZ99p88Mjb+yghf3mVoq8oiPRLKTEaBabM1 BaVyiT8PMiBjFQ2TSpxQlXxBUXowoBAW7hvtQlav7lL1zVWczaKZa1Lqf4NmnZsWjFkpVz 01Lre45ffeLhMTCedXDdULguUdhIh03Cli2bJuF9GMZMP88PJ+SS10nazfS8SOID8trifb Y0rSraRnBQRsf40wGEVDimnQqtJ/BwnaUlB68loMak5Nm+Zb/8u7/lf0fLOltg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1751640960; a=rsa-sha256; cv=none; b=m8NlOR4zpWWifmSaa7yQJtgDpRz8Wf7e6kxjvpgJ/SDhLSVbuX97oVJgrvbyse+mLZJ6ys EUck2HbEcp6/4IJhN1A05+imUgMCp9H7+7vp4lWBz6UofRtVnyxZvW6NpXBjUli0o0Wbw5 L9xPBjLKrHmZlib2JoztD1RpvPTb+LqkZaeEUmJVYNim3rCbpvhy4N/qW2rWjFuLRvd+ft UcuFX/oEOsuAxJeDjkqhSF+PaVrHA/5h+0gHUbTQshykzu3+rCBHC6xtbPeyeMFWIIi9ll i/TrZu2ffmiORs2BUOsdh/YnV68KRH7/2tWnmSPastpThuUnDy8lkwnV5jCmrg== 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 4bYcC42blzzvjf; Fri, 04 Jul 2025 14:56:00 +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 564Eu0Ho073690; Fri, 4 Jul 2025 14:56:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 564Eu0Vk073687; Fri, 4 Jul 2025 14:56:00 GMT (envelope-from git) Date: Fri, 4 Jul 2025 14:56:00 GMT Message-Id: <202507041456.564Eu0Vk073687@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: e02d4fab5453 - main - kdump: Add support for decoding inotify events 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: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e02d4fab54539a5d127c12e9e9f8b0ddd2a1cafa Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=e02d4fab54539a5d127c12e9e9f8b0ddd2a1cafa commit e02d4fab54539a5d127c12e9e9f8b0ddd2a1cafa Author: Mark Johnston AuthorDate: 2025-07-03 19:53:30 +0000 Commit: Mark Johnston CommitDate: 2025-07-04 14:42:33 +0000 kdump: Add support for decoding inotify events These are emitted when reading from an inotify descriptor. MFC after: 3 months Sponsored by: Klara, Inc. --- usr.bin/kdump/kdump.c | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/usr.bin/kdump/kdump.c b/usr.bin/kdump/kdump.c index 9cc22d382de5..17ed43b55c5a 100644 --- a/usr.bin/kdump/kdump.c +++ b/usr.bin/kdump/kdump.c @@ -46,6 +46,7 @@ #include #include #include +#include #include #include #include @@ -105,6 +106,7 @@ static void ktrcsw(struct ktr_csw *); static void ktrcsw_old(struct ktr_csw_old *); static void ktruser(int, void *); static void ktrcaprights(cap_rights_t *); +static void ktrinotify(struct inotify_event *); static void ktritimerval(struct itimerval *it); static void ktrsockaddr(struct sockaddr *); static void ktrsplice(struct splice *); @@ -1860,6 +1862,14 @@ ktrtimeval(struct timeval *tv) printf("{%ld, %ld}", (long)tv->tv_sec, tv->tv_usec); } +static void +ktrinotify(struct inotify_event *ev) +{ + printf( + "inotify { .wd = %d, .mask = %#x, .cookie = %u, .len = %u, .name = %s }\n", + ev->wd, ev->mask, ev->cookie, ev->len, ev->name); +} + static void ktritimerval(struct itimerval *it) { @@ -2128,6 +2138,17 @@ ktrstruct(char *buf, size_t buflen) goto invalid; memcpy(&rights, data, datalen); ktrcaprights(&rights); + } else if (strcmp(name, "inotify") == 0) { + struct inotify_event *ev; + + if (datalen < sizeof(struct inotify_event) || + datalen > sizeof(struct inotify_event) + NAME_MAX + 1) + goto invalid; + ev = malloc(datalen); + if (ev == NULL) + err(1, "malloc"); + memcpy(ev, data, datalen); + ktrinotify(ev); } else if (strcmp(name, "itimerval") == 0) { if (datalen != sizeof(struct itimerval)) goto invalid;