This is a note to let you know that I've just added the patch titled

[PATCH] Revert "x86/entry/64: Add missing irqflags tracing to

to the 4.14-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git%3Ba=su...

The filename of the patch is: revert-x86-entry-64-add-missing-irqflags-tracing-to.patch and it can be found in the queue-4.14 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let stable@vger.kernel.org know about it.

From 0ed6c0c778e67f00978a778612862441e48cc529 Mon Sep 17 00:00:00 2001

From: Greg Kroah-Hartman gregkh@linuxfoundation.org Date: Mon, 4 Dec 2017 12:59:57 +0100 Subject: [PATCH] Revert "x86/entry/64: Add missing irqflags tracing to native_load_gs_index()"

This reverts commit f9a64e23a9da528e7d8aa1bd2c7bb92be4ebb724 which is commit 0d794d0d018f23fb09c50f6ae26868bd6ae343d6 upstream.

Andy writes:

I think the thing to do is to revert the patch from -stable. The bug it fixes is very minor, and the regression is that it made a pre-existing bug in some nearly-undebuggable core resume code much easier to hit. I don't feel comfortable with a backport of the latter fix until it has a good long soak in Linus' tree.

Reported-by: Andy Lutomirski luto@kernel.org Cc: Borislav Petkov bpetkov@suse.de Cc: Brian Gerst brgerst@gmail.com Cc: Dave Hansen dave.hansen@intel.com Cc: Josh Poimboeuf jpoimboe@redhat.com Cc: Linus Torvalds torvalds@linux-foundation.org Cc: Peter Zijlstra peterz@infradead.org Cc: Thomas Gleixner tglx@linutronix.de Cc: Ingo Molnar mingo@kernel.org Signed-off-by: Greg Kroah-Hartman gregkh@linuxfoundation.org --- arch/x86/entry/entry_64.S | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-)

--- a/arch/x86/entry/entry_64.S +++ b/arch/x86/entry/entry_64.S @@ -51,19 +51,15 @@ ENTRY(native_usergs_sysret64) END(native_usergs_sysret64) #endif /* CONFIG_PARAVIRT */

-.macro TRACE_IRQS_FLAGS flags:req +.macro TRACE_IRQS_IRETQ #ifdef CONFIG_TRACE_IRQFLAGS - bt $9, \flags /* interrupts off? */ + bt $9, EFLAGS(%rsp) /* interrupts off? */ jnc 1f TRACE_IRQS_ON 1: #endif .endm

