From patchwork Fri Oct 27 11:53:10 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhao Zhili X-Patchwork-Id: 44371 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:bf16:b0:15d:8365:d4b8 with SMTP id gc22csp1100720pzb; Thu, 26 Oct 2023 20:53:42 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFCgyxGSrdMEhsP5U80OIBXeDPfHcBd2gckbXx9+B9wHo/3tk5xy9EsV66RyggFKniZ45jo X-Received: by 2002:a05:6402:2038:b0:53e:b8e2:1d58 with SMTP id ay24-20020a056402203800b0053eb8e21d58mr1200361edb.13.1698378821974; Thu, 26 Oct 2023 20:53:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1698378821; cv=none; d=google.com; s=arc-20160816; b=dXUmG3I0BrnceUVdVDCbLVovqZX/DXykl96kxOepcJDu34ltKwbKVUXhGbMNSrd6F0 8VDzQ7M8dTag8UFo+wXvN+D1OFFblFzhSIJRiEH1TG0HZyUlwXtxIYUYRUrLk3DR7Zm3 hROC92fpgVQ6kDK4UK5nWfzfuU1Xq2FvND6WqJF8PX6fpYhVTNANzXK6g7QazLr7JahU DljJAfV1b57fT7BFr7SsLzjhzcaE3D98jb0lgPOby8PqELI7UnOQT5jSngbmXto2mnqv xJOwpNNHviQea9nNW61Ilf+/58BDq+D7A1FAl1dkBIc1EwnKvynobUiWUxOZLNs9ukoE A+Yw== 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:date:to:from:message-id :dkim-signature:delivered-to; bh=ZyCFWYGn1tS6AqlxnrtvemC/wmLPYTABXXglaK8gGRg=; fh=HnHYuZ9XgUo86ZRXTLWWmQxhslYEI9B9taZ5X1DLFfc=; b=vVcAxvxuU0ZU54I7EYTxR7rEARr7Dz+Kue6BfakB7mZbf5RAQmk8l512ZjtKVeTJBT G7qhzH/K3Yj9MFMBPQFozuVNqZ5aXb45oPe1JMTR09lquBS1aD6k1c+n4PHrE7VX2ON/ Js+1bjNap8pDq9V9VG9PxsQU1C+P+94SrsWBgzBN2vNGBHdIE0X6SbWNEljMlxgwcxua Vij9dxgqN9uBWsF/UTNNfir5VjLG0U74hcWyVSJXacXLqPxnFp//pY+8LwsToffsbEDt pPRLFxx1xzy7f7Ibm8kkZfhZAVfAaMIE+oU+X48rb9FEOXcToASJ8scL1Gaf/l5/JGP7 NzuQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@foxmail.com header.s=s201512 header.b=yqfHUWjQ; 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 q30-20020a50cc9e000000b0053e510d3087si387891edi.567.2023.10.26.20.53.38; Thu, 26 Oct 2023 20:53:41 -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=yqfHUWjQ; 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 6879568CBC4; Fri, 27 Oct 2023 06:53:34 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from out162-62-58-216.mail.qq.com (out162-62-58-216.mail.qq.com [162.62.58.216]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4612968C94E for ; Fri, 27 Oct 2023 06:53:24 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1698378794; bh=pjh3sAAfwD/lkScfpD6lQQKE+d6Opk2ny3vB7VPzsDU=; h=From:To:Cc:Subject:Date; b=yqfHUWjQJwJG/2P3WnvsPlSm6q0Iur5MH0025Z844x3e4h8gWlr6SXLXYnazqZ8Ms L85c11lFvSUWLvLJYGXW/HnkYnrYQbIWASgUsaXe1wJTCBxghA24Ye7VsBqyaZCW5N MhDeoUcB4bggdWg/Fw4jvGGj/m4NlZ/i3GWkoPLQ= Received: from localhost.localdomain ([113.108.77.50]) by newxmesmtplogicsvrszb9-0.qq.com (NewEsmtp) with SMTP id D4C9F078; Fri, 27 Oct 2023 11:53:12 +0800 X-QQ-mid: xmsmtpt1698378792t6q63x3e4 Message-ID: X-QQ-XMAILINFO: MvTK+AXQ7a4FMI9tFlXdNS/Q9NpAcjrnwM3OAOZgvyla5to5InVcw5geP5IMR7 fheTXIlfGLr8sjMo75LtXFCuR8r7aedKLHOVYrVt6k7i5z2zTuvQSekN+lhq2jwYFFBXAwy2LT0N v18vgbF9e35J7HlqhnJkIlAz/jwQSePHO50ngAaf6wN5HgrJwWR7dxE5DIHJCZGhXgPifrSxov4A PqTOY2KpCQxDe6SjETD7xw+alpLahzdsOGiLBJBYjEg6gVfUbL4/DWnQb74oe+qUk6o9mT+PD7jo l/Eheiwa4V0+MJvhmKGjCuJ1VucWA3ChvciZ3+WT8rBF/M8PxLXNsyp5L4gv6SFLvP/OSIi1Bq5r FF4zQWYOaX7M3dSM3hH0DXWL037mOaAhNhQIGkPmjZ+DqnHmjBbudgwtE17XM8jQb2sEdcuzKrBs RrtBHSosdTvRtpXmOFVABfENKHBILNLka11foykH/IeGB8U52hH5becpHd5hBDzbaKRpW2o9uEwp r41BcmbHAQ4V58EDmuTf1SP7Fb7XOQHLQgYmJzmMz17uT6egb+cjuzW/9JFhcShqCbBuKszqxvFR 2HBWXrmYgYbmsDEhFuBlkqDoO/dkxAP8PDxb8j5ZVREmDhxYI1vKgRKkD946pnU6QSz64JTsYk4m 2XI101vTV7M3c4N8a54S/BgwkWWhQLiIt6gEFKAfo00Bn8pr82fAr6k0RGR7wxZJc8yQkAYUlVTL CaAWgkKLACuEQEepo9yK7rfat77jvqkwGmnGrijRTWMybaRoqnTfyXZEnzite5dLTTvhK67gP2gf hw5s/mWt5KO3tP0dJfZ6iA6NILj0peQS163Qi8BTN2yCzc3q77AxCO0vNdGFa8rqZA99T4+84OmW 5oym0HkMfrlebFsmmH/EOSTXGwFPzJK25TZkBBYJFbOr5y6TGmxCI7D8tQqGr4c//9++L9tcDEYR NAiGq2lJ/DX2ZKBnsNZrXd6W/2naGGGCS+w14uMR4= X-QQ-XMRINFO: M/715EihBoGSf6IYSX1iLFg= From: Zhao Zhili To: ffmpeg-devel@ffmpeg.org Date: Fri, 27 Oct 2023 19:53:10 +0800 X-OQ-MSGID: <20231027115310.38678-1-quinkblack@foxmail.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avutil/hwcontext_vulkan: fix memleak when device_create is skipped 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: MBkcdSqvRGjn From: Zhao Zhili --- libavutil/hwcontext_vulkan.c | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/libavutil/hwcontext_vulkan.c b/libavutil/hwcontext_vulkan.c index 4adcc0e839..8dd40cb66f 100644 --- a/libavutil/hwcontext_vulkan.c +++ b/libavutil/hwcontext_vulkan.c @@ -1164,6 +1164,11 @@ static int setup_queue_families(AVHWDeviceContext *ctx, VkDeviceCreateInfo *cd) return 0; } +/* Only resources created by vulkan_device_create should be released here, + * resources created by vulkan_device_init should be released by + * vulkan_device_uninit, to make sure we don't free user provided resources, + * and there is no leak. + */ static void vulkan_device_free(AVHWDeviceContext *ctx) { VulkanDevicePriv *p = ctx->internal->priv; @@ -1183,15 +1188,20 @@ static void vulkan_device_free(AVHWDeviceContext *ctx) if (p->libvulkan) dlclose(p->libvulkan); + RELEASE_PROPS(hwctx->enabled_inst_extensions, hwctx->nb_enabled_inst_extensions); + RELEASE_PROPS(hwctx->enabled_dev_extensions, hwctx->nb_enabled_dev_extensions); +} + +static void vulkan_device_uninit(AVHWDeviceContext *ctx) +{ + VulkanDevicePriv *p = ctx->internal->priv; + for (uint32_t i = 0; i < p->nb_tot_qfs; i++) { pthread_mutex_destroy(p->qf_mutex[i]); av_freep(&p->qf_mutex[i]); } av_freep(&p->qf_mutex); - RELEASE_PROPS(hwctx->enabled_inst_extensions, hwctx->nb_enabled_inst_extensions); - RELEASE_PROPS(hwctx->enabled_dev_extensions, hwctx->nb_enabled_dev_extensions); - ff_vk_uninit(&p->vkctx); } @@ -3702,6 +3712,7 @@ const HWContextType ff_hwcontext_type_vulkan = { .frames_priv_size = sizeof(VulkanFramesPriv), .device_init = &vulkan_device_init, + .device_uninit = &vulkan_device_uninit, .device_create = &vulkan_device_create, .device_derive = &vulkan_device_derive,