From patchwork Wed May 14 16:33:32 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rob Clark X-Patchwork-Id: 889945 Received: from mail-pl1-f169.google.com (mail-pl1-f169.google.com [209.85.214.169]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id BAEB11B040B; Wed, 14 May 2025 16:33:43 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.169 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1747240425; cv=none; b=FUvxZhuFaD/zui9zBqhR4cwx+w/9OukISviNqt+SIEB+Qpfgm7xT1dcx3o4DXok03Hx2aAaoaLhRFYsnJT3nACV5kCLRUuzi9lQLbDeWrC7a/t7woCNH130YV1rzJ5nRWiHFZodrWAq5l5qUFapxTnu2dyJ5K0AkVYC8RUD9N8k= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1747240425; c=relaxed/simple; bh=GZCwmkmzbXGm23N/nOld3XsSbdbeC2Re8XmPrqrvAyo=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=qtJPzCMBQHGYQb7UQyeS8T8Jnk+a1Eh11gil18ieP8pd6yXosxfMeULGNOvFUWJbXKXYQHiggO4bufIjrmCS0ngk9glie2MLJ+9n35KRmfvQLjmNqwX/H+usV+4a6gi4bc8qo6YGRdeDxQhC7/t0kDcKLXb40ILPeHvDmbPIwd4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=RHH3Bd//; arc=none smtp.client-ip=209.85.214.169 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="RHH3Bd//" Received: by mail-pl1-f169.google.com with SMTP id d9443c01a7336-22e6880d106so146715ad.1; Wed, 14 May 2025 09:33:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1747240422; x=1747845222; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=I8NFmJ8VaC2SUZH7esKNt2Ms7nN1mYBgEnYL3nIvpM4=; b=RHH3Bd//MXpg5JcyKNIs8utnSTz2Wf/7ItHftvJHOvbqSb8DAIc073IFq81cwYTKJ5 X8QGXOdcZzsu/Kk0LnPhnbK7kzaVc3Y2JPePntkOmaVHREiPbJFyorIIaRe0r1Mzf/Ss +DvUIuu2a5z1FG3UHC4i8l/KkIr/GLKvJtRGph0jj1fLzxLidqPCJwtJS7Sf7aI0IhYE Ywxg6XNC1Q2EJ+gTW2oy9LE45un3fB56n1A1oQhhX0Wp29N2u0x2mnS10/1FCY43sJzI 3AS6nP/SWjRKJNuY4ts2/RGCdIQjFKURAb/bpJY/Lq79P7h7J39vYyYap+pf/2FuOO18 c8Uw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747240422; x=1747845222; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=I8NFmJ8VaC2SUZH7esKNt2Ms7nN1mYBgEnYL3nIvpM4=; b=ecwYT0HvjJrsEj/Ca31DalpzoppNcAR1Jm19A2Wv1G3c1EdJtvRJrya0ydtG7HVvhm BKxnCS6FrENUj6ZcouK15FyKBFFqSEAy7At5yXY+ldL7i9AvjzCZW4+4KChWQT2gqUm+ on/N2LlSOr7pzW3hL66KwpKJXibGvuV+2nbnQvdCB4QpXUC4JKF9GR3Qhe+uzZyPMe4U mKzX9CBSuXU1X6snNUJcOk/AjNr+jAcZcywHzKHyDo1GNgbaOl6lN+aOTYwaMxjFQtU1 YhxCHapv/+nEprACiUVqab+nD7azwl4GdG7yvKYFtK/2L5nBXDFRVTPLzRaCm86iCkwg Zdog== X-Forwarded-Encrypted: i=1; AJvYcCVIkUUOIXFIvVK6gM+tcs2dIMNQOQYGhOXOswlV5QzpBZ+N3U435PVaG+MRrnm3dxIS9aGZH+epkJHX4so=@vger.kernel.org X-Gm-Message-State: AOJu0Yx/H0uVMT808nZB0wOSwNIAhJaIX24uMQ+Cb4krzzY+PFeRCehI sE96TDR3iEFe5xQeYkwrdt0GAawT3J9pNUaxZ9JIEfzTOunVt6Us X-Gm-Gg: ASbGncsMEQCOO9WAympWbQGdzfMu8gBhH9Z1bbWJcjnze59r1HyaHTeoeWJujW55HyH yk80bH6628COAcO6I5HeVXh+VoYSuwh74wSiRU1LGUvIpz0XJDCReN8w2YT+PUJF+P4FEbub36X FI41DhKePBF+SyRCKKrxU8ArvGwCr74W/iiWQUh7yRKE/09wPStco1AoATdSvSDYh7t2Wmziw2Y C5zhWb1jFWaUa4UTSQzhJLDpxJu46LFdMthK74/2P1uMr2xhR5feIqfRL5S7G4Nmr6nuvLE1Oba 2axfrNegnAmPd9kaJ8x4ruChz/XaJGJ7P9lYSeRfFjgKeJ7YMy8mMCaQglKVumioWikf4BjPyoJ iVLiEiLAeUyAgR2MoumWeZ1Br2A== X-Google-Smtp-Source: AGHT+IERCtCWMPp273Pn/kSesFNut1YmKeS7V26pT+IIXOt9MSp5ENJ0CmcVrJLH9gRNLdpIfbkHPw== X-Received: by 2002:a17:903:1aef:b0:21f:6a36:7bf3 with SMTP id d9443c01a7336-23198126227mr68599475ad.12.1747240421020; Wed, 14 May 2025 09:33:41 -0700 (PDT) Received: from localhost ([2a00:79e0:3e00:2601:3afc:446b:f0df:eadc]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-22fc773f225sm99788915ad.89.2025.05.14.09.33.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 14 May 2025 09:33:40 -0700 (PDT) From: Rob Clark To: dri-devel@lists.freedesktop.org Cc: linux-arm-msm@vger.kernel.org, freedreno@lists.freedesktop.org, Rob Clark , Rob Clark , Abhinav Kumar , Dmitry Baryshkov , Sean Paul , Marijn Suijten , David Airlie , Simona Vetter , linux-kernel@vger.kernel.org (open list) Subject: [PATCH 1/2] drm/msm: Fix a fence leak in submit error path Date: Wed, 14 May 2025 09:33:32 -0700 Message-ID: <20250514163334.23544-2-robdclark@gmail.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250514163334.23544-1-robdclark@gmail.com> References: <20250514163334.23544-1-robdclark@gmail.com> Precedence: bulk X-Mailing-List: linux-arm-msm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 From: Rob Clark In error paths, we could unref the submit without calling drm_sched_entity_push_job(), so msm_job_free() will never get called. Since drm_sched_job_cleanup() will NULL out the s_fence, we can use that to detect this case. Signed-off-by: Rob Clark --- drivers/gpu/drm/msm/msm_gem_submit.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/drivers/gpu/drm/msm/msm_gem_submit.c b/drivers/gpu/drm/msm/msm_gem_submit.c index 3e9aa2cc38ef..b2aeaecaa39b 100644 --- a/drivers/gpu/drm/msm/msm_gem_submit.c +++ b/drivers/gpu/drm/msm/msm_gem_submit.c @@ -85,6 +85,15 @@ void __msm_gem_submit_destroy(struct kref *kref) container_of(kref, struct msm_gem_submit, ref); unsigned i; + /* + * In error paths, we could unref the submit without calling + * drm_sched_entity_push_job(), so msm_job_free() will never + * get called. Since drm_sched_job_cleanup() will NULL out + * s_fence, we can use that to detect this case. + */ + if (submit->base.s_fence) + drm_sched_job_cleanup(&submit->base); + if (submit->fence_id) { spin_lock(&submit->queue->idr_lock); idr_remove(&submit->queue->fence_idr, submit->fence_id); From patchwork Wed May 14 16:33:33 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rob Clark X-Patchwork-Id: 890300 Received: from mail-pj1-f50.google.com (mail-pj1-f50.google.com [209.85.216.50]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id BF8892749EA; Wed, 14 May 2025 16:33:43 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.50 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1747240425; cv=none; b=ovtMwJpBPDtKLfsqQ6utRZjorUxeJiMAbZSTiA16fmy5YQHXyoXbcgqbjVm56z6g3fJyUh+yse2lnobAa/0KHHz5JPg9Buv1dak4EWllxdEgOzmbJBuUbvSpPNII7DlsZDU+xHvTGh4WPO8bvts43BCX26wfUWiknGS92aZcjrA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1747240425; c=relaxed/simple; bh=4ujIma5tBo8+opEU0UYn3/9H0LBTonNqlCEMXchmV/o=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=uXO2vbWiLwAOSo1IB5OQNnNBgEYaQZZXQ7FUCwAP1ozThcMtm3/BI14DF9Feg8pKRY/8SzMcR76SSZ2eKPkrnPdrzE56mP0vb/fbY4Uh2JytHJyAfTOgMVc+ECU4QogbwXg10Bk3Apeo/qGatW+fAN5ScT6BGNbQ7f/FQKn4sLU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=UZSNNVt4; arc=none smtp.client-ip=209.85.216.50 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="UZSNNVt4" Received: by mail-pj1-f50.google.com with SMTP id 98e67ed59e1d1-30c35ac35dfso49201a91.1; Wed, 14 May 2025 09:33:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1747240423; x=1747845223; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=giCrtqk56/EbDcVLPZnFActrlq6d0kOfsWi+ZhZMU1A=; b=UZSNNVt40+2/JTiTSdPmeOOkjlApy4pAHVBVH1GEZHivH3RUAYq8p68t0JRmkUNrUs fDhWDi0GRnOSYeft/X/J8idEZnGEEeFV648Heh3PldQ/zPWz1vb+4MDQl7X4J2PK9BJ/ WMQSnoB5HB10pM84crHN6xJDdBO+z2c1XuHBYp7cznjGPDJkktd5+88oSlR1w+S2rL6c zGkyoOutsQ9gYIJPssPSjc8z7yv46Ge4t+1yM4CSyS/LHidTxeNBDOUFnIwGxx6c6eDZ sRh5Afn0M4VolLY3SC9Bhn9plObhFTch88KQRdIgb2XDfFIeQuk6p29sU/98TXH3fHn9 eJCw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747240423; x=1747845223; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=giCrtqk56/EbDcVLPZnFActrlq6d0kOfsWi+ZhZMU1A=; b=e/HV+zL8y3Wuts2ykF+7Cm4xVNNyanrAgWaxvjxlnZv0VP5j2XVElXJNpHTdfHizBL q+X4EHxvyvBHxGtHm4p2u2QNrJDAmcg3htKlkMWbdBlb3+JRDS53Io4FLOIaxgbITJoy F0aDmb18jOzgJu7HzPUXiRRZYBM3OjLX+ASLXfh2hvez4thuQPOmajekdUlAK4BbVyK2 MrW4g/+4sXAQiqkx76gU5Y2hDWBYWoLX38M2wU7wf29wwezQw5MjH7oebajWTDw/s8Hk Nv1+uMlJPk06iH1euHSlGouXqG5G/WITSMfPO9KfyQvBxU+TJEdV6lIP85MzB34nCZdk RdXQ== X-Forwarded-Encrypted: i=1; AJvYcCVWVcokYds5LGkZhR7STI3w24zfGShG2l283TwYNuVBT3l9YT1YJVsxB26Giw/fVLRAXH6XOgPmzfyQJ/8=@vger.kernel.org X-Gm-Message-State: AOJu0YyThTMK6d2bz2CMpAKDZX3NBi8lBwmr63dCCImVPgdMhbBhTmob As5o1611BQDkdktxtkOi/HPTJb3XJ2Qfr04xs+0ngCczvjqlykPZTyxCqQ== X-Gm-Gg: ASbGncsHJcjNnriJL8ys4lEFe+VFDh00AOSDdQnfWwdiN7pLAKY3wFYChPaPHL/KrAx Ls71aNuvcwduy6kPYAheXJWj9mqODpalDZULCsLART5qZQb8GtMMI+4E6T+sOuENzoGzPlIduQS paGwoOwSI/g2XeWGYtHynkzs1Jy8gdU5OP5HM977h4yYhlaKITEUmdTeZ/HU6ndeSxeCyiEQLXT YkxXCFlYeL0Yw3ZjdkrrPyDlGhQje0sWRJrpGlDPFHudltzVyoT8s6aVBzvmugyeGeqx06ZHJZf 7Qspq6r9emPsRhc5HJUCSbQgQ/BhfOAN68J4GpeZ1mblVrBC+RaKIrPgPKF5cGsahChJG5H1vI7 JLe8r83ndZhaFp3ivRSl/XNnr4Q== X-Google-Smtp-Source: AGHT+IEKDLVaJTyQcdwmJsHMQpLOYV6IU6ZnpNJqxuawDUSfC4gUx33wXl6ykdcJH394EGz/IhSStQ== X-Received: by 2002:a17:90b:2f4b:b0:2ff:784b:ffe with SMTP id 98e67ed59e1d1-30e2e5e5a8fmr6693177a91.11.1747240422852; Wed, 14 May 2025 09:33:42 -0700 (PDT) Received: from localhost ([2a00:79e0:3e00:2601:3afc:446b:f0df:eadc]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-30e334018c2sm1810665a91.4.2025.05.14.09.33.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 14 May 2025 09:33:42 -0700 (PDT) From: Rob Clark To: dri-devel@lists.freedesktop.org Cc: linux-arm-msm@vger.kernel.org, freedreno@lists.freedesktop.org, Rob Clark , Rob Clark , Abhinav Kumar , Dmitry Baryshkov , Sean Paul , Marijn Suijten , David Airlie , Simona Vetter , linux-kernel@vger.kernel.org (open list) Subject: [PATCH 2/2] drm/msm: Fix another leak in the submit error path Date: Wed, 14 May 2025 09:33:33 -0700 Message-ID: <20250514163334.23544-3-robdclark@gmail.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250514163334.23544-1-robdclark@gmail.com> References: <20250514163334.23544-1-robdclark@gmail.com> Precedence: bulk X-Mailing-List: linux-arm-msm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 From: Rob Clark put_unused_fd() doesn't free the installed file, if we've already done fd_install(). So we need to also free the sync_file. Signed-off-by: Rob Clark --- drivers/gpu/drm/msm/msm_gem_submit.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/msm/msm_gem_submit.c b/drivers/gpu/drm/msm/msm_gem_submit.c index b2aeaecaa39b..d4f71bb54e84 100644 --- a/drivers/gpu/drm/msm/msm_gem_submit.c +++ b/drivers/gpu/drm/msm/msm_gem_submit.c @@ -658,6 +658,7 @@ int msm_ioctl_gem_submit(struct drm_device *dev, void *data, struct msm_ringbuffer *ring; struct msm_submit_post_dep *post_deps = NULL; struct drm_syncobj **syncobjs_to_reset = NULL; + struct sync_file *sync_file = NULL; int out_fence_fd = -1; unsigned i; int ret; @@ -867,7 +868,7 @@ int msm_ioctl_gem_submit(struct drm_device *dev, void *data, } if (ret == 0 && args->flags & MSM_SUBMIT_FENCE_FD_OUT) { - struct sync_file *sync_file = sync_file_create(submit->user_fence); + sync_file = sync_file_create(submit->user_fence); if (!sync_file) { ret = -ENOMEM; } else { @@ -901,8 +902,11 @@ int msm_ioctl_gem_submit(struct drm_device *dev, void *data, out_unlock: mutex_unlock(&queue->lock); out_post_unlock: - if (ret && (out_fence_fd >= 0)) + if (ret && (out_fence_fd >= 0)) { put_unused_fd(out_fence_fd); + if (sync_file) + fput(sync_file->file); + } if (!IS_ERR_OR_NULL(submit)) { msm_gem_submit_put(submit);