From mboxrd@z Thu Jan 1 00:00:00 1970 From: Clément Léger Date: Tue, 24 Oct 2023 15:26:55 +0200 Subject: [PATCH v2 5/5] riscv: kvm: use ".L" local labels in assembly when applicable In-Reply-To: <20231024132655.730417-1-cleger@rivosinc.com> References: <20231024132655.730417-1-cleger@rivosinc.com> Message-ID: <20231024132655.730417-6-cleger@rivosinc.com> List-Id: To: kvm-riscv@lists.infradead.org MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit For the sake of coherency, use local labels in assembly when applicable. This also avoid kprobes being confused when applying a kprobe since the size of function is computed by checking where the next visible symbol is located. This might end up in computing some function size to be way shorter than expected and thus failing to apply kprobes to the specified offset. Signed-off-by: Cl?ment L?ger Reviewed-by: Andrew Jones --- arch/riscv/kvm/vcpu_switch.S | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/riscv/kvm/vcpu_switch.S b/arch/riscv/kvm/vcpu_switch.S index 8b18473780ac..0c26189aa01c 100644 --- a/arch/riscv/kvm/vcpu_switch.S +++ b/arch/riscv/kvm/vcpu_switch.S @@ -45,7 +45,7 @@ SYM_FUNC_START(__kvm_riscv_switch_to) REG_L t0, (KVM_ARCH_GUEST_SSTATUS)(a0) REG_L t1, (KVM_ARCH_GUEST_HSTATUS)(a0) REG_L t2, (KVM_ARCH_GUEST_SCOUNTEREN)(a0) - la t4, __kvm_switch_return + la t4, .Lkvm_switch_return REG_L t5, (KVM_ARCH_GUEST_SEPC)(a0) /* Save Host and Restore Guest SSTATUS */ @@ -113,7 +113,7 @@ SYM_FUNC_START(__kvm_riscv_switch_to) /* Back to Host */ .align 2 -__kvm_switch_return: +.Lkvm_switch_return: /* Swap Guest A0 with SSCRATCH */ csrrw a0, CSR_SSCRATCH, a0 -- 2.42.0 From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 16609C07545 for ; Tue, 24 Oct 2023 13:28:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-ID:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=kWakTq/Z4T2xZY+9Gx8J2aNQoseJAN+ZMdhmMIUzvIU=; b=dsf/kmOWsjHVYU RNOwmi14ns7wnoDMpvQnklXv7EkIaKzVhPsQ0d3LiP0D6pS6zCb0wdN5o0CujSv2Hh5dzo7CD9Hg3 1vSCdZD+0y+2JZbVxJA3dYyuCASX0m275My48EhKGAbZXIPjmrAuIGWTDc4G5yjzDuPAGWwy609pz weoFQej73e1R6mhzCEhY5yXzMblCmi4H1muPCER8QEDmgsnTa7HIyHPMsTvLQTV1mBQGXOI1XoOoD XCngF0bjKqfg0vgPPA2rTBqSxL5ENCNsJ48BU42ndQU2hSD/Q/sT37VNfG/gvmg1kHyu+gvlFjTIL GgnC6fGPj2RsfA+EVDEQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1qvHS0-009wrj-1G; Tue, 24 Oct 2023 13:28:04 +0000 Received: from mail-lf1-x133.google.com ([2a00:1450:4864:20::133]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1qvHRv-009wmV-0J for linux-riscv@lists.infradead.org; Tue, 24 Oct 2023 13:28:00 +0000 Received: by mail-lf1-x133.google.com with SMTP id 2adb3069b0e04-507a3af69d8so1560440e87.0 for ; Tue, 24 Oct 2023 06:27:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1698154077; x=1698758877; darn=lists.infradead.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=EJFNx5rx7qhUkqIPLwjnmrfGOQmOs2H4ET4l8FDTOVI=; b=YAnxaKKi6pbHchsxtGqeP4D9n6fD2p9Kes5bBKvR7mtsiayuM1Z8iEH6mnIl7GEjXj FbdPQFglINuD61SUBeSsGE60afQhzSFPYIaP2ISO7xcXH6NKOF/kbNnSrt6iR/SdzFlu tnKsmDy5piXMnkJpOqSrvtIxIbW0PfeXEENYbaXZkQAnfGfq3eI4VsDlL4fBDpMkhXJ0 JS0sZplE4FgzBY9skzxPS5yljvLlIJFxW6F0zGYHMXGLMonIFPb1PIBDb9epeLaKO5ia ehiSHArfXmdCgmKuHFrO1d96+419V9r3s/o+wfKz0CnYC36mr+JLBLw0FkoDEmlO5D5k 2ssw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1698154077; x=1698758877; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=EJFNx5rx7qhUkqIPLwjnmrfGOQmOs2H4ET4l8FDTOVI=; b=e0q3aefcY6TXQnObQuwFljgt4ADe9flA1hoerq6GjzqVHv15AqRsDFq1SXR73e9WyM m0Hh1L3y35ltm/1IRca0waFZpwAHNP4TckBoPBeaUvbSXsle+NH//nDgi+qyna1bdg+a NZvYmYb/XJkPC+MTmwWekbeDrrFoXvEN6dNMfMeVd2epLCjU8EiHDEpf0S91Xr5ipedE SbfOW6Mb6JXqpJCWsOt/o8ujUflBdOUWJldKGEZwkYKKcvaBOcrL8n74OPDsDPYy82bo puA+3PsNjxaE5fY6rucunOZdQWueDI3d2iyMWBmNp8mNxwnwd9csoE5cV/9DzymzWtdH Te0w== X-Gm-Message-State: AOJu0YxZHQpYGa1ACK67n2Vq1lO5irGzclDS4WihbjA9R0gHGGtP4jae hit18UYxmpMkNVKq6Agc69E2Dg== X-Google-Smtp-Source: AGHT+IFWdNIkY0t6ET2TzgVKN75LNnZuJm4w1A0MxXp+TA6JlTnULSfRKZHPZd/CGJzYRaN7/ZBuVA== X-Received: by 2002:a05:6512:ac3:b0:505:7123:21ae with SMTP id n3-20020a0565120ac300b00505712321aemr8618901lfu.6.1698154076939; Tue, 24 Oct 2023 06:27:56 -0700 (PDT) Received: from carbon-x1.. ([2a01:e0a:999:a3a0:597d:e2c5:6741:bac9]) by smtp.gmail.com with ESMTPSA id c17-20020a5d4151000000b0032d87b13240sm10034964wrq.73.2023.10.24.06.27.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 24 Oct 2023 06:27:56 -0700 (PDT) From: =?UTF-8?q?Cl=C3=A9ment=20L=C3=A9ger?= To: Paul Walmsley , Palmer Dabbelt , Albert Ou , Anup Patel , Atish Patra , Andrew Jones Cc: =?UTF-8?q?Cl=C3=A9ment=20L=C3=A9ger?= , linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org, kvm@vger.kernel.org, kvm-riscv@lists.infradead.org Subject: [PATCH v2 5/5] riscv: kvm: use ".L" local labels in assembly when applicable Date: Tue, 24 Oct 2023 15:26:55 +0200 Message-ID: <20231024132655.730417-6-cleger@rivosinc.com> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20231024132655.730417-1-cleger@rivosinc.com> References: <20231024132655.730417-1-cleger@rivosinc.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20231024_062759_135030_26F1A58B X-CRM114-Status: GOOD ( 10.12 ) X-BeenThere: linux-riscv@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Sender: "linux-riscv" Errors-To: linux-riscv-bounces+linux-riscv=archiver.kernel.org@lists.infradead.org Rm9yIHRoZSBzYWtlIG9mIGNvaGVyZW5jeSwgdXNlIGxvY2FsIGxhYmVscyBpbiBhc3NlbWJseSB3 aGVuCmFwcGxpY2FibGUuIFRoaXMgYWxzbyBhdm9pZCBrcHJvYmVzIGJlaW5nIGNvbmZ1c2VkIHdo ZW4gYXBwbHlpbmcgYQprcHJvYmUgc2luY2UgdGhlIHNpemUgb2YgZnVuY3Rpb24gaXMgY29tcHV0 ZWQgYnkgY2hlY2tpbmcgd2hlcmUgdGhlCm5leHQgdmlzaWJsZSBzeW1ib2wgaXMgbG9jYXRlZC4g VGhpcyBtaWdodCBlbmQgdXAgaW4gY29tcHV0aW5nIHNvbWUKZnVuY3Rpb24gc2l6ZSB0byBiZSB3 YXkgc2hvcnRlciB0aGFuIGV4cGVjdGVkIGFuZCB0aHVzIGZhaWxpbmcgdG8gYXBwbHkKa3Byb2Jl cyB0byB0aGUgc3BlY2lmaWVkIG9mZnNldC4KClNpZ25lZC1vZmYtYnk6IENsw6ltZW50IEzDqWdl ciA8Y2xlZ2VyQHJpdm9zaW5jLmNvbT4KUmV2aWV3ZWQtYnk6IEFuZHJldyBKb25lcyA8YWpvbmVz QHZlbnRhbmFtaWNyby5jb20+Ci0tLQogYXJjaC9yaXNjdi9rdm0vdmNwdV9zd2l0Y2guUyB8IDQg KystLQogMSBmaWxlIGNoYW5nZWQsIDIgaW5zZXJ0aW9ucygrKSwgMiBkZWxldGlvbnMoLSkKCmRp ZmYgLS1naXQgYS9hcmNoL3Jpc2N2L2t2bS92Y3B1X3N3aXRjaC5TIGIvYXJjaC9yaXNjdi9rdm0v dmNwdV9zd2l0Y2guUwppbmRleCA4YjE4NDczNzgwYWMuLjBjMjYxODlhYTAxYyAxMDA2NDQKLS0t IGEvYXJjaC9yaXNjdi9rdm0vdmNwdV9zd2l0Y2guUworKysgYi9hcmNoL3Jpc2N2L2t2bS92Y3B1 X3N3aXRjaC5TCkBAIC00NSw3ICs0NSw3IEBAIFNZTV9GVU5DX1NUQVJUKF9fa3ZtX3Jpc2N2X3N3 aXRjaF90bykKIAlSRUdfTAl0MCwgKEtWTV9BUkNIX0dVRVNUX1NTVEFUVVMpKGEwKQogCVJFR19M CXQxLCAoS1ZNX0FSQ0hfR1VFU1RfSFNUQVRVUykoYTApCiAJUkVHX0wJdDIsIChLVk1fQVJDSF9H VUVTVF9TQ09VTlRFUkVOKShhMCkKLQlsYQl0NCwgX19rdm1fc3dpdGNoX3JldHVybgorCWxhCXQ0 LCAuTGt2bV9zd2l0Y2hfcmV0dXJuCiAJUkVHX0wJdDUsIChLVk1fQVJDSF9HVUVTVF9TRVBDKShh MCkKIAogCS8qIFNhdmUgSG9zdCBhbmQgUmVzdG9yZSBHdWVzdCBTU1RBVFVTICovCkBAIC0xMTMs NyArMTEzLDcgQEAgU1lNX0ZVTkNfU1RBUlQoX19rdm1fcmlzY3Zfc3dpdGNoX3RvKQogCiAJLyog QmFjayB0byBIb3N0ICovCiAJLmFsaWduIDIKLV9fa3ZtX3N3aXRjaF9yZXR1cm46CisuTGt2bV9z d2l0Y2hfcmV0dXJuOgogCS8qIFN3YXAgR3Vlc3QgQTAgd2l0aCBTU0NSQVRDSCAqLwogCWNzcnJ3 CWEwLCBDU1JfU1NDUkFUQ0gsIGEwCiAKLS0gCjIuNDIuMAoKCl9fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fCmxpbnV4LXJpc2N2IG1haWxpbmcgbGlzdApsaW51 eC1yaXNjdkBsaXN0cy5pbmZyYWRlYWQub3JnCmh0dHA6Ly9saXN0cy5pbmZyYWRlYWQub3JnL21h aWxtYW4vbGlzdGluZm8vbGludXgtcmlzY3YK From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 61FE7C07545 for ; Tue, 24 Oct 2023 13:37:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1343492AbjJXNhK (ORCPT ); Tue, 24 Oct 2023 09:37:10 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44766 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234547AbjJXNgu (ORCPT ); Tue, 24 Oct 2023 09:36:50 -0400 Received: from mail-lf1-x12c.google.com (mail-lf1-x12c.google.com [IPv6:2a00:1450:4864:20::12c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BDA376E85 for ; Tue, 24 Oct 2023 06:27:58 -0700 (PDT) Received: by mail-lf1-x12c.google.com with SMTP id 2adb3069b0e04-507a80e2a86so1552126e87.1 for ; Tue, 24 Oct 2023 06:27:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1698154077; x=1698758877; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=EJFNx5rx7qhUkqIPLwjnmrfGOQmOs2H4ET4l8FDTOVI=; b=Zbyz6T5qbkAMpwaeneQdg3zL3d47suRKNRrvsFDD+y3Ei0XN24YX430fRV1uiUpXrC Ho35mh39xUWgM+tsLLTefNAshXDfuhoJIINl+Pv2mjsgk/ZY7I71iIpPGM97nDFyHYAx TMzqoVJ1M0MFdvWdH7hlCqzp4NdoZrbzwyYwAEAH5pWIcJfbYSwWei6D4TrjsBVIW9YD g6DtBPKZMqUFMxnSyWEJ5fbPxIK1UdVT4QmZaVniG4OzeornVF+LI/pnHKlqMddH1ydw P0frM3i3i1uH3gUMhfJR4nkh7UNliUnPBx/EbrYnzMY3SZha/xujawddGvjYQcjAeJ4u TZyw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1698154077; x=1698758877; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=EJFNx5rx7qhUkqIPLwjnmrfGOQmOs2H4ET4l8FDTOVI=; b=cWgtxjsRO7JCRtqlSfBBf98LzqDJ4TfILdS6iT9zootnGibqCmERjNH0ooC0OGSui3 CWSiPxli8e6+2mXVJ8zA+RSipWEmgzJivSZJSo7HWFgrbCfh+Gv8OBTLozfa1JgF+QMW o588ZhuJ16n16dgatMdNv4ZMAAoqQKHFHYEEw977BxFaCU1m8yakarGWC6CK1tPgJ1Jz Qzi/7uQ/g3uHC15g+RjaCvVRThXlqrQbdBAVWEdg27TZTWpCbQEosTxpYUHtsLeBv6gL 56Zn2vl77l+KWhM5a3rlIN7bt19eKCyMhj9/NlmsfMTAIkLFDDAcr2axvHXJm9wlWnL1 7gow== X-Gm-Message-State: AOJu0YxqXfXVf3TvNqJAJYa5bT1V7RrBuEr0JfdWxfSKi7mRaTQjY6bv EOUKcX0q27B3byY48TbO1vzWpr7h2PpG/KVIsBJqZA== X-Google-Smtp-Source: AGHT+IFWdNIkY0t6ET2TzgVKN75LNnZuJm4w1A0MxXp+TA6JlTnULSfRKZHPZd/CGJzYRaN7/ZBuVA== X-Received: by 2002:a05:6512:ac3:b0:505:7123:21ae with SMTP id n3-20020a0565120ac300b00505712321aemr8618901lfu.6.1698154076939; Tue, 24 Oct 2023 06:27:56 -0700 (PDT) Received: from carbon-x1.. ([2a01:e0a:999:a3a0:597d:e2c5:6741:bac9]) by smtp.gmail.com with ESMTPSA id c17-20020a5d4151000000b0032d87b13240sm10034964wrq.73.2023.10.24.06.27.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 24 Oct 2023 06:27:56 -0700 (PDT) From: =?UTF-8?q?Cl=C3=A9ment=20L=C3=A9ger?= To: Paul Walmsley , Palmer Dabbelt , Albert Ou , Anup Patel , Atish Patra , Andrew Jones Cc: =?UTF-8?q?Cl=C3=A9ment=20L=C3=A9ger?= , linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org, kvm@vger.kernel.org, kvm-riscv@lists.infradead.org Subject: [PATCH v2 5/5] riscv: kvm: use ".L" local labels in assembly when applicable Date: Tue, 24 Oct 2023 15:26:55 +0200 Message-ID: <20231024132655.730417-6-cleger@rivosinc.com> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20231024132655.730417-1-cleger@rivosinc.com> References: <20231024132655.730417-1-cleger@rivosinc.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org For the sake of coherency, use local labels in assembly when applicable. This also avoid kprobes being confused when applying a kprobe since the size of function is computed by checking where the next visible symbol is located. This might end up in computing some function size to be way shorter than expected and thus failing to apply kprobes to the specified offset. Signed-off-by: Clément Léger Reviewed-by: Andrew Jones --- arch/riscv/kvm/vcpu_switch.S | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/riscv/kvm/vcpu_switch.S b/arch/riscv/kvm/vcpu_switch.S index 8b18473780ac..0c26189aa01c 100644 --- a/arch/riscv/kvm/vcpu_switch.S +++ b/arch/riscv/kvm/vcpu_switch.S @@ -45,7 +45,7 @@ SYM_FUNC_START(__kvm_riscv_switch_to) REG_L t0, (KVM_ARCH_GUEST_SSTATUS)(a0) REG_L t1, (KVM_ARCH_GUEST_HSTATUS)(a0) REG_L t2, (KVM_ARCH_GUEST_SCOUNTEREN)(a0) - la t4, __kvm_switch_return + la t4, .Lkvm_switch_return REG_L t5, (KVM_ARCH_GUEST_SEPC)(a0) /* Save Host and Restore Guest SSTATUS */ @@ -113,7 +113,7 @@ SYM_FUNC_START(__kvm_riscv_switch_to) /* Back to Host */ .align 2 -__kvm_switch_return: +.Lkvm_switch_return: /* Swap Guest A0 with SSCRATCH */ csrrw a0, CSR_SSCRATCH, a0 -- 2.42.0