~ubuntu-kernel-test/ubuntu/+source/linux/+git/mirror-drm-intel:topic/core-for-CI

Last commit made on 2023-11-13
Get this branch:
git clone -b topic/core-for-CI https://git.launchpad.net/~ubuntu-kernel-test/ubuntu/+source/linux/+git/mirror-drm-intel
Members of Ubuntu Kernel Test can upload to this branch. Log in for directions.

Branch merges

Branch information

Recent commits

a2458d8... by David Box

PCI/ASPM: pci_enable_link_state: Add argument to acquire bus lock

The VMD driver calls pci_enabled_link_state as a callback from
pci_bus_walk. Both will acquire the pci_bus_sem lock leading to a lockdep
warning. Add an argument to pci_enable_link_state to set whether the lock
should be acquired. In the VMD driver, set the argument to false since the
lock will already be obtained by pci_bus_walk.

Still, review comments needs to be addressed. However, this fix
is helping to unblock CI execution for now.

References: https://gitlab.freedesktop.org/drm/intel/-/issues/8316
Reported-by: Ville Syrjälä <email address hidden>
Fixes: de82f60f9c86 ("PCI/ASPM: Add pci_enable_link_state()")
Link: https://lore.kernel.org/linux-pci/ZBjko%<email address hidden>/
Signed-off-by: David E. Box <email address hidden>
Signed-off-by: Swati Sharma <email address hidden>
Signed-off-by: Jani Nikula <email address hidden>
Link: https://patchwork.<email address hidden>

4e69120... by Joonas Lahtinen <email address hidden>

HAX net/phy: Suppress WARN from phy_error

References: https://gitlab.freedesktop.org/drm/intel/-/issues/8047
Closes: https://gitlab.freedesktop.org/drm/intel/-/issues/2874
Signed-off-by: Rodrigo Vivi <email address hidden>
Signed-off-by: Joonas Lahtinen <email address hidden>

4ceabb0... by Chris Wilson

HAX net/phy: Suppress WARN for calling stop while halted

References: https://gitlab.freedesktop.org/drm/intel/-/issues/8046
Closes: https://gitlab.freedesktop.org/drm/intel/-/issues/2805
Signed-off-by: Rodrigo Vivi <email address hidden>

f18dd26... by Chris Wilson

HAX sound: Disable probing snd_hda with DG1

Audio component in i915 is not hooked up yet causing long timeouts and
angry abortive CI.

References: https://gitlab.freedesktop.org/drm/intel/-/issues/8045
Signed-off-by: Rodrigo Vivi <email address hidden>

903db8e... by Chris Wilson

HAX suspend: Disable S3/S4 for fi-bdw-samus

References: https://gitlab.freedesktop.org/drm/intel/-/issues/8043
Signed-off-by: Rodrigo Vivi <email address hidden>

d45b64e... by Maarten Lankhorst <email address hidden>

perf/core: Only copy-to-user after completely unlocking all locks, v3.

We inadvertently create a dependency on mmap_sem with a whole chain.

This breaks any user who wants to take a lock and call rcu_barrier(),
while also taking that lock inside mmap_sem:

