From nobody Sat Jul 5 21:19:18 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 4bZNfv3rKpz60sSn; Sat, 05 Jul 2025 21:19:19 +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 4bZNfv0pFrz44Gn; Sat, 05 Jul 2025 21:19:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1751750359; 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=66utnKF/sziLUhVvO0smbjLoNfDiiuDo8xU432HpePw=; b=mQ+c9UTg/5IFkIFlaCTfjTPgeaS+mZmq4Rsg+0+/STbM1f6JESWKSM5UuQyjluZ91NZ6he iFrkyvQcmo8zvEDRJpZPLqDumEb8OGyn+JZ8kRYH5RCk1Znk0XOIV1FiUTN3Va/BFHvPv0 7ulpMQulyvDGXqjX/MS0Flu7MLDDaZjLGYQ1Qqx+r6noO6vISdXMbtX/dNvFHSzIOutGAh 1kf3Js5vnarDj9m/AT3PlqFYctx9bgrvLvmLWqhLWy0YDyr/MGGQK4yy0Qpf7tW07Q597Z u/W2kft8y/AT5YGU1vOMtNWiza/18FauNc3o9JM+6jgKjWZBsBkV2hmqT50nmg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1751750359; 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=66utnKF/sziLUhVvO0smbjLoNfDiiuDo8xU432HpePw=; b=vubc8gJYJ92YLxFO6cv2PFZCshtFNhlHVQA63cLZ+XNlZPGfkmJ3vV/oaaf8L0q000vuCp Ah8gXgSDLbJ/rlHoVQ0D4cHunz0/xRbhAP3VYJpPLKcxieXSQb+LLKAUYLdhajUfLN6jez l2CIs7CfYYN0MkH1OItXQ/RgOa4qJ0saLILcaL4vZFvzMKEQ4PDFUeqKEsFwNJ367rIiuR 1F949ErGlRxuxjbXEnpBh4209YNuzUBzpjsKK4BFdb1Ng1BiMXKRlDDAUQWTE1OX9WEVJA CXWLzC3kig4/t6ZGaywbvawwVnMHuZuhyn/YVpbBlSYWdSSwuDDqJV9S19GXpw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1751750359; a=rsa-sha256; cv=none; b=xe0TWk1mx5jIr+tU9fkjZyrrLXKmclLg15B4rM8gPW09aQNQibdyvxK6h6Zdy4Xr+X/INV /r8ZGU5IkUt4xVUbFgwkQmbQ6xX8/yErp9ESIdA1EXpcayCTx+W9B6T/PegBtPLj3jy/Ma 43mZC3b/qbWqFsaONl+Bk3+ywEtB6/hEUoM/z5ZyCPMDOxQp+y9qqnahKHj3E49AWZcFrh uvA5BMgcboi8EQK27YFPzXDgRnZ0nH6OkUnLhGL9F/q1o+54PZ0go0+Vfpcp4tsejLXgvp Ci5ofzZarA6myZK9fp2aJ0rtk8FzECPID+hpBF6XeCvL2m7mbefxbL3DDfymHQ== 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 4bZNft6zTqzsZd; Sat, 05 Jul 2025 21:19:18 +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 565LJIDe099928; Sat, 5 Jul 2025 21:19:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 565LJIrH099925; Sat, 5 Jul 2025 21:19:18 GMT (envelope-from git) Date: Sat, 5 Jul 2025 21:19:18 GMT Message-Id: <202507052119.565LJIrH099925@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: 4685fa8e4bef - main - 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/main X-Git-Reftype: branch X-Git-Commit: 4685fa8e4bef169e6a1ceaf07f149232326de805 Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=4685fa8e4bef169e6a1ceaf07f149232326de805 commit 4685fa8e4bef169e6a1ceaf07f149232326de805 Author: Konstantin Belousov AuthorDate: 2025-07-04 18:30:31 +0000 Commit: Konstantin Belousov CommitDate: 2025-07-05 21:18:43 +0000 aio: handle errors from fork Do not try to fork forever if fork() failed. Propagate the error up. Reported and tested by: pho Sponsored by: The FreeBSD Foundation MFC after: 1 week --- 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 d7c23122b4d8..66ea50eee77b 100644 --- a/sys/kern/vfs_aio.c +++ b/sys/kern/vfs_aio.c @@ -301,7 +301,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); @@ -422,10 +422,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); @@ -451,8 +452,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 @@ -1490,8 +1496,11 @@ aio_aqueue(struct thread *td, struct aiocb *ujob, struct aioliojob *lj, int fd, kqfd; 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; @@ -2213,8 +2222,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; @@ -2503,8 +2515,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;