linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Sasha Levin <Alexander.Levin@microsoft.com>
To: "stable@vger.kernel.org" <stable@vger.kernel.org>,
	"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>
Cc: Miguel Ojeda <miguel.ojeda.sandonis@gmail.com>,
	Catalin Marinas <catalin.marinas@arm.com>,
	Will Deacon <will.deacon@arm.com>,
	Sasha Levin <Alexander.Levin@microsoft.com>
Subject: [PATCH AUTOSEL 4.9 19/26] arm64: jump_label.h: use asm_volatile_goto macro instead of "asm goto"
Date: Mon, 1 Oct 2018 00:40:40 +0000	[thread overview]
Message-ID: <20181001004026.147201-19-alexander.levin@microsoft.com> (raw)
In-Reply-To: <20181001004026.147201-1-alexander.levin@microsoft.com>

From: Miguel Ojeda <miguel.ojeda.sandonis@gmail.com>

[ Upstream commit 13aceef06adfaf93d52e01e28a8bc8a0ad471d83 ]

All other uses of "asm goto" go through asm_volatile_goto, which avoids
a miscompile when using GCC < 4.8.2. Replace our open-coded "asm goto"
statements with the asm_volatile_goto macro to avoid issues with older
toolchains.

Cc: Catalin Marinas <catalin.marinas@arm.com>
Reviewed-by: Nick Desaulniers <ndesaulniers@google.com>
Signed-off-by: Miguel Ojeda <miguel.ojeda.sandonis@gmail.com>
Signed-off-by: Will Deacon <will.deacon@arm.com>
Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
---
 arch/arm64/include/asm/jump_label.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/arm64/include/asm/jump_label.h b/arch/arm64/include/asm/jump_label.h
index 1b5e0e843c3a..7e2b3e360086 100644
--- a/arch/arm64/include/asm/jump_label.h
+++ b/arch/arm64/include/asm/jump_label.h
@@ -28,7 +28,7 @@
 
 static __always_inline bool arch_static_branch(struct static_key *key, bool branch)
 {
-	asm goto("1: nop\n\t"
+	asm_volatile_goto("1: nop\n\t"
 		 ".pushsection __jump_table,  \"aw\"\n\t"
 		 ".align 3\n\t"
 		 ".quad 1b, %l[l_yes], %c0\n\t"
@@ -42,7 +42,7 @@ static __always_inline bool arch_static_branch(struct static_key *key, bool bran
 
 static __always_inline bool arch_static_branch_jump(struct static_key *key, bool branch)
 {
-	asm goto("1: b %l[l_yes]\n\t"
+	asm_volatile_goto("1: b %l[l_yes]\n\t"
 		 ".pushsection __jump_table,  \"aw\"\n\t"
 		 ".align 3\n\t"
 		 ".quad 1b, %l[l_yes], %c0\n\t"
-- 
2.17.1

  parent reply	other threads:[~2018-10-01  0:40 UTC|newest]

Thread overview: 26+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-10-01  0:40 [PATCH AUTOSEL 4.9 01/26] HID: add support for Apple Magic Keyboards Sasha Levin
2018-10-01  0:40 ` [PATCH AUTOSEL 4.9 02/26] usb: gadget: fotg210-udc: Fix memory leak of fotg210->ep[i] Sasha Levin
2018-10-01  0:40 ` [PATCH AUTOSEL 4.9 04/26] HID: hid-saitek: Add device ID for RAT 7 Contagion Sasha Levin
2018-10-01  0:40 ` [PATCH AUTOSEL 4.9 03/26] pinctrl: msm: Really mask level interrupts to prevent latching Sasha Levin
2018-10-01  0:40 ` [PATCH AUTOSEL 4.9 06/26] perf probe powerpc: Ignore SyS symbols irrespective of endianness Sasha Levin
2018-10-01  0:40 ` [PATCH AUTOSEL 4.9 05/26] perf evsel: Fix potential null pointer dereference in perf_evsel__new_idx() Sasha Levin
2018-10-01  0:40 ` [PATCH AUTOSEL 4.9 07/26] RDMA/ucma: check fd type in ucma_migrate_id() Sasha Levin
2018-10-01  0:40 ` [PATCH AUTOSEL 4.9 08/26] USB: yurex: Check for truncation in yurex_read() Sasha Levin
2018-10-01  0:40 ` [PATCH AUTOSEL 4.9 09/26] nvmet-rdma: fix possible bogus dereference under heavy load Sasha Levin
2018-10-01  0:40 ` [PATCH AUTOSEL 4.9 10/26] net/mlx5: Consider PCI domain in search for next dev Sasha Levin
2018-10-01  0:40 ` [PATCH AUTOSEL 4.9 11/26] drm/nouveau/TBDdevinit: don't fail when PMU/PRE_OS is missing from VBIOS Sasha Levin
2018-10-01  0:40 ` [PATCH AUTOSEL 4.9 12/26] dm raid: fix rebuild of specific devices by updating superblock Sasha Levin
2018-10-01  0:40 ` [PATCH AUTOSEL 4.9 13/26] fs/cifs: suppress a string overflow warning Sasha Levin
2018-10-01  0:40 ` [PATCH AUTOSEL 4.9 14/26] net: ena: fix driver when PAGE_SIZE == 64kB Sasha Levin
2018-10-01  0:40 ` [PATCH AUTOSEL 4.9 15/26] perf/x86/intel: Add support/quirk for the MISPREDICT bit on Knights Landing CPUs Sasha Levin
2018-10-01  0:40 ` [PATCH AUTOSEL 4.9 16/26] dm thin metadata: try to avoid ever aborting transactions Sasha Levin
2018-10-01  0:40 ` [PATCH AUTOSEL 4.9 17/26] arch/hexagon: fix kernel/dma.c build warning Sasha Levin
2018-10-01  0:40 ` Sasha Levin [this message]
2018-10-01  0:40 ` [PATCH AUTOSEL 4.9 18/26] hexagon: modify ffs() and fls() to return int Sasha Levin
2018-10-01  0:40 ` [PATCH AUTOSEL 4.9 20/26] r8169: Clear RTL_FLAG_TASK_*_PENDING when clearing RTL_FLAG_TASK_ENABLED Sasha Levin
2018-10-01  0:40 ` [PATCH AUTOSEL 4.9 22/26] s390/qeth: don't dump past end of unknown HW header Sasha Levin
2018-10-01  0:40 ` [PATCH AUTOSEL 4.9 21/26] s390/qeth: use vzalloc for QUERY OAT buffer Sasha Levin
2018-10-01  0:40 ` [PATCH AUTOSEL 4.9 23/26] cifs: read overflow in is_valid_oplock_break() Sasha Levin
2018-10-01  0:40 ` [PATCH AUTOSEL 4.9 24/26] xen/manage: don't complain about an empty value in control/sysrq node Sasha Levin
2018-10-01  0:40 ` [PATCH AUTOSEL 4.9 25/26] xen: avoid crash in disable_hotplug_cpu Sasha Levin
2018-10-01  0:40 ` [PATCH AUTOSEL 4.9 26/26] xen: fix GCC warning and remove duplicate EVTCHN_ROW/EVTCHN_COL usage Sasha Levin

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20181001004026.147201-19-alexander.levin@microsoft.com \
    --to=alexander.levin@microsoft.com \
    --cc=catalin.marinas@arm.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=miguel.ojeda.sandonis@gmail.com \
    --cc=stable@vger.kernel.org \
    --cc=will.deacon@arm.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).