<4> [604.892532] ======================================================
<4> [604.892534] WARNING: possible circular locking dependency detected
<4> [604.892536] 5.6.0-rc7-CI-Patchwork_17096+ #1 Tainted: G U
<4> [604.892537] ------------------------------------------------------
<4> [604.892538] kms_frontbuffer/2595 is trying to acquire lock:
<4> [604.892540] ffffffff8264a558 (rcu_state.barrier_mutex){+.+.}, at: rcu_barrier+0x23/0x190
<4> [604.892547]
but task is already holding lock:
<4> [604.892547] ffff888484716050 (reservation_ww_class_mutex){+.+.}, at: i915_gem_object_pin_to_display_plane+0x89/0x270 [i915]
<4> [604.892592]
which lock already depends on the new lock.
<4> [604.892593]
the existing dependency chain (in reverse order) is:
<4> [604.892594]
-> #6 (reservation_ww_class_mutex){+.+.}:
<4> [604.892597] __ww_mutex_lock.constprop.15+0xc3/0x1090
<4> [604.892598] ww_mutex_lock+0x39/0x70
<4> [604.892600] dma_resv_lockdep+0x10e/0x1f5
<4> [604.892602] do_one_initcall+0x58/0x300
<4> [604.892604] kernel_init_freeable+0x17b/0x1dc
<4> [604.892605] kernel_init+0x5/0x100
<4> [604.892606] ret_from_fork+0x24/0x50
<4> [604.892607]
-> #5 (reservation_ww_class_acquire){+.+.}:
<4> [604.892609] dma_resv_lockdep+0xec/0x1f5
<4> [604.892610] do_one_initcall+0x58/0x300
<4> [604.892610] kernel_init_freeable+0x17b/0x1dc
<4> [604.892611] kernel_init+0x5/0x100
<4> [604.892612] ret_from_fork+0x24/0x50
<4> [604.892613]
-> #4 (&mm->mmap_sem#2){++++}:
<4> [604.892615] __might_fault+0x63/0x90
<4> [604.892617] _copy_to_user+0x1e/0x80
<4> [604.892619] perf_read+0x200/0x2b0
<4> [604.892621] vfs_read+0x96/0x160
<4> [604.892622] ksys_read+0x9f/0xe0
<4> [604.892623] do_syscall_64+0x4f/0x220
<4> [604.892624] entry_SYSCALL_64_after_hwframe+0x49/0xbe
<4> [604.892625]
-> #3 (&cpuctx_mutex){+.+.}:
<4> [604.892626] __mutex_lock+0x9a/0x9c0
<4> [604.892627] perf_event_init_cpu+0xa4/0x140
<4> [604.892629] perf_event_init+0x19d/0x1cd
<4> [604.892630] start_kernel+0x362/0x4e4
<4> [604.892631] secondary_startup_64+0xa4/0xb0
<4> [604.892631]
-> #2 (pmus_lock){+.+.}:
<4> [604.892633] __mutex_lock+0x9a/0x9c0
<4> [604.892633] perf_event_init_cpu+0x6b/0x140
<4> [604.892635] cpuhp_invoke_callback+0x9b/0x9d0
<4> [604.892636] _cpu_up+0xa2/0x140
<4> [604.892637] do_cpu_up+0x61/0xa0
<4> [604.892639] smp_init+0x57/0x96
<4> [604.892639] kernel_init_freeable+0x87/0x1dc
<4> [604.892640] kernel_init+0x5/0x100
<4> [604.892642] ret_from_fork+0x24/0x50
<4> [604.892642]
-> #1 (cpu_hotplug_lock.rw_sem){++++}:
<4> [604.892643] cpus_read_lock+0x34/0xd0
<4> [604.892644] rcu_barrier+0xaa/0x190
<4> [604.892645] kernel_init+0x21/0x100
<4> [604.892647] ret_from_fork+0x24/0x50
<4> [604.892647]
-> #0 (rcu_state.barrier_mutex){+.+.}:
<4> [604.892649] __lock_acquire+0x1328/0x15d0
<4> [604.892650] lock_acquire+0xa7/0x1c0
<4> [604.892651] __mutex_lock+0x9a/0x9c0
<4> [604.892652] rcu_barrier+0x23/0x190
<4> [604.892680] i915_gem_object_unbind+0x29d/0x3f0 [i915]
<4> [604.892707] i915_gem_object_pin_to_display_plane+0x141/0x270 [i915]
<4> [604.892737] intel_pin_and_fence_fb_obj+0xec/0x1f0 [i915]
<4> [604.892767] intel_plane_pin_fb+0x3f/0xd0 [i915]
<4> [604.892797] intel_prepare_plane_fb+0x13b/0x5c0 [i915]
<4> [604.892798] drm_atomic_helper_prepare_planes+0x85/0x110
<4> [604.892827] intel_atomic_commit+0xda/0x390 [i915]
<4> [604.892828] drm_atomic_helper_set_config+0x57/0xa0
<4> [604.892830] drm_mode_setcrtc+0x1c4/0x720
<4> [604.892830] drm_ioctl_kernel+0xb0/0xf0
<4> [604.892831] drm_ioctl+0x2e1/0x390
<4> [604.892833] ksys_ioctl+0x7b/0x90
<4> [604.892835] __x64_sys_ioctl+0x11/0x20
<4> [604.892835] do_syscall_64+0x4f/0x220
<4> [604.892836] entry_SYSCALL_64_after_hwframe+0x49/0xbe
<4> [604.892837]

Changes since v1:
- Use (*values)[n++] in perf_read_one().
Changes since v2:
- Centrally allocate values.

