From patchwork Tue Jan 28 12:53:44 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Karas X-Patchwork-Id: 13952530 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 gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 6BD02C0218A for ; Tue, 28 Jan 2025 12:54:13 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 7AC8310E0CE; Tue, 28 Jan 2025 12:54:12 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="beyaTxny"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.9]) by gabe.freedesktop.org (Postfix) with ESMTPS id 311C810E0CE; Tue, 28 Jan 2025 12:54:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1738068851; x=1769604851; h=date:from:to:cc:subject:message-id:mime-version; bh=o08hf8/Nw0KZFXdHGovm3v0BEopg1fP2colhiK+6jZ4=; b=beyaTxny5PDo5rElOPvLhaA77qPS3ruJVYD97lV0pAKPRbIc+cOOYeTQ Y8u/MeYGr2VCrJXNQNwn+gta14u1U39SaMMyPLt00UUna8HCgMbVu1tna V8PmxQFthGYRElzNLKjduMaFtMWqfAyYscNvPKr9Om26ohK6KgHHjZKeX fQuUCU7aDdGJRoOBzzBze4tL8pQEFehFqcGdqpIPRaGjse4PdpYRhWN/w bA0cSweRytjn6VYo3C4lpirj4HbIJagHFNhVNDRmR3PE5LSpWdtVaN5Sa 7xZKVsdSp4r02XG/pRDMuYDEfyelYyh8SJJNBrCzAhuq4LbMlAkKeUI1a g==; X-CSE-ConnectionGUID: SbUXqDVeRVup2K3YEwLMzA== X-CSE-MsgGUID: nvrbc5bVRhWSB3mvuCT7YA== X-IronPort-AV: E=McAfee;i="6700,10204,11329"; a="61020669" X-IronPort-AV: E=Sophos;i="6.13,241,1732608000"; d="scan'208";a="61020669" Received: from fmviesa008.fm.intel.com ([10.60.135.148]) by orvoesa101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 28 Jan 2025 04:54:11 -0800 X-CSE-ConnectionGUID: JHCoareOTmCvYj2XJCbpqQ== X-CSE-MsgGUID: 8XNZRDIYRkSRHxZ4pgIncg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.13,241,1732608000"; d="scan'208";a="108838269" Received: from orsmsx603.amr.corp.intel.com ([10.22.229.16]) by fmviesa008.fm.intel.com with ESMTP/TLS/AES256-GCM-SHA384; 28 Jan 2025 04:54:11 -0800 Received: from orsmsx603.amr.corp.intel.com (10.22.229.16) by ORSMSX603.amr.corp.intel.com (10.22.229.16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.44; Tue, 28 Jan 2025 04:54:10 -0800 Received: from orsedg603.ED.cps.intel.com (10.7.248.4) by orsmsx603.amr.corp.intel.com (10.22.229.16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.44 via Frontend Transport; Tue, 28 Jan 2025 04:54:10 -0800 Received: from NAM12-BN8-obe.outbound.protection.outlook.com (104.47.55.175) by edgegateway.intel.com (134.134.137.100) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2507.44; Tue, 28 Jan 2025 04:54:09 -0800 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=K3r1QKvNBpLOLMW3kewlqAw46SbIRrr1wksLOyChcme7KRGJ+sngdnPZowWd+3WhKK7LW8T9+TEqu+uQVphUASuanUUg6YdI13f7f5FwE67KLAFO9KJFfTS4DUqogHlizCD2JDQp/kYAcWUS2nleh7BLZdliv7d65j+YPa/clZOnh3wZr9OyYvurb0N++iiJXYGzKh+ldOAANo63wjGfZ+MLsLNuWs9e5liiYSv/6A0fOwhOCtvjeZx5Y6P4uSiz7THhUrT3sLFiCxZ9YKiT5eJBmb/mXrPYJYqI7brnIjLBvMpRuGMFNhRlwJZ89npY1AzD+vqpBgI7TRgCuNr8cw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=EamrNWWxrI60G3X9IvDDLEQdZzBPdtfC0nipFGMuzLw=; b=d5W+EOGFPr9K1yxc+GS7js0PLlG2eP2vT9imzAeEPutA1RFcHBzy/eZHzX6acqpOrcZIoR1e1VmmemoL2JJ807w+bUY7ghVmcX5bD5sUQv8NblCFyv+QvwGj1xDt8xCLpeQMA3nEQp0UblvFYVi6U8BUH6qXB+96lO4ozlQ/oMIY+lsXHOfU7Hbb5QaLKCqAp2pHpTxO0apMZ/0/2RHotpJUQxjIxrsnraVko2ElXCJi6iC5JraWj9r2ahMF1SwSGCaP1tKysVWI67cVq+POs6aweCNyOkpJYTQ/t25h63bs1/asrA/3OpmvRi0VtAMld9WZiK+imarIVvTxNKTSew== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=intel.com; dmarc=pass action=none header.from=intel.com; dkim=pass header.d=intel.com; arc=none Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=intel.com; Received: from CO1PR11MB5057.namprd11.prod.outlook.com (2603:10b6:303:6c::15) by IA1PR11MB7317.namprd11.prod.outlook.com (2603:10b6:208:427::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8377.22; Tue, 28 Jan 2025 12:53:53 +0000 Received: from CO1PR11MB5057.namprd11.prod.outlook.com ([fe80::4610:6d6c:9af6:2548]) by CO1PR11MB5057.namprd11.prod.outlook.com ([fe80::4610:6d6c:9af6:2548%4]) with mapi id 15.20.8398.014; Tue, 28 Jan 2025 12:53:53 +0000 Date: Tue, 28 Jan 2025 12:53:44 +0000 From: Krzysztof Karas To: , CC: Sebastian Brzezinka , Maarten Lankhorst Subject: [PATCH v2] drm/i915/selftests: avoid using uninitialized context Message-ID: "Organization: Intel Technology Poland sp. z o.o. - ul. Slowackiego 173, 80-298 Gdansk - KRS 101882 - NIP 957-07-52-316" Content-Disposition: inline X-ClientProxiedBy: VI1PR0502CA0010.eurprd05.prod.outlook.com (2603:10a6:803:1::23) To CO1PR11MB5057.namprd11.prod.outlook.com (2603:10b6:303:6c::15) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CO1PR11MB5057:EE_|IA1PR11MB7317:EE_ X-MS-Office365-Filtering-Correlation-Id: 50e3f09a-f10a-40bb-c867-08dd3f9ad1ba X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|366016|376014|1800799024; X-Microsoft-Antispam-Message-Info: =?utf-8?q?W8X/lfbRUXlBLDHPYEjqQht5ITlYhMo?= =?utf-8?q?I0Wld6n2fg+846EUfIkDFQv4AiKzTdxLqwGXjWNbd/2I0f1T1vO2/WRWk4yNW5BNf?= =?utf-8?q?n3jH7zY0NlUSD3J/9p61nmVMzeNXqFV8ij3NjTe0VQgoxZB1toxEMMfBkdczoto6z?= =?utf-8?q?4kfiNL32zEfsQ+ykna9p/55OdK9vj33ve59205JprqAwYFGPLGS66BV9lerKlIGNz?= =?utf-8?q?3olbhIOGarRT5AM4zac8mkrelI6itKI8LR3asccMJGTFdPvfrUEVngreWUKDlW8kH?= =?utf-8?q?URp5XNwdmzXbdARSpMlcGUsTHeuK6P8cjtfJ80U/QNDNdRykSsOrl7mS+Jy3PQJOT?= =?utf-8?q?/Y01xmDGmzIYm8daG3BsuwSRpkmsoJVEwBBo9hNxg60IqEaOYZPHfRNromh4VL8vp?= =?utf-8?q?aS4VwAw18B9N8i9YNzbWGsLS3YeQ4cViaZrbamvnD0DlZh847qpfgGX5ViAXSPBnc?= =?utf-8?q?lfhWk1XYV7oW8ExrCxgMc69sO4XPJlzpgE2K6JcK898UG0Rp7mKI/ZxmIzdBIHGE2?= =?utf-8?q?9eqD0vCFd9eItMorXzUh7d0AfP+ChPrxKVGKiX0lK+1/RmjtXEDh5V6a2yeULr8HS?= =?utf-8?q?fQW1xc/90xMJiXc0wlJZk28qTho++gNly1CvakrinTWMxb4fP2ombnXIhWeoBeYW0?= =?utf-8?q?Ii3yVByMUYYNz0bMESm8ODdu/hW7whWwUFadzKlRXSFIweEoColuGAHIattJ7cJBm?= =?utf-8?q?7H+5HnIx7yw0EwLvJOPiU0WIuVt8EqWh35jqPEud5HmqqN38FSKBLOI3i2SyCybl1?= =?utf-8?q?RdUY6mC7nnRbFJy3uP11osVH+A5hd3bpkaiO4ifPBuNium32CkW5bx/dePt5Ng9Lv?= =?utf-8?q?oVBdKFa+wwSu8yf9du3V5687vet125hVGu2sgFtPwnCXsCBVSlX8F/W1i+kTWz+Iz?= =?utf-8?q?R/W4/ooji1Yk6N6PE2vtQqkAtRIYd7TcR7sz52Hxth1zX4o5UBWnHcdpeX3YILS3Q?= =?utf-8?q?Kb6biSbsAnQKWocRD1VvdN6bK3s0AhMcZopb2Y6bw6qz7uOXt34lIOZixJuSwC+fu?= =?utf-8?q?q+eEnPTFjgxCD42B0chehGWQ2ZugYgi5O0EMjI2gJ67p+D3+dPT4UWf0Z2cVlsFl9?= =?utf-8?q?sKK6qswsJwklSfeWsHYe/7AYuPQiS6zKD0QuJSPz7llzdeBY2fWH/ELrxynyHLXmo?= =?utf-8?q?5t3Tt6x9QYWMrwi15JBFr6sTezUkwlBvnJnmlGwXy3eki33EQECjGohS1fsJk2Fj2?= =?utf-8?q?XfZ9LBpFmGNdROjN3dP0MgJobNSy50vP+Q/E42ajRyAezFTVnMCIW56jL86+otAZK?= =?utf-8?q?wMlEg2ABJPIP8+Xms8W7UGW2qJ+q22Y9tLLMAJfXg902Fa+bE8oIsF2Vbs6aCfXr3?= =?utf-8?q?UugbJ5teI6zT?= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:CO1PR11MB5057.namprd11.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230040)(366016)(376014)(1800799024); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?v9ImzJ6/eKTOYyd4KbnFui5YoxF3?= =?utf-8?q?/gaYc+Yn/3nNcc+HqpCmE2CRD82xX0+hCZ7DyWTVHz3T6aW2aQ7Pv6SLRlXISVx2i?= =?utf-8?q?+HaI3oCRQ6XNG0bUnvC6TBC+kZPaF6nDeYO+Se5Bfexp5QcZQ57VbGtP9aej5KGrH?= =?utf-8?q?jlkgMxrJEkP1/20EKtn6qL4JkdZQBbMaLt6GfIDhszUrw7oxHBA4rwOVeNFG3EoS3?= =?utf-8?q?G/y9ARJmMMGV8//7/X9PQaVVVYUlt4RENsMb9ChxqoPAwhC2QmHRXxjrwIadK58RK?= =?utf-8?q?05PBsgsff7Vmg1JhZE5KgzRl1qU2ACLrC3bAMPYuioP5IaT6tEpV+6D2ee67z77iw?= =?utf-8?q?1FnBkO9Y3wEnpU8BkwoF259jcTHaz7gr0P6WSSxbWNkXr+35S4nvaW60iSI49ThcP?= =?utf-8?q?fTEYts7B3wbB350fAsGejLSujull7KvCIQDe9INnwQtJwproiFqmqoESuBqaDtHOP?= =?utf-8?q?1efaZKiyAWYOC8VrkPrnrrr503YDxSFN1g9YyqcmPkBaIvKh64voDeeza8EiuJrtM?= =?utf-8?q?zMIEAxJFumrQQahfDKoSZSRGpRdtIw/rTjGEb2pmQFgpekaCXyZbZqOKRNNlh94VR?= =?utf-8?q?OR7n1d2nK2yK+wHgd8fi5ieatZHGcJnlZjD18Pqy/D87EVSnsJB6uQEmWpRrehELT?= =?utf-8?q?no771gERR3Mj0B6H0ORNldhD6krxbax/1bk5q8EpGM6HbEyuI9xhl5f5yCYCJbM0t?= =?utf-8?q?cmp1Ik5/08QEySG6dA2rQuwe85Zc4zxC0SC827v+2CEAoI4OVlFFyF4gb+fmyf5eG?= =?utf-8?q?Pt+GDD/hVxmapdmKHIrf//Nriy8LrTG6WK1/QdQMiIR6cJHrk2Eqbvnd4xAIF2UIi?= =?utf-8?q?Otfdpx0EDaRwe9MnhURVaD6Hr6MTdFB9ytTiTfu/dQNiS+Df5aPKIxFxWWeOFIV3v?= =?utf-8?q?LwBVhF8hyiT/V2HXIcZKe4AyZHMUp6h9dRD9u74hFjvidCDSIV3hwuHmLPX3ToPqJ?= =?utf-8?q?KmRGaETyRgEvC9VEo7T7TaX9KQ6ii0Wl2k0FnZl9uoAl9xO1qyStzjTTyEfx2vwyT?= =?utf-8?q?FUqPT+T5PcPAI3zkhEABTtv0As1u4oSc6wqTA/I326O7jeu4TUnzjxqruggSnYl/K?= =?utf-8?q?BuhfmnMZF4gIiDZpiDD+E8+9ycBhnGa+e4KiRVtAChUu5tGgRU0AU2njfgr7LYJOM?= =?utf-8?q?lN3HqETz3isg9DXH4v85McSA+1dJR6aNDDQfE1BXGCWQkDZnmv1b1auRwyNSSlXaz?= =?utf-8?q?iNEPYEpihDQupSjzcYwsleUZ/xuY9nG7+OZTFSU0G8D/SykHiJksyBp1DmvW6uUro?= =?utf-8?q?bAWHsq3YpXNjXn4ssMM88RM1E4n20/exG+SV6vf+gz8nSE+W4so/VVOi1W2PwADzX?= =?utf-8?q?lKdIzduvv64TgUKd03woMaaNIT2pC4R3uVmANKVjmGd4eAFKIYkQVZ8ptxcKH36aL?= =?utf-8?q?j4i6dswdfRzcInfGFNZazwQK0VUVpXndZ1svKAcfyRxZvQBKUDus462nuEGW63Gs6?= =?utf-8?q?+75yMpW23o8NWxOJUEqILuOaBC0up2+2NH8/onDLyDfXoUhJrKcSbCj8WQ8Rz5Dxy?= =?utf-8?q?AlGf1QCA8O6IGsk/OnsbJYEu5LFK8NQvkg=3D=3D?= X-MS-Exchange-CrossTenant-Network-Message-Id: 50e3f09a-f10a-40bb-c867-08dd3f9ad1ba X-MS-Exchange-CrossTenant-AuthSource: CO1PR11MB5057.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Jan 2025 12:53:53.4144 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 46c98d88-e344-4ed4-8496-4ed7712e255d X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: kIsZWwP7EYrFXcfgawVb0n92h1il0UiZxL+Bu41nmBIVkbFveMf1Xs+OpE8emrrvfmLii0UAfZeA6IEcjFpOZOHRES9e836mpCInW5aR7+Y= X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA1PR11MB7317 X-OriginatorOrg: intel.com X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" There is an error path in igt_ppgtt_alloc(), which leads to ww object being passed down to i915_gem_ww_ctx_fini() without initialization. Correct that by putting ppgtt->vm and returning early. Fixes: 480ae79537b2 ("drm/i915/selftests: Prepare gtt tests for obj->mm.lock removal") Signed-off-by: Krzysztof Karas Reviewed-by: Mikolaj Wasiak --- Changelog: * v1 -> v2: Avoid calling i915_gem_ww_ctx_fini() with zeroed context by returning early (Sebastian). drivers/gpu/drm/i915/selftests/i915_gem_gtt.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/i915/selftests/i915_gem_gtt.c b/drivers/gpu/drm/i915/selftests/i915_gem_gtt.c index 5816d515203a..d94a5b88f442 100644 --- a/drivers/gpu/drm/i915/selftests/i915_gem_gtt.c +++ b/drivers/gpu/drm/i915/selftests/i915_gem_gtt.c @@ -167,8 +167,10 @@ static int igt_ppgtt_alloc(void *arg) if (IS_ERR(ppgtt)) return PTR_ERR(ppgtt); - if (!ppgtt->vm.allocate_va_range) - goto err_ppgtt_cleanup; + if (!ppgtt->vm.allocate_va_range) { + i915_vm_put(&ppgtt->vm); + return 0; + } /* * While we only allocate the page tables here and so we could