diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-12-11 22:55:20 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-12-11 22:55:20 -0500 |
commit | 0019fab3558c8c8135c88c3d38f24ab0a5408aa6 (patch) | |
tree | d51fe9edb3e05efe5089e3360510f513cccb6b0b /arch/x86/kernel | |
parent | b64c5fda3868cb29d5dae0909561aa7d93fb7330 (diff) | |
parent | 6c8d8b3c69cef1330e0c5cbc2a8b9268024927a0 (diff) |
Merge branch 'x86-asm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 asm changes from Ingo Molnar:
"Two fixlets and a cleanup."
* 'x86-asm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86_32: Return actual stack when requesting sp from regs
x86: Don't clobber top of pt_regs in nested NMI
x86/asm: Clean up copy_page_*() comments and code
Diffstat (limited to 'arch/x86/kernel')
-rw-r--r-- | arch/x86/kernel/entry_64.S | 41 |
1 files changed, 27 insertions, 14 deletions
diff --git a/arch/x86/kernel/entry_64.S b/arch/x86/kernel/entry_64.S index 2a3806b95831..31b46128a63d 100644 --- a/arch/x86/kernel/entry_64.S +++ b/arch/x86/kernel/entry_64.S | |||
@@ -1699,9 +1699,10 @@ nested_nmi: | |||
1699 | 1699 | ||
1700 | 1: | 1700 | 1: |
1701 | /* Set up the interrupted NMIs stack to jump to repeat_nmi */ | 1701 | /* Set up the interrupted NMIs stack to jump to repeat_nmi */ |
1702 | leaq -6*8(%rsp), %rdx | 1702 | leaq -1*8(%rsp), %rdx |
1703 | movq %rdx, %rsp | 1703 | movq %rdx, %rsp |
1704 | CFI_ADJUST_CFA_OFFSET 6*8 | 1704 | CFI_ADJUST_CFA_OFFSET 1*8 |
1705 | leaq -10*8(%rsp), %rdx | ||
1705 | pushq_cfi $__KERNEL_DS | 1706 | pushq_cfi $__KERNEL_DS |
1706 | pushq_cfi %rdx | 1707 | pushq_cfi %rdx |
1707 | pushfq_cfi | 1708 | pushfq_cfi |
@@ -1709,8 +1710,8 @@ nested_nmi: | |||
1709 | pushq_cfi $repeat_nmi | 1710 | pushq_cfi $repeat_nmi |
1710 | 1711 | ||
1711 | /* Put stack back */ | 1712 | /* Put stack back */ |
1712 | addq $(11*8), %rsp | 1713 | addq $(6*8), %rsp |
1713 | CFI_ADJUST_CFA_OFFSET -11*8 | 1714 | CFI_ADJUST_CFA_OFFSET -6*8 |
1714 | 1715 | ||
1715 | nested_nmi_out: | 1716 | nested_nmi_out: |
1716 | popq_cfi %rdx | 1717 | popq_cfi %rdx |
@@ -1736,18 +1737,18 @@ first_nmi: | |||
1736 | * +-------------------------+ | 1737 | * +-------------------------+ |
1737 | * | NMI executing variable | | 1738 | * | NMI executing variable | |
1738 | * +-------------------------+ | 1739 | * +-------------------------+ |
1739 | * | Saved SS | | ||
1740 | * | Saved Return RSP | | ||
1741 | * | Saved RFLAGS | | ||
1742 | * | Saved CS | | ||
1743 | * | Saved RIP | | ||
1744 | * +-------------------------+ | ||
1745 | * | copied SS | | 1740 | * | copied SS | |
1746 | * | copied Return RSP | | 1741 | * | copied Return RSP | |
1747 | * | copied RFLAGS | | 1742 | * | copied RFLAGS | |
1748 | * | copied CS | | 1743 | * | copied CS | |
1749 | * | copied RIP | | 1744 | * | copied RIP | |
1750 | * +-------------------------+ | 1745 | * +-------------------------+ |
1746 | * | Saved SS | | ||
1747 | * | Saved Return RSP | | ||
1748 | * | Saved RFLAGS | | ||
1749 | * | Saved CS | | ||
1750 | * | Saved RIP | | ||
1751 | * +-------------------------+ | ||
1751 | * | pt_regs | | 1752 | * | pt_regs | |
1752 | * +-------------------------+ | 1753 | * +-------------------------+ |
1753 | * | 1754 | * |
@@ -1763,9 +1764,14 @@ first_nmi: | |||
1763 | /* Set the NMI executing variable on the stack. */ | 1764 | /* Set the NMI executing variable on the stack. */ |
1764 | pushq_cfi $1 | 1765 | pushq_cfi $1 |
1765 | 1766 | ||
1767 | /* | ||
1768 | * Leave room for the "copied" frame | ||
1769 | */ | ||
1770 | subq $(5*8), %rsp | ||
1771 | |||
1766 | /* Copy the stack frame to the Saved frame */ | 1772 | /* Copy the stack frame to the Saved frame */ |
1767 | .rept 5 | 1773 | .rept 5 |
1768 | pushq_cfi 6*8(%rsp) | 1774 | pushq_cfi 11*8(%rsp) |
1769 | .endr | 1775 | .endr |
1770 | CFI_DEF_CFA_OFFSET SS+8-RIP | 1776 | CFI_DEF_CFA_OFFSET SS+8-RIP |
1771 | 1777 | ||
@@ -1786,12 +1792,15 @@ repeat_nmi: | |||
1786 | * is benign for the non-repeat case, where 1 was pushed just above | 1792 | * is benign for the non-repeat case, where 1 was pushed just above |
1787 | * to this very stack slot). | 1793 | * to this very stack slot). |
1788 | */ | 1794 | */ |
1789 | movq $1, 5*8(%rsp) | 1795 | movq $1, 10*8(%rsp) |
1790 | 1796 | ||
1791 | /* Make another copy, this one may be modified by nested NMIs */ | 1797 | /* Make another copy, this one may be modified by nested NMIs */ |
1798 | addq $(10*8), %rsp | ||
1799 | CFI_ADJUST_CFA_OFFSET -10*8 | ||
1792 | .rept 5 | 1800 | .rept 5 |
1793 | pushq_cfi 4*8(%rsp) | 1801 | pushq_cfi -6*8(%rsp) |
1794 | .endr | 1802 | .endr |
1803 | subq $(5*8), %rsp | ||
1795 | CFI_DEF_CFA_OFFSET SS+8-RIP | 1804 | CFI_DEF_CFA_OFFSET SS+8-RIP |
1796 | end_repeat_nmi: | 1805 | end_repeat_nmi: |
1797 | 1806 | ||
@@ -1842,8 +1851,12 @@ nmi_swapgs: | |||
1842 | SWAPGS_UNSAFE_STACK | 1851 | SWAPGS_UNSAFE_STACK |
1843 | nmi_restore: | 1852 | nmi_restore: |
1844 | RESTORE_ALL 8 | 1853 | RESTORE_ALL 8 |
1854 | |||
1855 | /* Pop the extra iret frame */ | ||
1856 | addq $(5*8), %rsp | ||
1857 | |||
1845 | /* Clear the NMI executing stack variable */ | 1858 | /* Clear the NMI executing stack variable */ |
1846 | movq $0, 10*8(%rsp) | 1859 | movq $0, 5*8(%rsp) |
1847 | jmp irq_return | 1860 | jmp irq_return |
1848 | CFI_ENDPROC | 1861 | CFI_ENDPROC |
1849 | END(nmi) | 1862 | END(nmi) |