Hard lockups after resume since the zesty upgrade (x250)

I upgraded my system to zesty recently and since then I see repeated lockups on resume on my thinkpad x250.

My kernel version is:
$ uname -a
Linux bod 4.10.0-20-generic #22-Ubuntu SMP Thu Apr 20 09:22:42 UTC 2017 x86_64 x86_64 x86_64 GNU/Linux

$ apt list --installed linux-image-generic
Listing... Done
linux-image-generic/zesty-updates,zesty-security,now 4.10.0.20.22 amd64 [installed,automatic]

What I see in syslog is:
May 3 08:27:53 bod kernel: [17412.658410] ------------[ cut here ]------------
May 3 08:27:53 bod kernel: [17412.658448] kernel BUG at /build/linux-2NWldV/linux-4.10.0/include/linux/swapops.h:129!
May 3 08:27:53 bod kernel: [17412.658495] invalid opcode: 0000 [#1] SMP
May 3 08:27:53 bod kernel: [17412.658519] Modules linked in: usbhid hid ccm rfcomm xt_CHECKSUM iptable_mangle ipt_MASQUERADE nf_nat_masquerade_ipv4 iptable_nat nf_nat_ipv4 bridge stp llc ebtable_filter ebtables cmac bnep intel_rapl x86_pkg_temp_thermal intel_powerclamp coretemp kvm_intel kvm arc4 irqbypass crct10dif_pclmul crc32_pclmul ghash_clmulni_intel pcbc aesni_intel iwlmvm snd_seq_midi aes_x86_64 mac80211 crypto_simd glue_helper cryptd snd_seq_midi_event intel_cstate intel_rapl_perf iwlwifi input_leds joydev thinkpad_acpi snd_rawmidi serio_raw rtsx_pci_ms cdc_mbim cfg80211 intel_pch_thermal uvcvideo snd_hda_codec_hdmi memstick cdc_ncm nvram usbnet mii snd_hda_codec_realtek snd_hda_codec_generic cdc_wdm cdc_acm lpc_ich snd_hda_intel shpchp videobuf2_vmalloc videobuf2_memops videobuf2_v4l2 videobuf2_core btusb mei_me btrtl
May 3 08:27:53 bod kernel: [17412.658921] snd_hda_codec snd_seq videodev btbcm mei btintel snd_hda_core media snd_hwdep bluetooth snd_pcm snd_seq_device snd_timer snd soundcore mac_hid ip6t_REJECT nf_reject_ipv6 nf_log_ipv6 xt_hl ip6t_rt nf_conntrack_ipv6 nf_defrag_ipv6 ipt_REJECT nf_reject_ipv4 nf_log_ipv4 nf_log_common xt_LOG xt_limit xt_tcpudp xt_addrtype nf_conntrack_ipv4 nf_defrag_ipv4 xt_conntrack ip6table_filter ip6_tables nf_conntrack_netbios_ns nf_conntrack_broadcast nf_nat_ftp nf_nat libcrc32c nf_conntrack_ftp nf_conntrack iptable_filter parport_pc ppdev lp parport ip_tables x_tables autofs4 rtsx_pci_sdmmc i915 psmouse ahci libahci i2c_algo_bit e1000e rtsx_pci drm_kms_helper syscopyarea sysfillrect ptp sysimgblt pps_core fb_sys_fops drm wmi fjes video
May 3 08:27:53 bod kernel: [17412.659292] CPU: 3 PID: 3071 Comm: firefox Not tainted 4.10.0-20-generic #22-Ubuntu
May 3 08:27:53 bod kernel: [17412.659334] Hardware name: LENOVO 20CLS00007/20CLS00007, BIOS N10ET36W (1.15 ) 06/19/2015
May 3 08:27:53 bod kernel: [17412.659377] task: ffff907d060cda00 task.stack: ffffaea50203c000
May 3 08:27:53 bod kernel: [17412.659413] RIP: 0010:__migration_entry_wait+0x16a/0x180
May 3 08:27:53 bod kernel: [17412.659444] RSP: 0000:ffffaea50203fd68 EFLAGS: 00010246
May 3 08:27:53 bod kernel: [17412.659472] RAX: 0017ffffc0048078 RBX: ffffd5c7875b70f0 RCX: ffffd5c7875b70f0
May 3 08:27:53 bod kernel: [17412.659512] RDX: 0000000000000001 RSI: ffff907d16dc3040 RDI: ffffd5c785530200
May 3 08:27:53 bod kernel: [17412.659552] RBP: ffffaea50203fd80 R08: ffff907d5dee8f80 R09: ffff907d5dee8f80
May 3 08:27:53 bod kernel: [17412.659592] R10: 00007f9a7fddf048 R11: 0000000000000004 R12: ffffd5c785530200
May 3 08:27:53 bod kernel: [17412.659632] R13: 3e00000000154c08 R14: ffffaea50203fe30 R15: ffff907c6b6e1190
May 3 08:27:53 bod kernel: [17412.659672] FS: 00007f9a81270740(0000) GS:ffff907d6dcc0000(0000) knlGS:0000000000000000
May 3 08:27:53 bod kernel: [17412.659718] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033
May 3 08:27:53 bod kernel: [17412.659750] CR2: 00007f9897e08820 CR3: 00000001da21a000 CR4: 00000000003406e0
May 3 08:27:53 bod kernel: [17412.659789] Call Trace:
May 3 08:27:53 bod kernel: [17412.659807] migration_entry_wait+0x74/0x80
May 3 08:27:53 bod kernel: [17412.659834] do_swap_page+0x5b3/0x770
May 3 08:27:53 bod kernel: [17412.659858] ? cputime_adjust+0x97/0x130
May 3 08:27:53 bod kernel: [17412.659884] handle_mm_fault+0x873/0x1360
May 3 08:27:53 bod kernel: [17412.659909] ? get_task_mm+0x1e/0x50
May 3 08:27:53 bod kernel: [17412.659932] ? mmput+0x12/0x130
May 3 08:27:53 bod kernel: [17412.659953] __do_page_fault+0x23e/0x4e0
May 3 08:27:53 bod kernel: [17412.659978] do_page_fault+0x22/0x30
May 3 08:27:53 bod kernel: [17412.660002] page_fault+0x28/0x30
May 3 08:27:53 bod kernel: [17412.660022] RIP: 0033:0x7f9a721a6677
May 3 08:27:53 bod kernel: [17412.660044] RSP: 002b:00007fff684563a0 EFLAGS: 00010202
May 3 08:27:53 bod kernel: [17412.660073] RAX: 00007f9897e08820 RBX: 00007f9a6ba46000 RCX: 00007f9a3591bd58
May 3 08:27:53 bod kernel: [17412.660113] RDX: 0000000000000001 RSI: 00007f9a6bbc2838 RDI: 00007f9a7fddf048
May 3 08:27:53 bod kernel: [17412.660152] RBP: 00007fff684564c0 R08: 00007f9a6bbc2838 R09: 0000000000000000
May 3 08:27:53 bod kernel: [17412.660192] R10: 00007f9a7fddf048 R11: 0000000000000004 R12: 00007fff684563d0
May 3 08:27:53 bod kernel: [17412.660232] R13: 00007f9a3591bd58 R14: 00007fff684563e0 R15: 00007fff684566b8
May 3 08:27:53 bod kernel: [17412.660272] Code: ff ff ff 4c 89 e7 e8 96 a2 f8 ff e9 3c ff ff ff 85 d2 0f 84 2a ff ff ff 8d 4a 01 89 d0 f0 41 0f b1 4d 00 39 d0 74 81 89 c2 eb e5 <0f> 0b 4c 89 e7 e8 0c fb f9 ff eb b8 4c 8d 60 ff 4c 8d 68 1b eb
May 3 08:27:53 bod kernel: [17412.660408] RIP: __migration_entry_wait+0x16a/0x180 RSP: ffffaea50203fd68
May 3 08:27:53 bod kernel: [17412.667710] ---[ end trace 1654406659b6681c ]---

I get this about every ~24h to 36h but I suspect if I repeat susped/resume I can trigger it more often. If I can help in any way please do let me know.