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 5EC89C7EE23 for ; Fri, 9 Jun 2023 03:28:44 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 358CA10E099; Fri, 9 Jun 2023 03:28:44 +0000 (UTC) Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by gabe.freedesktop.org (Postfix) with ESMTPS id C1D3B10E0A5 for ; Fri, 9 Jun 2023 03:28:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1686281322; x=1717817322; h=date:from:to:cc:subject:message-id:references: in-reply-to:mime-version; bh=GliDrA8e0ZFSGPfoTjaz9WkuYoWHtxYAkm/m+zrgBuE=; b=k9IVtPgUaa11hmYZTFaKf3R5RC2tV8s6OjIjjfmU65aHVEYSFiX+tQbT ZVLnvTmpjQn6szzPLNWEPAlSyxXVim8+mftL0VKIz/znRkY7YJWy1s1gS 6BBXqh5o2ylLXZ3VCghL2YlWxewE/A+0bsGQW6w90pHXHyjRBVaHCG16a B7/rBBMJ6vFCcgQiC6xUFjJ1TN4F6L4Exieus3mBM8IlyUUaGxBBAWTd5 fFCrBpJcV6Ts/31CFS2Gk58lXG8pImVpA/6oScFXrWQGW3xHMEnYT2+8v SkPyPKtKj2Eg20oZ4En+1Ye/hVj8kauYPQlLvWNb+gBgmlXMifDSDKd/H g==; X-IronPort-AV: E=McAfee;i="6600,9927,10735"; a="443869205" X-IronPort-AV: E=Sophos;i="6.00,228,1681196400"; d="scan'208";a="443869205" Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 08 Jun 2023 20:28:42 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10735"; a="780138617" X-IronPort-AV: E=Sophos;i="6.00,228,1681196400"; d="scan'208";a="780138617" Received: from fmsmsx601.amr.corp.intel.com ([10.18.126.81]) by fmsmga004.fm.intel.com with ESMTP; 08 Jun 2023 20:28:42 -0700 Received: from fmsmsx610.amr.corp.intel.com (10.18.126.90) by fmsmsx601.amr.corp.intel.com (10.18.126.81) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.23; Thu, 8 Jun 2023 20:28:41 -0700 Received: from fmsmsx610.amr.corp.intel.com (10.18.126.90) by fmsmsx610.amr.corp.intel.com (10.18.126.90) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.23; Thu, 8 Jun 2023 20:28:40 -0700 Received: from FMSEDG603.ED.cps.intel.com (10.1.192.133) by fmsmsx610.amr.corp.intel.com (10.18.126.90) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.23 via Frontend Transport; Thu, 8 Jun 2023 20:28:40 -0700 Received: from NAM10-BN7-obe.outbound.protection.outlook.com (104.47.70.102) by edgegateway.intel.com (192.55.55.68) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2507.23; Thu, 8 Jun 2023 20:28:39 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=O3FeGKvw7vzMAjlSnyHnrHCEU0MfgnKjphfx3dNUqHk9dCjIkXBdTFEt0Vi1N5uX+sa/qua2OD8a+sgMcsdEquNH0xgilKvl82VuyJLPHZsHVvbtQLN66PnandtpIrxaSReCYjxbycGsPXhpxHai0ZNa0oPBy8TN7e7Dt1SdXp3jjlE5hSxwS78J6Jpde3dbG0QP7+fUTJgjzOJ3YNVkrxVjHQHdC8JmZIUQtwDBsCsn65tgi0VMuLA3xCmPyFL5wNJAJkAbD0vM3gAjGGc0PNTF5V7NFR4cmbHXL4wB22FouqOjuddw9+wyYtZcm68JXOE789uxXW3gZBKj6VJmEQ== 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=xhU2rHQbNkFoSWPbMP3ILIwBRJb7Vww/SL6/jaPJVM4=; b=WvxegNwTv1iJbkKcrfzMIIV1DGJjiqiWAc8J7EbIvneRcAX0WTpBX0o1yTSrxTKJrT43v7GW2SvXzBTytpOVhnqR9kQOTjAPq7W5k6Iz+Rf5N5cSMRu+JiP1JBSH6CKjmKT+fPxCu1UEIQwr3QUZ9nl8XdOHkoKDBmEHl4CjSKXsUgM9YKDYaVuBqir+D13ONVyvGLXvl8U2jZ/KpQx3wx4H2TCi1xMOdIAIXu5txzLnWrRTgw/zZAVSzcPZ46TsGWMVRuksFGjh/zZsc65/l9t9VwWvIGMJNaTiciYk05ks6RJj6kG0pZXdj4NJpxPy6PUmS+KN+wJZ0cn4gax1qA== 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 LV2PR11MB6023.namprd11.prod.outlook.com (2603:10b6:408:17b::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6455.32; Fri, 9 Jun 2023 03:28:39 +0000 Received: from PH7PR11MB6522.namprd11.prod.outlook.com ([fe80::ff06:a115:e4eb:680e]) by PH7PR11MB6522.namprd11.prod.outlook.com ([fe80::ff06:a115:e4eb:680e%5]) with mapi id 15.20.6455.030; Fri, 9 Jun 2023 03:28:39 +0000 Date: Fri, 9 Jun 2023 03:28:07 +0000 From: Matthew Brost To: "Welty, Brian" Message-ID: References: <20230608050333.37581-1-matthew.brost@intel.com> <20230608050333.37581-4-matthew.brost@intel.com> <2d909a53-2be7-0126-9e6d-d01116ec2164@intel.com> Content-Type: text/plain; charset="us-ascii" Content-Disposition: inline In-Reply-To: <2d909a53-2be7-0126-9e6d-d01116ec2164@intel.com> X-ClientProxiedBy: SJ0PR05CA0188.namprd05.prod.outlook.com (2603:10b6:a03:330::13) To PH7PR11MB6522.namprd11.prod.outlook.com (2603:10b6:510:212::12) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: PH7PR11MB6522:EE_|LV2PR11MB6023:EE_ X-MS-Office365-Filtering-Correlation-Id: 62c0e8c9-7f63-4d91-6a9b-08db68999db8 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Jf1Z+EJMh05mLgXE8gLNZxU6wF1sEZnT/t9tiCcsyd2htPOjoUxfWt8wyOAlkYpGK9M3lhxBBGdMiCAwnUll8oZKG21QNhp7hOgtKY1jS96mrgRvS5YAukeF7zHxkcO74DinMXzuIE7tPE+0Kon3YRJYv959IC5NkXPB7bGc5gxumu+Zblk5QM6VDsWtvHdDHcf3OlxZy+m7kpYYP1ANawij4kuiThFfllFdPF6n7tHbUldu+vZE7ZEqsttm1EOhbVXoqI+eNOctfBHdHL4AlwvuBN02IdzGT6U1E4OGxR/hctZOxiqXBH21bHXNs05HwoxXoOq/1qm9XmOExs7Z/uhXKWQb8tRYkMW4ihOaP8W+uSnRX0sNILar+2iAQUABsWljPpVO9zEhqOvKQ7Z9sCLGXXaVDrN3DdBs/syKostzm12fg12GM8QToUW8OPsdSz2bhZLzgHGl0Xt/VXV2kIKlu0Y2Fy9m4vnceKoLvPuh65khNXANvJLWnmWp/nCRhiai9yfVmOXf0HS2A4DAgatCE1v9J6libMi4RB+39i9cyWd5NskiAMY4hu0sXIvG 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:(13230028)(346002)(39860400002)(136003)(366004)(376002)(396003)(451199021)(6512007)(26005)(6506007)(53546011)(38100700002)(83380400001)(41300700001)(6486002)(6666004)(186003)(107886003)(478600001)(66476007)(6636002)(66556008)(66946007)(82960400001)(4326008)(316002)(6862004)(44832011)(8676002)(30864003)(2906002)(86362001)(5660300002)(8936002); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?mopk/6MJuNOv9nWz7pZEWWzrisWkAIGpegy7OlsBHqy+DSsfNDeutl3Fy1Ik?= =?us-ascii?Q?xC/miMrONCQKiVPYfCyx6fWOAddEJuveG3x2thNENmhLF3xSE7pAy9AQFaf+?= =?us-ascii?Q?59fgJcfDlFVM9AGGOJzXuRLM4Fk8PxBh7RQ9Hz0EyfGfWSDeBWVORf5FF/U5?= =?us-ascii?Q?Y7KgO3IyGrGIIX32ekGu0Opc4iV0trjX4fslEi0NF4RZTOvalA3nHs9KqPUL?= =?us-ascii?Q?VUhBLPatU3H5SRtDdj2ss8RAC/XHgwcdFllWtWhf+Jul+gVz3ZIUBJ8On1t3?= =?us-ascii?Q?W9RM3eGzPoAGqCA4DNFyykUkS3SNf7FLPGGF5DvMj7YNtlRZjhtEhT8N90mi?= =?us-ascii?Q?zm7W1Psi4Zmu1WNdmyiTiLFvDuw/GJcDZovQ0R3XzUYzq9y2Y6oM/3mCOkjv?= =?us-ascii?Q?UiMbvUCjoDTXbq4wegvKbbWRKg/WK6qm/6//VTWuRDdoOEFlWqVQCCZeO6Dr?= =?us-ascii?Q?wMatvzvYn0guU53nm6XUOsIeZYShbyqtVTn1C+8y5ZnvLkMBQcDmrO6yGerz?= =?us-ascii?Q?a2s3guN2RikKm7dMOtevlj8DiZNTve22uZBRmIxIwEIAsfUufkYYLqcZ7QTZ?= =?us-ascii?Q?4FCJ6v23ZN2TZ36xYvALXuYjHFLtP4sdtUzBIk6rlB7kdP7r6p1Hc5g9Yvsn?= =?us-ascii?Q?ffwKFGF5oMESoXrwctlb51xj2xpM2DdjCu1LxKdvqJkA5h2lj+/YJsK4iXfP?= =?us-ascii?Q?KdzY8oYp19cId6uni36PnFd5+I2YxtujRJ+dl4JuoQ300Jcq/ivnUne3tKhq?= =?us-ascii?Q?2h7dKb1RIBvudWTehiJzHJkm+34osDvjNCSK/XL0b8Z1j0K7ULK50T+Jzkwy?= =?us-ascii?Q?JUz6bUsDhSDGdpiZ3umlgmeTbDpUihg6C9J2Uw75HDLcqj5QEhCFNRH+lXcs?= =?us-ascii?Q?7BMvbGwyrPzBciH4qUQ3oM9DVrAifd/e1LgSgiUtcAuJkFyFtopt07Hm6crq?= =?us-ascii?Q?kQfPelWEdXZT+suMyWcoizjvEzGaOICrB1WOW8CbaJNtn4B/aUXe+SzbgqAj?= =?us-ascii?Q?4aIFBp+PsPXZgV33t4XNGgqyvR8J8QUXgur+JHB4WVM0IbG4Jv8tUb+7qzuu?= =?us-ascii?Q?qd2D830CVGQbWqGe9TfxcnJ1XjnE+hnd6672Bdv5YNDSr5ylmmx8J+79YR3j?= =?us-ascii?Q?5yFjWtBSHYmWoY4hIfnBXc+ZterMGJDdzaRasjxXmTAmoOHCJii3MIUWpYwf?= =?us-ascii?Q?5dPXQWMDTrbwaKTp+QYdggDtUJyg5zpHCG2uY1r/fKmDLJEib+gk1RJMdYuR?= =?us-ascii?Q?hYTH0Xoj3dZ/eROEOZnOY7R7mfWj8uJ49sIQ/pgxj6gT10fQ5/rxlcLU54rK?= =?us-ascii?Q?/T1J0wVwtQfNmwEK+LvgkTk/yeIvo1UXySb/J8pofvSaYTAVxHc7+R9zZqmM?= =?us-ascii?Q?qOEhvKCBlMrr9VncedvQWd6/fK7xIionCAo518+FRpagNHakG0efVNDVFpbH?= =?us-ascii?Q?0I3Yz4m4AWzsok8YuynynuTFnYiM29fUyJhfqqKdHnQ2vIacsxzjn4EcPGJ0?= =?us-ascii?Q?GWUb2ZMbT4qWcj95QuuvtniFN2IVm7juuHO0TcRmMOAScF/aS0dKpYUkoC4p?= =?us-ascii?Q?++2ktMLj4eD+EFK1Ptlkpuly5lVkVg2OvSSzm8Clylgj/4y2y4l2jMAM8g+E?= =?us-ascii?Q?GQ=3D=3D?= X-MS-Exchange-CrossTenant-Network-Message-Id: 62c0e8c9-7f63-4d91-6a9b-08db68999db8 X-MS-Exchange-CrossTenant-AuthSource: PH7PR11MB6522.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Jun 2023 03:28:39.0304 (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: EIRy4RHAbtcrrfMf0E9u0/XdBQ9sr47jqPoCL0qSr0pgVeoBdx7hOvSDnOddwWOSd0WBBqmpx1ey4jFd14LuLA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: LV2PR11MB6023 X-OriginatorOrg: intel.com Subject: Re: [Intel-xe] [PATCH 3/3] drm/xe: NULL binding implementation 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: intel-xe@lists.freedesktop.org, Paulo Zanoni Errors-To: intel-xe-bounces@lists.freedesktop.org Sender: "Intel-xe" On Thu, Jun 08, 2023 at 01:59:18PM -0700, Welty, Brian wrote: > > > On 6/7/2023 10:03 PM, Matthew Brost wrote: > > Add uAPI and implementation for NULL bindings. A NULL binding is defined > > as writes dropped and read zero. A single bit in the uAPI has been added > > which results in a single bit in the PTEs being set. > > > Since there won't ever be any backing store for these entries, we don't > really need a xe_vma created.... > If lots of sparse bindings, nice if can avoid the almost useless xe_vma > structure. Is an efficient implementation possible that updates PT without > needing and keeping the xe_vma structures here? And mark the address as in > use with some other type of bookkeeping? > Maybe you still create temporary xe_vma only for calling > __xe_pt_bind_vma() but then can free it after that? > > Maybe that means you can't support UNBIND of sparse entries, or would > certainly complicate it. > This doesn't really work with partial binds / unbinds (mmap / munmap semantics) or GPUVA. We need a VMA / GPUVA in the tracking structure. FWIW, the GPUVA series does a lot of work to reduce the VMA size. > > > > NULL bindings are indended to be used to implement VK sparse bindings, > > typo above with 'intended' > Yea checkpatch caught this too, fixed locally. Matt > > -Brian > > > > in particular residencyNonResidentStrict property. > > > > Suggested-by: Paulo Zanoni > > Signed-off-by: Matthew Brost > > --- > > drivers/gpu/drm/xe/xe_bo.h | 1 + > > drivers/gpu/drm/xe/xe_exec.c | 2 + > > drivers/gpu/drm/xe/xe_gt_pagefault.c | 4 +- > > drivers/gpu/drm/xe/xe_pt.c | 71 +++++++++++++++------ > > drivers/gpu/drm/xe/xe_vm.c | 95 ++++++++++++++++++---------- > > drivers/gpu/drm/xe/xe_vm.h | 12 +++- > > drivers/gpu/drm/xe/xe_vm_types.h | 1 + > > include/uapi/drm/xe_drm.h | 8 +++ > > 8 files changed, 138 insertions(+), 56 deletions(-) > > > > diff --git a/drivers/gpu/drm/xe/xe_bo.h b/drivers/gpu/drm/xe/xe_bo.h > > index dd3d448fee0b..3a148cc6e811 100644 > > --- a/drivers/gpu/drm/xe/xe_bo.h > > +++ b/drivers/gpu/drm/xe/xe_bo.h > > @@ -61,6 +61,7 @@ > > #define XE_PPGTT_PTE_LM BIT_ULL(11) > > #define XE_PDE_64K BIT_ULL(6) > > #define XE_PTE_PS64 BIT_ULL(8) > > +#define XE_PTE_NULL BIT_ULL(9) > > #define XE_PAGE_PRESENT BIT_ULL(0) > > #define XE_PAGE_RW BIT_ULL(1) > > diff --git a/drivers/gpu/drm/xe/xe_exec.c b/drivers/gpu/drm/xe/xe_exec.c > > index e44076ee2e11..4f7694a29348 100644 > > --- a/drivers/gpu/drm/xe/xe_exec.c > > +++ b/drivers/gpu/drm/xe/xe_exec.c > > @@ -120,6 +120,8 @@ static int xe_exec_begin(struct xe_engine *e, struct ww_acquire_ctx *ww, > > * to a location where the GPU can access it). > > */ > > list_for_each_entry(vma, &vm->rebind_list, rebind_link) { > > + XE_WARN_ON(xe_vma_is_null(vma)); > > + > > if (xe_vma_is_userptr(vma)) > > continue; > > diff --git a/drivers/gpu/drm/xe/xe_gt_pagefault.c b/drivers/gpu/drm/xe/xe_gt_pagefault.c > > index 73db7f7c0381..6faebd02f3fb 100644 > > --- a/drivers/gpu/drm/xe/xe_gt_pagefault.c > > +++ b/drivers/gpu/drm/xe/xe_gt_pagefault.c > > @@ -533,8 +533,8 @@ static int handle_acc(struct xe_gt *gt, struct acc *acc) > > trace_xe_vma_acc(vma); > > - /* Userptr can't be migrated, nothing to do */ > > - if (xe_vma_is_userptr(vma)) > > + /* Userptr or null can't be migrated, nothing to do */ > > + if (xe_vma_has_no_bo(vma)) > > goto unlock_vm; > > /* Lock VM and BOs dma-resv */ > > diff --git a/drivers/gpu/drm/xe/xe_pt.c b/drivers/gpu/drm/xe/xe_pt.c > > index 39ec94549439..265ee45bee5c 100644 > > --- a/drivers/gpu/drm/xe/xe_pt.c > > +++ b/drivers/gpu/drm/xe/xe_pt.c > > @@ -81,7 +81,9 @@ u64 gen8_pde_encode(struct xe_bo *bo, u64 bo_offset, > > static dma_addr_t vma_addr(struct xe_vma *vma, u64 offset, > > size_t page_size, bool *is_vram) > > { > > - if (xe_vma_is_userptr(vma)) { > > + if (xe_vma_is_null(vma)) { > > + return 0; > > + } else if (xe_vma_is_userptr(vma)) { > > struct xe_res_cursor cur; > > u64 page; > > @@ -559,6 +561,10 @@ static bool xe_pt_hugepte_possible(u64 addr, u64 next, unsigned int level, > > if (next - xe_walk->va_curs_start > xe_walk->curs->size) > > return false; > > + /* null VMA's do not have dma adresses */ > > + if (xe_walk->pte_flags & XE_PTE_FLAG_NULL) > > + return true; > > + > > /* Is the DMA address huge PTE size aligned? */ > > size = next - addr; > > dma = addr - xe_walk->va_curs_start + xe_res_dma(xe_walk->curs); > > @@ -575,6 +581,10 @@ xe_pt_scan_64K(u64 addr, u64 next, struct xe_pt_stage_bind_walk *xe_walk) > > { > > struct xe_res_cursor curs = *xe_walk->curs; > > + /* null VMA's do not have dma adresses */ > > + if (xe_walk->pte_flags & XE_PTE_FLAG_NULL) > > + return true; > > + > > if (!IS_ALIGNED(addr, SZ_64K)) > > return false; > > @@ -631,12 +641,29 @@ xe_pt_stage_bind_entry(struct xe_ptw *parent, pgoff_t offset, > > /* Is this a leaf entry ?*/ > > if (level == 0 || xe_pt_hugepte_possible(addr, next, level, xe_walk)) { > > struct xe_res_cursor *curs = xe_walk->curs; > > + u64 pte = 0; > > + bool is_null = xe_walk->pte_flags & XE_PTE_FLAG_NULL; > > XE_WARN_ON(xe_walk->va_curs_start != addr); > > - pte = __gen8_pte_encode(xe_res_dma(curs) + xe_walk->dma_offset, > > - xe_walk->cache, xe_walk->pte_flags, > > - level); > > + if (is_null) { > > + pte |= XE_PAGE_PRESENT | XE_PAGE_RW; > > + if (xe_walk->pte_flags & XE_PTE_FLAG_READ_ONLY) > > + pte &= ~XE_PAGE_RW; > > + > > + if (level == 1) > > + pte |= XE_PDE_PS_2M; > > + else if (level == 2) > > + pte |= XE_PDPE_PS_1G; > > + > > + pte |= XE_PTE_NULL; > > + } else { > > + pte = __gen8_pte_encode(xe_res_dma(curs) + > > + xe_walk->dma_offset, > > + xe_walk->cache, > > + xe_walk->pte_flags, > > + level); > > + } > > pte |= xe_walk->default_pte; > > /* > > @@ -654,7 +681,8 @@ xe_pt_stage_bind_entry(struct xe_ptw *parent, pgoff_t offset, > > if (unlikely(ret)) > > return ret; > > - xe_res_next(curs, next - addr); > > + if (!is_null) > > + xe_res_next(curs, next - addr); > > xe_walk->va_curs_start = next; > > *action = ACTION_CONTINUE; > > @@ -761,24 +789,29 @@ xe_pt_stage_bind(struct xe_tile *tile, struct xe_vma *vma, > > xe_walk.dma_offset = vram_region_gpu_offset(bo->ttm.resource); > > xe_walk.cache = XE_CACHE_WB; > > } else { > > - if (!xe_vma_is_userptr(vma) && bo->flags & XE_BO_SCANOUT_BIT) > > + if (!xe_vma_has_no_bo(vma) && bo->flags & XE_BO_SCANOUT_BIT) > > xe_walk.cache = XE_CACHE_WT; > > else > > xe_walk.cache = XE_CACHE_WB; > > } > > - if (!xe_vma_is_userptr(vma) && xe_bo_is_stolen(bo)) > > + if (!xe_vma_has_no_bo(vma) && xe_bo_is_stolen(bo)) > > xe_walk.dma_offset = xe_ttm_stolen_gpu_offset(xe_bo_device(bo)); > > xe_bo_assert_held(bo); > > - if (xe_vma_is_userptr(vma)) > > - xe_res_first_sg(vma->userptr.sg, 0, vma->end - vma->start + 1, > > - &curs); > > - else if (xe_bo_is_vram(bo) || xe_bo_is_stolen(bo)) > > - xe_res_first(bo->ttm.resource, vma->bo_offset, > > - vma->end - vma->start + 1, &curs); > > - else > > - xe_res_first_sg(xe_bo_get_sg(bo), vma->bo_offset, > > - vma->end - vma->start + 1, &curs); > > + > > + if (!xe_vma_is_null(vma)) { > > + if (xe_vma_is_userptr(vma)) > > + xe_res_first_sg(vma->userptr.sg, 0, > > + vma->end - vma->start + 1, &curs); > > + else if (xe_bo_is_vram(bo) || xe_bo_is_stolen(bo)) > > + xe_res_first(bo->ttm.resource, vma->bo_offset, > > + vma->end - vma->start + 1, &curs); > > + else > > + xe_res_first_sg(xe_bo_get_sg(bo), vma->bo_offset, > > + vma->end - vma->start + 1, &curs); > > + } else { > > + curs.size = vma->end - vma->start + 1; > > + } > > ret = xe_pt_walk_range(&pt->base, pt->level, vma->start, vma->end + 1, > > &xe_walk.base); > > @@ -967,7 +1000,7 @@ static void xe_pt_commit_locks_assert(struct xe_vma *vma) > > if (xe_vma_is_userptr(vma)) > > lockdep_assert_held_read(&vm->userptr.notifier_lock); > > - else > > + else if (!xe_vma_is_null(vma)) > > dma_resv_assert_held(vma->bo->ttm.base.resv); > > dma_resv_assert_held(&vm->resv); > > @@ -1330,7 +1363,7 @@ __xe_pt_bind_vma(struct xe_tile *tile, struct xe_vma *vma, struct xe_engine *e, > > DMA_RESV_USAGE_KERNEL : > > DMA_RESV_USAGE_BOOKKEEP); > > - if (!xe_vma_is_userptr(vma) && !vma->bo->vm) > > + if (!xe_vma_has_no_bo(vma) && !vma->bo->vm) > > dma_resv_add_fence(vma->bo->ttm.base.resv, fence, > > DMA_RESV_USAGE_BOOKKEEP); > > xe_pt_commit_bind(vma, entries, num_entries, rebind, > > @@ -1647,7 +1680,7 @@ __xe_pt_unbind_vma(struct xe_tile *tile, struct xe_vma *vma, struct xe_engine *e > > DMA_RESV_USAGE_BOOKKEEP); > > /* This fence will be installed by caller when doing eviction */ > > - if (!xe_vma_is_userptr(vma) && !vma->bo->vm) > > + if (!xe_vma_has_no_bo(vma) && !vma->bo->vm) > > dma_resv_add_fence(vma->bo->ttm.base.resv, fence, > > DMA_RESV_USAGE_BOOKKEEP); > > xe_pt_commit_unbind(vma, entries, num_entries, > > diff --git a/drivers/gpu/drm/xe/xe_vm.c b/drivers/gpu/drm/xe/xe_vm.c > > index 94fc9c330235..f7629db275f9 100644 > > --- a/drivers/gpu/drm/xe/xe_vm.c > > +++ b/drivers/gpu/drm/xe/xe_vm.c > > @@ -590,7 +590,7 @@ static void preempt_rebind_work_func(struct work_struct *w) > > goto out_unlock; > > list_for_each_entry(vma, &vm->rebind_list, rebind_link) { > > - if (xe_vma_is_userptr(vma) || vma->destroyed) > > + if (xe_vma_has_no_bo(vma) || vma->destroyed) > > continue; > > err = xe_bo_validate(vma->bo, vm, false); > > @@ -843,6 +843,7 @@ static struct xe_vma *xe_vma_create(struct xe_vm *vm, > > u64 bo_offset_or_userptr, > > u64 start, u64 end, > > bool read_only, > > + bool is_null, > > u64 tile_mask) > > { > > struct xe_vma *vma; > > @@ -868,8 +869,11 @@ static struct xe_vma *xe_vma_create(struct xe_vm *vm, > > vma->vm = vm; > > vma->start = start; > > vma->end = end; > > + vma->pte_flags = 0; > > if (read_only) > > - vma->pte_flags = XE_PTE_FLAG_READ_ONLY; > > + vma->pte_flags |= XE_PTE_FLAG_READ_ONLY; > > + if (is_null) > > + vma->pte_flags |= XE_PTE_FLAG_NULL; > > if (tile_mask) { > > vma->tile_mask = tile_mask; > > @@ -886,23 +890,26 @@ static struct xe_vma *xe_vma_create(struct xe_vm *vm, > > vma->bo_offset = bo_offset_or_userptr; > > vma->bo = xe_bo_get(bo); > > list_add_tail(&vma->bo_link, &bo->vmas); > > - } else /* userptr */ { > > - u64 size = end - start + 1; > > - int err; > > + } else /* userptr or null */ { > > + if (!is_null) { > > + u64 size = end - start + 1; > > + int err; > > - vma->userptr.ptr = bo_offset_or_userptr; > > + vma->userptr.ptr = bo_offset_or_userptr; > > - err = mmu_interval_notifier_insert(&vma->userptr.notifier, > > - current->mm, > > - vma->userptr.ptr, size, > > - &vma_userptr_notifier_ops); > > - if (err) { > > - kfree(vma); > > - vma = ERR_PTR(err); > > - return vma; > > + err = mmu_interval_notifier_insert(&vma->userptr.notifier, > > + current->mm, > > + vma->userptr.ptr, size, > > + &vma_userptr_notifier_ops); > > + if (err) { > > + kfree(vma); > > + vma = ERR_PTR(err); > > + return vma; > > + } > > + > > + vma->userptr.notifier_seq = LONG_MAX; > > } > > - vma->userptr.notifier_seq = LONG_MAX; > > xe_vm_get(vm); > > } > > @@ -942,6 +949,8 @@ static void xe_vma_destroy_late(struct xe_vma *vma) > > */ > > mmu_interval_notifier_remove(&vma->userptr.notifier); > > xe_vm_put(vm); > > + } else if (xe_vma_is_null(vma)) { > > + xe_vm_put(vm); > > } else { > > xe_bo_put(vma->bo); > > } > > @@ -1024,7 +1033,7 @@ static void xe_vma_destroy(struct xe_vma *vma, struct dma_fence *fence) > > list_del_init(&vma->userptr.invalidate_link); > > spin_unlock(&vm->userptr.invalidated_lock); > > list_del(&vma->userptr_link); > > - } else { > > + } else if (!xe_vma_is_null(vma)) { > > xe_bo_assert_held(vma->bo); > > list_del(&vma->bo_link); > > @@ -1391,7 +1400,7 @@ void xe_vm_close_and_put(struct xe_vm *vm) > > while (vm->vmas.rb_node) { > > struct xe_vma *vma = to_xe_vma(vm->vmas.rb_node); > > - if (xe_vma_is_userptr(vma)) { > > + if (xe_vma_has_no_bo(vma)) { > > down_read(&vm->userptr.notifier_lock); > > vma->destroyed = true; > > up_read(&vm->userptr.notifier_lock); > > @@ -1400,7 +1409,7 @@ void xe_vm_close_and_put(struct xe_vm *vm) > > rb_erase(&vma->vm_node, &vm->vmas); > > /* easy case, remove from VMA? */ > > - if (xe_vma_is_userptr(vma) || vma->bo->vm) { > > + if (xe_vma_has_no_bo(vma) || vma->bo->vm) { > > xe_vma_destroy(vma, NULL); > > continue; > > } > > @@ -2034,7 +2043,7 @@ static int xe_vm_prefetch(struct xe_vm *vm, struct xe_vma *vma, > > XE_BUG_ON(region > ARRAY_SIZE(region_to_mem_type)); > > - if (!xe_vma_is_userptr(vma)) { > > + if (!xe_vma_has_no_bo(vma)) { > > err = xe_bo_migrate(vma->bo, region_to_mem_type[region]); > > if (err) > > return err; > > @@ -2643,6 +2652,8 @@ static struct xe_vma *vm_unbind_lookup_vmas(struct xe_vm *vm, > > lookup->start - 1, > > (first->pte_flags & > > XE_PTE_FLAG_READ_ONLY), > > + (first->pte_flags & > > + XE_PTE_FLAG_NULL), > > first->tile_mask); > > if (first->bo) > > xe_bo_unlock(first->bo, &ww); > > @@ -2675,6 +2686,7 @@ static struct xe_vma *vm_unbind_lookup_vmas(struct xe_vm *vm, > > last->end, > > (last->pte_flags & > > XE_PTE_FLAG_READ_ONLY), > > + (last->pte_flags & XE_PTE_FLAG_NULL), > > last->tile_mask); > > if (last->bo) > > xe_bo_unlock(last->bo, &ww); > > @@ -2742,7 +2754,7 @@ static struct xe_vma *vm_prefetch_lookup_vmas(struct xe_vm *vm, > > *next; > > struct rb_node *node; > > - if (!xe_vma_is_userptr(vma)) { > > + if (!xe_vma_has_no_bo(vma)) { > > if (!xe_bo_can_migrate(vma->bo, region_to_mem_type[region])) > > return ERR_PTR(-EINVAL); > > } > > @@ -2751,7 +2763,7 @@ static struct xe_vma *vm_prefetch_lookup_vmas(struct xe_vm *vm, > > while ((node = rb_next(node))) { > > if (!xe_vma_cmp_vma_cb(lookup, node)) { > > __vma = to_xe_vma(node); > > - if (!xe_vma_is_userptr(__vma)) { > > + if (!xe_vma_has_no_bo(__vma)) { > > if (!xe_bo_can_migrate(__vma->bo, region_to_mem_type[region])) > > goto flush_list; > > } > > @@ -2765,7 +2777,7 @@ static struct xe_vma *vm_prefetch_lookup_vmas(struct xe_vm *vm, > > while ((node = rb_prev(node))) { > > if (!xe_vma_cmp_vma_cb(lookup, node)) { > > __vma = to_xe_vma(node); > > - if (!xe_vma_is_userptr(__vma)) { > > + if (!xe_vma_has_no_bo(__vma)) { > > if (!xe_bo_can_migrate(__vma->bo, region_to_mem_type[region])) > > goto flush_list; > > } > > @@ -2824,21 +2836,23 @@ static struct xe_vma *vm_bind_ioctl_lookup_vma(struct xe_vm *vm, > > switch (VM_BIND_OP(op)) { > > case XE_VM_BIND_OP_MAP: > > - XE_BUG_ON(!bo); > > - > > - err = xe_bo_lock(bo, &ww, 0, true); > > - if (err) > > - return ERR_PTR(err); > > + if (bo) { > > + err = xe_bo_lock(bo, &ww, 0, true); > > + if (err) > > + return ERR_PTR(err); > > + } > > vma = xe_vma_create(vm, bo, bo_offset_or_userptr, addr, > > addr + range - 1, > > op & XE_VM_BIND_FLAG_READONLY, > > + op & XE_VM_BIND_FLAG_NULL, > > tile_mask); > > - xe_bo_unlock(bo, &ww); > > + if (bo) > > + xe_bo_unlock(bo, &ww); > > if (!vma) > > return ERR_PTR(-ENOMEM); > > xe_vm_insert_vma(vm, vma); > > - if (!bo->vm) { > > + if (bo && !bo->vm) { > > vm_insert_extobj(vm, vma); > > err = add_preempt_fences(vm, bo); > > if (err) { > > @@ -2872,6 +2886,7 @@ static struct xe_vma *vm_bind_ioctl_lookup_vma(struct xe_vm *vm, > > vma = xe_vma_create(vm, NULL, bo_offset_or_userptr, addr, > > addr + range - 1, > > op & XE_VM_BIND_FLAG_READONLY, > > + op & XE_VM_BIND_FLAG_NULL, > > tile_mask); > > if (!vma) > > return ERR_PTR(-ENOMEM); > > @@ -2897,11 +2912,12 @@ static struct xe_vma *vm_bind_ioctl_lookup_vma(struct xe_vm *vm, > > #ifdef TEST_VM_ASYNC_OPS_ERROR > > #define SUPPORTED_FLAGS \ > > (FORCE_ASYNC_OP_ERROR | XE_VM_BIND_FLAG_ASYNC | \ > > - XE_VM_BIND_FLAG_READONLY | XE_VM_BIND_FLAG_IMMEDIATE | 0xffff) > > + XE_VM_BIND_FLAG_READONLY | XE_VM_BIND_FLAG_IMMEDIATE | \ > > + XE_VM_BIND_FLAG_NULL | 0xffff) > > #else > > #define SUPPORTED_FLAGS \ > > (XE_VM_BIND_FLAG_ASYNC | XE_VM_BIND_FLAG_READONLY | \ > > - XE_VM_BIND_FLAG_IMMEDIATE | 0xffff) > > + XE_VM_BIND_FLAG_IMMEDIATE | XE_VM_BIND_FLAG_NULL | 0xffff) > > #endif > > #define XE_64K_PAGE_MASK 0xffffull > > @@ -2949,6 +2965,7 @@ static int vm_bind_ioctl_check_args(struct xe_device *xe, > > u32 obj = (*bind_ops)[i].obj; > > u64 obj_offset = (*bind_ops)[i].obj_offset; > > u32 region = (*bind_ops)[i].region; > > + bool is_null = op & XE_VM_BIND_FLAG_NULL; > > if (XE_IOCTL_ERR(xe, (*bind_ops)[i].pad) || > > XE_IOCTL_ERR(xe, (*bind_ops)[i].reserved[0] || > > @@ -2982,8 +2999,13 @@ static int vm_bind_ioctl_check_args(struct xe_device *xe, > > if (XE_IOCTL_ERR(xe, VM_BIND_OP(op) > > > XE_VM_BIND_OP_PREFETCH) || > > XE_IOCTL_ERR(xe, op & ~SUPPORTED_FLAGS) || > > + XE_IOCTL_ERR(xe, obj && is_null) || > > + XE_IOCTL_ERR(xe, obj_offset && is_null) || > > + XE_IOCTL_ERR(xe, VM_BIND_OP(op) != XE_VM_BIND_OP_MAP && > > + is_null) || > > XE_IOCTL_ERR(xe, !obj && > > - VM_BIND_OP(op) == XE_VM_BIND_OP_MAP) || > > + VM_BIND_OP(op) == XE_VM_BIND_OP_MAP && > > + !is_null) || > > XE_IOCTL_ERR(xe, !obj && > > VM_BIND_OP(op) == XE_VM_BIND_OP_UNMAP_ALL) || > > XE_IOCTL_ERR(xe, addr && > > @@ -3389,6 +3411,7 @@ int xe_vm_invalidate_vma(struct xe_vma *vma) > > int ret; > > XE_BUG_ON(!xe_vm_in_fault_mode(vma->vm)); > > + XE_WARN_ON(xe_vma_is_null(vma)); > > trace_xe_vma_usm_invalidate(vma); > > /* Check that we don't race with page-table updates */ > > @@ -3451,8 +3474,11 @@ int xe_analyze_vm(struct drm_printer *p, struct xe_vm *vm, int gt_id) > > for (node = rb_first(&vm->vmas); node; node = rb_next(node)) { > > struct xe_vma *vma = to_xe_vma(node); > > bool is_userptr = xe_vma_is_userptr(vma); > > + bool is_null = xe_vma_is_null(vma); > > - if (is_userptr) { > > + if (is_null) { > > + addr = 0; > > + } else if (is_userptr) { > > struct xe_res_cursor cur; > > xe_res_first_sg(vma->userptr.sg, 0, XE_PAGE_SIZE, > > @@ -3463,7 +3489,8 @@ int xe_analyze_vm(struct drm_printer *p, struct xe_vm *vm, int gt_id) > > } > > drm_printf(p, " [%016llx-%016llx] S:0x%016llx A:%016llx %s\n", > > vma->start, vma->end, vma->end - vma->start + 1ull, > > - addr, is_userptr ? "USR" : is_vram ? "VRAM" : "SYS"); > > + addr, is_null ? "NULL" : is_userptr ? "USR" : > > + is_vram ? "VRAM" : "SYS"); > > } > > up_read(&vm->lock); > > diff --git a/drivers/gpu/drm/xe/xe_vm.h b/drivers/gpu/drm/xe/xe_vm.h > > index 372f26153209..38731e200813 100644 > > --- a/drivers/gpu/drm/xe/xe_vm.h > > +++ b/drivers/gpu/drm/xe/xe_vm.h > > @@ -115,11 +115,21 @@ static inline void xe_vm_reactivate_rebind(struct xe_vm *vm) > > } > > } > > -static inline bool xe_vma_is_userptr(struct xe_vma *vma) > > +static inline bool xe_vma_is_null(struct xe_vma *vma) > > +{ > > + return vma->pte_flags & XE_PTE_FLAG_NULL; > > +} > > + > > +static inline bool xe_vma_has_no_bo(struct xe_vma *vma) > > { > > return !vma->bo; > > } > > +static inline bool xe_vma_is_userptr(struct xe_vma *vma) > > +{ > > + return xe_vma_has_no_bo(vma) && !xe_vma_is_null(vma); > > +} > > + > > int xe_vma_userptr_pin_pages(struct xe_vma *vma); > > int xe_vma_userptr_check_repin(struct xe_vma *vma); > > diff --git a/drivers/gpu/drm/xe/xe_vm_types.h b/drivers/gpu/drm/xe/xe_vm_types.h > > index 6daddd29d416..f775bafe4619 100644 > > --- a/drivers/gpu/drm/xe/xe_vm_types.h > > +++ b/drivers/gpu/drm/xe/xe_vm_types.h > > @@ -31,6 +31,7 @@ struct xe_vma { > > u64 end; > > /** @pte_flags: pte flags for this VMA */ > > #define XE_PTE_FLAG_READ_ONLY BIT(0) > > +#define XE_PTE_FLAG_NULL BIT(1) > > u32 pte_flags; > > /** @bo: BO if not a userptr, must be NULL is userptr */ > > diff --git a/include/uapi/drm/xe_drm.h b/include/uapi/drm/xe_drm.h > > index 0ebc50beb5e5..39a1ce89732f 100644 > > --- a/include/uapi/drm/xe_drm.h > > +++ b/include/uapi/drm/xe_drm.h > > @@ -456,6 +456,14 @@ struct drm_xe_vm_bind_op { > > * than differing the MAP to the page fault handler. > > */ > > #define XE_VM_BIND_FLAG_IMMEDIATE (0x1 << 18) > > + /* > > + * 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 > > + * the future, the NULL flags will only be valid for XE_VM_BIND_OP_MAP > > + * operations, the BO handle MBZ, and the BO offset MBZ. This flag is > > + * intended to implement VK sparse bindings. > > + */ > > +#define XE_VM_BIND_FLAG_NULL (0x1 << 19) > > /** @reserved: Reserved */ > > __u64 reserved[2];