From nobody Fri Sep 19 02:22:05 2025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0B2BFC4332F for ; Tue, 29 Nov 2022 20:03:02 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237191AbiK2UDA (ORCPT ); Tue, 29 Nov 2022 15:03:00 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45958 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237181AbiK2UC6 (ORCPT ); Tue, 29 Nov 2022 15:02:58 -0500 Received: from mail-pf1-x434.google.com (mail-pf1-x434.google.com [IPv6:2607:f8b0:4864:20::434]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 40F2E1583E; Tue, 29 Nov 2022 12:02:57 -0800 (PST) Received: by mail-pf1-x434.google.com with SMTP id h28so1170667pfq.9; Tue, 29 Nov 2022 12:02:57 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; 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=oVxl8G3vAtq5mJZNn3p6Nl5YUEEXKLYUFCsxfarFtXc=; b=F+s++DaJ4sldRIEiCojdUgWz6k5RPsplDj4ODUo5IlwzxOaMDu8AUzcf3JB1x2rIUq kh9aAlbhS7FVhtzEaeirIpbhlmSKXAXGWQrj7B+kZbDGgOX6HcXMl4gjrmSqLFT2btgJ YDJpmHR1ggBLhYY29kYmk5fLIwON13iTgpQg2dQj/l9F32E0v2fAJ+nd1bT+we0CgqFV 5x85SiAPV4QHcXqAppCO/TH0Ap6/JE3vWw4Me3FbxVO11B61vrafxNrNWb5xd1Kanjrs cDCdq2/hTrJmIoyaBC1oZYMgUjy2LpnGiVuN/9KOzkBzgXLF9chgpjtCUKCBVeyU5Yyi 0XiQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=oVxl8G3vAtq5mJZNn3p6Nl5YUEEXKLYUFCsxfarFtXc=; b=G4c+fkXRBw7KIAUeGFv9UzSLNIkVovC+lTvkYqHhyBdKbAqzau52uwroXFVyOJsvIx PN1vTGjJ8VT4xOtys9c0Xn3ZirmSzGyfMsiFeO9n5+q5hWF8CFXdaV29nAgIcuM4zQm3 4PUs7fSgaCEOsqwoMbOsCcBYJ9jmw871i4VwUGSIuggHrQR3NE4oExPy5oWodS+yfY2Y 23opTAPjWIgbkZCzXEFxsknAi4f8B5uKIthk4xE94QHZreCN8+ZL5fCZkerHJroSHQqL MH1h1UuYp2qzVHenJ19aB877ZqCfEEh49H/pPT4gSciRIrWZjSREfZkorv9fe+J0mOJO 5yaw== X-Gm-Message-State: ANoB5plIsNzfdYdk6BWYcesoC+xpZb+Ekn2OrbV2IiYAX3lE+Dhw5b/2 a+n28hkbSF6cZiMBtcwypjo= X-Google-Smtp-Source: AA0mqf4ecb3iEcndqk8sTt5tbiiiy6NU4qulFX8rCv8viufcaHtiTxFmnJS+pEfXfrkiCbx/9tLSGw== X-Received: by 2002:a63:cc48:0:b0:477:5515:8a9c with SMTP id q8-20020a63cc48000000b0047755158a9cmr33292439pgi.256.1669752176739; Tue, 29 Nov 2022 12:02:56 -0800 (PST) Received: from localhost ([2a00:79e1:abd:4a00:2703:3c72:eb1a:cffd]) by smtp.gmail.com with ESMTPSA id c10-20020a170902d48a00b00188a7bce192sm11269560plg.264.2022.11.29.12.02.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 29 Nov 2022 12:02:56 -0800 (PST) From: Rob Clark To: dri-devel@lists.freedesktop.org Cc: Daniel Vetter , Rob Clark , stable@vger.kernel.org, Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Eric Anholt , =?UTF-8?q?Noralf=20Tr=C3=B8nnes?= , Rob Herring , linux-kernel@vger.kernel.org (open list) Subject: [PATCH 1/2] drm/shmem-helper: Remove errant put in error path Date: Tue, 29 Nov 2022 12:02:41 -0800 Message-Id: <20221129200242.298120-2-robdclark@gmail.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221129200242.298120-1-robdclark@gmail.com> References: <20221129200242.298120-1-robdclark@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From: Rob Clark drm_gem_shmem_mmap() doesn't own this reference! Fixes: 2194a63a818d ("drm: Add library for shmem backed GEM objects") Cc: stable@vger.kernel.org Signed-off-by: Rob Clark Reviewed-by: Daniel Vetter --- drivers/gpu/drm/drm_gem_shmem_helper.c | 1 - 1 file changed, 1 deletion(-) diff --git a/drivers/gpu/drm/drm_gem_shmem_helper.c b/drivers/gpu/drm/drm_g= em_shmem_helper.c index 35138f8a375c..110a9eac2af8 100644 --- a/drivers/gpu/drm/drm_gem_shmem_helper.c +++ b/drivers/gpu/drm/drm_gem_shmem_helper.c @@ -623,7 +623,6 @@ int drm_gem_shmem_mmap(struct drm_gem_shmem_object *shm= em, struct vm_area_struct =20 ret =3D drm_gem_shmem_get_pages(shmem); if (ret) { - drm_gem_vm_close(vma); return ret; } =20 --=20 2.38.1 From nobody Fri Sep 19 02:22:05 2025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id E13BAC433FE for ; Tue, 29 Nov 2022 20:03:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237198AbiK2UDH (ORCPT ); Tue, 29 Nov 2022 15:03:07 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46042 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237192AbiK2UDB (ORCPT ); Tue, 29 Nov 2022 15:03:01 -0500 Received: from mail-pl1-x62c.google.com (mail-pl1-x62c.google.com [IPv6:2607:f8b0:4864:20::62c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D6AB817E22; Tue, 29 Nov 2022 12:02:59 -0800 (PST) Received: by mail-pl1-x62c.google.com with SMTP id y17so6617091plp.3; Tue, 29 Nov 2022 12:02:59 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; 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=KmLZiaEVkjJr8RiYF6yToHXQoLPPBZhOHiujuwoMMv8=; b=Dz7C3calMnoC2yh0ZC4zZ18Y3+Fg658tq9lsj9p0WciuPXjgUd+tVvWl0Lc62p6jVW r2Bd5aY2VRPWULHTa6j95JU+cnKHKPHnhokZ8HHRUkXMxDRfKyho4TJOBtfLMgnN+jtk 6qX+OzHN0jn37opP0t8b0WA97hE2SX19L9NufPseOkLxo9fx3ln3D27ws/2/FmFfLWBs 2QiVp247MYChRznqD8zQlY1Lq6+md5jBcmE2ngOip1Im7cI9Rx6uQL1xuibovEpkTLY9 POfy1S6VtEZK9vsQvB5mLbG+0CGKZwNmlz/ChDoSF5CaH+QBXV5gMYFobvOGJ+Jp5ez7 mLzQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=KmLZiaEVkjJr8RiYF6yToHXQoLPPBZhOHiujuwoMMv8=; b=S7pxbw4PUyLUtUIrEQdYroomjl8+jdR330+KaDLk3ZXch6HlLkKZMtuLz0NacRhPqC K+ms40Z34BlsnJr8zBJB8dm3I0IIvhFANENJL6zynEn1qPIYDb1xeWwMloOHh8bgD+d1 JP4qShSSr2lF6pM4zT9C8SEdXuTzB8TLleyO1134nyjDVLRrb3BDwaPM5q8j913jl3da EklmTXYrLUuplEqkwsawQlf+LdgBYv1wGRZLmkYSnGIyxOIU3UMlAbn5V0tYo4q+1N5C wDteGR6Ny1MMzd7leSZRWrGqY0N+PGHdxy0uLSIyjCcRPYeloi4vVdf8IGBysDnWs/r4 IGEQ== X-Gm-Message-State: ANoB5plFTbpgktu9inR6h4pOe/tJUios2seTBqvCFq8EVMV/SOmLIQGO 3U9rNcKeYAWJ7wihGcpMAa4= X-Google-Smtp-Source: AA0mqf58iGfyCo4hDR+2yRciiyJd2DTGXcfQcykl7GdRzbd7PwYHNjjcg3PQcDS5ZyQve/9BqimogA== X-Received: by 2002:a17:902:dac6:b0:189:7105:59e8 with SMTP id q6-20020a170902dac600b00189710559e8mr19846111plx.50.1669752179326; Tue, 29 Nov 2022 12:02:59 -0800 (PST) Received: from localhost ([2a00:79e1:abd:4a00:2703:3c72:eb1a:cffd]) by smtp.gmail.com with ESMTPSA id q5-20020a17090311c500b00186985198a4sm11337838plh.169.2022.11.29.12.02.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 29 Nov 2022 12:02:58 -0800 (PST) From: Rob Clark To: dri-devel@lists.freedesktop.org Cc: Daniel Vetter , Rob Clark , stable@vger.kernel.org, Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Eric Anholt , =?UTF-8?q?Noralf=20Tr=C3=B8nnes?= , Rob Herring , linux-kernel@vger.kernel.org (open list) Subject: [PATCH 2/2] drm/shmem-helper: Avoid vm_open error paths Date: Tue, 29 Nov 2022 12:02:42 -0800 Message-Id: <20221129200242.298120-3-robdclark@gmail.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221129200242.298120-1-robdclark@gmail.com> References: <20221129200242.298120-1-robdclark@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From: Rob Clark vm_open() is not allowed to fail. Fortunately we are guaranteed that the pages are already pinned, and only need to increment the refcnt. So just increment it directly. Fixes: 2194a63a818d ("drm: Add library for shmem backed GEM objects") Cc: stable@vger.kernel.org Signed-off-by: Rob Clark --- drivers/gpu/drm/drm_gem_shmem_helper.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/drm_gem_shmem_helper.c b/drivers/gpu/drm/drm_g= em_shmem_helper.c index 110a9eac2af8..9885ba64127f 100644 --- a/drivers/gpu/drm/drm_gem_shmem_helper.c +++ b/drivers/gpu/drm/drm_gem_shmem_helper.c @@ -571,12 +571,20 @@ static void drm_gem_shmem_vm_open(struct vm_area_stru= ct *vma) { struct drm_gem_object *obj =3D vma->vm_private_data; struct drm_gem_shmem_object *shmem =3D to_drm_gem_shmem_obj(obj); - int ret; =20 WARN_ON(shmem->base.import_attach); =20 - ret =3D drm_gem_shmem_get_pages(shmem); - WARN_ON_ONCE(ret !=3D 0); + mutex_lock(&shmem->pages_lock); + + /* + * We should have already pinned the pages, vm_open() just grabs + * an additional reference for the new mm the vma is getting + * copied into. + */ + WARN_ON_ONCE(!shmem->pages_use_count); + + shmem->pages_use_count++; + mutex_unlock(&shmem->pages_lock); =20 drm_gem_vm_open(vma); } --=20 2.38.1