From mboxrd@z Thu Jan 1 00:00:00 1970 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 2329CC3271E for ; Mon, 8 Jul 2024 21:21:50 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id DF59910E02F; Mon, 8 Jul 2024 21:21:49 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="df2PNHB3"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.21]) by gabe.freedesktop.org (Postfix) with ESMTPS id 678F910E02F for ; Mon, 8 Jul 2024 21:21:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1720473708; x=1752009708; h=date:from:to:cc:subject:message-id:references: in-reply-to:mime-version; bh=WNdY0rfXVqfF5jI2LDBLvZGgaEdmJCPXXovzFL+rNfw=; b=df2PNHB33uafhkbO0cXEKJI7C7kztTEg60NBOB7SgW8rR90X9KwXq5Lc SRj4fxXd5+W+TgQMP1w7AJD3Z0adkCZD+5Qh2wyKwgrHlyg1hUyPxgx6D 67sBx3mgxdvNPuvMD5+CVFN9FYVZNy4mJxCuot2KN+3FrPZTFOSuMnVOi 21mS/NIMGreojgrdg5VWhkRPEAkUaxm6q2V1DfTsYEsOzEbRdWnSD0t+4 s5uPdFp3Z2jXrjqzJXZtD0ojMlSaTzZ0sb+6rt2doFErpQTazsB1csn3v bFX5m3/j4o6+J1kmyWmPMwEZkAAeNDRWA7NBocCHcNCkV+n2xlSBueNP5 Q==; X-CSE-ConnectionGUID: NU0DCpCISfSXiqIujKJXUg== X-CSE-MsgGUID: isCChbqCTB2tWdywbD6tTg== X-IronPort-AV: E=McAfee;i="6700,10204,11127"; a="17650816" X-IronPort-AV: E=Sophos;i="6.09,193,1716274800"; d="scan'208";a="17650816" Received: from fmviesa010.fm.intel.com ([10.60.135.150]) by orvoesa113.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 08 Jul 2024 14:21:48 -0700 X-CSE-ConnectionGUID: Z/JLBtTySliPD762wQWIfg== X-CSE-MsgGUID: Lv6wq9CWQy26Dhu8dL5JgQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.09,193,1716274800"; d="scan'208";a="47710686" Received: from orsmsx603.amr.corp.intel.com ([10.22.229.16]) by fmviesa010.fm.intel.com with ESMTP/TLS/AES256-GCM-SHA384; 08 Jul 2024 14:21:48 -0700 Received: from orsmsx610.amr.corp.intel.com (10.22.229.23) 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.39; Mon, 8 Jul 2024 14:21:47 -0700 Received: from ORSEDG601.ED.cps.intel.com (10.7.248.6) by orsmsx610.amr.corp.intel.com (10.22.229.23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.39 via Frontend Transport; Mon, 8 Jul 2024 14:21:47 -0700 Received: from NAM11-DM6-obe.outbound.protection.outlook.com (104.47.57.168) by edgegateway.intel.com (134.134.137.102) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2507.39; Mon, 8 Jul 2024 14:21:47 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=VaXEnYI3ph2YVKVImEePmEqxn2HQpajQT47193oJCyfwyQLUr5+h087+yEwSiX0FD3c0plbZOEnkZocSRg1kOkPegN8HEO//P3b1U7bYTU6M/5LotJuhApU/6n9IeQlygFGe6aSGzNOLYVjaIINBEx3/A3ruE2ReL3GhDV+Uq+c/JkNVoRjUtjUqyGeZfPtYpQndkxU1DGVgfT1hV+xS2m+y0CmxTs/ZoeWtXz4rwj5lsHU960Qd3ONCPKQDtRV9sNorRnlAvvFlQh4oFI9Ypcv5yShAc2ud+YfdYJTDNsQqHkW9jHyqiWaKZNqrlrusPSJ6ZuFKk1FHNGvMlyPuWA== 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=XmOX+6ADgvhz58Cz5IqhRd1dUpiiCn1fFNWQuKpbP4U=; b=jrrF0ezzIaIGOVJUwWzBdUGC4MmNL/TTgWWtlB7M17+YgQlZcC/sTzm08k5J32nxrsjDck5P2mMd8pEBdbqxLjOPONrYBFoxsLmauNb+OplywCzy65q66F84RR5oX4uhg6IiQZ/n1quZYkE6QmQ+W4L2N2WO95eDXFmF5x33Azc8WyQzrILMUMAcv1BxWYXJlxnFKxwl1UIbU7O25bYDJPBo85yd4ERcwqQyhnEM3eJoIUsw+v8fVVBmTMwwbzn8yBpYnJrU1wBMFluMcmtkP0DoF6EBalTZUI728JFmOEZzppiki+N7s4uKc30/6uvslGyKe+SpgnYopFoiFc8g+Q== 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 BL3PR11MB6508.namprd11.prod.outlook.com (2603:10b6:208:38f::5) by MW3PR11MB4652.namprd11.prod.outlook.com (2603:10b6:303:5a::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7741.36; Mon, 8 Jul 2024 21:21:44 +0000 Received: from BL3PR11MB6508.namprd11.prod.outlook.com ([fe80::1a0f:84e3:d6cd:e51]) by BL3PR11MB6508.namprd11.prod.outlook.com ([fe80::1a0f:84e3:d6cd:e51%4]) with mapi id 15.20.7741.017; Mon, 8 Jul 2024 21:21:44 +0000 Date: Mon, 8 Jul 2024 21:21:01 +0000 From: Matthew Brost To: Umesh Nerlige Ramappa CC: , Subject: Re: [PATCH 1/5] drm/xe: Move part of xe_file cleanup to a helper Message-ID: References: <20240708202103.3347869-1-umesh.nerlige.ramappa@intel.com> <20240708202103.3347869-2-umesh.nerlige.ramappa@intel.com> Content-Type: text/plain; charset="us-ascii" Content-Disposition: inline In-Reply-To: <20240708202103.3347869-2-umesh.nerlige.ramappa@intel.com> X-ClientProxiedBy: BY3PR04CA0020.namprd04.prod.outlook.com (2603:10b6:a03:217::25) To BL3PR11MB6508.namprd11.prod.outlook.com (2603:10b6:208:38f::5) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BL3PR11MB6508:EE_|MW3PR11MB4652:EE_ X-MS-Office365-Filtering-Correlation-Id: 9bb91e50-c449-4591-60e4-08dc9f93f7b8 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|366016|376014; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?W//A/HSHSe8KrHPRLhi/CsIZPa+zydbjyzzXOYfvOtj1Xg/Jge7vOcNpx7Zj?= =?us-ascii?Q?B778ZqtSJ35mZVXLcVOU0vU6U8Bb6ZFw3UGRL2auOk3xlUntHFFiEp8LfrWV?= =?us-ascii?Q?mhUqqogp/qXSh7ptMTBmVSVOpYCzHtBtl/oOSW8EytnizgkNwSv+RBknKwCq?= =?us-ascii?Q?RVEGWkEioOJyCLTHZusGRHg2yuj4DhJsWdoCWCWYcI4gGwMJFP0O7koD2G6t?= =?us-ascii?Q?mnMz+YiOWM53u/GHWatcWmYGeLKTUvcJPvQHiFgxUnLAEsUg7dxtv5/MStC+?= =?us-ascii?Q?JQ8P7P1KLGZuUAAddoVlhBp+QMG6/hqdbswzTGbTawRuYWAcetkdNRqvNg9y?= =?us-ascii?Q?vlxdq5rCfLkFOeiJkaHFgycbQUYT/3JKYtTBph53RjHBESeZYMdfrszimkJR?= =?us-ascii?Q?GnoFvyJdoBGTl9LYn5AvncPr71DnEz6/0P0TggkZRUsjXlKZq1P1NlkiIxtY?= =?us-ascii?Q?KkAyX7VjBLWfKaYy8EeJ8nuv/3VPVasswJAhf8bqcoPNoIKhMtIeInFCZkr2?= =?us-ascii?Q?tC6VmGEAlLQAnymoZeAPoBRwZsGTNSqVPibTnP9ut+xH60mTtFTCw1cxeng9?= =?us-ascii?Q?9H37wO2oITc5uDUD2CdrEvb1JAbGn7AaLUFxe/BQ/Xjy44jJc4B/rKOh3is1?= =?us-ascii?Q?wGOqV+4UVnEaKQXJAcXleQE6m4oZTXANYre4zpssf20ZHh9BNeqP92G2osF6?= =?us-ascii?Q?eVs0Q1YV57fp/ow6yvznjruiVJBrS7jWprJsWV/AR9hrsdmjd+usZeJ1AsQ1?= =?us-ascii?Q?XsTZAhctVffQVxVKaLi394s/yyowZX/gczodqWPTl3AzwzEqkL3OF4oYyRh+?= =?us-ascii?Q?eh3RQ8e0Ias5hk1wQ3hN9nOhBgktY5+Tnfkz5WO3SlStjp4Kf/lw10lqm9ez?= =?us-ascii?Q?tKKQdJlrtthqp8E2Df0rZfhT+NbYPzfDfeTv3E4vheN29YqFNKtL89yYOdC9?= =?us-ascii?Q?eZxNB3EfRfv2PkJYiTb3P5zYP3eGYfn8zBJEf5D/V+wwkqJp5PP3O0x/UndE?= =?us-ascii?Q?QZkZVSQf3bUJD2B2qf3p9ykP/MOTzh//ne74NhioPK4FkTX1NkiUa2Uy+p1j?= =?us-ascii?Q?6GpH/gyFPRQUePLSKeS9woFwMkkX/87udLZrR9Wn9b1k+SeBzO+jiAQPcu/5?= =?us-ascii?Q?uQ0hVDHQSN7ShvMRxwVMVFuzXaybMVMsfoOm2YES7Y6LjML1T1YT2z93u6//?= =?us-ascii?Q?kfMZKi3vVrMlR89nzRUMS5LG56vrjDw1InR5D7WfCoUL5glw74TTkpANFjyD?= =?us-ascii?Q?CT7zC4SxzYR5KvE2xiyQXyTgZbMgo0AFdUwy4WzfnF87e0OOPjqpvOdUNgAH?= =?us-ascii?Q?4NmTvohEsT69sAXtqsSjbEsdFbSs3+L+EcRtxla0DDR/ig=3D=3D?= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:BL3PR11MB6508.namprd11.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230040)(1800799024)(366016)(376014); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?HO46bzSRHDpZuDfgS0Z28MOBGbshErYTryseDec8PanFA/NbK17m2PdA23K1?= =?us-ascii?Q?cQlzybBA0Kih35u1VcSUXMrbVlP67WiYR80hgOfxO+6/cLLI3x/yYsWQD/II?= =?us-ascii?Q?y7g/zIfc3zxagmeyYH1ymHc3R7B1+7BjTqlljNm4rvropqKRb2CGlW1Kvq8G?= =?us-ascii?Q?IJh5j799B2K4Zp6J+jJBVpl5z4EVOvfdl1wnU82nbi84z2GRBiiGz9BS0qyq?= =?us-ascii?Q?gqAESx6nKdhoqGuQTMLKSCYCbcpbrWW82j3PLa2HMSpj+EAXsmt2zyWvRPz5?= =?us-ascii?Q?iz7KFiAcbHFeYuRQliZbad5X69DQzrExDmmuA/NJFGJQxP1Ef8fYZ26BLflS?= =?us-ascii?Q?FvqxUkHiyMAZ6dIJiYEbJeEO5I/MFpz/xDDMuy1JHM+OrX1vih0vDDXimx0H?= =?us-ascii?Q?bwavAc4VUYhuC6UQe6DdFkoDoLHcACgEuAzLr5gaNWIH+1Px4e3BdAqknXK3?= =?us-ascii?Q?jg1oNPr4mlJkZvFOFCp9pnGTFHjubbspVFZN3LrXf+azbCy4vtJTP2x0QpY9?= =?us-ascii?Q?1ey88pWslQio7d+umcw6NsiKkZ+ACO0evdGcY4tujjOeDuJWqDGzNH9Bm3NA?= =?us-ascii?Q?3iOmSOhtlNf+4yiOWotoJv/LQgztbyLDU5PDP0JIsfAGRxrQCjG3gK1BEDCn?= =?us-ascii?Q?46kqzTopyx8ZQ7WLmB07HN0KV/2xZWahvBX3gJggWrzV+UC5Zq9baRTpqFcm?= =?us-ascii?Q?aPj/px2nbx4SY5/S1DKLZHIF4j/VkDVUAljamakNgF0AzdUnQvAwBZgXta5c?= =?us-ascii?Q?lazHGokwBEmiv7oOnE/eM2oGeZ7D71LdTYpzJb3vcHidg3ybiXJKbVCozSfs?= =?us-ascii?Q?MOuWDWpVFIfYHmZscvM0F/2gknKhjHZCAFWPfMBXD6m1k5y9R15qh2pPLarl?= =?us-ascii?Q?lnz7wzgTnAiYyTDda3/GKQJonzIUVNrCMOA3Qz34gvnAr1iHxbbimyK42qlD?= =?us-ascii?Q?ADglzK22askk5EWzV3uM1Q0Cmv7Uu9wYLVU3bX1Jow9nfagjSan2trQ92If8?= =?us-ascii?Q?nuTBM2hrp/COC+Ltw4rZcDwZJcE/DScAk5RLcnXcD1soRUQq3LXNY9u0eMWU?= =?us-ascii?Q?o8bsI3UdpVDUuFu3Kv9Y2aZW3nevcQi0xXaXr8VcPcX/Wis3W8FUOEdg+FlF?= =?us-ascii?Q?ZIGJZJtfP9YnF1fjeRjm61co56mYaxF9g+0DVNo61llw0rCaVMk1pAD+q/ee?= =?us-ascii?Q?3lEC3VKQj0WJWg1Ij7leLhqx+rwuwy4a6O93xky57ubhQcgsPUL5P3rNH/qw?= =?us-ascii?Q?Xcdfoe17M3LrCx3L+ko2EH6K3r1NyiiHxlSYz5n60ttU7CNkAFsu6hBIPAu/?= =?us-ascii?Q?X0HDUdRvCmxxI4zGHgmCwLV+SgA5bNMOBSCHj8DcVQwaKSZKU9ac/Ks/q4I1?= =?us-ascii?Q?HG0oiNwuIdwE0X+f3lMg6xGZal1eFc4jtjXUX6h83GDjYJ+bVpj7LVRQJ9Il?= =?us-ascii?Q?MkCcCX+FFUN2gLCB9ixigR1TZoRzSCOII2ipCltxLUeB/haXu36+qbTBFoAG?= =?us-ascii?Q?AQmUteNSKrI9h2Qu1aNn0k19zPVPhivPx5Q+xNhR8kRKW0FvIpa1CWSlGIaW?= =?us-ascii?Q?K3i3VNDl7U636HKoyyJybUEMVHhtWwMl1HOdoKWhbgRqcGVYukgjFaWr89lG?= =?us-ascii?Q?kA=3D=3D?= X-MS-Exchange-CrossTenant-Network-Message-Id: 9bb91e50-c449-4591-60e4-08dc9f93f7b8 X-MS-Exchange-CrossTenant-AuthSource: BL3PR11MB6508.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Jul 2024 21:21:44.6000 (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: FitCnGrvbl6a2W6XN7HrATmWyyHALWfzSd7waWppDqgnIUojV6B8jWPRvgq+SPFTXLiRcoYURKm+30MD1jiJPw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW3PR11MB4652 X-OriginatorOrg: intel.com X-BeenThere: intel-xe@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel Xe graphics driver List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-xe-bounces@lists.freedesktop.org Sender: "Intel-xe" On Mon, Jul 08, 2024 at 01:20:59PM -0700, Umesh Nerlige Ramappa wrote: > In order to make xe_file ref counted, move destruction of xe_file > members to a helper. > I don't see where xe_file_close is called in this patch but appears to called in .postclose later in the series. I'd move that change into this patch. Also I think the VM should ref count the xref too to be uniform and it appears this series is not doing that either. With a VM ref counting xref, the 'xe_vm_close_and_put' is going to need to be in xe_file_close too. Matt > Signed-off-by: Umesh Nerlige Ramappa > --- > drivers/gpu/drm/xe/xe_device.c | 36 +++++++++++++++++++++------------- > 1 file changed, 22 insertions(+), 14 deletions(-) > > diff --git a/drivers/gpu/drm/xe/xe_device.c b/drivers/gpu/drm/xe/xe_device.c > index cfda7cb5df2c..babb697652d5 100644 > --- a/drivers/gpu/drm/xe/xe_device.c > +++ b/drivers/gpu/drm/xe/xe_device.c > @@ -90,24 +90,12 @@ static int xe_file_open(struct drm_device *dev, struct drm_file *file) > return 0; > } > > -static void xe_file_close(struct drm_device *dev, struct drm_file *file) > +static void xe_file_destroy(struct xe_file *xef) > { > - struct xe_device *xe = to_xe_device(dev); > - struct xe_file *xef = file->driver_priv; > + struct xe_device *xe = xef->xe; > struct xe_vm *vm; > - struct xe_exec_queue *q; > unsigned long idx; > > - /* > - * No need for exec_queue.lock here as there is no contention for it > - * when FD is closing as IOCTLs presumably can't be modifying the > - * xarray. Taking exec_queue.lock here causes undue dependency on > - * vm->lock taken during xe_exec_queue_kill(). > - */ > - xa_for_each(&xef->exec_queue.xa, idx, q) { > - xe_exec_queue_kill(q); > - xe_exec_queue_put(q); > - } > xa_destroy(&xef->exec_queue.xa); > mutex_destroy(&xef->exec_queue.lock); > mutex_lock(&xef->vm.lock); > @@ -125,6 +113,26 @@ static void xe_file_close(struct drm_device *dev, struct drm_file *file) > kfree(xef); > } > > +static void xe_file_close(struct drm_device *dev, struct drm_file *file) > +{ > + struct xe_file *xef = file->driver_priv; > + struct xe_exec_queue *q; > + unsigned long idx; > + > + /* > + * No need for exec_queue.lock here as there is no contention for it > + * when FD is closing as IOCTLs presumably can't be modifying the > + * xarray. Taking exec_queue.lock here causes undue dependency on > + * vm->lock taken during xe_exec_queue_kill(). > + */ > + xa_for_each(&xef->exec_queue.xa, idx, q) { > + xe_exec_queue_kill(q); > + xe_exec_queue_put(q); > + } > + > + xe_file_destroy(xef); > +} > + > static const struct drm_ioctl_desc xe_ioctls[] = { > DRM_IOCTL_DEF_DRV(XE_DEVICE_QUERY, xe_query_ioctl, DRM_RENDER_ALLOW), > DRM_IOCTL_DEF_DRV(XE_GEM_CREATE, xe_gem_create_ioctl, DRM_RENDER_ALLOW), > -- > 2.38.1 >