From nobody Mon Aug 18 09:18:19 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 4c56Zg6Gs9z64t4P; Mon, 18 Aug 2025 09:18:19 +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 4c56Zg5QCsz3bmm; Mon, 18 Aug 2025 09:18:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755508699; 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=vOM7p7FkwlTyHlUVoJ7wJqzeBbe/Pnx0A3nufJqUrNg=; b=T3zqa8rxZmnEYUG1t5YW7EIkCF/gXTDFMxjokw9DsMVhPZuloBpWumNASVtyXGaDgvAoZe LD2CiHnVl/fs6e2QvI1ETsQFxVldYwfTTXl6zM5DpfCVdXcoo1Zy+gtisdZZYTBlIESSed TGKTQ/HX11YKU6k2tnn7DRsEN/NfgUh6MkQuB1VBUDRrHwUog2J5hyku3kcAPgkB+ehS81 J0I/MZ7OswkGMGT7NqV86EBw96bNOYGo3WtCQt9pUv2wyOwRhJXB6NCbGrekd80CnRZVHa FKe20NbDE0w1bc4Gbbl4ghYIhZC5+1fF94Fue7r6lJIBr5Tv8CR6ZTPGFaRwSA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755508699; 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=vOM7p7FkwlTyHlUVoJ7wJqzeBbe/Pnx0A3nufJqUrNg=; b=hRG3ldNc4Y6oun8Qcqh0e1V1OlZdwq4us4kjBIogStVDeALyHWTjDHi8bVtdoNS8k/2pKl uaLxErwOAZr+ZnhPZCLpFrJaO4so4SYw2KSsJA+S0SggZgLqFzg8WkLWzJ9IM6ISeL/m7Z 2cggPMUZsAyezbDg5JgAwL/umiMtjPgatiP2tAIi212Dd8cn0c3+1+eGiolUs90CbcZD58 bYar/QIEQ4abxy1KhRvB+utJMEwxm0QBTJrwr62zx3kmPB0oCLP9/zhE4Nbd9SqE6gFuzi w8aIvWE5z7ejKk9l2T0yEKiU+BhJVBdX7C1iEVZ6xbdMMn8+8/svgrSfyZF2Cw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1755508699; a=rsa-sha256; cv=none; b=XxE/ccHD8KktDTxlwYKuuvQ7cxRjp7YWjB+TbtMhJobIEVRCfCNG94LrFIdXK7y6HkN76t 0uiBpfehamb5fRTJKZq6+Cw3T/ZzdWmfQxt1L4POGeFrV2tdpBIkfPrr2k0ECnTbBsy0s2 V7jZ28js+t7SI8I2lYfd/9y1Km0qK1EgjjX672cQmbW8bSJRjFNxjBfNM9KOzH05ditKm/ 99nC1SEyYh66dGKlLYVGJyg+CfDWMNMCqR8O6nxIINm/wXs4tPoWZk2S89ziJOp4leBBi6 DdUtr8LM20wzZxETPJB/wRoPVRZkBjQhUxfnhccgY1QJ6TT6avEUeqhHYPBDAQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4c56Zg4kX2zr1s; Mon, 18 Aug 2025 09:18:19 +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 57I9IJ3L061933; Mon, 18 Aug 2025 09:18:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57I9IJvU061930; Mon, 18 Aug 2025 09:18:19 GMT (envelope-from git) Date: Mon, 18 Aug 2025 09:18:19 GMT Message-Id: <202508180918.57I9IJvU061930@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Pietro Cerutti Subject: git: 4d41e3a22d32 - stable/14 - null: support EVFILT_READ/EVFILT_WRITE kevent filters 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: gahr X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 4d41e3a22d320e45619c2a10ce73957d15c3efc2 Auto-Submitted: auto-generated The branch stable/14 has been updated by gahr: URL: https://cgit.FreeBSD.org/src/commit/?id=4d41e3a22d320e45619c2a10ce73957d15c3efc2 commit 4d41e3a22d320e45619c2a10ce73957d15c3efc2 Author: Pietro Cerutti AuthorDate: 2025-08-07 20:24:06 +0000 Commit: Pietro Cerutti CommitDate: 2025-08-18 09:18:01 +0000 null: support EVFILT_READ/EVFILT_WRITE kevent filters This enhances the full, null, and zero devices to support read and write kevent filters. A read event is immediately triggered for full and null, and never for zero. A write event is immediately triggered for zero and null, and never for full. Reviewed by: cognet MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D51807 (cherry picked from commit b89104dfd5cf001b34963b9e02083027f9d215d5) --- sys/dev/null/null.c | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) diff --git a/sys/dev/null/null.c b/sys/dev/null/null.c index 4565639574f3..b04f4cd8919a 100644 --- a/sys/dev/null/null.c +++ b/sys/dev/null/null.c @@ -4,6 +4,7 @@ * Copyright (c) 2000 Mark R. V. Murray & Jeroen C. van Gelderen * Copyright (c) 2001-2004 Mark R. V. Murray * Copyright (c) 2014 Eitan Adler + * Copyright (c) 2025 Pietro Cerutti * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -40,6 +41,7 @@ #include #include #include +#include #include #include @@ -54,12 +56,26 @@ static d_write_t null_write; static d_ioctl_t null_ioctl; static d_ioctl_t zero_ioctl; static d_read_t zero_read; +static d_kqfilter_t kqfilter; +static int one_ev(struct knote *kn, long hint); +static int zero_ev(struct knote *kn, long hint); + +static const struct filterops one_fop = { + .f_isfd = 1, + .f_event = one_ev +}; + +static const struct filterops zero_fop = { + .f_isfd = 1, + .f_event = zero_ev +}; static struct cdevsw full_cdevsw = { .d_version = D_VERSION, .d_read = zero_read, .d_write = full_write, .d_ioctl = zero_ioctl, + .d_kqfilter = kqfilter, .d_name = "full", }; @@ -68,6 +84,7 @@ static struct cdevsw null_cdevsw = { .d_read = (d_read_t *)nullop, .d_write = null_write, .d_ioctl = null_ioctl, + .d_kqfilter = kqfilter, .d_name = "null", }; @@ -76,6 +93,7 @@ static struct cdevsw zero_cdevsw = { .d_read = zero_read, .d_write = null_write, .d_ioctl = zero_ioctl, + .d_kqfilter = kqfilter, .d_name = "zero", .d_flags = D_MMAP_ANON, }; @@ -198,5 +216,35 @@ null_modevent(module_t mod __unused, int type, void *data __unused) return (0); } +static int +one_ev(struct knote *kn, long hint) +{ + + return (1); +} + +static int +zero_ev(struct knote *kn, long hint) +{ + + return (0); +} + +static int +kqfilter(struct cdev *dev, struct knote *kn) +{ + + switch (kn->kn_filter) { + case EVFILT_READ: + kn->kn_fop = dev->si_devsw == &null_cdevsw ? &zero_fop : &one_fop; + return (0); + case EVFILT_WRITE: + kn->kn_fop = dev->si_devsw == &full_cdevsw ? &zero_fop : &one_fop; + return (0); + default: + return (EOPNOTSUPP); + } +} + DEV_MODULE(null, null_modevent, NULL); MODULE_VERSION(null, 1);