From patchwork Tue Oct 24 13:26:50 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?Q2zDqW1lbnQgTMOpZ2Vy?= X-Patchwork-Id: 15812 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:ce89:0:b0:403:3b70:6f57 with SMTP id p9csp1945505vqx; Tue, 24 Oct 2023 06:34:57 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEJaY7RLHiVvJij67rSMT4KkKRbcypXHtUYYRIqWcOzgVuVBzSJFtEUwR9NTiHbPymlHTD/ X-Received: by 2002:a05:6a21:328e:b0:17e:8d04:f764 with SMTP id yt14-20020a056a21328e00b0017e8d04f764mr3101118pzb.2.1698154497318; Tue, 24 Oct 2023 06:34:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1698154497; cv=none; d=google.com; s=arc-20160816; b=blbrGvxRTyDrGXdNJVNAR6oTg+sx3cVo7MM62F1HgQUPuj+DVuGC5y2jLrd40aGCja 4Ab5U/mqHWgBgvmabUguNsddouBsP2WzfnzYhi99mV71CLcSAXatgHPIsz8vI6OECTEF mimKs2ahRJ8zCyxc4t/jJ6YbUmHkayW5b31PatUwEldC09I/21DV0LqjoVVLN0J2uslE 8LV+DlfXRzUHqpcbiFBH6BzJz9iYj94bkWm2VXdvrJsdAomms/Nb1d6j8YnANV9O+eu/ eVHMcom1yuTvvNNwHRxh8PHxub1RWybDSWh55yk4huwxT2T96SYbcmmsz43E8pppvSys RAQg== 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=p7NxDbO7GUxLbtod+vtUf5vVuxdvzarRCEG44wnrlEM=; fh=Rc5BA83UGq8xI+benUSDUMXSpsH6SOD8MT9gG1locMQ=; b=G39GW/zglSp9KpVwBuJauRxyVNXePy0dMal4ksi3T3nmIkqq5zqS1Pvw52Jo1qZXLX VosjY983mK8eKtrxcMKqjc6EdltW+gsuLOXVEAdZszrP1HSBUgFvqqc1VOqqdba5853T VUKejHoGUemjSgBTYH82maVTgjkGtL5vVHhOOKeS6I77foek2dSCei9LIJXx8TnlEoas HFyhVSVouhH8YFU05fp+TGjgz/YxmIlNSqYJxXzY5a6jo32uTCqYyj20GW9D7fWY4qfR b2Z9x0yQ5b/QncR9O2fp3mOef8okX8jJOoW8aQ9p4cPmsrnP99GkfDTXljatSnzKn1Zm uVZA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=xwUmhfBy; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from snail.vger.email (snail.vger.email. [2620:137:e000::3:7]) by mx.google.com with ESMTPS id n3-20020a654cc3000000b00565f0e91894si8154821pgt.394.2023.10.24.06.34.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 24 Oct 2023 06:34:57 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) client-ip=2620:137:e000::3:7; Authentication-Results: mx.google.com; dkim=pass header.i=@rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=xwUmhfBy; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by snail.vger.email (Postfix) with ESMTP id A3B88802C8D8; Tue, 24 Oct 2023 06:34:55 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234581AbjJXNew (ORCPT + 26 others); Tue, 24 Oct 2023 09:34:52 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48752 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234574AbjJXNer (ORCPT ); Tue, 24 Oct 2023 09:34:47 -0400 Received: from mail-wm1-x330.google.com (mail-wm1-x330.google.com [IPv6:2a00:1450:4864:20::330]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 02E956A70 for ; Tue, 24 Oct 2023 06:27:53 -0700 (PDT) Received: by mail-wm1-x330.google.com with SMTP id 5b1f17b1804b1-408363c2918so5186735e9.0 for ; Tue, 24 Oct 2023 06:27:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1698154071; x=1698758871; 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=p7NxDbO7GUxLbtod+vtUf5vVuxdvzarRCEG44wnrlEM=; b=xwUmhfBygJgbn9ZhfJx6kMQE/3xoShhv+BwNb498DMPgntOJZO0skb+jMsPBXAkaoJ kLo/QGylY36f7bjKLy8RWH4YW1WIxyb+HWY0GEu6xgkPc68H/7nvjMwLFiciW09t/mYT MfW8keRcVgh9QvzzRsrNBPJ5GensudLK4y1Kf1/DIBRJlVxqTMtPIcwbyXTb0k7ryaSZ AYaGSXKL5pw2YN0JgzROVQdMEdj4nB2giRlkzD+vL1bvYQ70WkaYlV6PwPiMxyI+Kcqs WXRygQGjPzMgGSEEknSJzgE1Tp0K4+EwItWL7Lgnl1QNReCHMsTg0cDk+TTG8zQ62qxw fbkg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1698154071; x=1698758871; 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=p7NxDbO7GUxLbtod+vtUf5vVuxdvzarRCEG44wnrlEM=; b=o6Hdg8jh9FjNZYco8/kTK1zB0skinbzWzQeDkfrLdFSWquaSZnI4ZS0qy0U75sd9Gl wD9Aj6hNWqtXhrz+BQt6riND+8rv6ZLYLutt5NJpfZ9SGXHxktoJPNdpDZ3W19W1ekLk sclwwcorw+iueQPx4t1w2A4EHZ6ejd7PsOXLAEyx3aTEmKV4aid243gHgVIA+1ERc04Z Es5NSgltF+j2q3egKb6AVf5vrSwKQi8diLISf0h0xx+EH9kzx1BaNNEwJOYk1SL37gqh MV5IdPvj0fbFQsCpUb9ZQLwor7JdrUFYw4iLn+m3o/hrUKLQ5sL+uZ0fU8NOFCJIc373 T3Ww== X-Gm-Message-State: AOJu0Yz4xEbgiixgtIDcnlSQJjU9RQHUqj0M/QH2lzTaw7JbN4/jzBGJ vs5rdvZCuSeEk99aXUcQl+dDiQ== X-Received: by 2002:a05:600c:2293:b0:403:334:fb0d with SMTP id 19-20020a05600c229300b004030334fb0dmr9098071wmf.4.1698154071124; Tue, 24 Oct 2023 06:27:51 -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.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 24 Oct 2023 06:27:50 -0700 (PDT) From: =?utf-8?b?Q2zDqW1lbnQgTMOpZ2Vy?= To: Paul Walmsley , Palmer Dabbelt , Albert Ou , Anup Patel , Atish Patra , Andrew Jones Cc: =?utf-8?b?Q2zDqW1lbnQgTMOpZ2Vy?= , linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org, kvm@vger.kernel.org, kvm-riscv@lists.infradead.org Subject: [PATCH v2 0/5] riscv: cleanup assembly usage of ENTRY()/END() and use local labels Date: Tue, 24 Oct 2023 15:26:50 +0200 Message-ID: <20231024132655.730417-1-cleger@rivosinc.com> X-Mailer: git-send-email 2.42.0 MIME-Version: 1.0 X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,RCVD_IN_DNSWL_NONE,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 lindbergh.monkeyblade.net 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 (snail.vger.email [0.0.0.0]); Tue, 24 Oct 2023 06:34:55 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1780644050156124179 X-GMAIL-MSGID: 1780644050156124179 This series does a cleanup of all ENTRY()/END() macros that are used in arch/riscv/ as well as use of local labels. This allows to remove the use of the now deprecated ENTRY()/END()/WEAK() macros as well as using the new SYM_*() ones which provide a better understanding of what is meant to be annotated. Some wrong usage of SYM_FUNC_START() are also fixed in this series by using the correct annotations. Finally a few labels that were meant to be local have been renamed to use the .L suffix and thus not to be emitted as visible symbols. Note: the patches have been split between arch/riscv/ and arch/riscv/kvm/ due to having different maintainers. --- Changes in V2: - Remove duplicated SYM_FUNC_END(memmove) - Use SYM_DATA for simple .quad usage - Added Andrew Rb: Clément Léger (5): riscv: use ".L" local labels in assembly when applicable riscv: Use SYM_*() assembly macros instead of deprecated ones riscv: kernel: Use correct SYM_DATA_*() macro for data riscv: kvm: Use SYM_*() assembly macros instead of deprecated ones riscv: kvm: use ".L" local labels in assembly when applicable arch/riscv/kernel/copy-unaligned.S | 8 +-- arch/riscv/kernel/entry.S | 19 +++---- arch/riscv/kernel/fpu.S | 8 +-- arch/riscv/kernel/head.S | 30 +++++----- arch/riscv/kernel/hibernate-asm.S | 12 ++-- arch/riscv/kernel/mcount-dyn.S | 20 +++---- arch/riscv/kernel/mcount.S | 18 +++--- arch/riscv/kernel/probes/rethook_trampoline.S | 4 +- arch/riscv/kernel/suspend_entry.S | 4 +- arch/riscv/kernel/vdso/flush_icache.S | 4 +- arch/riscv/kernel/vdso/getcpu.S | 4 +- arch/riscv/kernel/vdso/rt_sigreturn.S | 4 +- arch/riscv/kernel/vdso/sys_hwprobe.S | 4 +- arch/riscv/kvm/vcpu_switch.S | 32 +++++------ arch/riscv/lib/memcpy.S | 6 +- arch/riscv/lib/memmove.S | 57 +++++++++---------- arch/riscv/lib/memset.S | 6 +- arch/riscv/lib/uaccess.S | 11 ++-- arch/riscv/purgatory/entry.S | 16 ++---- 19 files changed, 124 insertions(+), 143 deletions(-)