From patchwork Fri May 10 19:40:35 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jiasheng Jiang X-Patchwork-Id: 13663451 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 D87F1C25B10 for ; Mon, 13 May 2024 13:34:48 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id E128910E479; Mon, 13 May 2024 13:34:47 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (1024-bit key; unprotected) header.d=purdue.edu header.i=@purdue.edu header.b="cccAuAdQ"; dkim-atps=neutral Received: from NAM10-DM6-obe.outbound.protection.outlook.com (mail-dm6nam10on2133.outbound.protection.outlook.com [40.107.93.133]) by gabe.freedesktop.org (Postfix) with ESMTPS id 8282510E0E7; Fri, 10 May 2024 19:40:40 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=DhOp+90gZ92LR4ukZsDNarfN4pKDNYbR2qKSsQ3pGGGj/sOcJLWEg924X8S0V438ov90RwDPOoIjPuEyjiEixL0EcgoLHXWxLP4BqZVur62IOEaTVHa72edeHzEm7yB0wPmZ11D7R4EutioDBiCXHW0ujqiGpTW3DImmeaGpGUgxegBPns8GjjGbn2C0nZnzLZxt2caF/lGKq11XfODde2Bynk/Sn5U2K55o7omSmkF3XYY9KGstvTuDCIb2wgt4IaB8gzIjNcHu9hE8DHDCzM9XNrW4r36C9Y3TXP4RnU7P7OLyM67QCi6hH5NPL/OwwlPnLpzeFWUBXV0F8VsLqg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; 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=1OopLCcWNE/5SopgzEWn+rlT6aPnD5CgKEStzINgWDU=; b=cTeOEG40Vbg/mseF7Q7cK4aMwgKpHTpl7WlrW4REgNOJpt5JO8SN8TrFpLSIo+5c338zqFTkW+aUt49WxjLE5HBWzVAkIt1+1uUkc5VKDyre1c5Ky5b1MK3UvU+o4hYwvMmOGQukBfC4ReOo2A2ToW81+bX4psNxKmhj9gWNAgpANWZYQ+ZBf+9EOxZXHberNUJeQox5TyZ+3FvghWF2t/ubMX2Mjvbcj6zW1K3CrmPbuUSWAfg09xhDyLc6VWOpcJujS2+JNteopQn94T4GaVFSCdmOEQMewBwR+PP7MyLwd5W5rHYUWbEV9xPyOvFXqZqKx/zUTosMgc6Y1TKw/Q== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=purdue.edu; dmarc=pass action=none header.from=purdue.edu; dkim=pass header.d=purdue.edu; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=purdue.edu; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=1OopLCcWNE/5SopgzEWn+rlT6aPnD5CgKEStzINgWDU=; b=cccAuAdQVUNYN3pMGYzLmnkYygB7hLOPxTVTX6vAw/WQt3AfGmmGkc5F+TdBQ0PjJz65nB9FJYu0AFFrXYJKdzQVuQ25BryN/ABVz9snGAxgLCiVrbktHAddzXn3Lpksm16J768T/IzA3IZ8mtBjeUMjGuMYfMVj/LW84q2hEcU= Received: from SA1PR22MB5493.namprd22.prod.outlook.com (2603:10b6:806:3dc::14) by MN0PR22MB5544.namprd22.prod.outlook.com (2603:10b6:208:4cb::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7544.49; Fri, 10 May 2024 19:40:35 +0000 Received: from SA1PR22MB5493.namprd22.prod.outlook.com ([fe80::a308:2ed6:d751:9a0c]) by SA1PR22MB5493.namprd22.prod.outlook.com ([fe80::a308:2ed6:d751:9a0c%3]) with mapi id 15.20.7544.048; Fri, 10 May 2024 19:40:35 +0000 From: Jiasheng Jiang To: "jani.nikula@linux.intel.com" , "joonas.lahtinen@linux.intel.com" , "rodrigo.vivi@intel.com" , "tursulin@ursulin.net" , "airlied@gmail.com" , "daniel@ffwll.ch" , "chris@chris-wilson.co.uk" CC: "intel-gfx@lists.freedesktop.org" , "dri-devel@lists.freedesktop.org" , "linux-kernel@vger.kernel.org" Subject: [PATCH] drm/i915: Correct error handler Thread-Topic: [PATCH] drm/i915: Correct error handler Thread-Index: AQHaoxG6TBQoAhaMu0CLAXku3n0QMw== Date: Fri, 10 May 2024 19:40:35 +0000 Message-ID: Accept-Language: en-US, zh-CN Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: msip_labels: authentication-results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=purdue.edu; x-ms-publictraffictype: Email x-ms-traffictypediagnostic: SA1PR22MB5493:EE_|MN0PR22MB5544:EE_ x-ms-office365-filtering-correlation-id: fbafb80f-6d84-4b0e-0479-08dc71290ff4 x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; ARA:13230031|376005|366007|1800799015|7416005|38070700009; x-microsoft-antispam-message-info: =?iso-8859-1?q?r2p0NO2KGRKQRa/vN8cEwDS7S4?= =?iso-8859-1?q?dF563gHNG7I0JGQ7Gnflf+B5hKnfOuBJjnmnv/S0MyNspHMCgRm4zjrxG8r6?= =?iso-8859-1?q?2P+QrSoe1BcHocm/5v7F5znvIMKbby6OGB3O8LbM24BVzku7oCDBDiF/pfO4?= =?iso-8859-1?q?2pk4C9yldZrVMVoz3ovW8WmUHvHcrK+xPEPjbtn/RrjW16XubbvBt4JuOEZJ?= =?iso-8859-1?q?YZMAtlulM+rbiEhdubIxOELqsS9ad7NQixnHwftHkiMncfePbPTtKtqjhN1C?= =?iso-8859-1?q?3cj628qUDtT2pfY5awXoRwHot5a8fztqNkWvOgFDRRJFsF8MPEi7LK/+qkss?= =?iso-8859-1?q?/xH8u11tbHTtZMyxEZrBFd1xeQgbch0Vdj06vFX9dNBVHvd7MWk1domx3Pll?= =?iso-8859-1?q?mWhv/raNszxi34bICDp54b5DA/xP0txpGQwZkO+Ms+FMXqHM8B6freQ0N0n3?= =?iso-8859-1?q?7Qq4Lq/oHJFGOZf0X3jOika9PJqNTPikl/jfmwNQt5xva2HyTHKwkIsmHY0v?= =?iso-8859-1?q?k4pO30A5oTG7pRcVChO2izAjFSJqtSXTxDSYVvAzt/8y3Tc6/ZNwBEZQqHpP?= =?iso-8859-1?q?DhTuI7JSw96LqRD4ZwkW0x9leaz5YdPyQLPEpcZoaIVI0VjUByV3urVJwVR0?= =?iso-8859-1?q?C6JJCXTJbjuWI+xe86Zbr/wAyD747N7DjIS0njs+xuz91b6mDBNINYJj8ngj?= =?iso-8859-1?q?UOgpzSsLVGXLO4M5K4jb2QysNtiZNbBgjV3w2y2b0c4/myEyAK0Rxbr8xr3j?= =?iso-8859-1?q?CGC9Ri6HooDFI2uB1kaxBy4aV6wALMUZf3JSbgb6yjPVvIyKGyCehvFcmGQd?= =?iso-8859-1?q?5ERXr4m5Zww8f9fElFtdsWqjTfdGu1+HICL8qub54EXomUdAs2Mo67Fba2gX?= =?iso-8859-1?q?lSXZAuuquA6tscmLpptfwnkqs+PTZ8vgvzausYnGbu1NLDmLUmvfU59tVT5P?= =?iso-8859-1?q?B6WN2ylr8IBfM4sWYKN1e9inq72AD1FizkDio/areV1UtFZGFLl2t+A5+dji?= =?iso-8859-1?q?LmwbD2cR7Tlzj1ScnzA8c683/F1LTDyhyXniPoX1u9rGEjqgiVwn1+gYsDIy?= =?iso-8859-1?q?B0oqnb9PaAjnQgCVZmbZ4RWnHqybaxI30Y+LYKDbH62REqdY9y7F9m45WD9d?= =?iso-8859-1?q?h/el+5TxWwEzXH5H0C7CXxFIgW+cObj0cws/v8DDXsd4s9ekvZOdrLEPvUFm?= =?iso-8859-1?q?A0PPOlrniOi2EPquKmVTrDdC9V0ZSjJGSXwYbH+8k2Jd6CZr6Up3KZTpwPGj?= =?iso-8859-1?q?MSBKjVjySioJ+NvTONWtRUJhDo2Ag9xCoPPQwletyQFglbD7NUSucDnWAGXA?= =?iso-8859-1?q?t5eK8tYg4/wQw9+uNqusvjg48wCyRoup5HTbtleZ5VIpjjvAOuwe37D3v54u?= =?iso-8859-1?q?CbL6xV1J0/5OD4WRc+PQ=3D=3D?= x-forefront-antispam-report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:SA1PR22MB5493.namprd22.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230031)(376005)(366007)(1800799015)(7416005)(38070700009); DIR:OUT; SFP:1102; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?iso-8859-1?q?n6YrBLDvtEhGRaQPco1Nwjr?= =?iso-8859-1?q?HdNiNrJ9LMDruczO3YoTukeeVDkJZzSgPj29HXQyMXWMhWqa6WzzmLCebkDX?= =?iso-8859-1?q?d5Smvjk1zWbR2WFWXJWwhPB0X25SrNjT4KqUG2AKpZXkQDl67QcHhNDspxWC?= =?iso-8859-1?q?3ZZ7tGE2qkRxEEk1S9mEzyOqsTufpHCyu3THqUzL0J2HrQkLWVk7Sa9091Tx?= =?iso-8859-1?q?SeDu/ydWG2cfhIN+EG0w/LtyittHVRPUK0rqCEgd4btaNHF1RGOOeRJhp8zT?= =?iso-8859-1?q?V1RMjNLmkjn6FERfnbhIKVpUOeLJOpoH68a0VZzz5pzi+r9lBwsLsV9Z9qjS?= =?iso-8859-1?q?FpPKt9YWBmUO+JeGUBiROyVrUJlS7QpS7fB4SfgBhvNGX/88YcFMfzBs3cgE?= =?iso-8859-1?q?+9pn1F/wM7Q7Qerr+LSkjISwp5S8lmhxpRlWGP2AJAXPhaB1Bd18erVmNOHC?= =?iso-8859-1?q?ggORCyLzJEH6l+k5LrlFmdMqx+lzsuXLm61+yJUBLlSWEVor8VBEJN/E8l7U?= =?iso-8859-1?q?ir797Hma74DMQ++DIvPEfvy/mVSJ8L/iX4q43cJ6qB0VAbA2hiXbeK6IPuBY?= =?iso-8859-1?q?MYMC/cUuntJMTM/wGkRNwg3yqpGtgbAsJlHDlW0hbIjU8nRnQg7q6UIXMf9x?= =?iso-8859-1?q?TtKtsL/u2ys1KUDAKaa6ssVx8g1ZQd2lH2NVeOF1/i6b5Q3QIc/Hlr4kk+C/?= =?iso-8859-1?q?mrfCWQkZ+QItInRTCJWEw4qoFMFCR1Q6Rippj7s+RnhSMdPQ9FBHs/IK+J+B?= =?iso-8859-1?q?OaT5NoPa8V955VgJuyUVxNQH/KVUAFfkMRlOCeGLYDu22ZWWFcvSfJLH3X8E?= =?iso-8859-1?q?v47m6WvitN3Gk0Aw5DO1mA6Sqiu3XX4+97nkcVsABlBoYGNNOyHdzlDjQsFt?= =?iso-8859-1?q?xcUZPmJxj9T0Uu24ynVX4zKUsxNi3yYxP6ww2U8KHMitEvJI3QIRELlW3AnK?= =?iso-8859-1?q?2GtVpQySZQr1I+M7JDVZSmExXDf9IeGP+Ow4EpjtLqwR61OJpc29a413cpTC?= =?iso-8859-1?q?Kna9PSxIowM45yFIJEAeTmreWG7xHRRsL77ig8gk/FhVOSIeTw0ubd0YAvPf?= =?iso-8859-1?q?nUY1yl1sopgHXNlta7O0V10mWlWQAzFjsO48KvwtcnHHKYogvqmNDV3aJrPA?= =?iso-8859-1?q?2i5dDA61fBaKG6W8MN/GQPSNv4R0THxF3mKKhvUCZ3/JCxF5RPglkSB4gjl5?= =?iso-8859-1?q?LMJ+cyx8Z8JNJ4yl316x0u1YoijRVfVl/xrY8NTjhhyuucGTKXPVwjmgAXX1?= =?iso-8859-1?q?Ih9xiWL4q95iDh27j740xhdEla20ciWAtoIPyyh7iJ5P5Xe9Tu9Os6MQHAmd?= =?iso-8859-1?q?R3/Ia5dfmSDhMIoE454EctBmR6TDcpUqFFZ52/ZKpcmf7/tG7iPAdgnXiV9F?= =?iso-8859-1?q?dlu9+nhxqtSvUN5kiq/bKV1tWfaif23FIFlKoHE6TMy+LOkhLKt2fVhyuIpb?= =?iso-8859-1?q?iXOsLgixyfD1oScoDK4R1TmXvRs9FU8Ji7GjtS2nIdEA+Gdr5opMhrJT5jnJ?= =?iso-8859-1?q?LcPkbSk13Odaile17J25f8XiX3YZct+LU3mTnmWcvKZjKIM6fy1+Nv0iNaa7?= =?iso-8859-1?q?gS2KU8q5Mg5khj/n1q41pE2i6QT3Or7Bnl5bw0qomARp6Htw+sbD6c80=3D?= MIME-Version: 1.0 X-OriginatorOrg: purdue.edu X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: SA1PR22MB5493.namprd22.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: fbafb80f-6d84-4b0e-0479-08dc71290ff4 X-MS-Exchange-CrossTenant-originalarrivaltime: 10 May 2024 19:40:35.4702 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 4130bd39-7c53-419c-b1e5-8758d6d63f21 X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: 75V4F0CkqSagb5JjLt4sBpkJP8FQT8EWDNjeb7HzqQ+RCp6cYvL3IPGipoB+gShkxY0lomSuQz71OZoxqWUZnQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN0PR22MB5544 X-Mailman-Approved-At: Mon, 13 May 2024 13:34:46 +0000 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" Replace "slab_priorities" with "slab_dependencies" in the error handler to avoid memory leak. Fixes: 32eb6bcfdda9 ("drm/i915: Make request allocation caches global") Signed-off-by: Jiasheng Jiang --- drivers/gpu/drm/i915/i915_scheduler.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/i915/i915_scheduler.c b/drivers/gpu/drm/i915/i915_scheduler.c index 762127dd56c5..70a854557e6e 100644 --- a/drivers/gpu/drm/i915/i915_scheduler.c +++ b/drivers/gpu/drm/i915/i915_scheduler.c @@ -506,6 +506,6 @@ int __init i915_scheduler_module_init(void) return 0; err_priorities: - kmem_cache_destroy(slab_priorities); + kmem_cache_destroy(slab_dependencies); return -ENOMEM; }