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 236C2C4167B for ; Fri, 8 Dec 2023 16:46:34 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id E109F10EADD; Fri, 8 Dec 2023 16:46:33 +0000 (UTC) Received: from mgamail.intel.com (mgamail.intel.com [134.134.136.20]) by gabe.freedesktop.org (Postfix) with ESMTPS id 8847D10EADD for ; Fri, 8 Dec 2023 16:46:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1702053992; x=1733589992; h=date:from:to:cc:subject:message-id:references: content-transfer-encoding:in-reply-to:mime-version; bh=icIIoM/B5bAqv1l9Al68F07XEouXLmupWaCB7lUaCms=; b=hShmXGn/HLrASeQZeT4jBtPgoT2aWTmveW4Fy5PHc27DRlgEx9FPhwp5 yrFsSUUtBD/A9hFNKZ9V12lfDgwMRiDqlvjdr6nUD0eWlppcD9d/0jUH7 ca6mExRwD2wz7meoY13HcUNacBgAd/L7FOUHW4Ys9l+k8jZka/aV+gtxd /rH6zG8hvM6WlMCbC18A1QAywdUv1ITiin/mqKsiE0wxLKbVT/lqBVwGx kPBvYOxA4VQo6Nbg42Nc873jDqq93OKZkltrgRmFhalooHqY73a+icATz ZzYSzWKgo5FKjAiC/81eUklkZ3kA4L993ViXEHoG6T5qKIxJAe3A6cmyF Q==; X-IronPort-AV: E=McAfee;i="6600,9927,10918"; a="384835727" X-IronPort-AV: E=Sophos;i="6.04,261,1695711600"; d="scan'208";a="384835727" Received: from orsmga007.jf.intel.com ([10.7.209.58]) by orsmga101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 08 Dec 2023 08:46:32 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10918"; a="765542802" X-IronPort-AV: E=Sophos;i="6.04,261,1695711600"; d="scan'208";a="765542802" Received: from orsmsx602.amr.corp.intel.com ([10.22.229.15]) by orsmga007.jf.intel.com with ESMTP/TLS/AES256-GCM-SHA384; 08 Dec 2023 08:46:31 -0800 Received: from orsmsx612.amr.corp.intel.com (10.22.229.25) by ORSMSX602.amr.corp.intel.com (10.22.229.15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.35; Fri, 8 Dec 2023 08:46:31 -0800 Received: from orsmsx610.amr.corp.intel.com (10.22.229.23) by ORSMSX612.amr.corp.intel.com (10.22.229.25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.35; Fri, 8 Dec 2023 08:46:30 -0800 Received: from ORSEDG602.ED.cps.intel.com (10.7.248.7) 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.35 via Frontend Transport; Fri, 8 Dec 2023 08:46:30 -0800 Received: from NAM12-DM6-obe.outbound.protection.outlook.com (104.47.59.168) by edgegateway.intel.com (134.134.137.103) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2507.35; Fri, 8 Dec 2023 08:46:30 -0800 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=NkNc1X6tdcTx42JzXo2W7hkVRaxyvwR9qyjJk93pWYo7ts+++jXn1r40tEhTiPEV4RPAeCL9hOS0agBLxAfAamIa+oIEXpc+0iM+Ck80mLYS7vD+6Qp/93aITQWhUCRGtNYDlOva1W/5N0uMtZTuyFEmOf8gKDsoOdq07ky2tJoBT72bCFVqjXb4V+lW05N3zLAw+OkjU80ixlbJprmdHMbGkbqk/vY7HOdhePjZZDlOjavkrtaRILwGU9z9fjvaU9s9ZeVxrIM46qOXB8LsmPVkvAdQR4ktHNEljsZG+MYwHzA4cAqzFj0SfNNTaBAI1XuM4uNvrLOnU8iWHBBzcg== 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=xZeyMBVbpbIu7fBnn7Oq25zJXgCShBKl6qDSz4zrRMU=; b=NmXYVmzOBsrRcXkviaXno88f6X45ToY7QuUP/T/u9wF4+YndYlWq/K/n3Fpc5rbDNdY1727aJi/Ae00z0Pl8iEJAY35Q9QkMkwAkonSUexe+QjxyaGSJBzQPosOagN8TimYL2mh8UYFbT5peL9mtgoyT+onLbFK+k5Jb5K24c3tsrk+tMdP+RXFEKH9dv0a1Hgnt9ADzwa6H1PgmUfOtrZbf/8FVSBsMiBF2B0k0K5lyd02BkR/pYEQ7O0xYQAS/sDCGDSfyhLCoXyX9FOn8Snv+zMYrHpoe75DboEfs5Zzl+4ovU2nuVgTnVRnMdui67EZTLIxKTFNL2lSsFnjp9g== 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 PH7PR11MB6522.namprd11.prod.outlook.com (2603:10b6:510:212::12) by SA1PR11MB6848.namprd11.prod.outlook.com (2603:10b6:806:29c::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7068.28; Fri, 8 Dec 2023 16:46:28 +0000 Received: from PH7PR11MB6522.namprd11.prod.outlook.com ([fe80::b9a8:8221:e4a1:4cda]) by PH7PR11MB6522.namprd11.prod.outlook.com ([fe80::b9a8:8221:e4a1:4cda%4]) with mapi id 15.20.7068.028; Fri, 8 Dec 2023 16:46:27 +0000 Date: Fri, 8 Dec 2023 09:45:29 +0000 From: Matthew Brost To: Thomas =?iso-8859-1?Q?Hellstr=F6m?= Subject: Re: [RFC PATCH 7/7] drm/xe/uapi: Uniform async vs sync handling Message-ID: References: <20231207055729.438642-1-matthew.brost@intel.com> <20231207055729.438642-8-matthew.brost@intel.com> Content-Type: text/plain; charset="iso-8859-1" Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: X-ClientProxiedBy: SJ0PR03CA0366.namprd03.prod.outlook.com (2603:10b6:a03:3a1::11) To PH7PR11MB6522.namprd11.prod.outlook.com (2603:10b6:510:212::12) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: PH7PR11MB6522:EE_|SA1PR11MB6848:EE_ X-MS-Office365-Filtering-Correlation-Id: 42ec886c-a1cb-46e6-7dc8-08dbf80d38f4 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: QQ1l7m68l0uHfPgWd/7yfW6aEUxIv9ei3qsAdy4/BvSom5PBGz5lhHePydSDM3qvL4oP2lkCvVr0DLmn28XMSbK62a5TNorXmYVBFPTdiSxjn94bXCRzx7+Ls+v3vCwXiJF7NZe6j7BFFjqgtfn9egyYo6efdJalWHlzHy7ZGrPp8NlDqtQDB7nzn+ENciieTN7EDivoVesPDDzT8zJJf6fkkyn5ZI7Wfvgw23kXy/AotfNDD24Z73obkCGxtj3OVBaiJ4x5bUWEgBYMJwGSxWCVuYkm650OAOk0XgfaOQkwUhRSaAJqJwe47XaVJ52pmrNM7vMrIyJXEPibDS3FHJ5mgfD6is1dGAb4xUJnJ5Orq3r29bePn5SBniMlhafcV9ivN0+gTQyaYsyzeEtKJstGoQshj2TP+kvLAPWR4lbQTW4eDZ4Qkkti5uDKsl6Icb9tjfkRSrrPCPdSjXUD9pzgG6yStKR6HK7WzBiyK/JhDOuvBeXoaRvM0BrlXBV9zh6ajNyCN4TMuMdiES7RRBnEPwiSPmmRRVpVYffTeqHSkN76cCwKIM/zSjMGwzuH0xiqYAL/rKZq19sB09QZxsYIUKXUH0ZPJm8QSASYIGw= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:PH7PR11MB6522.namprd11.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230031)(366004)(136003)(346002)(376002)(396003)(39860400002)(230173577357003)(230922051799003)(230273577357003)(64100799003)(1800799012)(451199024)(186009)(66946007)(66476007)(66574015)(66556008)(316002)(6506007)(38100700002)(8936002)(6486002)(8676002)(966005)(26005)(4326008)(44832011)(5660300002)(53546011)(83380400001)(2906002)(30864003)(54906003)(6916009)(478600001)(41300700001)(82960400001)(6512007)(86362001); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?iso-8859-1?Q?izSxdnl5h8+0nMe8JEYO/Dk3Qejz0MsfqC6QDiZ1uLNlvi1klafrgcPlzF?= =?iso-8859-1?Q?f9L7ElNkTTG3RZdOwgHtPLP+SYfzv9SbTWfsVv6lwwwYGhxhs3dMRN3RhJ?= =?iso-8859-1?Q?aszDr/qBW3+hunxzMaJ7/z4MsvsHjAwM89/17pn/6jWc9yDRHxg0DFODmE?= =?iso-8859-1?Q?6Q7CK1sTc5LeYI7rEBNWOw4fooo1lRJdWqXjD6YhzFi7XKfI23GtTrgNl7?= =?iso-8859-1?Q?SFBjm09JjBvhLn0pDojIy8QuW1L/uvneCucYqHDkPnFFgRn094vR7T8z56?= =?iso-8859-1?Q?nHzw/uOQ+srBu51K/co+/viMCb14P2cD2wCkeJSY4H8c/NAUY0RxKnqpMn?= =?iso-8859-1?Q?VfJ6/WBZz0lEJK/cH5dKdYU7c2czp9A8xnHIRRvy5C3fNVA8BarQKFWSEa?= =?iso-8859-1?Q?CCZ/7koD7UcyQ8QxmUIqR8v8bf/ZMnfPonwaCTg0kRstnmYVZKJXiPYpSJ?= =?iso-8859-1?Q?2fiJOB1bGoQIqk8r9kgi/AS3ChcSsMoVPJMqekwvlJ1r2YObrhHSP5ObNO?= =?iso-8859-1?Q?zrUmB207UBOmzynzy4oUVdLOfPtFUOaFh0ZAoiMtfSMr/GVNmSwbHWUMPy?= =?iso-8859-1?Q?crPgO1JoWe9+TA+qI8gtNtKdjKBvbTYdv9Lmg61oc2D6+Fmc1xfnhegtUF?= =?iso-8859-1?Q?6dh4YvaaeivD8qmnkc0zXbvShvVaGnb21F0b+ADS/mklWNNujc8aQCHzvo?= =?iso-8859-1?Q?q4Mn0JZv1x1uEhH+9ia4BaKNzcc16rgErvRAooNPnHWfi8HE4cnZGNXdn+?= =?iso-8859-1?Q?gAZnX3KPNnd3gbObBEbaQg1IrvK4LCFINfQEWj7qiY3mGEXMfqaPbHX3YI?= =?iso-8859-1?Q?0bA+HeCBfgfRruxS3AIeDvoVW6AhlGmla76i7uVtIdK8hNvgHGIfUn4mf0?= =?iso-8859-1?Q?QJEDOAFMhCdDg5l5iTTSxVdcpXvGdeMgBeZWlY6V5EmVb750GRFESlS4uV?= =?iso-8859-1?Q?J3mPmVZDEae3eNFav5sIVaZron4vyoRDVOQ0SyibNkvqb+R4kTAOG25vAV?= =?iso-8859-1?Q?TTzWC3DVPXwdURh+0MKFvj349n6DwLZ76fd+JviyDt6qNaoOCH6Bk9og5g?= =?iso-8859-1?Q?blP+MJeju6p1ltUupf4xWsMK244iRlOBw2mWsJsC/qhbm4wVGyZHrB8fYc?= =?iso-8859-1?Q?6G0vyUmWH4Gi7QZipVWRAZVjs/htEinSMmLuqR3IPubXfldovYcY4plyGh?= =?iso-8859-1?Q?IYPKUpwwTfcFek0cuj6Ab6JVLaWA8YiYaS+hGmLqx5NDKQ9Qten65RIphU?= =?iso-8859-1?Q?xw+OwMIOutv4sQJGp503/Bxu8cu8rJTjG24EWCMNvMpqIVmE70DWzXPf7h?= =?iso-8859-1?Q?89aHgZ9q+94jjaHtA4q4T00GEe8A4yp4X8VpIxQRfJCBYXlMjMAMgVeOkl?= =?iso-8859-1?Q?v+ZYNXdEG2KSy/GDefRLXntPrZAlCtGmzSKYIgknEpnhBrAPy4K5W2KP3P?= =?iso-8859-1?Q?+cSqwbAmXBlJoq2w/yo2pbx8HKmyYMiZQ8sNorqx7XWVKiHMZHdOkQ8zar?= =?iso-8859-1?Q?2yeQgPTR3MHKDPEpH7HWU6NO8jNGViNcRu0AD6BOzTAUV99nNsJiWB49nE?= =?iso-8859-1?Q?C0tfo5w86CcM9i/GXgEd+yKKsKm/Dhbjo7GRHzLpZzta14S5k2Hlga3oMu?= =?iso-8859-1?Q?wRcrEcDArL/eeXOqMw97tqMrLzix1MefW9lNq1KX3m9fDhMK80ym5rnw?= =?iso-8859-1?Q?=3D=3D?= X-MS-Exchange-CrossTenant-Network-Message-Id: 42ec886c-a1cb-46e6-7dc8-08dbf80d38f4 X-MS-Exchange-CrossTenant-AuthSource: PH7PR11MB6522.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Dec 2023 16:46:27.8281 (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: SgIeLvmT9oMeSgS+XRL2wHXV+r12dtoYSnXXB+uDcaWJWuCi9vGN0D1YMbnMj0EaEmMHa8O1lNAwiPtn1il1Mg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA1PR11MB6848 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: , Cc: Francois Dugast , intel-xe@lists.freedesktop.org, Rodrigo Vivi Errors-To: intel-xe-bounces@lists.freedesktop.org Sender: "Intel-xe" On Fri, Dec 08, 2023 at 04:00:37PM +0100, Thomas Hellström wrote: > > On 12/7/23 06:57, Matthew Brost wrote: > > Remove concept of async vs sync VM bind queues, rather make async vs > > sync a per IOCTL choice. Since this is per IOCTL, it makes sense to have > > a singular flag IOCTL rather than per VM bind op flag too. Add > > DRM_XE_SYNCS_FLAG_WAIT_FOR_OP which is an input sync flag to support > > this. Support this new flag for both the VM bind IOCTL and the exec > > IOCTL to match behavior. > > > > Cc: Rodrigo Vivi > > Cc: Thomas Hellström > > Cc: Francois Dugast > > Signed-off-by: Matthew Brost > > --- > > drivers/gpu/drm/xe/xe_exec.c | 58 ++++++++---- > > drivers/gpu/drm/xe/xe_exec_queue.c | 7 +- > > drivers/gpu/drm/xe/xe_exec_queue_types.h | 2 - > > drivers/gpu/drm/xe/xe_vm.c | 110 ++++++++++------------- > > drivers/gpu/drm/xe/xe_vm_types.h | 15 ++-- > > include/uapi/drm/xe_drm.h | 56 +++++++----- > > 6 files changed, 129 insertions(+), 119 deletions(-) > > > > diff --git a/drivers/gpu/drm/xe/xe_exec.c b/drivers/gpu/drm/xe/xe_exec.c > > index 92b0da6580e8..c62cabfaa112 100644 > > --- a/drivers/gpu/drm/xe/xe_exec.c > > +++ b/drivers/gpu/drm/xe/xe_exec.c > > @@ -130,12 +130,15 @@ static int xe_exec_begin(struct drm_exec *exec, struct xe_vm *vm) > > return err; > > } > > +#define ALL_DRM_XE_SYNCS_FLAGS (DRM_XE_SYNCS_FLAG_WAIT_FOR_OP) > > + > > int xe_exec_ioctl(struct drm_device *dev, void *data, struct drm_file *file) > > { > > struct xe_device *xe = to_xe_device(dev); > > struct xe_file *xef = to_xe_file(file); > > struct drm_xe_exec *args = data; > > - struct drm_xe_sync __user *syncs_user = u64_to_user_ptr(args->syncs); > > + struct drm_xe_sync __user *syncs_user = > > + u64_to_user_ptr(args->syncs.syncs); > > u64 __user *addresses_user = u64_to_user_ptr(args->address); > > struct xe_exec_queue *q; > > struct xe_sync_entry *syncs = NULL; > > @@ -143,15 +146,18 @@ int xe_exec_ioctl(struct drm_device *dev, void *data, struct drm_file *file) > > struct drm_exec exec; > > u32 i, num_syncs = 0; > > struct xe_sched_job *job; > > - struct dma_fence *rebind_fence; > > + struct dma_fence *rebind_fence, *job_fence; > > struct xe_vm *vm; > > - bool write_locked; > > + bool write_locked, skip_job_put = false; > > + bool wait = args->syncs.flags & DRM_XE_SYNCS_FLAG_WAIT_FOR_OP; > > ktime_t end = 0; > > int err = 0; > > if (XE_IOCTL_DBG(xe, args->extensions) || > > - XE_IOCTL_DBG(xe, args->pad[0] || args->pad[1] || args->pad[2]) || > > - XE_IOCTL_DBG(xe, args->reserved[0] || args->reserved[1])) > > + XE_IOCTL_DBG(xe, args->pad || args->pad2[0] || args->pad2[1] || args->pad2[2]) || > > + XE_IOCTL_DBG(xe, args->reserved[0] || args->reserved[1]) || > > + XE_IOCTL_DBG(xe, args->syncs.flags & ~ALL_DRM_XE_SYNCS_FLAGS) || > > + XE_IOCTL_DBG(xe, wait && args->syncs.num_syncs)) > > return -EINVAL; > > q = xe_exec_queue_lookup(xef, args->exec_queue_id); > > @@ -170,8 +176,9 @@ int xe_exec_ioctl(struct drm_device *dev, void *data, struct drm_file *file) > > goto err_exec_queue; > > } > > - if (args->num_syncs) { > > - syncs = kcalloc(args->num_syncs, sizeof(*syncs), GFP_KERNEL); > > + if (args->syncs.num_syncs) { > > + syncs = kcalloc(args->syncs.num_syncs, sizeof(*syncs), > > + GFP_KERNEL); > > if (!syncs) { > > err = -ENOMEM; > > goto err_exec_queue; > > @@ -180,7 +187,7 @@ int xe_exec_ioctl(struct drm_device *dev, void *data, struct drm_file *file) > > vm = q->vm; > > - for (i = 0; i < args->num_syncs; i++) { > > + for (i = 0; i < args->syncs.num_syncs; i++) { > > err = xe_sync_entry_parse(xe, xef, &syncs[num_syncs++], > > &syncs_user[i], SYNC_PARSE_FLAG_EXEC | > > (xe_vm_in_lr_mode(vm) ? > > @@ -245,9 +252,17 @@ int xe_exec_ioctl(struct drm_device *dev, void *data, struct drm_file *file) > > err = PTR_ERR(fence); > > goto err_exec; > > } > > + > > for (i = 0; i < num_syncs; i++) > > xe_sync_entry_signal(&syncs[i], NULL, fence); > > + > > xe_exec_queue_last_fence_set(q, vm, fence); > > + if (wait) { > > + long timeout = dma_fence_wait(fence, true); > > + > > + if (timeout < 0) > > + err = -EINTR; > > + } > > Here it looks like we will rerun the same IOCTL again if we return -EINTR. > The user-space expected action on -EINTR is to just restart the IOCTL > without any argument changes. Solution is to add an ioctl argument cookie > (or to skip sync vm binds and have the user just use the 0 batch buffers / > vm_binds calls or wait for an out-fence). If you go for the cookie solution > then IMO we should keep the -ERESTARTSYS returned from dma_fence_wait() > since it's converted to -EINTR on return-to-user-space, and the kernel > restarts the IOCTL automatically if there was no requested-for-delivery > signal pending. > > I think the simplest solution at this point is to skip the sync behaviour, > in particular if we enable the 0 batch / bind possibility. > > If we still want to provide it, we could add a cookie address as an > extension to the ioctl and activate sync if present? (Just throwing up ideas > here). > Hmm, forgot about this. A cookie is fairly easy, what about something like this: 807 /** 808 * struct drm_xe_syncs - In / out syncs for IOCTLs. 809 */ 810 struct drm_xe_syncs { 811 /** @num_syncs: amount of syncs to wait on */ 812 __u32 num_syncs; 813 814 /* 815 * Block in IOCTL until operation complete, num_syncs MBZ if set. 816 */ 817 #define DRM_XE_SYNCS_IN_FLAG_WAIT_FOR_OP (1 << 0) 818 /** @in_flags: Input Sync flags */ 819 __u16 in_flags; 820 821 /* 822 * IOCTL operation has started (no need for user to resubmit on 823 * -ERESTARTSYS) 824 */ 825 #define DRM_XE_SYNCS_OUT_FLAG_OP_COMMITTED (1 << 0) 826 /** @out_flags: Output Sync flags */ 827 __u16 out_flags; 828 829 /** @syncs: pointer to struct drm_xe_sync array */ 830 __u64 syncs; 831 832 /** @reserved: Reserved */ 833 __u64 reserved[2]; 834 }; DRM_XE_SYNCS_OUT_FLAG_OP_COMMITTED gets set in exec / bind IOCTL after the job is committed or in the of zero ops last-fence updated on the queue. Note that for binds we don't yet do 1 job per IOCTL but after landing some version of [1] After DRM_XE_SYNCS_OUT_FLAG_OP_COMMITTED is set we return -ERESTARTSYS if the wait is interrupted and -EINTR is still DRM_XE_SYNCS_OUT_FLAG_OP_COMMITTED (interrupted before job is committed). I'd rather go with patch as we have to change the uAPI here regardless so we might as well make this complete. Matt [1] https://patchwork.freedesktop.org/series/125608/ > > dma_fence_put(fence); > > } > > @@ -331,42 +346,51 @@ int xe_exec_ioctl(struct drm_device *dev, void *data, struct drm_file *file) > > * the job and let the DRM scheduler / backend clean up the job. > > */ > > xe_sched_job_arm(job); > > + job_fence = &job->drm.s_fence->finished; > > + if (wait) > > + dma_fence_get(job_fence); > > if (!xe_vm_in_lr_mode(vm)) { > > /* Block userptr invalidations / BO eviction */ > > - dma_resv_add_fence(&vm->resv, > > - &job->drm.s_fence->finished, > > + dma_resv_add_fence(&vm->resv, job_fence, > > DMA_RESV_USAGE_BOOKKEEP); > > /* > > * Make implicit sync work across drivers, assuming all external > > * BOs are written as we don't pass in a read / write list. > > */ > > - xe_vm_fence_all_extobjs(vm, &job->drm.s_fence->finished, > > - DMA_RESV_USAGE_WRITE); > > + xe_vm_fence_all_extobjs(vm, job_fence, DMA_RESV_USAGE_WRITE); > > } > > for (i = 0; i < num_syncs; i++) > > - xe_sync_entry_signal(&syncs[i], job, > > - &job->drm.s_fence->finished); > > + xe_sync_entry_signal(&syncs[i], job, job_fence); > > if (xe_exec_queue_is_lr(q)) > > q->ring_ops->emit_job(job); > > if (!xe_vm_in_lr_mode(vm)) > > - xe_exec_queue_last_fence_set(q, vm, &job->drm.s_fence->finished); > > + xe_exec_queue_last_fence_set(q, vm, job_fence); > > xe_sched_job_push(job); > > xe_vm_reactivate_rebind(vm); > > - if (!err && !xe_vm_in_lr_mode(vm)) { > > + if (!xe_vm_in_lr_mode(vm)) { > > spin_lock(&xe->ttm.lru_lock); > > ttm_lru_bulk_move_tail(&vm->lru_bulk_move); > > spin_unlock(&xe->ttm.lru_lock); > > } > > + skip_job_put = true; > > + if (wait) { > > + long timeout = dma_fence_wait(job_fence, true); > > + > > + dma_fence_put(job_fence); > > + if (timeout < 0) > > + err = -EINTR; > > + } > > + > > err_repin: > > if (!xe_vm_in_lr_mode(vm)) > > up_read(&vm->userptr.notifier_lock); > > err_put_job: > > - if (err) > > + if (err && !skip_job_put) > > xe_sched_job_put(job); > > err_exec: > > drm_exec_fini(&exec); > > diff --git a/drivers/gpu/drm/xe/xe_exec_queue.c b/drivers/gpu/drm/xe/xe_exec_queue.c > > index 3911d14522ee..98776d02d634 100644 > > --- a/drivers/gpu/drm/xe/xe_exec_queue.c > > +++ b/drivers/gpu/drm/xe/xe_exec_queue.c > > @@ -625,10 +625,7 @@ int xe_exec_queue_create_ioctl(struct drm_device *dev, void *data, > > if (XE_IOCTL_DBG(xe, eci[0].gt_id >= xe->info.gt_count)) > > return -EINVAL; > > - if (eci[0].engine_class >= DRM_XE_ENGINE_CLASS_VM_BIND_ASYNC) { > > - bool sync = eci[0].engine_class == > > - DRM_XE_ENGINE_CLASS_VM_BIND_SYNC; > > - > > + if (eci[0].engine_class == DRM_XE_ENGINE_CLASS_VM_BIND) { > > for_each_gt(gt, xe, id) { > > struct xe_exec_queue *new; > > @@ -654,8 +651,6 @@ int xe_exec_queue_create_ioctl(struct drm_device *dev, void *data, > > args->width, hwe, > > EXEC_QUEUE_FLAG_PERSISTENT | > > EXEC_QUEUE_FLAG_VM | > > - (sync ? 0 : > > - EXEC_QUEUE_FLAG_VM_ASYNC) | > > (id ? > > EXEC_QUEUE_FLAG_BIND_ENGINE_CHILD : > > 0)); > > diff --git a/drivers/gpu/drm/xe/xe_exec_queue_types.h b/drivers/gpu/drm/xe/xe_exec_queue_types.h > > index 52f0927d0d9b..c78f6e8b41c4 100644 > > --- a/drivers/gpu/drm/xe/xe_exec_queue_types.h > > +++ b/drivers/gpu/drm/xe/xe_exec_queue_types.h > > @@ -74,8 +74,6 @@ struct xe_exec_queue { > > #define EXEC_QUEUE_FLAG_VM BIT(4) > > /* child of VM queue for multi-tile VM jobs */ > > #define EXEC_QUEUE_FLAG_BIND_ENGINE_CHILD BIT(5) > > -/* VM jobs for this queue are asynchronous */ > > -#define EXEC_QUEUE_FLAG_VM_ASYNC BIT(6) > > /** > > * @flags: flags for this exec queue, should statically setup aside from ban > > diff --git a/drivers/gpu/drm/xe/xe_vm.c b/drivers/gpu/drm/xe/xe_vm.c > > index cf2eb44a71db..4b0c976c003a 100644 > > --- a/drivers/gpu/drm/xe/xe_vm.c > > +++ b/drivers/gpu/drm/xe/xe_vm.c > > @@ -1433,9 +1433,7 @@ struct xe_vm *xe_vm_create(struct xe_device *xe, u32 flags) > > struct xe_gt *gt = tile->primary_gt; > > struct xe_vm *migrate_vm; > > struct xe_exec_queue *q; > > - u32 create_flags = EXEC_QUEUE_FLAG_VM | > > - ((flags & XE_VM_FLAG_ASYNC_DEFAULT) ? > > - EXEC_QUEUE_FLAG_VM_ASYNC : 0); > > + u32 create_flags = EXEC_QUEUE_FLAG_VM; > > if (!vm->pt_root[id]) > > continue; > > @@ -1835,16 +1833,10 @@ xe_vm_bind_vma(struct xe_vma *vma, struct xe_exec_queue *q, > > return ERR_PTR(err); > > } > > -static bool xe_vm_sync_mode(struct xe_vm *vm, struct xe_exec_queue *q) > > -{ > > - return q ? !(q->flags & EXEC_QUEUE_FLAG_VM_ASYNC) : > > - !(vm->flags & XE_VM_FLAG_ASYNC_DEFAULT); > > -} > > - > > static int __xe_vm_bind(struct xe_vm *vm, struct xe_vma *vma, > > struct xe_exec_queue *q, struct xe_sync_entry *syncs, > > u32 num_syncs, bool immediate, bool first_op, > > - bool last_op) > > + bool last_op, bool async) > > { > > struct dma_fence *fence; > > struct xe_exec_queue *wait_exec_queue = to_wait_exec_queue(vm, q); > > @@ -1870,7 +1862,7 @@ static int __xe_vm_bind(struct xe_vm *vm, struct xe_vma *vma, > > if (last_op) > > xe_exec_queue_last_fence_set(wait_exec_queue, vm, fence); > > - if (last_op && xe_vm_sync_mode(vm, q)) > > + if (last_op && !async) > > dma_fence_wait(fence, true); > > dma_fence_put(fence); > > @@ -1880,7 +1872,7 @@ static int __xe_vm_bind(struct xe_vm *vm, struct xe_vma *vma, > > static int xe_vm_bind(struct xe_vm *vm, struct xe_vma *vma, struct xe_exec_queue *q, > > struct xe_bo *bo, struct xe_sync_entry *syncs, > > u32 num_syncs, bool immediate, bool first_op, > > - bool last_op) > > + bool last_op, bool async) > > { > > int err; > > @@ -1894,12 +1886,12 @@ static int xe_vm_bind(struct xe_vm *vm, struct xe_vma *vma, struct xe_exec_queue > > } > > return __xe_vm_bind(vm, vma, q, syncs, num_syncs, immediate, first_op, > > - last_op); > > + last_op, async); > > } > > static int xe_vm_unbind(struct xe_vm *vm, struct xe_vma *vma, > > struct xe_exec_queue *q, struct xe_sync_entry *syncs, > > - u32 num_syncs, bool first_op, bool last_op) > > + u32 num_syncs, bool first_op, bool last_op, bool async) > > { > > struct dma_fence *fence; > > struct xe_exec_queue *wait_exec_queue = to_wait_exec_queue(vm, q); > > @@ -1914,7 +1906,7 @@ static int xe_vm_unbind(struct xe_vm *vm, struct xe_vma *vma, > > xe_vma_destroy(vma, fence); > > if (last_op) > > xe_exec_queue_last_fence_set(wait_exec_queue, vm, fence); > > - if (last_op && xe_vm_sync_mode(vm, q)) > > + if (last_op && !async) > > dma_fence_wait(fence, true); > > It looks like we're dropping the error return code here. > > > > dma_fence_put(fence); > > @@ -1923,7 +1915,6 @@ static int xe_vm_unbind(struct xe_vm *vm, struct xe_vma *vma, > > #define ALL_DRM_XE_VM_CREATE_FLAGS (DRM_XE_VM_CREATE_FLAG_SCRATCH_PAGE | \ > > DRM_XE_VM_CREATE_FLAG_LR_MODE | \ > > - DRM_XE_VM_CREATE_FLAG_ASYNC_DEFAULT | \ > > DRM_XE_VM_CREATE_FLAG_FAULT_MODE) > > int xe_vm_create_ioctl(struct drm_device *dev, void *data, > > @@ -1977,8 +1968,6 @@ int xe_vm_create_ioctl(struct drm_device *dev, void *data, > > flags |= XE_VM_FLAG_SCRATCH_PAGE; > > if (args->flags & DRM_XE_VM_CREATE_FLAG_LR_MODE) > > flags |= XE_VM_FLAG_LR_MODE; > > - if (args->flags & DRM_XE_VM_CREATE_FLAG_ASYNC_DEFAULT) > > - flags |= XE_VM_FLAG_ASYNC_DEFAULT; > > if (args->flags & DRM_XE_VM_CREATE_FLAG_FAULT_MODE) > > flags |= XE_VM_FLAG_FAULT_MODE; > > @@ -2062,7 +2051,7 @@ static const u32 region_to_mem_type[] = { > > static int xe_vm_prefetch(struct xe_vm *vm, struct xe_vma *vma, > > struct xe_exec_queue *q, u32 region, > > struct xe_sync_entry *syncs, u32 num_syncs, > > - bool first_op, bool last_op) > > + bool first_op, bool last_op, bool async) > > { > > struct xe_exec_queue *wait_exec_queue = to_wait_exec_queue(vm, q); > > int err; > > @@ -2077,7 +2066,7 @@ static int xe_vm_prefetch(struct xe_vm *vm, struct xe_vma *vma, > > if (vma->tile_mask != (vma->tile_present & ~vma->usm.tile_invalidated)) { > > return xe_vm_bind(vm, vma, q, xe_vma_bo(vma), syncs, num_syncs, > > - true, first_op, last_op); > > + true, first_op, last_op, async); > > } else { > > int i; > > @@ -2400,6 +2389,8 @@ static int vm_bind_ioctl_ops_parse(struct xe_vm *vm, struct xe_exec_queue *q, > > } > > op->q = q; > > + if (async) > > + op->flags |= XE_VMA_OP_ASYNC; > > switch (op->base.op) { > > case DRM_GPUVA_OP_MAP: > > @@ -2538,7 +2529,8 @@ static int op_execute(struct drm_exec *exec, struct xe_vm *vm, > > op->syncs, op->num_syncs, > > op->map.immediate || !xe_vm_in_fault_mode(vm), > > op->flags & XE_VMA_OP_FIRST, > > - op->flags & XE_VMA_OP_LAST); > > + op->flags & XE_VMA_OP_LAST, > > + op->flags & XE_VMA_OP_ASYNC); > > break; > > case DRM_GPUVA_OP_REMAP: > > { > > @@ -2552,7 +2544,8 @@ static int op_execute(struct drm_exec *exec, struct xe_vm *vm, > > op->num_syncs, > > op->flags & XE_VMA_OP_FIRST, > > op->flags & XE_VMA_OP_LAST && > > - !prev && !next); > > + !prev && !next, > > + op->flags & XE_VMA_OP_ASYNC); > > if (err) > > break; > > op->remap.unmap_done = true; > > @@ -2563,7 +2556,8 @@ static int op_execute(struct drm_exec *exec, struct xe_vm *vm, > > err = xe_vm_bind(vm, op->remap.prev, op->q, > > xe_vma_bo(op->remap.prev), op->syncs, > > op->num_syncs, true, false, > > - op->flags & XE_VMA_OP_LAST && !next); > > + op->flags & XE_VMA_OP_LAST && !next, > > + op->flags & XE_VMA_OP_ASYNC); > > op->remap.prev->gpuva.flags &= ~XE_VMA_LAST_REBIND; > > if (err) > > break; > > @@ -2576,7 +2570,8 @@ static int op_execute(struct drm_exec *exec, struct xe_vm *vm, > > xe_vma_bo(op->remap.next), > > op->syncs, op->num_syncs, > > true, false, > > - op->flags & XE_VMA_OP_LAST); > > + op->flags & XE_VMA_OP_LAST, > > + op->flags & XE_VMA_OP_ASYNC); > > op->remap.next->gpuva.flags &= ~XE_VMA_LAST_REBIND; > > if (err) > > break; > > @@ -2588,13 +2583,15 @@ static int op_execute(struct drm_exec *exec, struct xe_vm *vm, > > case DRM_GPUVA_OP_UNMAP: > > err = xe_vm_unbind(vm, vma, op->q, op->syncs, > > op->num_syncs, op->flags & XE_VMA_OP_FIRST, > > - op->flags & XE_VMA_OP_LAST); > > + op->flags & XE_VMA_OP_LAST, > > + op->flags & XE_VMA_OP_ASYNC); > > break; > > case DRM_GPUVA_OP_PREFETCH: > > err = xe_vm_prefetch(vm, vma, op->q, op->prefetch.region, > > op->syncs, op->num_syncs, > > op->flags & XE_VMA_OP_FIRST, > > - op->flags & XE_VMA_OP_LAST); > > + op->flags & XE_VMA_OP_LAST, > > + op->flags & XE_VMA_OP_ASYNC); > > break; > > default: > > drm_warn(&vm->xe->drm, "NOT POSSIBLE"); > > @@ -2808,16 +2805,16 @@ static int vm_bind_ioctl_ops_execute(struct xe_vm *vm, > > #ifdef TEST_VM_ASYNC_OPS_ERROR > > #define SUPPORTED_FLAGS \ > > - (FORCE_ASYNC_OP_ERROR | DRM_XE_VM_BIND_FLAG_ASYNC | \ > > - DRM_XE_VM_BIND_FLAG_READONLY | DRM_XE_VM_BIND_FLAG_IMMEDIATE | \ > > - DRM_XE_VM_BIND_FLAG_NULL | 0xffff) > > + (FORCE_ASYNC_OP_ERROR | DRM_XE_VM_BIND_FLAG_READONLY | \ > > + DRM_XE_VM_BIND_FLAG_IMMEDIATE | DRM_XE_VM_BIND_FLAG_NULL | 0xffff) > > #else > > #define SUPPORTED_FLAGS \ > > - (DRM_XE_VM_BIND_FLAG_ASYNC | DRM_XE_VM_BIND_FLAG_READONLY | \ > > + (DRM_XE_VM_BIND_FLAG_READONLY | \ > > DRM_XE_VM_BIND_FLAG_IMMEDIATE | DRM_XE_VM_BIND_FLAG_NULL | \ > > 0xffff) > > #endif > > #define XE_64K_PAGE_MASK 0xffffull > > +#define ALL_DRM_XE_SYNCS_FLAGS (DRM_XE_SYNCS_FLAG_WAIT_FOR_OP) > > #define MAX_BINDS 512 /* FIXME: Picking random upper limit */ > > @@ -2829,7 +2826,7 @@ static int vm_bind_ioctl_check_args(struct xe_device *xe, > > int err; > > int i; > > - if (XE_IOCTL_DBG(xe, args->pad || args->pad2) || > > + if (XE_IOCTL_DBG(xe, args->pad) || > > XE_IOCTL_DBG(xe, args->reserved[0] || args->reserved[1])) > > return -EINVAL; > > @@ -2857,6 +2854,14 @@ static int vm_bind_ioctl_check_args(struct xe_device *xe, > > *bind_ops = &args->bind; > > } > > + *async = !(args->syncs.flags & DRM_XE_SYNCS_FLAG_WAIT_FOR_OP); > > + > > + if (XE_IOCTL_DBG(xe, args->syncs.flags & ~ALL_DRM_XE_SYNCS_FLAGS) || > > + XE_IOCTL_DBG(xe, !*async && args->syncs.num_syncs)) { > > + err = -EINVAL; > > + goto free_bind_ops; > > + } > > + > > for (i = 0; i < args->num_binds; ++i) { > > u64 range = (*bind_ops)[i].range; > > u64 addr = (*bind_ops)[i].addr; > > @@ -2887,18 +2892,6 @@ static int vm_bind_ioctl_check_args(struct xe_device *xe, > > goto free_bind_ops; > > } > > - if (i == 0) { > > - *async = !!(flags & DRM_XE_VM_BIND_FLAG_ASYNC); > > - if (XE_IOCTL_DBG(xe, !*async && args->num_syncs)) { > > - err = -EINVAL; > > - goto free_bind_ops; > > - } > > - } else if (XE_IOCTL_DBG(xe, *async != > > - !!(flags & DRM_XE_VM_BIND_FLAG_ASYNC))) { > > - err = -EINVAL; > > - goto free_bind_ops; > > - } > > - > > if (XE_IOCTL_DBG(xe, op > DRM_XE_VM_BIND_OP_PREFETCH) || > > XE_IOCTL_DBG(xe, flags & ~SUPPORTED_FLAGS) || > > XE_IOCTL_DBG(xe, obj && is_null) || > > @@ -2951,7 +2944,7 @@ static int vm_bind_ioctl_check_args(struct xe_device *xe, > > static int vm_bind_ioctl_signal_fences(struct xe_vm *vm, > > struct xe_exec_queue *q, > > struct xe_sync_entry *syncs, > > - int num_syncs) > > + int num_syncs, bool async) > > { > > struct dma_fence *fence; > > int i, err = 0; > > @@ -2967,7 +2960,7 @@ static int vm_bind_ioctl_signal_fences(struct xe_vm *vm, > > xe_exec_queue_last_fence_set(to_wait_exec_queue(vm, q), vm, > > fence); > > - if (xe_vm_sync_mode(vm, q)) { > > + if (!async) { > > long timeout = dma_fence_wait(fence, true); > > if (timeout < 0) > > @@ -3001,7 +2994,7 @@ int xe_vm_bind_ioctl(struct drm_device *dev, void *data, struct drm_file *file) > > if (err) > > return err; > > - if (XE_IOCTL_DBG(xe, args->pad || args->pad2) || > > + if (XE_IOCTL_DBG(xe, args->pad) || > > XE_IOCTL_DBG(xe, args->reserved[0] || args->reserved[1])) > > return -EINVAL; > > @@ -3016,12 +3009,6 @@ int xe_vm_bind_ioctl(struct drm_device *dev, void *data, struct drm_file *file) > > err = -EINVAL; > > goto put_exec_queue; > > } > > - > > - if (XE_IOCTL_DBG(xe, args->num_binds && async != > > - !!(q->flags & EXEC_QUEUE_FLAG_VM_ASYNC))) { > > - err = -EINVAL; > > - goto put_exec_queue; > > - } > > } > > vm = xe_vm_lookup(xef, args->vm_id); > > @@ -3030,14 +3017,6 @@ int xe_vm_bind_ioctl(struct drm_device *dev, void *data, struct drm_file *file) > > goto put_exec_queue; > > } > > - if (!args->exec_queue_id) { > > - if (XE_IOCTL_DBG(xe, args->num_binds && async != > > - !!(vm->flags & XE_VM_FLAG_ASYNC_DEFAULT))) { > > - err = -EINVAL; > > - goto put_vm; > > - } > > - } > > - > > err = down_write_killable(&vm->lock); > > if (err) > > goto put_vm; > > @@ -3127,16 +3106,16 @@ int xe_vm_bind_ioctl(struct drm_device *dev, void *data, struct drm_file *file) > > } > > } > > - if (args->num_syncs) { > > - syncs = kcalloc(args->num_syncs, sizeof(*syncs), GFP_KERNEL); > > + if (args->syncs.num_syncs) { > > + syncs = kcalloc(args->syncs.num_syncs, sizeof(*syncs), GFP_KERNEL); > > if (!syncs) { > > err = -ENOMEM; > > goto put_obj; > > } > > } > > - syncs_user = u64_to_user_ptr(args->syncs); > > - for (num_syncs = 0; num_syncs < args->num_syncs; num_syncs++) { > > + syncs_user = u64_to_user_ptr(args->syncs.syncs); > > + for (num_syncs = 0; num_syncs < args->syncs.num_syncs; num_syncs++) { > > err = xe_sync_entry_parse(xe, xef, &syncs[num_syncs], > > &syncs_user[num_syncs], > > (xe_vm_in_lr_mode(vm) ? > > @@ -3210,7 +3189,8 @@ int xe_vm_bind_ioctl(struct drm_device *dev, void *data, struct drm_file *file) > > vm_bind_ioctl_ops_unwind(vm, ops, args->num_binds); > > free_syncs: > > if (err == -ENODATA) > > - err = vm_bind_ioctl_signal_fences(vm, q, syncs, num_syncs); > > + err = vm_bind_ioctl_signal_fences(vm, q, syncs, num_syncs, > > + async); > > while (num_syncs--) > > xe_sync_entry_cleanup(&syncs[num_syncs]); > > diff --git a/drivers/gpu/drm/xe/xe_vm_types.h b/drivers/gpu/drm/xe/xe_vm_types.h > > index 23abdfd8622f..ce8b9bde7e9c 100644 > > --- a/drivers/gpu/drm/xe/xe_vm_types.h > > +++ b/drivers/gpu/drm/xe/xe_vm_types.h > > @@ -167,13 +167,12 @@ struct xe_vm { > > */ > > #define XE_VM_FLAG_64K BIT(0) > > #define XE_VM_FLAG_LR_MODE BIT(1) > > -#define XE_VM_FLAG_ASYNC_DEFAULT BIT(2) > > -#define XE_VM_FLAG_MIGRATION BIT(3) > > -#define XE_VM_FLAG_SCRATCH_PAGE BIT(4) > > -#define XE_VM_FLAG_FAULT_MODE BIT(5) > > -#define XE_VM_FLAG_BANNED BIT(6) > > -#define XE_VM_FLAG_TILE_ID(flags) FIELD_GET(GENMASK(8, 7), flags) > > -#define XE_VM_FLAG_SET_TILE_ID(tile) FIELD_PREP(GENMASK(8, 7), (tile)->id) > > +#define XE_VM_FLAG_MIGRATION BIT(2) > > +#define XE_VM_FLAG_SCRATCH_PAGE BIT(3) > > +#define XE_VM_FLAG_FAULT_MODE BIT(4) > > +#define XE_VM_FLAG_BANNED BIT(5) > > +#define XE_VM_FLAG_TILE_ID(flags) FIELD_GET(GENMASK(7, 6), flags) > > +#define XE_VM_FLAG_SET_TILE_ID(tile) FIELD_PREP(GENMASK(7, 6), (tile)->id) > > unsigned long flags; > > /** @composite_fence_ctx: context composite fence */ > > @@ -385,6 +384,8 @@ enum xe_vma_op_flags { > > XE_VMA_OP_PREV_COMMITTED = BIT(3), > > /** @XE_VMA_OP_NEXT_COMMITTED: Next VMA operation committed */ > > XE_VMA_OP_NEXT_COMMITTED = BIT(4), > > + /** @XE_VMA_OP_ASYNC: operation is async */ > > + XE_VMA_OP_ASYNC = BIT(5), > > }; > > /** struct xe_vma_op - VMA operation */ > > diff --git a/include/uapi/drm/xe_drm.h b/include/uapi/drm/xe_drm.h > > index eb03a49c17a1..fd8172fe2d9a 100644 > > --- a/include/uapi/drm/xe_drm.h > > +++ b/include/uapi/drm/xe_drm.h > > @@ -141,8 +141,7 @@ struct drm_xe_engine_class_instance { > > * Kernel only classes (not actual hardware engine class). Used for > > * creating ordered queues of VM bind operations. > > */ > > -#define DRM_XE_ENGINE_CLASS_VM_BIND_ASYNC 5 > > -#define DRM_XE_ENGINE_CLASS_VM_BIND_SYNC 6 > > +#define DRM_XE_ENGINE_CLASS_VM_BIND 5 > > __u16 engine_class; > > __u16 engine_instance; > > @@ -660,7 +659,6 @@ struct drm_xe_vm_create { > > * still enable recoverable pagefaults if supported by the device. > > */ > > #define DRM_XE_VM_CREATE_FLAG_LR_MODE (1 << 1) > > -#define DRM_XE_VM_CREATE_FLAG_ASYNC_DEFAULT (1 << 2) > > /* > > * DRM_XE_VM_CREATE_FLAG_FAULT_MODE requires also > > * DRM_XE_VM_CREATE_FLAG_LR_MODE. It allows memory to be allocated > > @@ -668,7 +666,7 @@ struct drm_xe_vm_create { > > * The xe driver internally uses recoverable pagefaults to implement > > * this. > > */ > > -#define DRM_XE_VM_CREATE_FLAG_FAULT_MODE (1 << 3) > > +#define DRM_XE_VM_CREATE_FLAG_FAULT_MODE (1 << 2) > > /** @flags: Flags */ > > __u32 flags; > > @@ -776,12 +774,11 @@ struct drm_xe_vm_bind_op { > > __u32 op; > > #define DRM_XE_VM_BIND_FLAG_READONLY (1 << 0) > > -#define DRM_XE_VM_BIND_FLAG_ASYNC (1 << 1) > > /* > > * Valid on a faulting VM only, do the MAP operation immediately rather > > * than deferring the MAP to the page fault handler. > > */ > > -#define DRM_XE_VM_BIND_FLAG_IMMEDIATE (1 << 2) > > +#define DRM_XE_VM_BIND_FLAG_IMMEDIATE (1 << 1) > > /* > > * When the NULL flag is set, the page tables are setup with a special > > * bit which indicates writes are dropped and all reads return zero. In > > @@ -789,7 +786,7 @@ struct drm_xe_vm_bind_op { > > * operations, the BO handle MBZ, and the BO offset MBZ. This flag is > > * intended to implement VK sparse bindings. > > */ > > -#define DRM_XE_VM_BIND_FLAG_NULL (1 << 3) > > +#define DRM_XE_VM_BIND_FLAG_NULL (1 << 2) > > /** @flags: Bind flags */ > > __u32 flags; > > @@ -807,6 +804,27 @@ struct drm_xe_vm_bind_op { > > __u64 reserved[3]; > > }; > > +/** > > + * struct drm_xe_syncs - In / out syncs for IOCTLs. > > + */ > > +struct drm_xe_syncs { > > + /** @num_syncs: amount of syncs to wait on */ > > + __u32 num_syncs; > > + > > + /* > > + * Block in IOCTL until operation complete, num_syncs MBZ if set. > > + */ > > +#define DRM_XE_SYNCS_FLAG_WAIT_FOR_OP (1 << 0) > > + /** @flags: Sync flags */ > > + __u32 flags; > > + > > + /** @syncs: pointer to struct drm_xe_sync array */ > > + __u64 syncs; > > + > > + /** @reserved: Reserved */ > > + __u64 reserved[2]; > > +}; > > + > > struct drm_xe_vm_bind { > > /** @extensions: Pointer to the first extension struct, if any */ > > __u64 extensions; > > @@ -838,14 +856,8 @@ struct drm_xe_vm_bind { > > __u64 vector_of_binds; > > }; > > - /** @pad: MBZ */ > > - __u32 pad2; > > - > > - /** @num_syncs: amount of syncs to wait on */ > > - __u32 num_syncs; > > - > > - /** @syncs: pointer to struct drm_xe_sync array */ > > - __u64 syncs; > > + /** @syncs: syncs for bind */ > > + struct drm_xe_syncs syncs; > > /** @reserved: Reserved */ > > __u64 reserved[2]; > > @@ -974,14 +986,14 @@ struct drm_xe_exec { > > /** @extensions: Pointer to the first extension struct, if any */ > > __u64 extensions; > > + /** @pad: MBZ */ > > + __u32 pad; > > + > > /** @exec_queue_id: Exec queue ID for the batch buffer */ > > __u32 exec_queue_id; > > - /** @num_syncs: Amount of struct drm_xe_sync in array. */ > > - __u32 num_syncs; > > - > > - /** @syncs: Pointer to struct drm_xe_sync array. */ > > - __u64 syncs; > > + /** @syncs: syncs for exec */ > > + struct drm_xe_syncs syncs; > > /** > > * @address: address of batch buffer if num_batch_buffer == 1 or an > > @@ -995,8 +1007,8 @@ struct drm_xe_exec { > > */ > > __u16 num_batch_buffer; > > - /** @pad: MBZ */ > > - __u16 pad[3]; > > + /** @pad2: MBZ */ > > + __u16 pad2[3]; > > /** @reserved: Reserved */ > > __u64 reserved[2];