From nobody Sat Oct 18 05:14:17 2025 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 4cpVGy3KZbz6CQDW; Sat, 18 Oct 2025 05:14:18 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cpVGx6NsSz3VDX; Sat, 18 Oct 2025 05:14:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760764457; 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=MPzn3G2GdkbbhtpLMClUHKlNdyWLYmw+Kp+VLJGE544=; b=otX3p8yhX2GDd/uux/I8ErLI+VAwC2nADlIbHpJlmsPWBDBUhX2AZ0kSr4tmW4VIs2LlD0 BvjkySicj51HIHX122p7c8uzd1KLufnM4Q98fxoKk77BfGdqdbbK6BzjbOyFOAnoWcwpK3 vT7XvzWcvdB+LqBvAs3FBlXpgevPvfAHtkwjcVt2Kd0Yr9wlTkTMmjyqA23I1dzPCcSeVi cLJzzt4Jfka7a3xT+KVKt++ZD51w+4iXIRcokuMTTWK7Zf4yW4it7N5DsgNfl8RBVdmUl1 n3B44IWAK084gDtGxE4OqMnDjDrCVjaYp1xs5AHWfm0d5LWnug9P7p1stmnUXA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760764457; 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=MPzn3G2GdkbbhtpLMClUHKlNdyWLYmw+Kp+VLJGE544=; b=eULi4OL/XFo5cRg6Xkku/HspduoyLEby8cc6NRx7iw1E+6wN5UGAI0b7CLKLVR/7kTPkjk Q5weFoxuiueKv+G4TiEOgzW64hgb6ueupEmyGElUFPni52NZfjtF6eZanf/b1rL6mdmOxL DIgBui+Z8d77D/VOdv18is+6lJVY/MnoBPBhb0ktHn8ncEMmF0oMBjZP/6zuor9dYK3Si3 4EcOhUAUz79DSnLtAMJpzMQ1CRQgOabVcFkt2tGWcrkv9SCrz9H+iTKCmJtugGDr+HerXZ B9bK62DE2GgLUu+gxNlOQwQD3mJfGK34W1DH02hBcvaS6ZOtGX16eZdIc1dB/w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1760764457; a=rsa-sha256; cv=none; b=kHIJvgrWTdAEvf0TQ2grVvC6Kxrqe4uISVvCO6S3dOPfMkkIG4v807vYevJ0pZD/FrHnSv WORZoSu3882gGGPGHQwuqpYVSDe3Xb+I1p4HKqVw3EOP86mXsYnIIgRTAEijcWGDFQTA20 u0A/87SczRGxOoaB36eV6WEUHJEFojfn+fnp6QSEkNjuh1leZfdOJBh+G3yS1L+yqBs0Rk KjewPb9dnZlC2hbYPTiGI9A8E85fMHkv7y/bh5yLXBmaGa7T5eDwTkVSGFgoD7TOZvMs7W LaIR8/SQmz5lFYAkxMof61ayJKUz6uuaGFsk5ooCqZj3fQuDqn4oIw4dUI/dZg== 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 4cpVGx5RvkzBl8; Sat, 18 Oct 2025 05:14:17 +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 59I5EHnF062538; Sat, 18 Oct 2025 05:14:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59I5EHTs062535; Sat, 18 Oct 2025 05:14:17 GMT (envelope-from git) Date: Sat, 18 Oct 2025 05:14:17 GMT Message-Id: <202510180514.59I5EHTs062535@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 7a72e88781ae - main - kqueue: handle copy for netmap filters 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 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: 7a72e88781ae294aae6b97e1972cb19b2a670412 Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=7a72e88781ae294aae6b97e1972cb19b2a670412 commit 7a72e88781ae294aae6b97e1972cb19b2a670412 Author: Konstantin Belousov AuthorDate: 2025-08-23 14:42:19 +0000 Commit: Konstantin Belousov CommitDate: 2025-10-18 05:12:36 +0000 kqueue: handle copy for netmap filters Reviewed by: markj Tested by: pho Sponsored by: The FreeBSD Foundation MFC after: 2 weeks Differential revision: https://reviews.freebsd.org/D52045 --- sys/dev/netmap/netmap_freebsd.c | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/sys/dev/netmap/netmap_freebsd.c b/sys/dev/netmap/netmap_freebsd.c index ac267a66d669..9fb4370129f3 100644 --- a/sys/dev/netmap/netmap_freebsd.c +++ b/sys/dev/netmap/netmap_freebsd.c @@ -1407,19 +1407,34 @@ netmap_knwrite(struct knote *kn, long hint) return netmap_knrw(kn, hint, POLLOUT); } +static int +netmap_kncopy(struct knote *kn, struct proc *p1) +{ + struct netmap_priv_d *priv; + struct nm_selinfo *si; + + priv = kn->kn_hook; + si = priv->np_si[kn->kn_filter == EVFILT_WRITE ? NR_TX : NR_RX]; + NMG_LOCK(); + si->kqueue_users++; + NMG_UNLOCK(); + return (0); +} + static const struct filterops netmap_rfiltops = { .f_isfd = 1, .f_detach = netmap_knrdetach, .f_event = netmap_knread, + .f_copy = netmap_kncopy, }; static const struct filterops netmap_wfiltops = { .f_isfd = 1, .f_detach = netmap_knwdetach, .f_event = netmap_knwrite, + .f_copy = netmap_kncopy, }; - /* * This is called when a thread invokes kevent() to record * a change in the configuration of the kqueue().