From nobody Fri Nov 13 10:21:30 2026 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 4jQtZy5yCmz70QTd for ; Fri, 13 Nov 2026 10:21:30 +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) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4jQtZy5BCmz52NY for ; Fri, 13 Nov 2026 10:21:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794565290; 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=FDis7ut882MFrv4Xiczgk2MQHTV0hVvQ4SnQU8EhliI=; b=oyJUhMcSUa75BAMtSmTyYugB0FfnUrGjN9Wdk5kuQcvKJmwvkUamRk4RcNmgDSNc9wVee3 hrf+uKDwKix439nUbs1MeJdSj2PY76en8lZtcNVPamAWSYFUjRMvn0gEvrQO2/VWKpwyCJ rJwxy/NZPptvAECzhwC2QsU07xEf45hGBIOYTLpku35YT9WQ4HgfJGPo7jqHyDc0x+XBk3 dWhn9LdWsCobY0owrE5OKCAVigrCZF5kRnagT1TrbAP3KSV0NOVd/Gl+mrBZS0XNE+s+vy AFK+na6euaUmODCzlw3aaoMYxXeHTFQ7XIqzqeoSWo3K4Nu35jRXV4l6VAjfrA== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1794565290; b=B6lmuDURfiofIpygW8foR/gEFOxf6nIfeK3fqBAZpfJAiHPJXF7cYBNbjJmEBTkv8YUb7j yzzQ/MP2f5EHTpOc8Q2V7Ndk5Sx0JKwybVUo0LDLDMXgh6OfW23QeGbSjCvIilmit5QAgF A/pNeXlc90xEVx3Q0vCTXukGfrFbxy/645SGjfSsW9UqtmGVtsX5NZN79pJJ8fHVzb6FFd MunZXA3UK4YnKbz1GazKA7W7v8rSj5dObUEBUxFhXohD8N8A4Yk75dCjjbenfJwOU8qvgG EEm73HuJMCfVeJ9C2nwDA0rRJe7J+fp3JQU0lAOEIcmHMR3b+tQt1wDbkDyMQg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794565290; 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=FDis7ut882MFrv4Xiczgk2MQHTV0hVvQ4SnQU8EhliI=; b=noyAwbonhu2oEUycIj5WsMXCIEX9dE5ZGyqLG/mOj0aPsGC9rbgSfAzPuI5dQQ9LN1uZpu S4aPUcI251V9IAoFMzBct9WXJ13HQwIaHempXxAaUHKjVPr9pQz0HMrNQCtpowdvAqFoQ7 yQj+Uq5c33iAo/Ibm4My72pNT0p8XpFq3VnBp/N+leVf17KPwf/Vpw5R9ymZhEl8Iwtjx9 aWhzzz7CuSRnn7Hg2ckGEXKvCLFNqsKxSan5Dvyk7nTy7OM30n8EXFVr2taDg/E/rSnnLd IsDGrhY7SlUggMfa2gk5YanjFbsdJb8SoAdZvwweNmCnyB9EHBc9tDh2y5brcA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4jQtZy4pc5zSxd for ; Fri, 13 Nov 2026 10:21:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id c056 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 13 Nov 2026 10:21:30 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Brooks Davis Subject: git: 70cf77eaefa8 - main - aio_cancel(2): add kern_aio_cancel List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all X-BeenThere: dev-commits-src-all@freebsd.org List-Id: Commit messages for all branches of the src repository List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: brooks X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 70cf77eaefa826570287ded6b27087fd5df89298 Auto-Submitted: auto-generated Date: Fri, 13 Nov 2026 10:21:30 +0000 Message-Id: <6af6e4aa.c056.60295697@gitrepo.freebsd.org> The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=70cf77eaefa826570287ded6b27087fd5df89298 commit 70cf77eaefa826570287ded6b27087fd5df89298 Author: Brooks Davis AuthorDate: 2026-03-12 14:19:04 +0000 Commit: Brooks Davis CommitDate: 2026-11-13 10:18:13 +0000 aio_cancel(2): add kern_aio_cancel Effort: CHERI upstreaming Sponsored by: DARPA, AFRL, Innovate UK Pull Request: https://github.com/freebsd/freebsd-src/pull/2284 --- sys/kern/vfs_aio.c | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/sys/kern/vfs_aio.c b/sys/kern/vfs_aio.c index f94d343c20ab..2ae8abbc2486 100644 --- a/sys/kern/vfs_aio.c +++ b/sys/kern/vfs_aio.c @@ -330,6 +330,8 @@ static int filt_aio(struct knote *kn, long hint); static int filt_lioattach(struct knote *kn); static void filt_liodetach(struct knote *kn); static int filt_lio(struct knote *kn, long hint); +static int kern_aio_cancel(struct thread *td, int fd, struct aiocb *ujob, + struct aiocb_ops *ops); /* * Zones for: @@ -2041,6 +2043,13 @@ sys_aio_suspend(struct thread *td, struct aio_suspend_args *uap) */ int sys_aio_cancel(struct thread *td, struct aio_cancel_args *uap) +{ + return (kern_aio_cancel(td, uap->fd, uap->aiocbp, &aiocb_ops)); +} + +static int +kern_aio_cancel(struct thread *td, int fd, struct aiocb *ujob, + struct aiocb_ops *ops) { struct proc *p = td->td_proc; struct kaioinfo *ki; @@ -2052,7 +2061,7 @@ sys_aio_cancel(struct thread *td, struct aio_cancel_args *uap) struct vnode *vp; /* Lookup file object. */ - error = fget(td, uap->fd, &cap_no_rights, &fp); + error = fget(td, fd, &cap_no_rights, &fp); if (error) return (error); @@ -2081,8 +2090,8 @@ sys_aio_cancel(struct thread *td, struct aio_cancel_args *uap) AIO_LOCK(ki); TAILQ_FOREACH_SAFE(job, &ki->kaio_jobqueue, plist, jobn) { - if (uap->fd == job->uaiocb.aio_fildes && - (uap->aiocbp == NULL || uap->aiocbp == job->ujob) && + if (fd == job->uaiocb.aio_fildes && + (ujob == NULL || ujob == job->ujob) && (job->jobflags & KAIOCB_MARKER) == 0) { TAILQ_INSERT_AFTER(&ki->kaio_jobqueue, job, &marker, plist); @@ -2093,7 +2102,7 @@ sys_aio_cancel(struct thread *td, struct aio_cancel_args *uap) } jobn = TAILQ_NEXT(&marker, plist); TAILQ_REMOVE(&ki->kaio_jobqueue, &marker, plist); - if (uap->aiocbp != NULL) + if (ujob != NULL) break; } } @@ -2102,7 +2111,7 @@ sys_aio_cancel(struct thread *td, struct aio_cancel_args *uap) done: fdrop(fp, td); - if (uap->aiocbp != NULL) { + if (ujob != NULL) { if (cancelled) { td->td_retval[0] = AIO_CANCELED; return (0);