On Tue, 25 Jan 2022 10:59:26 +1100 Jonathan Gray <[email protected]> wrote:
> > if you revert the previous and try this does it still boot? > > this would be more interesting to try > > corresponds to 'drm/i915: Add object locking to vm_fault_cpu' > 9fa1f4785f2a54286ccb8a850cda5661f0a3aaf9 > > https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?&id=9fa1f4785f2a54286ccb8a850cda5661f0a3aaf9 > Unfortunately both diffs (this one and the one from earlier today for drm_linux.c) with the pool_debug patch reversed again lead to the same pmap crash on boot with the MP kernel. Of note, someone posted the same panic on reddit with screenshots. The mentioned T14s gen 2 appears to be another Tiger Lake model. There is some more detailed that they queried from ddb in the link than what I reported: https://old.reddit.com/r/openbsd/comments/sblbr2/kernel_panic_when_installing_70current_the/ > > Index: sys/dev/pci/drm/i915/gem/i915_gem_mman.c > =================================================================== > RCS file: /cvs/src/sys/dev/pci/drm/i915/gem/i915_gem_mman.c,v > retrieving revision 1.7 > diff -u -p -r1.7 i915_gem_mman.c > --- sys/dev/pci/drm/i915/gem/i915_gem_mman.c 23 Jan 2022 22:53:03 -0000 > 1.7 > +++ sys/dev/pci/drm/i915/gem/i915_gem_mman.c 24 Jan 2022 23:46:19 -0000 > @@ -563,6 +563,9 @@ vm_fault_cpu(struct i915_mmap_offset *mm > return VM_PAGER_BAD; > } > > + if (i915_gem_object_lock_interruptible(obj, NULL)) > + return VM_PAGER_ERROR; > + > err = i915_gem_object_pin_pages(obj); > if (err) > goto out; > @@ -602,6 +605,7 @@ vm_fault_cpu(struct i915_mmap_offset *mm > i915_gem_object_unpin_pages(obj); > > out: > + i915_gem_object_unlock(obj); > uvmfault_unlockall(ufi, NULL, &obj->base.uobj); > return i915_error_to_vmf_fault(err); > }
