From patchwork Thu Jan 30 09:19:31 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Karas X-Patchwork-Id: 13954365 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 CE235C0218A for ; Thu, 30 Jan 2025 09:19:59 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 730C810E2F6; Thu, 30 Jan 2025 09:19:59 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="hqpxYwBW"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.18]) by gabe.freedesktop.org (Postfix) with ESMTPS id B8BD310E2F6; Thu, 30 Jan 2025 09:19:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1738228798; x=1769764798; h=date:from:to:cc:subject:message-id:mime-version; bh=AYSa7Dp2RRbcRF538jmZWesHQtoZEDPb2+Y3kao+CZs=; b=hqpxYwBWiPc8rY8sYDOy/43gn+YzIft/C7pXsmb4CQDe3rHoZIk8uNs4 syzIrUyYftW4XbMEA8mZHCPDs3Ys23nV2h4veg0r9VrNvJyLQACwd1Vjm Q7h+cQuR48y4QM6nUabzU0evC78GoZZeIwK06FdzYkk7ry7JsI173QZ11 0TaHFCXWZndswi0JIyUBfPHk9HjuQp+pGd/F+Zb+DZiKENkM0UoQf/sHg dB8XjWF1AlWON+8GJ2z7/nbNNpg5hquADjuxMwYKQt7BZbq5BmRHUiqdy 6DoiYapd9uKLNwhf3S1NqMxIHokejVmkFnOOC0hLaK01E8h0EMM5L+ukE A==; X-CSE-ConnectionGUID: LAC3C05OSUOJ4cfdCqL9pw== X-CSE-MsgGUID: 5HMOtCKFTvq+gUyYNSgB6w== X-IronPort-AV: E=McAfee;i="6700,10204,11314"; a="38870297" X-IronPort-AV: E=Sophos;i="6.12,310,1728975600"; d="scan'208";a="38870297" Received: from orviesa004.jf.intel.com ([10.64.159.144]) by orvoesa110.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 30 Jan 2025 01:19:58 -0800 X-CSE-ConnectionGUID: A68zN1TFSxe/Hjg7P8nvWw== X-CSE-MsgGUID: UqExu1wsQEaW/HQZjtGjdw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.13,245,1732608000"; d="scan'208";a="114307965" Received: from orsmsx603.amr.corp.intel.com ([10.22.229.16]) by orviesa004.jf.intel.com with ESMTP/TLS/AES256-GCM-SHA384; 30 Jan 2025 01:19:59 -0800 Received: from orsmsx601.amr.corp.intel.com (10.22.229.14) 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; Thu, 30 Jan 2025 01:19:58 -0800 Received: from orsedg603.ED.cps.intel.com (10.7.248.4) by orsmsx601.amr.corp.intel.com (10.22.229.14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.44 via Frontend Transport; Thu, 30 Jan 2025 01:19:58 -0800 Received: from NAM02-BN1-obe.outbound.protection.outlook.com (104.47.51.42) 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; Thu, 30 Jan 2025 01:19:57 -0800 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=o08ITI7r6QyfEmJBku+ZtGU3XUoTWMONElT0O80wqxzYYj6ESI6ExwGx3MFuuqWQbpNEnA6Bg4r5kTYnv1lhAEzzo3V9atQBfSpPHjhO6mh0eNsWAvGtG7RpAMCBqDuJSXgEpeh4YXZjyLPcz7cxh9XH5ZClQMfh+A/iLvS0afqONj23TXKiExrR0rJF4uMi/QYXVmWCUCsaEhcjYWT5ZYmnxRRHv77YP/y3in53TtWWEAfbxSDp+DUv7o+Tz7zGf3EQgkFU8BZE5ljtE8vn1UkixUBNM1h4SvqswU1l2FxulxAtjNhCur7RuGeTc+6OfqcyxUqjS07L3xhXzhHnIA== 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=R40L3hqrf28IH8CEd3VNMpSnFF9nH6yUyp+OH7UoPUE=; b=DfjDk5Ita7aom6Q/eNICJb0gnYOf9Qo9/dmmlF+GIEzoD6uSeOLA/Y6JRlZhm0AvzWSq6SfQNfY4gW7qYD66JqIPNdf1FGM9HWTvCekux/SkUR84XyvUCwI3Bp4nwPKnxQKMzgcNp/24XBXeT23iWjFHmkkj6p8iS82qoY51HGWQZvq17LKn3z7gr6KHvrfT7G9n+lgMelKOnFbSLEDocwt5p1PahYnDDRAl7xXAuiJD03saQWTz+9rqOrqqcjzfKlbHVQRJkLkOF1rZdkaLJetPWC3BA2ryV0BVQaWaOLwFI1ChZ4lL0A7ousblLLc8RvEcWFdY5vXI/R3wJe3FkA== 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 IA1PR11MB7342.namprd11.prod.outlook.com (2603:10b6:208:425::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8398.20; Thu, 30 Jan 2025 09:19:41 +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.018; Thu, 30 Jan 2025 09:19:41 +0000 Date: Thu, 30 Jan 2025 09:19:31 +0000 From: Krzysztof Karas To: , CC: Sebastian Brzezinka , Mikolaj Wasiak , Maarten Lankhorst Subject: [PATCH v3] 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: DU2PR04CA0306.eurprd04.prod.outlook.com (2603:10a6:10:2b5::11) To CO1PR11MB5057.namprd11.prod.outlook.com (2603:10b6:303:6c::15) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CO1PR11MB5057:EE_|IA1PR11MB7342:EE_ X-MS-Office365-Filtering-Correlation-Id: 9dea4d03-f5a6-4070-db6e-08dd410f3a5a 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?lO66TampQYGTS3cK9aN8SMrE4In6sVw?= =?utf-8?q?K0YWv7frQg+Ryzn2Ouk6oskHd2eR6wmQ+1cZBAYkfYG1nYKw18iMP+X24xM5+QNoM?= =?utf-8?q?MTsQaQeAUj/9XMzfQcQwu+OgKanQzcG1hxuA81xM/phEoFWBRLgvA6IUC+HU/LEzH?= =?utf-8?q?OLLmK6wibj0FEisCYawIxgmU5Ppl9F6txJruhjODhgvZuyZj+nB0u6ez2EM38Qfm+?= =?utf-8?q?fPl1CdPECeZBY8uwUR5LNuvc2YCQvguKTs0SFuZzJLHjacBj9q22X1OE3Ute/KfdO?= =?utf-8?q?M4mbi8eByGpbthYPekoZP2sz0p4tuUIKPZm7VRDtJu4Vvy6/wq4QhyL9/GSMn6HCg?= =?utf-8?q?EyJ4B2LHHO6aqWqRasSdmFbpXr7plN9w7CQFHFCvnOaRx+uNx08oqvjflf/o1+qTL?= =?utf-8?q?P9mtacN+SMdYSPbYw0Up7VUpvyUe6Xt6h3dSjhc62/KlZcEWVKKlo1+099Lfni5JB?= =?utf-8?q?gS36yI5uwxXU7c+IVk/dI3In1FHud6hMUd8ptvhw5MqXFR0dXXkSLgJUgP4Y7eEEO?= =?utf-8?q?Ytwb5+xA/RPBJ2PkdLO3Qe9z33YsO3yeUnP35S//2UTH5I0xnhQj2seQzBczxs8gn?= =?utf-8?q?ZV3TCygPp/EnguOycctdqMAfVwqmj+RWAi004NAVCtWWYKGgdqDD1OIjwH3P7mQGx?= =?utf-8?q?wNfRPXR3VUd/mXpC9qfY2/4dsDQO3rPEqwAA5MsRVufEnG2XM9WRQU2R82HgD+PBd?= =?utf-8?q?Z9ge1Jep1zReQF90/CAbmp/vomeWm+VbXLQWz6hpmRHNWF0wQaHDQkM5KZYj36J22?= =?utf-8?q?IjXXND2LPqRtUPu7tQuNAZF4LDQ3XgkK22wqL0miSOtiYtUwSSqxf1nclHhcw7vJK?= =?utf-8?q?VVJSIRfScGOxqrKv3XcdHrQ43xuCc8ukCdUudEKRIH73+eDO6u137zCePfhjMI6Vm?= =?utf-8?q?CxB2PmgzILYSUuV46kQy4aPOlYX8VpE73vcefXtrA2okcP2mF/UO2R5YyIg6Odoyv?= =?utf-8?q?y6+Hu4dJChN0BtvoX4Sr81V1XipPBy6700vyAELkCSocpuhtLvPmdUUMCht5wZY5T?= =?utf-8?q?NCExMjucqJQwyd13BEqHZRPT2tyFxkcIwVa/uf8RKCoSNtJfgak3XG86wpi/CN06b?= =?utf-8?q?MB8X3f0hjP0yfyW0Bx8mYLJIXFdYkS9xiLlsk1Kug8EO+XUtdijBPu3iVnaoyP+ez?= =?utf-8?q?IwSvfjYNG+D0nk1nBrCe6aCB9oVFP+H/uCrfyRAFu82vh58nvNIXwqmZhKStz56ts?= =?utf-8?q?opSMi3pRcQpAj7y+7I4T3MUBMf4C/9dHbOfsI0RQNHGVwFPkuW/Oh6q9aWFt4NyoT?= =?utf-8?q?kyRq6FCsgNN4445jeCaTD7KbLcEJyuaRm41046ptTMLHKHek+sxuGZo+CoZ/lttoh?= =?utf-8?q?xmNho32WT3uO?= 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?l123tKIYFEpvMrfRXZTyXybIDb+0?= =?utf-8?q?2TBrKgmy7fTBwdDlDDOi54VcdPsQ1tiFVriIkbvjZg5POk63iCcG2WIfV7RYpk1ej?= =?utf-8?q?O40pzjyqjKV4ovzhz+im30cw+crKjAUGXo3vzJ5sEAcE9nOv77xHbb3Y6LerUJckU?= =?utf-8?q?+HVKbDWQaaFL5q0zf9u9J5eY28SYt9gU/li5HMAYlJsVk2nUki0xaK/HP9LUbCW/R?= =?utf-8?q?Yx5XJSibz6gP6NKINRwq70TIG1wDDG1CUAyXtaUoHN8llJ9l3F1RlNJWPKhOjRbTO?= =?utf-8?q?DT3SypcyykFaG2d4It+peYD6pf/OsonUoehkJCO5wwvRKaDXemZGABLqOuNMmZ+uz?= =?utf-8?q?6LSmfeGFQCo9OxC+y70GvANmUKRyab6CI1N6jUnzZ6isgCNz6jF98rgKf0Na3ia/N?= =?utf-8?q?73dMmfQnCEXhzeZbn0nhemPW5Q2pUATLkVOputCrI4WXSQqAIBptCGTibctoPp3oy?= =?utf-8?q?MCC5XyFCRMXUdVjuIGvy4Wy7bKO7S9eYELd/AUwBORiKeSPPSzF0y11xCqfFxLiJB?= =?utf-8?q?ZB5OrO+sAJfn+IjKFf3poqY/WmlJJCaVLJ9HUKh8Opfc1cbaoy72ZMLHHxkRnQ2l4?= =?utf-8?q?cbV3N+0ekPUAR1WiQbT5WtKHBvWzsGt2RAtl5pr398enWTTXAYwIdr2OxBTuAdw1Z?= =?utf-8?q?jLeVvpmXGBqSu4iVXaZA41tIPhpwzq3tgi91kHYpwDMKfiTXm8dfA9AWGFrvnRTWw?= =?utf-8?q?NlQVMFXarFcZF9s1iPiRJbhep3y4NTp/cRO0WAQD+8R+QH3v5JH8+VcNZ+TTePx63?= =?utf-8?q?U5q47WDT5Nrt4nTt6mqqnqfM6OhT0E40CDiXOqIf3KejGz6UcNdGvNPaH3C8Yevj8?= =?utf-8?q?M1gK7pHiUP70YGmQ0Rg7PNVy/95fAfXloUeCAnhHhC2fifpx/IB8/AdvzGUcdKJ2V?= =?utf-8?q?ODhh/Ep7FuCxUn9A7mHTMhk3xmqvtzuahYc7P9Kn0yhwShOy1GaA/e1YSJ59l8UMc?= =?utf-8?q?YfUZwzTTWEsxhHLdeH3R8VW0tqRdoCrFwxzrVfXTtbizL8Hatszo2lUq4wxlLgjq5?= =?utf-8?q?51r76RQPX4X4lowDFaezahMqkPRlJMPs/+nmPY9+7pUs8rzhuWUggSZI9nqFzS0Cb?= =?utf-8?q?/xKe/rBvgjT6o802XKgyFWKijGqa3XeoxAE/I0ANFilCZ4v4IhuX5hHv/MNkI0LVt?= =?utf-8?q?UqwEFzXRLicauvW66EACPrdqriZ4VIPbH/1tBQSbDuaQsgtK8rwCioKLicXfry7Cq?= =?utf-8?q?xlBizEeQ5A7kT+gY/NNwJ4DtEWeXZClBy5avVlb1HKWWLC4mdkLi1jb72Gjg+9tod?= =?utf-8?q?ce9uNgSLFzOhHbF7WMgKqEIX3t/t4ygtmEOk8KXjh439cvzFlYRSOM6gfrWBnLqCy?= =?utf-8?q?qjxiI5wKzu6J5c2lTwY/5J/YoAk5xnJjLiEsXuZOh/mdO/fAAgbGkDbmX1bifbBxB?= =?utf-8?q?PPgu5Pyu4QVMMg+VIVgW71U0+5kf2NGEYUrkt5pzIJ7D+/GCqGA7RNCntwHNFmZJR?= =?utf-8?q?UgkPQEnIObpT2S31aWyDgVudrgRB4zk1v0wkCHJkrlNZDq6YvakD0XvlJ2FdCTvDs?= =?utf-8?q?yLjMAOZX96mvd3//ZYMygGS4GQHtAzofBg=3D=3D?= X-MS-Exchange-CrossTenant-Network-Message-Id: 9dea4d03-f5a6-4070-db6e-08dd410f3a5a X-MS-Exchange-CrossTenant-AuthSource: CO1PR11MB5057.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Jan 2025 09:19:41.6994 (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: IMXHnLVfXyUZUZ1fabeYnfR4KQfGP0sOXc658O+SAUEXkHVYYmKUNFqlKyKmiEYnEOTUqlyQDHYdOI8dlUkl0hWt3pHlo73lnwByZwZek4g= X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA1PR11MB7342 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 only 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). * v2 -> v3: Use an additional label for clenup path (Mikolaj). drivers/gpu/drm/i915/selftests/i915_gem_gtt.c | 4 ++-- 1 file changed, 2 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..7ab4c4e60264 100644 --- a/drivers/gpu/drm/i915/selftests/i915_gem_gtt.c +++ b/drivers/gpu/drm/i915/selftests/i915_gem_gtt.c @@ -168,7 +168,7 @@ static int igt_ppgtt_alloc(void *arg) return PTR_ERR(ppgtt); if (!ppgtt->vm.allocate_va_range) - goto err_ppgtt_cleanup; + goto ppgtt_vm_put; /* * While we only allocate the page tables here and so we could @@ -236,7 +236,7 @@ static int igt_ppgtt_alloc(void *arg) goto retry; } i915_gem_ww_ctx_fini(&ww); - +ppgtt_vm_put: i915_vm_put(&ppgtt->vm); return err; }