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 9E72BC54E58 for ; Wed, 13 Mar 2024 12:19:42 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 62F7E10EE2C; Wed, 13 Mar 2024 12:19:42 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="g9DYYfwF"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.13]) by gabe.freedesktop.org (Postfix) with ESMTPS id 7D74B10EE2C for ; Wed, 13 Mar 2024 12:19:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1710332380; x=1741868380; h=message-id:subject:from:to:date:in-reply-to:references: content-transfer-encoding:mime-version; bh=M0FuMqqB3K2P9OoPecM8W1lfx1eFXlz/95uQnT9eTt8=; b=g9DYYfwF1LhCv4nA+9ZHzSslMY09RtLnXS7p4SsU5GRXz5NLLsqeV8fa S7OB7Dt1LNDTMSvk+Kop1D4SLMoBLMhGRN1sscEcfHO72bdmIYVW4r0OL ro1uuryvSXtjd1+C+717Wsv19KgHBPGTSZZpc6fmf5ByI0uA45y9Yg50o HWyd95WoKYLljptvh2gwh1oe+73UEmeq9ga7rfh2d59ZdhjWgdF9GV+7I wbPxalnxkb5afziAZfKMKpWISGCXvvRJj3A5T2wAtkCosmmwA3IaVxCBj byFpxi1wY7OEkftTlKdCbpBt0fOBVBF/PxknDHstrMi5ksuJ7kDMSMiq8 Q==; X-IronPort-AV: E=McAfee;i="6600,9927,11011"; a="8034109" X-IronPort-AV: E=Sophos;i="6.07,122,1708416000"; d="scan'208";a="8034109" Received: from orviesa001.jf.intel.com ([10.64.159.141]) by fmvoesa107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 13 Mar 2024 05:19:01 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.07,122,1708416000"; d="scan'208";a="49332740" Received: from janlundk-mobl.ger.corp.intel.com (HELO [10.249.254.162]) ([10.249.254.162]) by smtpauth.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 13 Mar 2024 05:19:00 -0700 Message-ID: <147956e76fa97bd6a6e7e7827a8ccae45802b89e.camel@linux.intel.com> Subject: Re: [PATCH] drm/xe: Invalidate userptr VMA on page pin fault From: Thomas =?ISO-8859-1?Q?Hellstr=F6m?= To: Matthew Brost , intel-xe@lists.freedesktop.org Date: Wed, 13 Mar 2024 13:18:57 +0100 In-Reply-To: <20240312183907.933835-1-matthew.brost@intel.com> References: <20240312183907.933835-1-matthew.brost@intel.com> Autocrypt: addr=thomas.hellstrom@linux.intel.com; prefer-encrypt=mutual; keydata=mDMEZaWU6xYJKwYBBAHaRw8BAQdAj/We1UBCIrAm9H5t5Z7+elYJowdlhiYE8zUXgxcFz360SFRob21hcyBIZWxsc3Ryw7ZtIChJbnRlbCBMaW51eCBlbWFpbCkgPHRob21hcy5oZWxsc3Ryb21AbGludXguaW50ZWwuY29tPoiTBBMWCgA7FiEEbJFDO8NaBua8diGTuBaTVQrGBr8FAmWllOsCGwMFCwkIBwICIgIGFQoJCAsCBBYCAwECHgcCF4AACgkQuBaTVQrGBr/yQAD/Z1B+Kzy2JTuIy9LsKfC9FJmt1K/4qgaVeZMIKCAxf2UBAJhmZ5jmkDIf6YghfINZlYq6ixyWnOkWMuSLmELwOsgPuDgEZaWU6xIKKwYBBAGXVQEFAQEHQF9v/LNGegctctMWGHvmV/6oKOWWf/vd4MeqoSYTxVBTAwEIB4h4BBgWCgAgFiEEbJFDO8NaBua8diGTuBaTVQrGBr8FAmWllOsCGwwACgkQuBaTVQrGBr/P2QD9Gts6Ee91w3SzOelNjsus/DcCTBb3fRugJoqcfxjKU0gBAKIFVMvVUGbhlEi6EFTZmBZ0QIZEIzOOVfkaIgWelFEH Organization: Intel Sweden AB, Registration Number: 556189-6027 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable User-Agent: Evolution 3.50.3 (3.50.3-1.fc39) MIME-Version: 1.0 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 Tue, 2024-03-12 at 11:39 -0700, Matthew Brost wrote: > Rather than return an error to the user or ban the VM when userptr > VMA > page pin fails with -EFAULT, invalidate VMA mappings. This supports > the > UMD use case of freeing userptr while still having bindings. >=20 > Now that non-faulting VMs can invalidate VMAs, drop the usm prefix > for > the tile_invalidated member. >=20 > v2: > =C2=A0- Fix build error (CI) > v3: > =C2=A0- Don't invalidate VMA if in fault mode, rather kill VM (Thomas) > =C2=A0- Update commit message with tile_invalidated name chagne (Thomas) > =C2=A0- Wait VM bookkeep slots with VM resv lock (Thomas) > v4: > =C2=A0- Move list_del_init(&userptr.repin_link) after error check (Thomas= ) > =C2=A0- Assert not in fault mode (Matthew) >=20 > Signed-off-by: Matthew Brost Reviewed-by: Thomas Hellstr=C3=B6m > --- > =C2=A0drivers/gpu/drm/xe/xe_gt_pagefault.c |=C2=A0 4 ++-- > =C2=A0drivers/gpu/drm/xe/xe_trace.h=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0 |=C2=A0 2 +- > =C2=A0drivers/gpu/drm/xe/xe_vm.c=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0 | 32 +++++++++++++++++++++----- > -- > =C2=A0drivers/gpu/drm/xe/xe_vm_types.h=C2=A0=C2=A0=C2=A0=C2=A0 |=C2=A0 7 = ++---- > =C2=A04 files changed, 29 insertions(+), 16 deletions(-) >=20 > diff --git a/drivers/gpu/drm/xe/xe_gt_pagefault.c > b/drivers/gpu/drm/xe/xe_gt_pagefault.c > index 73c535193a98..241c294270d9 100644 > --- a/drivers/gpu/drm/xe/xe_gt_pagefault.c > +++ b/drivers/gpu/drm/xe/xe_gt_pagefault.c > @@ -69,7 +69,7 @@ static bool access_is_atomic(enum access_type > access_type) > =C2=A0static bool vma_is_valid(struct xe_tile *tile, struct xe_vma *vma) > =C2=A0{ > =C2=A0 return BIT(tile->id) & vma->tile_present && > - !(BIT(tile->id) & vma->usm.tile_invalidated); > + !(BIT(tile->id) & vma->tile_invalidated); > =C2=A0} > =C2=A0 > =C2=A0static bool vma_matches(struct xe_vma *vma, u64 page_addr) > @@ -226,7 +226,7 @@ static int handle_pagefault(struct xe_gt *gt, > struct pagefault *pf) > =C2=A0 > =C2=A0 if (xe_vma_is_userptr(vma)) > =C2=A0 ret =3D > xe_vma_userptr_check_repin(to_userptr_vma(vma)); > - vma->usm.tile_invalidated &=3D ~BIT(tile->id); > + vma->tile_invalidated &=3D ~BIT(tile->id); > =C2=A0 > =C2=A0unlock_dma_resv: > =C2=A0 drm_exec_fini(&exec); > diff --git a/drivers/gpu/drm/xe/xe_trace.h > b/drivers/gpu/drm/xe/xe_trace.h > index 4ddc55527f9a..846f14507d5f 100644 > --- a/drivers/gpu/drm/xe/xe_trace.h > +++ b/drivers/gpu/drm/xe/xe_trace.h > @@ -468,7 +468,7 @@ DEFINE_EVENT(xe_vma, xe_vma_userptr_invalidate, > =C2=A0 =C2=A0=C2=A0=C2=A0=C2=A0 TP_ARGS(vma) > =C2=A0); > =C2=A0 > -DEFINE_EVENT(xe_vma, xe_vma_usm_invalidate, > +DEFINE_EVENT(xe_vma, xe_vma_invalidate, > =C2=A0 =C2=A0=C2=A0=C2=A0=C2=A0 TP_PROTO(struct xe_vma *vma), > =C2=A0 =C2=A0=C2=A0=C2=A0=C2=A0 TP_ARGS(vma) > =C2=A0); > diff --git a/drivers/gpu/drm/xe/xe_vm.c b/drivers/gpu/drm/xe/xe_vm.c > index 643b3701a738..cbb9b8935c90 100644 > --- a/drivers/gpu/drm/xe/xe_vm.c > +++ b/drivers/gpu/drm/xe/xe_vm.c > @@ -708,6 +708,7 @@ int xe_vm_userptr_pin(struct xe_vm *vm) > =C2=A0 int err =3D 0; > =C2=A0 LIST_HEAD(tmp_evict); > =C2=A0 > + xe_assert(vm->xe, !xe_vm_in_fault_mode(vm)); > =C2=A0 lockdep_assert_held_write(&vm->lock); > =C2=A0 > =C2=A0 /* Collect invalidated userptrs */ > @@ -724,11 +725,27 @@ int xe_vm_userptr_pin(struct xe_vm *vm) > =C2=A0 list_for_each_entry_safe(uvma, next, &vm- > >userptr.repin_list, > =C2=A0 userptr.repin_link) { > =C2=A0 err =3D xe_vma_userptr_pin_pages(uvma); > - if (err < 0) > - return err; > + if (err =3D=3D -EFAULT) { > + list_del_init(&uvma->userptr.repin_link); > =C2=A0 > - list_del_init(&uvma->userptr.repin_link); > - list_move_tail(&uvma->vma.combined_links.rebind, > &vm->rebind_list); > + /* Wait for pending binds */ > + xe_vm_lock(vm, false); > + dma_resv_wait_timeout(xe_vm_resv(vm), > + =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 > DMA_RESV_USAGE_BOOKKEEP, > + =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 false, > MAX_SCHEDULE_TIMEOUT); > + > + err =3D xe_vm_invalidate_vma(&uvma->vma); > + xe_vm_unlock(vm); > + if (err) > + return err; > + } else { > + if (err < 0) > + return err; > + > + list_del_init(&uvma->userptr.repin_link); > + list_move_tail(&uvma- > >vma.combined_links.rebind, > + =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 &vm->rebind_list); > + } > =C2=A0 } > =C2=A0 > =C2=A0 return 0; > @@ -2024,7 +2041,7 @@ static int xe_vm_prefetch(struct xe_vm *vm, > struct xe_vma *vma, > =C2=A0 return err; > =C2=A0 } > =C2=A0 > - if (vma->tile_mask !=3D (vma->tile_present & ~vma- > >usm.tile_invalidated)) { > + if (vma->tile_mask !=3D (vma->tile_present & ~vma- > >tile_invalidated)) { > =C2=A0 return xe_vm_bind(vm, vma, q, xe_vma_bo(vma), syncs, > num_syncs, > =C2=A0 =C2=A0 true, first_op, last_op); > =C2=A0 } else { > @@ -3214,9 +3231,8 @@ int xe_vm_invalidate_vma(struct xe_vma *vma) > =C2=A0 u8 id; > =C2=A0 int ret; > =C2=A0 > - xe_assert(xe, xe_vm_in_fault_mode(xe_vma_vm(vma))); > =C2=A0 xe_assert(xe, !xe_vma_is_null(vma)); > - trace_xe_vma_usm_invalidate(vma); > + trace_xe_vma_invalidate(vma); > =C2=A0 > =C2=A0 /* Check that we don't race with page-table updates */ > =C2=A0 if (IS_ENABLED(CONFIG_PROVE_LOCKING)) { > @@ -3254,7 +3270,7 @@ int xe_vm_invalidate_vma(struct xe_vma *vma) > =C2=A0 } > =C2=A0 } > =C2=A0 > - vma->usm.tile_invalidated =3D vma->tile_mask; > + vma->tile_invalidated =3D vma->tile_mask; > =C2=A0 > =C2=A0 return 0; > =C2=A0} > diff --git a/drivers/gpu/drm/xe/xe_vm_types.h > b/drivers/gpu/drm/xe/xe_vm_types.h > index 79b5cab57711..ae5fb565f6bf 100644 > --- a/drivers/gpu/drm/xe/xe_vm_types.h > +++ b/drivers/gpu/drm/xe/xe_vm_types.h > @@ -84,11 +84,8 @@ struct xe_vma { > =C2=A0 struct work_struct destroy_work; > =C2=A0 }; > =C2=A0 > - /** @usm: unified shared memory state */ > - struct { > - /** @tile_invalidated: VMA has been invalidated */ > - u8 tile_invalidated; > - } usm; > + /** @tile_invalidated: VMA has been invalidated */ > + u8 tile_invalidated; > =C2=A0 > =C2=A0 /** @tile_mask: Tile mask of where to create binding for > this VMA */ > =C2=A0 u8 tile_mask;