References: https://gitlab.freedesktop.org/drm/intel/-/issues/8042
Signed-off-by: Maarten Lankhorst <email address hidden>
Link: https://patchwork<email address hidden>
Signed-off-by: Rodrigo Vivi <email address hidden>

4beda7a... by Chris Wilson

pci/msi: Stop warning for MSI enabling failure

If the MSI is already enabled, trying to enable it again results in an
-EINVAL and on the first attempt a WARN. That WARN causes our CI to
abort the run [on each first attempt to suspend]:

<4> [463.142025] WARNING: CPU: 0 PID: 2225 at drivers/pci/msi.c:1074 __pci_enable_msi_range+0x3cb/0x420
<4> [463.142026] Modules linked in: snd_hda_intel i915 snd_hda_codec_hdmi snd_hda_codec_realtek snd_hda_codec_generic mei_hdcp x86_pkg_temp_thermal coretemp crct10dif_pclmul crc32_pclmul snd_intel_dspcfg ghash_clmulni_intel snd_hda_codec btusb btrtl btbcm btintel e1000e bluetooth snd_hwdep snd_hda_core ptp ecdh_generic snd_pcm ecc pps_core mei_me mei prime_numbers [last unloaded: i915]
<4> [463.142045] CPU: 0 PID: 2225 Comm: kworker/u8:14 Tainted: G U 5.7.0-rc2-CI-CI_DRM_8350+ #1
<4> [463.142046] Hardware name: Intel Corporation NUC7i5BNH/NUC7i5BNB, BIOS BNKBL357.86A.0060.2017.1214.2013 12/14/2017
<4> [463.142049] Workqueue: events_unbound async_run_entry_fn
<4> [463.142051] RIP: 0010:__pci_enable_msi_range+0x3cb/0x420
<4> [463.142053] Code: 76 58 49 8d 56 48 48 89 df e8 31 73 fd ff e9 20 fe ff ff 31 f6 48 89 df e8 c2 e9 fd ff e9 d6 fe ff ff 45 89 fc e9 1a ff ff ff <0f> 0b 41 bc ea ff ff ff e9 0d ff ff ff 41 bc ea ff ff ff e9 02 ff
<4> [463.142054] RSP: 0018:ffffc90000593cd0 EFLAGS: 00010202
<4> [463.142056] RAX: 0000000000000010 RBX: ffff888274051000 RCX: 0000000000000000
<4> [463.142057] RDX: 0000000000000001 RSI: 0000000000000001 RDI: ffff888274051000
<4> [463.142058] RBP: ffff888238aa1018 R08: 0000000000000001 R09: 0000000000000001
<4> [463.142060] R10: ffffc90000593d90 R11: 00000000c79cdfd5 R12: ffff8882740510b0
<4> [463.142061] R13: 0000000000000001 R14: 0000000000000000 R15: 0000000000000001
<4> [463.142062] FS: 0000000000000000(0000) GS:ffff888276c00000(0000) knlGS:0000000000000000
<4> [463.142064] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033
<4> [463.142065] CR2: 000055706f347d80 CR3: 0000000005610003 CR4: 00000000003606f0
<4> [463.142066] Call Trace:
<4> [463.142073] pci_enable_msi+0x11/0x20
<4> [463.142077] azx_resume+0x1ab/0x200 [snd_hda_intel]
<4> [463.142080] ? pci_pm_thaw+0x80/0x80
<4> [463.142084] dpm_run_callback+0x64/0x280
<4> [463.142089] device_resume+0xd4/0x1c0
<4> [463.142093] ? dpm_watchdog_set+0x60/0

While this would appear to be a bug in snd-hda, it does appear
inconsequential, at least for gfx-ci.

Downgrade the warning to an info, like the other already-enabled error
for MSI-X.

References: https://gitlab.freedesktop.org/drm/intel/-/issues/8041
Closes: https://gitlab.freedesktop.org/drm/intel/-/issues/1687
Signed-off-by: Chris Wilson <email address hidden>
Link: https://patchwork<email address hidden>
Signed-off-by: Rodrigo Vivi <email address hidden>

b533afd... by Chris Wilson

uapi/perf: Squelch compiler warning

Remove copious amounts of
./include/uapi/linux/perf_event.h:147:56: warning: cast truncates bits from constant value (8000000000000000 becomes 0)
as they are drowning out our warnings.

References: https://gitlab.freedesktop.org/drm/intel/-/issues/8039
Signed-off-by: Chris Wilson <email address hidden>
Link: https://patchwork<email address hidden>
Signed-off-by: Rodrigo Vivi <email address hidden>

