Received: by 2002:a05:7412:f589:b0:e2:908c:2ebd with SMTP id eh9csp79591rdb; Tue, 31 Oct 2023 00:54:00 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFtFVRyt41+AdJQBUm0qLdeMaXjRojHTi+DHB/nMBCR0P84+qR+3hsu6pe5JTBaSeoWgk1w X-Received: by 2002:a05:6a21:3d8d:b0:180:d66b:7f1 with SMTP id bj13-20020a056a213d8d00b00180d66b07f1mr3059184pzc.62.1698738840128; Tue, 31 Oct 2023 00:54:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1698738840; cv=none; d=google.com; s=arc-20160816; b=BvKg8CK/XoX8qRI9zrgwtKGMJhzBkdc+BLcUtR/it/oBN7Gw8jnRr0wicIYser0h9O I8kooPdPIm2q9hFhr5AUU6WF2s7kxAbaG65W85i1g1tWW/92bTmlCHTX6QoKNWZPqxZX cBfpinjcC/vPOXg8wi1MVr3p0BfyGQH9ZMwG4VJlEBjwXeidOuxqenoKVNpRJUhAjebk ljRs3C4Q59yWablAT2JLaP77ZInnNZD037ji4Yq44wEkUHwS9nL8NVXnHzwGKfxPNPUq tRE5P1M1xQMTjLM9bCvHnkpDRt1/L8WQX1rdeomecyBfsTd2iiJe4LdjfjH8sVQKAka3 HMUw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=Q8328NPnqLMZL/J6Fv5GQFajew6G8hAgprdw35iD2+U=; fh=uy4wSCPejcMXX9BUxrAiaR7ANmmsnjGJ2erN5CXbdt8=; b=zUzdgJiYINtXEkdCtXo2JCqojG13pfpj79EL5+HGjrxzRJvzxCCVE36pBsyuSrzehw CUZXPjy3eDH3B11/RG8LLGPMQAD2S76W24G8seQuihX2KSEwBJYdVFlZLtWxrzBOhsnR w8CrNYn0dY4daCPfqV7SO++ErP/TAG9ogV70ao4MFGtSLc1++tWa5sCynbKQqwx+5k0c ur61JVPyXn9xaT2KFHjp31PBKPd3OoeZQy+TOz0uU2Qn0ITX9Ao1dg7GXgpAuVKaR1fr UyX8NbLLSP52urfoxP1sCLXarcZv8ecYU+v6RTLcMmQ2rdDCJ2iICYNKWReK3ZXR9SDv PQIg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=RxHG82JP; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.35 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from groat.vger.email (groat.vger.email. [23.128.96.35]) by mx.google.com with ESMTPS id u18-20020a056a00125200b006b261e83225si637526pfi.310.2023.10.31.00.53.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 31 Oct 2023 00:54:00 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.35 as permitted sender) client-ip=23.128.96.35; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=RxHG82JP; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.35 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by groat.vger.email (Postfix) with ESMTP id 38C6C8052BDB; Tue, 31 Oct 2023 00:53:55 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at groat.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1343757AbjJaHxc (ORCPT + 99 others); Tue, 31 Oct 2023 03:53:32 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60228 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1343733AbjJaHxb (ORCPT ); Tue, 31 Oct 2023 03:53:31 -0400 Received: from mail-ed1-x531.google.com (mail-ed1-x531.google.com [IPv6:2a00:1450:4864:20::531]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DE2E9C1; Tue, 31 Oct 2023 00:53:22 -0700 (PDT) Received: by mail-ed1-x531.google.com with SMTP id 4fb4d7f45d1cf-53e751aeb3cso8677863a12.2; Tue, 31 Oct 2023 00:53:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1698738801; x=1699343601; 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=Q8328NPnqLMZL/J6Fv5GQFajew6G8hAgprdw35iD2+U=; b=RxHG82JPVJurVegwdlMkSsy4coUsZEuZX8J59MW5KFqjcFvqGNevWJZaF6LgTlDgnA GEK7MokrR1kuFQW07blnqKoM7kiGz07I9mq4YDlBJ6n+kj9Cw9moNPHntX4+S0T95nd4 1mx8OpYsINalO2lGj7jDRREvALLB5hSGJ62oV5P444B/qQqWL/1oFLJmTbnXCMAIGNMU duD7J30aejEq3KEYy2Nsj/hvWCP91shU3pt2TxXdoEBQseDgg8WwunQCsyczjL8kUSTJ ItYRC3uPMH9st3cXK3N7G/Z0oyCumjTy0kCWSc9dnioRBd+jHBI5XuM+pCOyyRlrPX8m 9vjA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1698738801; x=1699343601; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=Q8328NPnqLMZL/J6Fv5GQFajew6G8hAgprdw35iD2+U=; b=S91Ec9/XZx1hQG2Pc6W51orkn5iV833DP86GhHl8RMPDbXslbgtGTIWMAEHzR4PCjf nFKWlh05Fr5oIaBBVmYwE9zGUemkVkVpWcuafpMeDhLsrJuw/5tGIIlObntBrxuNWRzi HLefyuIaB0QmZ67Lk2ZLWpVJvwYtQt5kLTuT+aBVxBiBV5wqNdLZZJ+S+KLjL88R+5ho k7td8RfZ+yJmG+iRativwVBMpnyTa9GsP59aUeRKTaIgtZeapBuUwKEbsNrbEUeoTDTl lHdanMMzbpvXfji1EYgz95PvcKw3EzQIevVqb4M+BSdtD0zRz4VviKjn8AZN+MkMyaef Rehg== X-Gm-Message-State: AOJu0YxruUKvL/As/dQO+pI5l+wCS9LG3JoydpVgxRWe95jaqJ/FshEO HTH7X9M9O8zslBivARJ3n/zMHkTjiQHhcLLa X-Received: by 2002:a50:9f06:0:b0:53f:25c4:357f with SMTP id b6-20020a509f06000000b0053f25c4357fmr8557733edf.34.1698738800629; Tue, 31 Oct 2023 00:53:20 -0700 (PDT) Received: from localhost.localdomain ([46.248.82.114]) by smtp.gmail.com with ESMTPSA id j22-20020aa7c416000000b0053fa13e27dcsm659851edq.48.2023.10.31.00.53.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 31 Oct 2023 00:53:20 -0700 (PDT) From: Uros Bizjak To: kvm@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Uros Bizjak , Sean Christopherson , Paolo Bonzini Subject: [PATCH] KVM: SVM,VMX: Use %rip-relative addressing to access kvm_rebooting Date: Tue, 31 Oct 2023 08:52:40 +0100 Message-ID: <20231031075312.47525-1-ubizjak@gmail.com> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-0.6 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, 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 groat.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 (groat.vger.email [0.0.0.0]); Tue, 31 Oct 2023 00:53:55 -0700 (PDT) Instruction with %rip-relative address operand is one byte shorter than its absolute address counterpart and is also compatible with position independent executable (-fpie) build. No functional changes intended. Cc: Sean Christopherson Cc: Paolo Bonzini Signed-off-by: Uros Bizjak --- arch/x86/kvm/svm/vmenter.S | 10 +++++----- arch/x86/kvm/vmx/vmenter.S | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/arch/x86/kvm/svm/vmenter.S b/arch/x86/kvm/svm/vmenter.S index ef2ebabb059c..9499f9c6b077 100644 --- a/arch/x86/kvm/svm/vmenter.S +++ b/arch/x86/kvm/svm/vmenter.S @@ -270,16 +270,16 @@ SYM_FUNC_START(__svm_vcpu_run) RESTORE_GUEST_SPEC_CTRL_BODY RESTORE_HOST_SPEC_CTRL_BODY -10: cmpb $0, kvm_rebooting +10: cmpb $0, _ASM_RIP(kvm_rebooting) jne 2b ud2 -30: cmpb $0, kvm_rebooting +30: cmpb $0, _ASM_RIP(kvm_rebooting) jne 4b ud2 -50: cmpb $0, kvm_rebooting +50: cmpb $0, _ASM_RIP(kvm_rebooting) jne 6b ud2 -70: cmpb $0, kvm_rebooting +70: cmpb $0, _ASM_RIP(kvm_rebooting) jne 8b ud2 @@ -381,7 +381,7 @@ SYM_FUNC_START(__svm_sev_es_vcpu_run) RESTORE_GUEST_SPEC_CTRL_BODY RESTORE_HOST_SPEC_CTRL_BODY -3: cmpb $0, kvm_rebooting +3: cmpb $0, _ASM_RIP(kvm_rebooting) jne 2b ud2 diff --git a/arch/x86/kvm/vmx/vmenter.S b/arch/x86/kvm/vmx/vmenter.S index be275a0410a8..906ecd001511 100644 --- a/arch/x86/kvm/vmx/vmenter.S +++ b/arch/x86/kvm/vmx/vmenter.S @@ -289,7 +289,7 @@ SYM_INNER_LABEL_ALIGN(vmx_vmexit, SYM_L_GLOBAL) RET .Lfixup: - cmpb $0, kvm_rebooting + cmpb $0, _ASM_RIP(kvm_rebooting) jne .Lvmfail ud2 .Lvmfail: -- 2.41.0