From patchwork Mon Jul 8 07:40:21 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhao Zhili X-Patchwork-Id: 50403 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:cc64:0:b0:482:c625:d099 with SMTP id k4csp5613944vqv; Mon, 8 Jul 2024 00:46:52 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXmfSpN49cMWgpdFgxFk4NKSp6B0i2wLseHsaSqV3nE7d25hTvT/kbsQWl4xwkHC8PAduUNoA2uTRxS90BYPzSOtA4/wjei6C8icw== X-Google-Smtp-Source: AGHT+IHZNp+f9dCt1OXmueCy0sGcMje2pphQDc+oyG7rxpRw2q7QPOTT4fGw37OWIX85W66kpZ6w X-Received: by 2002:a17:906:a5a:b0:a77:d0a0:ea74 with SMTP id a640c23a62f3a-a77d0a0eb49mr520451066b.3.1720424811848; Mon, 08 Jul 2024 00:46:51 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1720424811; cv=none; d=google.com; s=arc-20160816; b=fja2os6YHHKXuW35+pa7rxudSUOLu+1t8oLW7TdNOS58Uvu+FELltx55i9/9h/OVRl m1/0iDUNEOvcSRdB13Ya0dUBKDOfKuGuo8DZD17PVbGCYWbLkB3O+Kbxb/ZrgpmiZHXx K52nuAAf6RNzPdi8dntgbU1/JFj5Vxvw8HV26XnJmu99mNdVo1jh/hS6iX2/k875dtT3 eS1wccLPBS5w2AGZ1ZQ2hdmpif5SMn44Y21mzsX6A4vTy3TQ0QT0mWFciG6gX528/f1i qahc6gS5jOjpl/BcQsLQJi4fBCd9yxkj5/prIY7KNlOjXP4HR3QIQL87MhBekcmNEZzQ R3wA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:references:in-reply-to:date :to:from:message-id:dkim-signature:delivered-to; bh=Llx5vAx/8RoomBISqGb0+Vhfm2DHBTmQabSK4Dx3h+4=; fh=HnHYuZ9XgUo86ZRXTLWWmQxhslYEI9B9taZ5X1DLFfc=; b=lDKrZSmod/imFz9b6ETqVuRXvFfUGaolRgZtOlNlZiKe5J2m/lumrnJqccZTf3h9IY mJMFLNxz2se934zhQPN8jKd7Xai3VDIEJPD3y8/wJDNUD9XKUnEkCDMvEWgsWhw04vev ROCyjJpNwMW/QZrNEHyKDqlgkBY7WNJK0OAtKI5NyCHdw8CT5k/Dr60nBZrXjFO7Yjc6 l1XzPBYgI+aluPuTSST2BGJKHThpktcsJwXdSzHE8MyyQVq3z+heP98gs+RLuMe+ZIDm Q3FaSc5rThdFarEhLfeE9MQiZJq65hI+iZHwRxnzYydqMOgca4jJ7kQzIAxZ32TwWN2J yXLg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@foxmail.com header.s=s201512 header.b=U8PGH9gw; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=foxmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id a640c23a62f3a-a77cd608d99si345207166b.224.2024.07.08.00.46.51; Mon, 08 Jul 2024 00:46:51 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@foxmail.com header.s=s201512 header.b=U8PGH9gw; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=foxmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 32C0E68D92F; Mon, 8 Jul 2024 10:46:48 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from out203-205-251-82.mail.qq.com (out203-205-251-82.mail.qq.com [203.205.251.82]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7C42F68D89F for ; Mon, 8 Jul 2024 10:46:39 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1720424794; bh=Vs0xeD7P/zSm0ttANOF/JldT9tHC63gNc/RKAyYCxgw=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=U8PGH9gwE2sDhVp0QvwaDgcP9J2R+kzwRt6nbE1Ek0N16ZkDyXbiZDwyn+FhZB1wu wBAyPs5490pmZfR3ZMdF27hTIlmz4E5K0+AvEH802f12Mhp4i9D+zxcYBuckveOeiN MrgV0MvIWV4BOTgeOLcDs+DgqOqvamZ4YWSblid0= Received: from ZHILIZHAO-MB1.tencent.com ([119.147.10.207]) by newxmesmtplogicsvrszb9-1.qq.com (NewEsmtp) with SMTP id A1690CB4; Mon, 08 Jul 2024 15:40:22 +0800 X-QQ-mid: xmsmtpt1720424423t17yf3frw Message-ID: X-QQ-XMAILINFO: OZsapEVPoiO692zZB5ypniTapPMnhq9oSV3a9Bza+SBkVhlGfsW+K4PsgKl4k2 Q7XmfYw8DN3m1Avaf+l+n5vGHy16uuFqTC8q2bUgdtbG/pjlhj0oIeGovWpKJLl9/Yn8qtwXw/FO AcoXM1q9YpHMIJqraSRi/3jmdYuJKf9D0L5gkdBOhUUqRL3Pc7Etb5Zs7KvkYdy3J7VHoG8l18yf xyCGREtRwYkrTPdMF9oHN8U0UDQymSB+eWOqh0HR9wPPKyfGZIt9tptR0y/rA/HJL+8yOVi2ytGi h6DunH39pBq+9s/6cGu3nb1V/Oo9zvYmnIL1tKAKWGcUgV3VbcAsqYbSX50QrciT+ZEA/t7dy+Yc g38HKY2IUKw9doKfnVe4xZ4qIVXc57CjrSyivX2mqIwTZY2VvYDHgKco0/24xLaKtkZ6XqOn1vqV clKt93tIjm+u8G/SsFwghpSB1BloMq/cEehqkLpP7T6jUQzeEHyeaB74XgTKxl4cvd+eLtPSV2A9 5BdAM4UScUCcFnG4pkyIiF4QSay8FE0a5X0lLULv9t3b1bdmEIuPXnC74WKJIJQY8TopQGp8Hk+w eAz1A7v6RMbjeAwinPDHy0yKvei1k14jZFStYi9wMWuesfhhZkHH8530QQ9DvL97c3241MLeGDA3 O7UOnmhnSe6EelN6FLy1O4oTkg+ye6AEYWSOhdOMIasMnLfZ3Y2mCnDeVyJfd27t8dpClVcXmaZN Di7Ho0h70Q3CdFB03fDqlIkVgEXzZLcdGImx27G7ZyEwH/UkidCZjaHDJ5AEYu7b167KRs5L+NKT /f4FZrzNKdHwuQMVNDN4X2J//XMPQ2n7NAJJJ8b044pna55ropvBBo25aE6dChB/cOLmhHnSlAeV LpeNplTv4mOpAh88GAWyGWnGzuMkkiopWNm279wsWMCzFuMqit15OyfhnpKH+RolyOaKdOOMYTHN c452cU7OK2derSlejTceN+cFr9pXhNo9FO2kob2O5oQZoSLExzn6kM9DPjexWp X-QQ-XMRINFO: NyFYKkN4Ny6FSmKK/uo/jdU= From: Zhao Zhili To: ffmpeg-devel@ffmpeg.org Date: Mon, 8 Jul 2024 15:40:21 +0800 X-OQ-MSGID: <20240708074021.13413-2-quinkblack@foxmail.com> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20240708074021.13413-1-quinkblack@foxmail.com> References: <20240708074021.13413-1-quinkblack@foxmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/2] avutil/executor: Fix stack overflow due to recursive call X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Cc: Zhao Zhili Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: woLDJp4acoqB From: Zhao Zhili av_executor_execute run the task directly when thread is disabled. The task can schedule a new task by call av_executor_execute. This forms an implicit recursive call. This patch removed the recursive call. --- libavutil/executor.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/libavutil/executor.c b/libavutil/executor.c index 89058fab2f..c145c51be9 100644 --- a/libavutil/executor.c +++ b/libavutil/executor.c @@ -58,6 +58,7 @@ struct AVExecutor { int die; AVTask *tasks; + int stack_depth; }; static AVTask* remove_task(AVTask **prev, AVTask *t) @@ -207,8 +208,12 @@ void av_executor_execute(AVExecutor *e, AVTask *t) } if (!e->thread_count || !HAVE_THREADS) { + if (e->stack_depth > 0) + return; + e->stack_depth++; // We are running in a single-threaded environment, so we must handle all tasks ourselves while (run_one_task(e, e->local_contexts)) /* nothing */; + e->stack_depth--; } }