-.macro TRACE_IRQS_IRETQ - TRACE_IRQS_FLAGS EFLAGS(%rsp) -.endm - /* * When dynamic function tracer is enabled it will add a breakpoint * to all locations that it is about to modify, sync CPUs, update @@ -927,13 +923,11 @@ ENTRY(native_load_gs_index) FRAME_BEGIN pushfq DISABLE_INTERRUPTS(CLBR_ANY & ~CLBR_RDI) - TRACE_IRQS_OFF SWAPGS .Lgs_change: movl %edi, %gs 2: ALTERNATIVE "", "mfence", X86_BUG_SWAPGS_FENCE SWAPGS - TRACE_IRQS_FLAGS (%rsp) popfq FRAME_END ret

Patches currently in stable-queue which might be from gregkh@linuxfoundation.org are

queue-4.14/nvme-pci-add-quirk-for-delay-before-chk-rdy-for-wdc-sn200.patch queue-4.14/drm-i915-prevent-zero-length-index-write.patch queue-4.14/autofs-revert-autofs-fix-at_no_automount-not-being-honored.patch queue-4.14/crypto-af_alg-remove-locking-in-async-callback.patch queue-4.14/i2c-i801-fix-failed-to-allocate-irq-2147483648-error.patch queue-4.14/drm-amd-pp-fix-typecast-error-in-powerplay.patch queue-4.14/mmc-block-check-return-value-of-blk_get_request.patch queue-4.14/drm-panel-simple-add-missing-panel_simple_unprepare-calls.patch queue-4.14/drm-ttm-fix-ttm_bo_cleanup_refs_or_queue-once-more.patch queue-4.14/drm-i915-re-register-pmic-bus-access-notifier-on-runtime-resume.patch queue-4.14/platform-x86-hp-wmi-fix-tablet-mode-detection-for-convertibles.patch queue-4.14/mm-hugetlbfs-introduce-split-to-vm_operations_struct.patch queue-4.14/mmc-block-fix-missing-blk_put_request.patch queue-4.14/ib-hfi1-do-not-warn-on-lid-conversions-for-opa.patch queue-4.14/mmc-block-ensure-that-debugfs-files-are-removed.patch queue-4.14/mmc-core-do-not-leave-the-block-driver-in-a-suspended-state.patch queue-4.14/arm64-ftrace-emit-ftrace-mod.o-contents-through-code.patch queue-4.14/kvm-lapic-fixup-ldr-on-load-in-x2apic.patch queue-4.14/powerpc-powernv-fix-kexec-crashes-caused-by-tlbie-tracing.patch queue-4.14/s390-revert-elf_et_dyn_base-base-changes.patch queue-4.14/mm-oom_reaper-gather-each-vma-to-prevent-leaking-tlb-entry.patch queue-4.14/drm-omapdrm-fix-dpi-on-platforms-using-the-dsi-vdds.patch queue-4.14/kvm-x86-inject-exceptions-produced-by-x86_decode_insn.patch queue-4.14/mm-memory_hotplug-do-not-back-off-draining-pcp-free-pages-from-kworker-context.patch queue-4.14/ib-core-disable-memory-registration-of-filesystem-dax-vmas.patch queue-4.14/drm-hisilicon-ensure-ldi-regs-are-properly-configured.patch queue-4.14/bcache-fix-building-error-on-mips.patch queue-4.14/exec-avoid-rlimit_stack-races-with-prlimit.patch queue-4.14/nfsd-fix-stateid-races-between-open-and-close.patch queue-4.14/drm-i915-gvt-correct-addr_4k-2m-1g_mask-definition.patch queue-4.14/drm-ttm-once-more-fix-ttm_buffer_object_transfer.patch queue-4.14/mm-introduce-get_user_pages_longterm.patch queue-4.14/bcache-only-permit-to-recovery-read-error-when-cache-device-is-clean.patch queue-4.14/mm-fail-get_vaddr_frames-for-filesystem-dax-mappings.patch queue-4.14/revert-x86-entry-64-add-missing-irqflags-tracing-to.patch queue-4.14/ib-core-do-not-warn-on-lid-conversions-for-opa.patch queue-4.14/drm-amdgpu-potential-uninitialized-variable-in-amdgpu_vce_ring_parse_cs.patch queue-4.14/drm-edid-don-t-send-non-zero-yq-in-avi-infoframe-for-hdmi-1.x-sinks.patch queue-4.14/acpi-ec-fix-regression-related-to-pm-ops-support-in-ecdt-device.patch queue-4.14/arm64-module-plts-factor-out-plt-generation-code-for-ftrace.patch queue-4.14/device-dax-implement-split-to-catch-invalid-munmap-attempts.patch queue-4.14/drm-radeon-fix-atombios-on-big-endian.patch queue-4.14/eeprom-at24-fix-reading-from-24mac402-24mac602.patch queue-4.14/drm-amdgpu-reserve-root-pd-while-releasing-it.patch queue-4.14/hwmon-jc42-optionally-try-to-disable-the-smbus-timeout.patch queue-4.14/e1000e-fix-the-use-of-magic-numbers-for-buffer-overrun-issue.patch queue-4.14/powerpc-kexec-fix-kexec-kdump-in-p9-guest-kernels.patch queue-4.14/kvm-x86-exit-to-user-mode-on-ud-intercept-when-emulator-requires.patch queue-4.14/drm-amdgpu-properly-allocate-vm-invalidate-eng-v2.patch queue-4.14/v4l2-disable-filesystem-dax-mapping-support.patch queue-4.14/lockd-lost-rollback-of-set_grace_period-in-lockd_down_net.patch queue-4.14/eeprom-at24-check-at24_read-write-arguments.patch queue-4.14/kvm-lapic-split-out-x2apic-ldr-calculation.patch queue-4.14/mmc-core-prepend-0x-to-ocr-entry-in-sysfs.patch queue-4.14/fs-fat-inode.c-fix-sb_rdonly-change.patch queue-4.14/mm-memcg-fix-mem_cgroup_swapout-for-thps.patch queue-4.14/nfsd-fix-panic-in-posix_unblock_lock-called-from-nfs4_laundromat.patch queue-4.14/bcache-recover-data-from-backing-when-data-is-clean.patch queue-4.14/crypto-algif_aead-skip-sgl-entries-with-null-page.patch queue-4.14/drm-amdgpu-correct-reference-clock-value-on-vega10.patch queue-4.14/mm-fix-device-dax-pud-write-faults-triggered-by-get_user_pages.patch queue-4.14/mm-hugetlb-fix-null-pointer-dereference-on-5-level-paging-machine.patch queue-4.14/drm-i915-fix-false-positive-assert_rpm_wakelock_held-in-i915_pmic_bus_access_notifier-v2.patch queue-4.14/drm-tilcdc-precalculate-total-frametime-in-tilcdc_crtc_set_mode.patch queue-4.14/kvm-x86-pvclock-handle-first-time-write-to-pvclock-page-contains-random-junk.patch queue-4.14/drm-amdgpu-set-adev-vcn.irq.num_types-for-vcn.patch queue-4.14/drm-amdgpu-potential-uninitialized-variable-in-amdgpu_vm_update_directories.patch queue-4.14/nfsd-fix-another-open-stateid-race.patch queue-4.14/crypto-skcipher-fix-skcipher_walk_aead_common.patch queue-4.14/drm-amdgpu-fix-error-handling-in-amdgpu_bo_do_create.patch queue-4.14/md-forbid-a-raid5-from-having-both-a-bitmap-and-a-journal.patch queue-4.14/drm-fsl-dcu-don-t-set-connector-dpms-property.patch queue-4.14/omapdrm-hdmi4-correct-the-soc-revision-matching.patch queue-4.14/btrfs-clear-space-cache-inode-generation-always.patch queue-4.14/mmc-sdhci-avoid-swiotlb-buffer-being-full.patch queue-4.14/mmc-core-prepend-0x-to-pre_eol_info-entry-in-sysfs.patch queue-4.14/autofs-revert-autofs-take-more-care-to-not-update-last_used-on-path-walk.patch queue-4.14/eeprom-at24-correctly-set-the-size-for-at24mac402.patch queue-4.14/mm-cma-fix-alloc_contig_range-ret-code-potential-leak.patch queue-4.14/drm-i915-fbdev-serialise-early-hotplug-events-with-async-fbdev-config.patch queue-4.14/cxl-check-if-vphb-exists-before-iterating-over-afu-devices.patch queue-4.14/include-linux-compiler-clang.h-handle-randomizable-anonymous-structs.patch queue-4.14/drm-ttm-always-and-only-destroy-bo-ttm_resv-in-ttm_bo_release_list.patch queue-4.14/mm-thp-do-not-make-page-table-dirty-unconditionally-in-touch_pd.patch queue-4.14/revert-drm-radeon-dont-switch-vt-on-suspend.patch queue-4.14/drm-i915-don-t-try-indexed-reads-to-alternate-slave-addresses.patch queue-4.14/drm-amdgpu-remove-check-which-is-not-valid-for-certain-vbios.patch queue-4.14/mm-migrate-fix-an-incorrect-call-of-prep_transhuge_page.patch queue-4.14/apparmor-fix-oops-in-audit_signal_cb-hook.patch queue-4.14/dma-buf-make-reservation_object_copy_fences-rcu-save.patch queue-4.14/drm-amdgpu-move-uvd-vce-and-vcn-structure-out-from-union.patch queue-4.14/drm-vblank-fix-flip-event-vblank-count.patch queue-4.14/drm-fb_helper-disable-all-crtc-s-when-initial-setup-fails.patch queue-4.14/drm-vblank-tune-drm_crtc_accurate_vblank_count-warn-down-to-a-debug.patch queue-4.14/mm-madvise.c-fix-madvise-infinite-loop-under-special-circumstances.patch