From nobody Sat Nov 01 00:45:10 2025 X-Original-To: dev-commits-src-branches@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 4cyzdz2M7Cz6FWpW; Sat, 01 Nov 2025 00:45:11 +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 4cyzdz0BX0z3hKC; Sat, 01 Nov 2025 00:45:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761957911; 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=gUJIEGIm0uxmBAROs2x4LmUTfj+WpC3pGLgTXqdMHOc=; b=wnMjWiKRf2n5Tvu9MBo4YYqLUU9B9MVxxV5mHi4pp+EJKtMx9c50/mepWy+XyF9F/OX7Sr o7pymLFNbMzLL+wzklu31OJilcD9xbmbHl8QnLcABZr0r6N796E+SNOToBmNIlT9Jf6Ud3 6ZnT6TaM9ipdJN+5kCbzyDXrnpIRiQ0TeWS9WDC08JmlL9Mhw2wuA4nDHjQ47yUbytdDQL vPsFecjQwcGqbvWqxFt3U+TxWqVQXGf0fPFxEA5dA4zpT+Uk3+YSiePTviSxF48ypPcdm4 FADVPC/KtJ+K7R+wgK/I0eXlFLCecGdVs2Nv8ov1kVidmCDNJkiB3g93H0HjZQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761957911; 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=gUJIEGIm0uxmBAROs2x4LmUTfj+WpC3pGLgTXqdMHOc=; b=dh86XKidgAcaNRDuAfGsh3y9dHqp+cP4kv9Ie03AjpIIwVYMZ5iRYgYfKyGcmEW9KpiMu9 aswg+Tir5md8vdRkFf/r5HXrNV3A8+tX9cfF8ui0W7/2de/QFU1lisnUCEHCEN+BWtg5gL L0wXA7e5ZbYcN3BO13bY29rCohv3efQGKDkk5zD6OnF7EZdgYpLjUm3ziuth2X+ie48ALo 6vSWG1/Y6v8LfTaRcd/5uMdyAvcAEGLDoKpnpvNH7xnBnmyClHOKwCKoIMfxUpYWlza82n jitNh6IQAZwucLb7uR8lUk3VqdM5bQTCZGMmekTB9y8iC6q4uUyqNiTFyzQioQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761957911; a=rsa-sha256; cv=none; b=lDdJJfNIf9eJ4u7ZMfxwsBhyFqAEfAAPraVcsDcPSk3eFVmcTS/vHqZAU9OcUwvd54ERMK tCj2aSmAQ+cBL+hDnuvc0Hl/0Q0GneMacjd1xxC14z1LGXwg1S6gXpHOMsILPptOWL8zxQ NSDS+I6Ts9K3+865T8LA+gt7fuz2ntQkzgJeiV7lYO78tPDAyy7xTIuFlRzcawB47E0XVd /ESP/jeWHrr0uS3AcKBL6xzhMRmne3oPQ46zLCLcNy53LNmiHlpog7hK+UQTc/4x7mX5tn uFEmrrSgL0aiI3/OQXux55cNQ/dFXMtJlEwL+NLkbTj+KYZnhpQleMwAmf8XUA== 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 4cyzdy6m16z1cV; Sat, 01 Nov 2025 00:45:10 +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 5A10jAeG000949; Sat, 1 Nov 2025 00:45:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5A10jAIf000946; Sat, 1 Nov 2025 00:45:10 GMT (envelope-from git) Date: Sat, 1 Nov 2025 00:45:10 GMT Message-Id: <202511010045.5A10jAIf000946@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: b4946ace9b04 - stable/15 - kqueue: handle copy for netmap filters List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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/stable/15 X-Git-Reftype: branch X-Git-Commit: b4946ace9b04751bb7931818bbe5b3bb8eaa3c95 Auto-Submitted: auto-generated The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=b4946ace9b04751bb7931818bbe5b3bb8eaa3c95 commit b4946ace9b04751bb7931818bbe5b3bb8eaa3c95 Author: Konstantin Belousov AuthorDate: 2025-08-23 14:42:19 +0000 Commit: Konstantin Belousov CommitDate: 2025-11-01 00:43:14 +0000 kqueue: handle copy for netmap filters (cherry picked from commit 7a72e88781ae294aae6b97e1972cb19b2a670412) --- 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().