From nobody Sat Jul 12 01:44:24 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 4bfBG10Hxbz617kP; Sat, 12 Jul 2025 01:44:25 +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 4bfBG030Qkz3G02; Sat, 12 Jul 2025 01:44:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1752284664; 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=XswG37Kak6GMo8N6bX5i8mO1apvgNI4/mEgpe/EW98k=; b=AMHJVXMKRf0MFLcAB9TBSy4rHClVouiyU0tp2uC1fZlkYYYerkvbfRDhgpwz82Z8bPzKXB P4RfDx/4u19PsU67DnvlE/JbFhQBPYKE2KKK4sLP23bw7Kx3tNudBLVnXxBYyrg2ivKNe2 UjD+ydOX5EHNwy1QynqjetqQyXqqQU5EkfI74MwDI5u5z78bXn6bQXxXPNsRlGBf8vKyNo VFnXiJNizMTsGfijxhJDzFVPx6evZyuP9Fvn1ENrdPIjNtMOLE6Vt3KSLbPz2NspPBQS3/ 4E88K+a1Z6y5oKe8Ceua2+sJjHsoX+s/H23EifhVMVM5qCYtaIkLNci2EcR9HA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1752284664; 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=XswG37Kak6GMo8N6bX5i8mO1apvgNI4/mEgpe/EW98k=; b=luPvwuGWJET3DZVvVIEyT4EaJcBPWKAaDfzxPJNJLjwQxewlgyJ4hRnrfMaQt+b7flHFCU pxSgB4WVsbzv/wtVf9Eri75b6z5hZOg2oFyFodWzmXNa+xY3f5A8lxAl245xbA0iXwNyUQ +/mCy8A8Pa5qNh87JzFzkTZ9yrwcAgLhUeHff+Ese4f7vQW8ToVirYxuT8uf8TE4xZdZpf zDN5jhVsLVljE+heZtShiQPrrLjN9YN0usxQSPVBcHGjUsPrleccw2oVpE6SyzU4cQK6xi sI71B6Q2gDECY3Xc3TioyYBiF7jyZqYr7KQSV3idMaOVkU0gq7TLjChg9qRePA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1752284664; a=rsa-sha256; cv=none; b=ujkBBzJXSRWz80j9iWuH/H/1R21O645WiB31LVmvjusZsl4WFpSSyXvOXQaGG6lHo0zRD+ 9CBrl4nO92KfJgWZAFmwsRaDF3wfe7FkXHIHRQ6gjCUWvPZBpnjWCqYSf1iezJUEbIqTw+ bjxUSZ59FpadRlthY4jMbcyP0/lWKMDy12yWYpLc9QrKMOQVrUS929rTl2Mzz8Z0xFsKlO GJTM95y/HCvFYgK5kgOSDW6Ehl3iZhBy5NWC4jtTU0OpofSUm8hpLQa9rv758HldKuRKgC HucBbwGUDSXR4D9ea2LnjyJQk8+QiSxW3Tnx7a2H4TzfyswBvaG6jDCgO+TLjQ== 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 4bfBG02FsPz12Cx; Sat, 12 Jul 2025 01:44:24 +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 56C1iOeY050637; Sat, 12 Jul 2025 01:44:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 56C1iOtK050634; Sat, 12 Jul 2025 01:44:24 GMT (envelope-from git) Date: Sat, 12 Jul 2025 01:44:24 GMT Message-Id: <202507120144.56C1iOtK050634@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: bd5f7669c0fd - stable/14 - aio: handle errors from fork 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: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: bd5f7669c0fd14eec352552cb569915c5421e7c0 Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=bd5f7669c0fd14eec352552cb569915c5421e7c0 commit bd5f7669c0fd14eec352552cb569915c5421e7c0 Author: Konstantin Belousov AuthorDate: 2025-07-04 18:30:31 +0000 Commit: Konstantin Belousov CommitDate: 2025-07-12 01:41:34 +0000 aio: handle errors from fork (cherry picked from commit 4685fa8e4bef169e6a1ceaf07f149232326de805) --- sys/kern/vfs_aio.c | 35 +++++++++++++++++++++++++---------- 1 file changed, 25 insertions(+), 10 deletions(-) diff --git a/sys/kern/vfs_aio.c b/sys/kern/vfs_aio.c index 91137fa1e0dd..ff1e522f7cf2 100644 --- a/sys/kern/vfs_aio.c +++ b/sys/kern/vfs_aio.c @@ -309,7 +309,7 @@ static TAILQ_HEAD(,kaiocb) aio_jobs; /* (c) Async job list */ static struct unrhdr *aiod_unr; static void aio_biocleanup(struct bio *bp); -static void aio_init_aioinfo(struct proc *p); +static int aio_init_aioinfo(struct proc *p); static int aio_onceonly(void); static int aio_free_entry(struct kaiocb *job); static void aio_process_rw(struct kaiocb *job); @@ -431,10 +431,11 @@ aio_onceonly(void) * Init the per-process aioinfo structure. The aioinfo limits are set * per-process for user limit (resource) management. */ -static void +static int aio_init_aioinfo(struct proc *p) { struct kaioinfo *ki; + int error; ki = uma_zalloc(kaio_zone, M_WAITOK); mtx_init(&ki->kaio_mtx, "aiomtx", NULL, MTX_DEF | MTX_NEW); @@ -460,8 +461,13 @@ aio_init_aioinfo(struct proc *p) uma_zfree(kaio_zone, ki); } - while (num_aio_procs < MIN(target_aio_procs, max_aio_procs)) - aio_newproc(NULL); + error = 0; + while (num_aio_procs < MIN(target_aio_procs, max_aio_procs)) { + error = aio_newproc(NULL); + if (error != 0) + break; + } + return (error); } static int @@ -1509,8 +1515,11 @@ aio_aqueue(struct thread *td, struct aiocb *ujob, struct aioliojob *lj, int jid; u_short evflags; - if (p->p_aioinfo == NULL) - aio_init_aioinfo(p); + if (p->p_aioinfo == NULL) { + error = aio_init_aioinfo(p); + if (error != 0) + goto err1; + } ki = p->p_aioinfo; @@ -2241,8 +2250,11 @@ kern_lio_listio(struct thread *td, int mode, struct aiocb * const *uacb_list, if (nent < 0 || nent > max_aio_queue_per_proc) return (EINVAL); - if (p->p_aioinfo == NULL) - aio_init_aioinfo(p); + if (p->p_aioinfo == NULL) { + error = aio_init_aioinfo(p); + if (error != 0) + return (error); + } ki = p->p_aioinfo; @@ -2531,8 +2543,11 @@ kern_aio_waitcomplete(struct thread *td, struct aiocb **ujobp, timo = tvtohz(&atv); } - if (p->p_aioinfo == NULL) - aio_init_aioinfo(p); + if (p->p_aioinfo == NULL) { + error = aio_init_aioinfo(p); + if (error != 0) + return (error); + } ki = p->p_aioinfo; error = 0;