From patchwork Fri Oct 20 10:28:55 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: tip-bot2 for Thomas Gleixner X-Patchwork-Id: 155967 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:2010:b0:403:3b70:6f57 with SMTP id fe16csp956533vqb; Fri, 20 Oct 2023 03:29:33 -0700 (PDT) X-Google-Smtp-Source: AGHT+IG+KiMBtQJcbJSAsBAXoShSfNrS4CurxniWiVKKdyNPi4f2cGLM1bFdeFjVhvvh4/H+Du42 X-Received: by 2002:a17:902:facb:b0:1ca:85ae:3b59 with SMTP id ld11-20020a170902facb00b001ca85ae3b59mr1537090plb.9.1697797772956; Fri, 20 Oct 2023 03:29:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1697797772; cv=none; d=google.com; s=arc-20160816; b=d3rRaW5+EVT+aWqQgMZ1LtsTGBXXY+izKhjqTaaAY8zIsSNCAPB//TDaaXNQyFbkA5 GJrXJbj8jHUB0ka0TNx4ZHV3C8pzewAbkHQr1+omlXfH0omc7tnO9wAg9Q5Mb52f2uqT XKpbCGhyW4lBGxM8F6zar+fT5zP0o9C2tOzf+gcz1G9ZMKdKyRVmhrzCVtZ9BuZohp+O LV3Ej/8zaef+wkAaEcsQHrQzwh0/uRIJAgfJpECrBRPAsz10PvD0Kkvcco3AVLt9x1JJ gipApgAOrtCGCGUdd299U8BiNbkfmUvPHK+o1AwoacAdOBeXLa5wqCB9/BRSwLEMZwka nTSA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:robot-unsubscribe :robot-id:message-id:mime-version:cc:subject:to:reply-to:sender:from :dkim-signature:dkim-signature:date; bh=VhHzo1Cv7+X6YKiJes2rk0Mf7POXMLyxJrcorpDyS4s=; fh=UWOydrlg92RncPFMEwqC/Wd4aUhc58PmHAMRGZNwVSU=; b=wm7mhwG4bB8IVE0+ud5IlzJeKh3sZW/30nNdNRB6RweBC9llfKnRgtQKj/3TuDuf1a Re0yKjkkJfVWEZ9j2AlWOzCeL/ts80hXFWfaNsbt7Hr94lvKsdPwMFuh0xNAaJgIBSQg 3AbH+HPH3YAKTDGjOr726/Z8Cz93KlCEcGuMJYokycV88dzuuCqeDS0zm8kimwqDdW0H dAKBaWo8u5AuLqUUBF9LInrzf7THUaFn1vc0mvuiS8FChw2BsC9Ir1pxPgZL/fFBsLgf n4DI+m4qntBwK0nx9AWdH8hxQ5ZfDULF/5YEW/S3xNai9RJebQ/U0kBWIIv8LZG87f3E lPhw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=GzDaKj0H; dkim=neutral (no key) header.i=@linutronix.de; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.36 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Received: from pete.vger.email (pete.vger.email. [23.128.96.36]) by mx.google.com with ESMTPS id z7-20020a1709028f8700b001c9ff461649si1433314plo.581.2023.10.20.03.29.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 20 Oct 2023 03:29:32 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.36 as permitted sender) client-ip=23.128.96.36; Authentication-Results: mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=GzDaKj0H; dkim=neutral (no key) header.i=@linutronix.de; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.36 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by pete.vger.email (Postfix) with ESMTP id 77C39831757C; Fri, 20 Oct 2023 03:29:30 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at pete.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1376860AbjJTK3F (ORCPT + 25 others); Fri, 20 Oct 2023 06:29:05 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39984 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1376842AbjJTK3A (ORCPT ); Fri, 20 Oct 2023 06:29:00 -0400 Received: from galois.linutronix.de (Galois.linutronix.de [IPv6:2a0a:51c0:0:12e:550::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D8938D52; Fri, 20 Oct 2023 03:28:57 -0700 (PDT) Date: Fri, 20 Oct 2023 10:28:55 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1697797735; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VhHzo1Cv7+X6YKiJes2rk0Mf7POXMLyxJrcorpDyS4s=; b=GzDaKj0HmAZ6iPfxGhT0JGrqyCtvN8oFszVWl50DZKK7FQMwfnK6nLSilYU1seD6eiCOeL Fp+xE2qDLoPHV/EbgqjhfF7mqrURzSitQP+URxgybHcZ4rBDGVtzxJv9LAAxNy7Tajx0vl XDwHOD3XTeC4331n6N9Y+/NLS42TseIVUfvGEiI+Z+cfhpgeMpFLbLqUq9sDcwwD2SulTN 5RFHaMORmNmQFF/p0rZLl0E50UHMx/s4z6ndVeU/mazZfRwbkcIFoCJgDOVKm72GbdYtKP j5vG5fCbzddG0R3AHgxjOf6GIbYC03dRwwsDpGBW0dGtY6rYVKyKp3zIQpMUXw== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1697797735; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VhHzo1Cv7+X6YKiJes2rk0Mf7POXMLyxJrcorpDyS4s=; b=+BNt2ql994GaQA5D24LQCr3xiFGbtD1LfdQc43o4h1iZ2qfHVztOI2VcwupqmSj7uyR45h nCr7ilQLv+ncpxBg== From: "tip-bot2 for Uros Bizjak" Sender: tip-bot2@linutronix.de Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: x86/percpu] x86/percpu, xen: Correct PER_CPU_VAR() usage to include symbol and its addend Cc: Uros Bizjak , Ingo Molnar , Boris Ostrovsky , linux-kernel@vger.kernel.org, Brian Gerst , "H. Peter Anvin" , Linus Torvalds , Sean Christopherson , x86@kernel.org MIME-Version: 1.0 Message-ID: <169779773522.3135.10554164923279581371.tip-bot2@tip-bot2> Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails X-Spam-Status: No, score=-0.8 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on pete.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (pete.vger.email [0.0.0.0]); Fri, 20 Oct 2023 03:29:30 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1780269997767128449 X-GMAIL-MSGID: 1780269997767128449 The following commit has been merged into the x86/percpu branch of tip: Commit-ID: aa47f90cd4331e1809d56c72fcbdbbe0a85e5992 Gitweb: https://git.kernel.org/tip/aa47f90cd4331e1809d56c72fcbdbbe0a85e5992 Author: Uros Bizjak AuthorDate: Tue, 17 Oct 2023 18:27:33 +02:00 Committer: Ingo Molnar CommitterDate: Fri, 20 Oct 2023 12:19:51 +02:00 x86/percpu, xen: Correct PER_CPU_VAR() usage to include symbol and its addend The PER_CPU_VAR() macro should be applied to a symbol and its addend. Inconsistent usage is currently harmless, but needs to be corrected before %rip-relative addressing is introduced to the PER_CPU_VAR() macro. No functional changes intended. Signed-off-by: Uros Bizjak Signed-off-by: Ingo Molnar Reviewed-by: Boris Ostrovsky Cc: linux-kernel@vger.kernel.org Cc: Brian Gerst Cc: H. Peter Anvin Cc: Linus Torvalds Cc: Sean Christopherson --- arch/x86/xen/xen-asm.S | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/arch/x86/xen/xen-asm.S b/arch/x86/xen/xen-asm.S index 9e5e680..448958d 100644 --- a/arch/x86/xen/xen-asm.S +++ b/arch/x86/xen/xen-asm.S @@ -28,7 +28,7 @@ * non-zero. */ SYM_FUNC_START(xen_irq_disable_direct) - movb $1, PER_CPU_VAR(xen_vcpu_info) + XEN_vcpu_info_mask + movb $1, PER_CPU_VAR(xen_vcpu_info + XEN_vcpu_info_mask) RET SYM_FUNC_END(xen_irq_disable_direct) @@ -69,7 +69,7 @@ SYM_FUNC_END(check_events) SYM_FUNC_START(xen_irq_enable_direct) FRAME_BEGIN /* Unmask events */ - movb $0, PER_CPU_VAR(xen_vcpu_info) + XEN_vcpu_info_mask + movb $0, PER_CPU_VAR(xen_vcpu_info + XEN_vcpu_info_mask) /* * Preempt here doesn't matter because that will deal with any @@ -78,7 +78,7 @@ SYM_FUNC_START(xen_irq_enable_direct) */ /* Test for pending */ - testb $0xff, PER_CPU_VAR(xen_vcpu_info) + XEN_vcpu_info_pending + testb $0xff, PER_CPU_VAR(xen_vcpu_info + XEN_vcpu_info_pending) jz 1f call check_events @@ -97,7 +97,7 @@ SYM_FUNC_END(xen_irq_enable_direct) * x86 use opposite senses (mask vs enable). */ SYM_FUNC_START(xen_save_fl_direct) - testb $0xff, PER_CPU_VAR(xen_vcpu_info) + XEN_vcpu_info_mask + testb $0xff, PER_CPU_VAR(xen_vcpu_info + XEN_vcpu_info_mask) setz %ah addb %ah, %ah RET @@ -113,7 +113,7 @@ SYM_FUNC_END(xen_read_cr2); SYM_FUNC_START(xen_read_cr2_direct) FRAME_BEGIN - _ASM_MOV PER_CPU_VAR(xen_vcpu_info) + XEN_vcpu_info_arch_cr2, %_ASM_AX + _ASM_MOV PER_CPU_VAR(xen_vcpu_info + XEN_vcpu_info_arch_cr2), %_ASM_AX FRAME_END RET SYM_FUNC_END(xen_read_cr2_direct);