From nobody Mon Mar 18 15:53:19 2024 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 4TyzsX124Cz5F01b; Mon, 18 Mar 2024 15:53:20 +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 4TyzsW71sYz4cNh; Mon, 18 Mar 2024 15:53:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710777200; 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=D1TLFUiHca2AX4oZ2icnoHFAKnZJwCmhLw9ZUpCZ4io=; b=s5DnvyiIQDr0VxekhECykIl3D+tA6Jswp2XQZDucvu+fcIE5u423mUE7dZ5OJNobBGIyr9 dGF/zql1sMvP+hoZvhsPD6KDb7CQEVmhb7uJnErKreFzdUhPvId/qTvnslJ56z2Tuwe0OH /h7jky4eyBznW2dezvrF0ClUniWMYEGcyfkfYpz+MsSwt820rBoOaZ57hDW3uj5Q0cZPPL awu3K16FplTDcL9bwsQh/He9OgTczyb81hpvj4qXhUkVa9iRuzxGZYDe188Z+svC5jFApk m6OavaeEgKo9sdp5kMYMKH4wPPr43p8q3Msy8jgYsQHyhjcXcF1V1B7WUXW29A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1710777200; a=rsa-sha256; cv=none; b=RndDd3ffg/Qy3E9g85iZgzdRGWcVqt7ZIHiEvW43PdPRrw2F+LLsvlEYcgKfGjE3C+0mzl b8YBXkskcDqxC6eXMjbOI0Fgw4t63adzWOPVuX9SAz9+seOAf2xkLPBEgvjtUCBMr4eKLe WGuKnTyxgN5Pk1Hp59qxxkoYuVdjkuRi2PjpCl7HMTCuilBksvJonAmk1XIPFEWHrUYZS2 TX5szB15io7pPkHGLlFVakCPLLNYCPu80SwMEZIai3QxVnHlCr3aMkncWywqnELg0eu+9D sT0tCApZax3NyN+vlgJtAT1d6O/enzKQ/EPAnVY+RqtiRUDJRjJFeu3YZHYztg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710777200; 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=D1TLFUiHca2AX4oZ2icnoHFAKnZJwCmhLw9ZUpCZ4io=; b=YPI1ITeglJORY6DagleyiyqXr3pjfqDAwkEJprx9JU6ca3S+6OgstwTuKKQMQKPJ65RYF0 JFnxAyY+nqJIgeTud7fxdGOaJbe/dznsc8UlPeYamjKiYyZu6TMcu59av0kVcfehQr1jUs FodhoRvOXfoxhOQWnIfhpE44MsRzCSHmodSwYC5yckQFEnmEOklgKJjmqBPvvo8QaHgYd/ Ta08kBkSMqo8AK2I61bdcezch7aHSuz5AqOloE81a3o384xnVg+gn9waiGlqo4AfFmbP2s ykPAsEiFN+9MadppLMmOS7JbJ25pDi5qccpMpp5+lBI8zbBIDFSjlGjeDS19QA== 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 4TyzsW6fMzzTrK; Mon, 18 Mar 2024 15:53:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 42IFrJul001242; Mon, 18 Mar 2024 15:53:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42IFrJc0001239; Mon, 18 Mar 2024 15:53:19 GMT (envelope-from git) Date: Mon, 18 Mar 2024 15:53:19 GMT Message-Id: <202403181553.42IFrJc0001239@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kyle Evans Subject: git: 416547ba79c3 - stable/14 - kern: poll: tap out the pollfd array on successful return 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: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kevans X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 416547ba79c3dec8e69502174abecf33dbf74606 Auto-Submitted: auto-generated The branch stable/14 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=416547ba79c3dec8e69502174abecf33dbf74606 commit 416547ba79c3dec8e69502174abecf33dbf74606 Author: Kyle Evans AuthorDate: 2024-03-05 04:14:06 +0000 Commit: Kyle Evans CommitDate: 2024-03-18 15:52:57 +0000 kern: poll: tap out the pollfd array on successful return We do this in kern_poll() to include freebsd32 but exclude the linux compat layer. The ABI should be the same, but the POLL constants are probably different or should be assumed so. Reviewed by: bapt, jhb (cherry picked from commit b5d2165b9046572c9361a8e8b09323a6001ac586) --- sys/kern/sys_generic.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/sys/kern/sys_generic.c b/sys/kern/sys_generic.c index b569a9f808d5..d0d0b1efa354 100644 --- a/sys/kern/sys_generic.c +++ b/sys/kern/sys_generic.c @@ -1608,6 +1608,11 @@ kern_poll(struct thread *td, struct pollfd *ufds, u_int nfds, error = kern_poll_kfds(td, kfds, nfds, tsp, set); if (error == 0) error = pollout(td, kfds, ufds, nfds); +#ifdef KTRACE + if (error == 0 && KTRPOINT(td, KTR_STRUCT_ARRAY)) + ktrstructarray("pollfd", UIO_USERSPACE, ufds, nfds, + sizeof(*ufds)); +#endif out: if (nfds > nitems(stackfds))