309aafa... by Chris Wilson

mm: Show slab debug as offsets from section base not hashed pointers

Since the kernel now used hashed pointers for raw addresses, it is very
hard to guage the relative placement within a section, and since the
hash value will never match up with any contents, using it provides no
information relevant for slab debugging. Show the relative offset into
each section, so that some reference for the hexdump is provided.

References: https://gitlab.freedesktop.org/drm/intel/-/issues/8038
Signed-off-by: Chris Wilson <email address hidden>
Signed-off-by: Rodrigo Vivi <email address hidden>

5e4c7cb... by Daniel Vetter

net/sch_generic: Shut up noise

We can't allow spam in CI.

Update 26th June 2018: This is still an issue:
Update 23rd May 2019: You guessed it, still ocurring.

[ 224.739686] ------------[ cut here ]------------
[ 224.739712] WARNING: CPU: 3 PID: 2982 at net/sched/sch_generic.c:461 dev_watchdog+0x1fd/0x210
[ 224.739714] Modules linked in: vgem snd_hda_codec_hdmi snd_hda_codec_realtek snd_hda_codec_generic snd_hda_intel snd_hda_codec snd_hwdep snd_hda_core x86_pkg_temp_thermal intel_powerclamp coretemp crct10dif_pclmul crc32_pclmul ghash_clmulni_intel snd_pcm i915 asix usbnet mii mei_me mei prime_numbers i2c_hid pinctrl_sunrisepoint pinctrl_intel btusb btrtl btbcm btintel bluetooth ecdh_generic
[ 224.739775] CPU: 3 PID: 2982 Comm: gem_exec_suspen Tainted: G U W 4.18.0-rc2-CI-Patchwork_9414+ #1
[ 224.739777] Hardware name: Dell Inc. XPS 13 9350/, BIOS 1.4.12 11/30/2016
[ 224.739780] RIP: 0010:dev_watchdog+0x1fd/0x210
[ 224.739781] Code: 49 63 4c 24 f0 eb 92 4c 89 ef c6 05 21 46 ad 00 01 e8 77 ee fc ff 89 d9 48 89 c2 4c 89 ee 48 c7 c7 88 4c 14 82 e8 a3 fe 84 ff <0f> 0b eb be 0f 1f 44 00 00 66 2e 0f 1f 84 00 00 00 00 00 48 c7 47
[ 224.739866] RSP: 0018:ffff88027dd83e40 EFLAGS: 00010286
[ 224.739869] RAX: 0000000000000000 RBX: 0000000000000000 RCX: 0000000000000102
[ 224.739871] RDX: 0000000080000102 RSI: ffffffff820c8c6c RDI: 00000000ffffffff
[ 224.739873] RBP: ffff8802644c1540 R08: 0000000071be9b33 R09: 0000000000000000
[ 224.739874] R10: ffff88027dd83dc0 R11: 0000000000000000 R12: ffff8802644c1588
[ 224.739876] R13: ffff8802644c1160 R14: 0000000000000001 R15: ffff88026a5dc728
[ 224.739878] FS: 00007f18f4887980(0000) GS:ffff88027dd80000(0000) knlGS:0000000000000000
[ 224.739880] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033
[ 224.739881] CR2: 00007f4c627ae548 CR3: 000000022ca1a002 CR4: 00000000003606e0
[ 224.739883] DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000
[ 224.739885] DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400
[ 224.739886] Call Trace:
[ 224.739888] <IRQ>
[ 224.739892] ? qdisc_reset+0xe0/0xe0
[ 224.739894] ? qdisc_reset+0xe0/0xe0
[ 224.739897] call_timer_fn+0x93/0x360
[ 224.739903] expire_timers+0xc1/0x1d0
[ 224.739908] run_timer_softirq+0xc7/0x170
[ 224.739916] __do_softirq+0xd9/0x505
[ 224.739923] irq_exit+0xa9/0xc0
[ 224.739926] smp_apic_timer_interrupt+0x9c/0x2d0
[ 224.739929] apic_timer_interrupt+0xf/0x20
[ 224.739931] </IRQ>
[ 224.739934] RIP: 0010:delay_tsc+0x2e/0xb0
[ 224.739936] Code: 49 89 fc 55 53 bf 01 00 00 00 e8 6d 2c 78 ff e8 88 9d b6 ff 41 89 c5 0f ae e8 0f 31 48 c1 e2 20 48 09 c2 48 89 d5 eb 16 f3 90 <bf> 01 00 00 00 e8 48 2c 78 ff e8 63 9d b6 ff 44 39 e8 75 36 0f ae
[ 224.740021] RSP: 0018:ffffc900002f7d48 EFLAGS: 00000286 ORIG_RAX: ffffffffffffff13
[ 224.740024] RAX: 0000000080000000 RBX: 0000000649565ca9 RCX: 0000000000000001
[ 224.740026] RDX: 0000000080000001 RSI: ffffffff820c8c6c RDI: 00000000ffffffff
[ 224.740027] RBP: 00000006493ea9ce R08: 000000005e81e2ee R09: 0000000000000000
[ 224.740029] R10: 0000000000000120 R11: 0000000000000000 R12: 00000000002ad8d6
[ 224.740030] R13: 0000000000000003 R14: 0000000000000004 R15: ffff88025caf5408
[ 224.740040] ? delay_tsc+0x66/0xb0
[ 224.740045] hibernation_debug_sleep+0x1c/0x30
[ 224.740048] hibernation_snapshot+0x2c1/0x690
[ 224.740053] hibernate+0x142/0x2a4
[ 224.740057] state_store+0xd0/0xe0
[ 224.740063] kernfs_fop_write+0x104/0x190
[ 224.740068] __vfs_write+0x31/0x180
[ 224.740072] ? rcu_read_lock_sched_held+0x6f/0x80
[ 224.740075] ? rcu_sync_lockdep_assert+0x29/0x50
[ 224.740078] ? __sb_start_write+0x152/0x1f0
[ 224.740080] ? __sb_start_write+0x168/0x1f0
[ 224.740084] vfs_write+0xbd/0x1a0
[ 224.740088] ksys_write+0x50/0xc0
[ 224.740094] do_syscall_64+0x55/0x190
[ 224.740097] entry_SYSCALL_64_after_hwframe+0x49/0xbe
[ 224.740099] RIP: 0033:0x7f18f400a281
[ 224.740100] Code: c3 0f 1f 84 00 00 00 00 00 48 8b 05 59 8d 20 00 c3 0f 1f 84 00 00 00 00 00 8b 05 8a d1 20 00 85 c0 75 16 b8 01 00 00 00 0f 05 <48> 3d 00 f0 ff ff 77 57 f3 c3 0f 1f 44 00 00 41 54 55 49 89 d4 53
[ 224.740186] RSP: 002b:00007fffd1f4fec8 EFLAGS: 00000246 ORIG_RAX: 0000000000000001
[ 224.740189] RAX: ffffffffffffffda RBX: 0000000000000000 RCX: 00007f18f400a281
[ 224.740190] RDX: 0000000000000004 RSI: 00007f18f448069a RDI: 0000000000000006
[ 224.740192] RBP: 00007fffd1f4fef0 R08: 0000000000000000 R09: 0000000000000000
[ 224.740194] R10: 0000000000000000 R11: 0000000000000246 R12: 000055e795d03400
[ 224.740195] R13: 00007fffd1f50500 R14: 0000000000000000 R15: 0000000000000000
[ 224.740205] irq event stamp: 1582591
[ 224.740207] hardirqs last enabled at (1582590): [<ffffffff810f9f9c>] vprintk_emit+0x4bc/0x4d0
[ 224.740210] hardirqs last disabled at (1582591): [<ffffffff81a0111c>] error_entry+0x7c/0x100
[ 224.740212] softirqs last enabled at (1582568): [<ffffffff81c0034f>] __do_softirq+0x34f/0x505
[ 224.740215] softirqs last disabled at (1582571): [<ffffffff8108c959>] irq_exit+0xa9/0xc0
[ 224.740218] WARNING: CPU: 3 PID: 2982 at net/sched/sch_generic.c:461 dev_watchdog+0x1fd/0x210
[ 224.740219] ---[ end trace 6e41d690e611c338 ]---

References: https://gitlab.freedesktop.org/drm/intel/-/issues/8037
References: https://bugzilla.kernel.org/show_bug.cgi?id=196399
Acked-by: Martin Peres <email address hidden>
Cc: Martin Peres <email address hidden>
Signed-off-by: Daniel Vetter <email address hidden>
Link: https://patchwork.<email address hidden>
Signed-off-by: Rodrigo Vivi <email address hidden>
Signed-off-by: Joonas Lahtinen <email address hidden>