From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-ed1-f44.google.com (mail-ed1-f44.google.com [209.85.208.44]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 46B703570B5 for ; Wed, 14 Jan 2026 21:20:03 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.44 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1768425605; cv=none; b=W6I+6GG088yQRWfmhY694nMBuFT2vcDMwtooOfZcoBtnxMmGDJvLWM9mEdqAKhiX2itswASyBgU5rMWagx+I8444qc1sim4GKbJ5tQogtXIoHNe7kpPG8r1+BB2ucHEWNJheQK4yUp1OefVH2ySbW2J5a4t1lnzJUvyUHRpCrg8= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1768425605; c=relaxed/simple; bh=kpkq2j5rxRipq/uytTDNI6/jUQtKyAbYri7acGHzUwA=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=GSWjKeV4Xr3kwHLDHLbJT4+V8rUKJpE6waU9UpDAhNSIDGbe9qpRGLmHGmpm0OXrIRFAdCw71NQPjZlC6S2zSAREbYqAybtRIb27qBCSJ2pbn3fvMHIixjY7zezk6nGynNY1A8CPO2gu5igWhXEqntIjYwJYXVCL9OaAPLdTzxc= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=WdkLDoWG; arc=none smtp.client-ip=209.85.208.44 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="WdkLDoWG" Received: by mail-ed1-f44.google.com with SMTP id 4fb4d7f45d1cf-64d4d8b3ad7so308610a12.2 for ; Wed, 14 Jan 2026 13:20:02 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1768425601; x=1769030401; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=IIN3WvlmSxyI6hejD78KoAYfFiS9lOjkAKs4i0jX9j8=; b=WdkLDoWGEH9Q38A25+4Ik+2j8oMfGXHaaDrf/Aglvcf5jtchVhc/wLc0HJe6WF5s8N x1bA4uPiyWZ2Vh4YKFHYs0mJ5ddtTJhV7VWPLp3L/uE/GkSM5qQrm1TqmSoknw6F6DLI xpKWzyoP5jWQHCSr8e5RDeNxzMlMFzF81fUTRhY3k+HXKJqaFC314WT8W11+gPqha3eF I3kBHLaeQffjZ7B+ZBHbG4ibxoMZMvftRX5STiJzX7hezNKezPgyLrSDa7oNS9xKuU5O T6DCgGh7h5d2vjN/WM9W8bEzwocEijmatW2mUHgCTCUBdJb7t130FPToimcbauvIGRvR uOcA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1768425601; x=1769030401; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=IIN3WvlmSxyI6hejD78KoAYfFiS9lOjkAKs4i0jX9j8=; b=APeMrXeEgMyVcNm76QYjABUfmZ3I1sCWAomf2RbzVzsB+Zj6WUgKVWoB+mjIVI9/kQ lE0JcGzjdsvCTEMnSnhlW7RhdC0lqtGvu3Be7ESBzZQfc2xtAdClpbgqWfsFCglglWZv OmtHndn/sw5D+ChIbaItXHpJdttjXdfdtn0yu0h4eZazZRszmKDhdVb9anoTZTuLkPdq 9kgXxqpvRi+wkoJDmdEPovP9Pst+GCHZioYQ/bWaPGLVFS0+NXb4aGzbNEINpc/z3PXO T6J610H466uPNmJcKlhlSU6EthTBSyc0RZhV3Xgx18TBlzvJcqtPaaweCmEXwhPYDXUe FNgA== X-Forwarded-Encrypted: i=1; AJvYcCXBJphrNdu3q1R4ygfUae1i3ryfZtqub98HitajO+Etiw7ok1u3a9zQ0TiM1MeNls3Pmk6YjunL9BoxqY0=@vger.kernel.org X-Gm-Message-State: AOJu0YwAls3bzsPasKku8ZmdfDque/PQEcMKCuxhCKkD0zQjsrnCqs2X qqCrD7WalZs2wK7nP5ti2mieFE28ZNZxih44+jMqq7qtuR875DfONmGbRP+d7TCD X-Gm-Gg: AY/fxX5fRnqiwEhRBX0AFh20v5d8n5CIIRdpyvFMKcAuI3FslcC4Qdm16CA+/wEcj+L 61L/SZc7U5Vx/IVhOTAb/yz+uMAp9YefukfPi5Pz3qdlRgx+5qr+LwCK/qdJbhKzrjhB8Vju+nc 5WcSTn+6mTd8Qxmm0JZbsV3e3e1ov3383PxSTopfdDLzcbBri3iJnO3JNAd7alvgpziojoEacib vRmq9Zi5fFVdU0vJXJXoUKtH822R3uH0erFRYDS+yP307T6t9AmI5ZB1KWlatAW/gvg1Vj/G5hG 0Y3Up4EiAnuG7nT+panBTCatP6crnZy0fTSxYZNj0lQam2WrlFJPoNMNv1gSpRfTtds66jfuVFQ rv3VMEhBVsKlIfh5ldBwyaNeKQRpmh3NZ4jZIH82UtyLkfKrgpRnsxmeZLkrT5SsIvh4vS8KdAn eQ+43kqov2c/vf0Mn8TtOnDkK6rNEnNTDUGF15Irc1N0c= X-Received: by 2002:a17:907:1c26:b0:b73:b05c:38fd with SMTP id a640c23a62f3a-b87612796ccmr367472866b.50.1768425601165; Wed, 14 Jan 2026 13:20:01 -0800 (PST) Received: from fedora ([46.248.82.114]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-b8731f071e4sm683374166b.66.2026.01.14.13.19.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 14 Jan 2026 13:20:00 -0800 (PST) From: Uros Bizjak To: bcm-kernel-feedback-list@broadcom.com, virtualization@lists.linux.dev, x86@kernel.org, linux-kernel@vger.kernel.org Cc: Uros Bizjak , Juergen Gross , Alexey Makhalov , Ajay Kaher , Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , "H. Peter Anvin" Subject: [PATCH RESEND 1/2] x86/paravirt: Remove trailing semicolons from alternative asm templates Date: Wed, 14 Jan 2026 22:18:14 +0100 Message-ID: <20260114211948.74774-1-ubizjak@gmail.com> X-Mailer: git-send-email 2.52.0 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit GCC inline asm treats semicolons as instruction separators, so a semicolon after the last instruction is not required. Signed-off-by: Uros Bizjak Reviewed-by: Juergen Gross Acked-by: Alexey Makhalov Cc: Ajay Kaher Cc: Thomas Gleixner Cc: Ingo Molnar Cc: Borislav Petkov Cc: Dave Hansen Cc: "H. Peter Anvin" --- arch/x86/include/asm/paravirt-spinlock.h | 4 ++-- arch/x86/include/asm/paravirt.h | 16 ++++++++-------- arch/x86/include/asm/paravirt_types.h | 2 +- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/arch/x86/include/asm/paravirt-spinlock.h b/arch/x86/include/asm/paravirt-spinlock.h index a5011ef3a6cc..458b888aba84 100644 --- a/arch/x86/include/asm/paravirt-spinlock.h +++ b/arch/x86/include/asm/paravirt-spinlock.h @@ -38,14 +38,14 @@ static __always_inline void pv_queued_spin_lock_slowpath(struct qspinlock *lock, static __always_inline void pv_queued_spin_unlock(struct qspinlock *lock) { PVOP_ALT_VCALLEE1(pv_ops_lock, queued_spin_unlock, lock, - "movb $0, (%%" _ASM_ARG1 ");", + "movb $0, (%%" _ASM_ARG1 ")", ALT_NOT(X86_FEATURE_PVUNLOCK)); } static __always_inline bool pv_vcpu_is_preempted(long cpu) { return PVOP_ALT_CALLEE1(bool, pv_ops_lock, vcpu_is_preempted, cpu, - "xor %%" _ASM_AX ", %%" _ASM_AX ";", + "xor %%" _ASM_AX ", %%" _ASM_AX, ALT_NOT(X86_FEATURE_VCPUPREEMPT)); } diff --git a/arch/x86/include/asm/paravirt.h b/arch/x86/include/asm/paravirt.h index b21072af731d..3d0b92a8a557 100644 --- a/arch/x86/include/asm/paravirt.h +++ b/arch/x86/include/asm/paravirt.h @@ -117,7 +117,7 @@ static inline void write_cr0(unsigned long x) static __always_inline unsigned long read_cr2(void) { return PVOP_ALT_CALLEE0(unsigned long, pv_ops, mmu.read_cr2, - "mov %%cr2, %%rax;", ALT_NOT_XEN); + "mov %%cr2, %%rax", ALT_NOT_XEN); } static __always_inline void write_cr2(unsigned long x) @@ -128,7 +128,7 @@ static __always_inline void write_cr2(unsigned long x) static inline unsigned long __read_cr3(void) { return PVOP_ALT_CALL0(unsigned long, pv_ops, mmu.read_cr3, - "mov %%cr3, %%rax;", ALT_NOT_XEN); + "mov %%cr3, %%rax", ALT_NOT_XEN); } static inline void write_cr3(unsigned long x) @@ -516,18 +516,18 @@ static inline void __set_fixmap(unsigned /* enum fixed_addresses */ idx, static __always_inline unsigned long arch_local_save_flags(void) { - return PVOP_ALT_CALLEE0(unsigned long, pv_ops, irq.save_fl, "pushf; pop %%rax;", + return PVOP_ALT_CALLEE0(unsigned long, pv_ops, irq.save_fl, "pushf; pop %%rax", ALT_NOT_XEN); } static __always_inline void arch_local_irq_disable(void) { - PVOP_ALT_VCALLEE0(pv_ops, irq.irq_disable, "cli;", ALT_NOT_XEN); + PVOP_ALT_VCALLEE0(pv_ops, irq.irq_disable, "cli", ALT_NOT_XEN); } static __always_inline void arch_local_irq_enable(void) { - PVOP_ALT_VCALLEE0(pv_ops, irq.irq_enable, "sti;", ALT_NOT_XEN); + PVOP_ALT_VCALLEE0(pv_ops, irq.irq_enable, "sti", ALT_NOT_XEN); } static __always_inline unsigned long arch_local_irq_save(void) @@ -553,9 +553,9 @@ static __always_inline unsigned long arch_local_irq_save(void) call PARA_INDIRECT(pv_ops+PV_IRQ_save_fl); .endm -#define SAVE_FLAGS ALTERNATIVE_2 "PARA_IRQ_save_fl;", \ - "ALT_CALL_INSTR;", ALT_CALL_ALWAYS, \ - "pushf; pop %rax;", ALT_NOT_XEN +#define SAVE_FLAGS ALTERNATIVE_2 "PARA_IRQ_save_fl", \ + "ALT_CALL_INSTR", ALT_CALL_ALWAYS, \ + "pushf; pop %rax", ALT_NOT_XEN #endif #endif /* CONFIG_PARAVIRT_XXL */ #endif /* CONFIG_X86_64 */ diff --git a/arch/x86/include/asm/paravirt_types.h b/arch/x86/include/asm/paravirt_types.h index 7ccd41628d36..9bcf6bce88f6 100644 --- a/arch/x86/include/asm/paravirt_types.h +++ b/arch/x86/include/asm/paravirt_types.h @@ -210,7 +210,7 @@ extern struct paravirt_patch_template pv_ops; */ #define PARAVIRT_CALL \ ANNOTATE_RETPOLINE_SAFE "\n\t" \ - "call *%[paravirt_opptr];" + "call *%[paravirt_opptr]" /* * These macros are intended to wrap calls through one of the paravirt -- 2.52.0