From patchwork Fri Nov 17 19:56:11 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Charlie Jenkins X-Patchwork-Id: 166298 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9910:0:b0:403:3b70:6f57 with SMTP id i16csp779792vqn; Fri, 17 Nov 2023 12:02:30 -0800 (PST) X-Google-Smtp-Source: AGHT+IFuDFM2CexGND9yuMnuSXsZ6iQV3FzYD4N2JhVho/m0iyOZKclLMfl/mJpPMQIAphy+1LDr X-Received: by 2002:a17:902:d491:b0:1cc:7e40:de4a with SMTP id c17-20020a170902d49100b001cc7e40de4amr737574plg.58.1700251350017; Fri, 17 Nov 2023 12:02:30 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1700251349; cv=none; d=google.com; s=arc-20160816; b=i+8pH/I9excjAy01IcZyvSubGMbvE7uwc31UXBiyjyu2b1UV3Ci4Q3ekf06VjIf7as bIju9lRubGmvPP26A/DRxLrCijzEJHNOIzfuuIS+5d/9osuYnrvHp435wffQwjQhfCF9 MxOfdUZgzYAhcr50Jtp7tL0HfZBLZdrd88G92m/K3YKqnumlXMzBgftsvMFzSdicuLrA HXhuZQO5t6HpyAhVNCBTBad3REArYqKGN+/TJZ3sDpeHZGK32AbwrtSkZp0GfCYPArHF kWeOA6XzEZFuAw+t/FrEGGKFVLTx6vX0Dh2Zr3seAlPXgWoL+ti/w3/zAa28bE424QVd Pwgg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:in-reply-to:references:message-id :content-transfer-encoding:mime-version:subject:date:from :dkim-signature; bh=eFY9yyw+/EAdIRUxdIlmPfWs3oHbG4Tu++kYGInr8MQ=; fh=kw4Z/sSXEfnzVF7S5naQFfkIg6ezWm8mQYNglyA9etg=; b=gmSd0nCxUF7nGQtsKqmp8U2KNrI1rVXrOCFBc3JAuT5sXkWc0eJdm7wDuc6SUq8zq1 XUdUniNhqEndkscgeJxgoAhM8en7mK1D80Fxu3jliD9v4RdJb7ax55g7Ay1bSBfgFxcF 7be7aEuLFis6iird6gy+kg7WhYZuFgN0PZuKbj1cHBeL/jGoHxYw07skEb82AqaQPpy6 IhalMdHDMw+G9YjkdxtPAVuzaDx9EzxOUSLm9osmLmawkKuX8tLYKbTY0bV6osFnumaZ RLUOXqeP3dHo0roNsFgYmPW+O6p/aB3UWB3Xv9ks3qQia4pG/LwtW6sCHk7G6M/Q1N+c rsgw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=bzFeIzWM; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from snail.vger.email (snail.vger.email. [23.128.96.37]) by mx.google.com with ESMTPS id jh6-20020a170903328600b001cc50f67fd9si2334370plb.511.2023.11.17.12.02.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 17 Nov 2023 12:02:29 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) client-ip=23.128.96.37; Authentication-Results: mx.google.com; dkim=pass header.i=@rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=bzFeIzWM; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 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 682A48051907; Fri, 17 Nov 2023 12:01:28 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232163AbjKQUBU (ORCPT + 29 others); Fri, 17 Nov 2023 15:01:20 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48868 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232118AbjKQUBS (ORCPT ); Fri, 17 Nov 2023 15:01:18 -0500 Received: from mail-pl1-x62d.google.com (mail-pl1-x62d.google.com [IPv6:2607:f8b0:4864:20::62d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 247FDD6A for ; Fri, 17 Nov 2023 12:01:13 -0800 (PST) Received: by mail-pl1-x62d.google.com with SMTP id d9443c01a7336-1cc1e1e74beso21240245ad.1 for ; Fri, 17 Nov 2023 12:01:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1700251272; x=1700856072; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=eFY9yyw+/EAdIRUxdIlmPfWs3oHbG4Tu++kYGInr8MQ=; b=bzFeIzWMPm+/0dMozHI/Kobn4mCLpm09WvAAi72Dj+KYJFOl2rSt1TvrhinPx00785 h3BTFvsLrfQ3USlKgzj5HXJ0R6eWLcyrvKyhmMhvgDlBU4+CNIrmBb3tXCt5PQsOpU8f t6I0OW2wBJHWmo4+KkZlct4Hl94HJT57ZLITdL6Hrb9qIjY0VBK5iA0X0rfrlSb2Us94 NsZcX+nNbUvp0ieMVFyy9FMImvvR5WrygHlckbny4FQvcAWVM01Ejm6PW6FJGviEptJr uIt4Zdv0Vx4D7/2ZzKLvrBrrGiBmT8MRB6BCYGHxxOjZrVGHnMGxu9ylqdBUVNf5RSW0 sFdA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1700251272; x=1700856072; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=eFY9yyw+/EAdIRUxdIlmPfWs3oHbG4Tu++kYGInr8MQ=; b=pPmybbYSH2Q6+F2N73NdTzxcYcF/2coSfCJjihbv16cqq1lEU2GHyY4123gveTIm3f KK8EDmvYp4lqlmdsO4fvylIzT5xkNYabaO0/wUUWR2ECVu5z7wcRQLqT0XHZYFBNSc72 IjpSoDlVnrlirBXfXhk1f/4lYoIY7DVhfCIfZjtoWWH7RjiqzR3xJ9WERuqF0s3BHbg6 hU2bNjqGbC1FeF2YspqLzfRvRd2lLYy6Ec7ZgdjvZZF6pLg8ZQXJ9cb3qBxx1tjGdWFl aVMcQy1G7tAwv5gmtMglSHDUtHBHJEaSPtUu1sMyFIAlkKATFXUPktthKcXhc9XdmD+J J3zg== X-Gm-Message-State: AOJu0Yz1zgO28xaw5x3iTlRrxhI6/f8Pu/Md6y3l16psc/YdqpY+aGf4 IAVeLcvHiJPBhepkwWZ3ihWnnQ== X-Received: by 2002:a17:902:9687:b0:1cc:431f:55e6 with SMTP id n7-20020a170902968700b001cc431f55e6mr543932plp.63.1700251272659; Fri, 17 Nov 2023 12:01:12 -0800 (PST) Received: from charlie.ba.rivosinc.com ([64.71.180.162]) by smtp.gmail.com with ESMTPSA id bf1-20020a170902b90100b001b53953f306sm1749737plb.178.2023.11.17.12.01.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 17 Nov 2023 12:01:11 -0800 (PST) From: Charlie Jenkins Date: Fri, 17 Nov 2023 11:56:11 -0800 Subject: [PATCH 1/2] Support rv32 ULEB128 test MIME-Version: 1.0 Message-Id: <20231117-module_fixup-v1-1-62bb777f6825@rivosinc.com> References: <20231117-module_fixup-v1-0-62bb777f6825@rivosinc.com> In-Reply-To: <20231117-module_fixup-v1-0-62bb777f6825@rivosinc.com> To: Paul Walmsley , Palmer Dabbelt , Albert Ou , Randy Dunlap Cc: Palmer Dabbelt , linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org, Charlie Jenkins X-Mailer: b4 0.12.3 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, T_SCC_BODY_TEXT_LINE autolearn=ham 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]); Fri, 17 Nov 2023 12:01:28 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1782842759407342896 X-GMAIL-MSGID: 1782842759407342896 Use opcodes available to both rv32 and rv64 in uleb128 module linking test. Fixes: af71bc194916 ("riscv: Add tests for riscv module loading") Signed-off-by: Charlie Jenkins Reported-by: Randy Dunlap Tested-by: Randy Dunlap # build-tested --- arch/riscv/kernel/tests/module_test/test_uleb128.S | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/riscv/kernel/tests/module_test/test_uleb128.S b/arch/riscv/kernel/tests/module_test/test_uleb128.S index 90f22049d553..8515ed7cd8c1 100644 --- a/arch/riscv/kernel/tests/module_test/test_uleb128.S +++ b/arch/riscv/kernel/tests/module_test/test_uleb128.S @@ -6,13 +6,13 @@ .text .global test_uleb_basic test_uleb_basic: - ld a0, second + lw a0, second addi a0, a0, -127 ret .global test_uleb_large test_uleb_large: - ld a0, fourth + lw a0, fourth addi a0, a0, -0x07e8 ret @@ -22,10 +22,10 @@ first: second: .reloc second, R_RISCV_SET_ULEB128, second .reloc second, R_RISCV_SUB_ULEB128, first - .dword 0 + .word 0 third: .space 1000 fourth: .reloc fourth, R_RISCV_SET_ULEB128, fourth .reloc fourth, R_RISCV_SUB_ULEB128, third - .dword 0 + .word 0 From patchwork Fri Nov 17 19:56:12 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Charlie Jenkins X-Patchwork-Id: 166299 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9910:0:b0:403:3b70:6f57 with SMTP id i16csp779863vqn; Fri, 17 Nov 2023 12:02:36 -0800 (PST) X-Google-Smtp-Source: AGHT+IElLGxQk38RLInjI3HE56zZK2xK7AjquRwWZluIIFOyENBdNCwqjwV2//+ULYY4mkM935jV X-Received: by 2002:a05:6a20:8f1f:b0:17d:d272:7954 with SMTP id b31-20020a056a208f1f00b0017dd2727954mr8228435pzk.9.1700251355865; Fri, 17 Nov 2023 12:02:35 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1700251355; cv=none; d=google.com; s=arc-20160816; b=HVqPAgMREbFzOVkkLvUiGlDI8xZqiJdh+BuReEjLDFNJQiN6PekIPz5vcAgMvhQR/N UYXih7NLC7/fwq0sRnbqfs1LR+zd4HZeptPeY2wuPdh2tNDcHPWEkYdYtJjJrZvNnYw7 I6q0AucyxlUHRhuZnonL3ZAMJy+9geFT7b7rvBJFVhgrdbUMd0olA2eVvkI+yrt8hLqu /rI+FJl+Vwx5FZeK8aofdi73pyMH2LbMrjwAcSsGcIX3ZANPs5UC/MchUsQwKs3iwEV4 5bklKbTTiioQriV367ovO4uNNNH9RABqcQLp043uO+LDRQTs45IGYDOivt7XMkfqzx9s S22g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:in-reply-to:references:message-id :content-transfer-encoding:mime-version:subject:date:from :dkim-signature; bh=PagaqPISiFMUN5ZfGlzy9E8bahGMoCf4MLBDz6dwo3U=; fh=kw4Z/sSXEfnzVF7S5naQFfkIg6ezWm8mQYNglyA9etg=; b=XM0qi9g8v7fDPHx8MC6y72CV0D6DPfehzpqCDbkZG+2J4UW+JbFaGUx2AT/KEc2mQO Bjvhe5Fhw9PuzhRB/M6UtlyHHxw4h4SCUjgo7fLQVwDY+/e/o+5SOCHziMZjHTIRukPo hUIb402qRKAK/AqCkggzCAfS5/UCiEGzAwoxj3ZNPTKGIuUtZ8KJwDyY23B9AzMj1Bsn Cm3vA0sioT1CWhWV53grijga1Z+oNBGi+pcoTESvYOvmgwu8fdzfwsv5Bgslv4jdmp5Q Hi6aHeMloVq+qWbofjbUvlV6gYCIipzsdGKXM0Qe/0TQiTy4U+xPQ47Gqu2JfZu0U+kP UnlQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=qrEa9VIk; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from snail.vger.email (snail.vger.email. [23.128.96.37]) by mx.google.com with ESMTPS id e6-20020a63d946000000b005b8ebb6d6d7si2409684pgj.117.2023.11.17.12.02.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 17 Nov 2023 12:02:35 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) client-ip=23.128.96.37; Authentication-Results: mx.google.com; dkim=pass header.i=@rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=qrEa9VIk; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 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 87B1C80A73E3; Fri, 17 Nov 2023 12:01:40 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232415AbjKQUBX (ORCPT + 29 others); Fri, 17 Nov 2023 15:01:23 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48870 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229535AbjKQUBS (ORCPT ); Fri, 17 Nov 2023 15:01:18 -0500 Received: from mail-pl1-x62f.google.com (mail-pl1-x62f.google.com [IPv6:2607:f8b0:4864:20::62f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4F017AD for ; Fri, 17 Nov 2023 12:01:14 -0800 (PST) Received: by mail-pl1-x62f.google.com with SMTP id d9443c01a7336-1ce618b7919so5934275ad.0 for ; Fri, 17 Nov 2023 12:01:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1700251274; x=1700856074; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=PagaqPISiFMUN5ZfGlzy9E8bahGMoCf4MLBDz6dwo3U=; b=qrEa9VIkFCMc8UBv7aN8NJGTiooZ3UXuqTzX9IXIH9ecQaAlMXRgmud2bwOJ5autrh bGI6CsxP5fGAs62q462ClRCpxepC24dE7VSLqKg8YOO8FdcfTcn2y7AWfyXFlrXbR/Ge aCNLa3zRDr/xs03Qhp+AdBZBDo2VF54PzuUVKAaRgkJZK/Up06vcQdLFzVC/4sQv7AKY 2b58QpujQeY7AaIHJQH8F27596dG1cg7JUFKE7wONJNgJnfcPzYEKke/nPMh4O4t/oVF 9QyxexuSeulKwx1CfulQplwD/LYICJfeCv2P4JU8UhqvsvAOgY0acEiSzaTuOtrhR8wm QP2w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1700251274; x=1700856074; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=PagaqPISiFMUN5ZfGlzy9E8bahGMoCf4MLBDz6dwo3U=; b=PhwrRHmDd6nsCqLncrMDbfG9pTJ3KwgBIhz6dxVipd5JvwpSUQugdtwDeqyKGLiY/p Vhp3euMF37SApmXO/0RwPWA5QpGKwovw9kKUskOztFQ9mmNExt0OCKBA5oOGOgZc1YKf hQKmwXP0kaCWKRTPCwJMsa6pNGx6CeBaKjWmaC87QKYaiR/bOE+v4OHgI6yTdFqc71xU dZl4hA2bZd9dnRz4kG/YCaAe3XK0AVWYmEo1axzTSqRVMaQT63xKUFz+G+EMG7lgD9t4 294Pq3bsiBrJ94KsqCV/5TdOzHZ2kELXLxfINObiRpqtfQA77glewTVjnPjRpSR6VRly ZEbw== X-Gm-Message-State: AOJu0YxLZj744PdIguIjfFmTpXu8+8iSDqDQlTI9Fall+7xgeZkOHFar l5O8MfINvNlo+bpPSCC3xC6U4A== X-Received: by 2002:a17:902:f684:b0:1c0:afda:7707 with SMTP id l4-20020a170902f68400b001c0afda7707mr127578plg.34.1700251273779; Fri, 17 Nov 2023 12:01:13 -0800 (PST) Received: from charlie.ba.rivosinc.com ([64.71.180.162]) by smtp.gmail.com with ESMTPSA id bf1-20020a170902b90100b001b53953f306sm1749737plb.178.2023.11.17.12.01.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 17 Nov 2023 12:01:13 -0800 (PST) From: Charlie Jenkins Date: Fri, 17 Nov 2023 11:56:12 -0800 Subject: [PATCH 2/2] Correct type casting in module loading MIME-Version: 1.0 Message-Id: <20231117-module_fixup-v1-2-62bb777f6825@rivosinc.com> References: <20231117-module_fixup-v1-0-62bb777f6825@rivosinc.com> In-Reply-To: <20231117-module_fixup-v1-0-62bb777f6825@rivosinc.com> To: Paul Walmsley , Palmer Dabbelt , Albert Ou , Randy Dunlap Cc: Palmer Dabbelt , linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org, Charlie Jenkins X-Mailer: b4 0.12.3 X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,RCVD_IN_DNSWL_BLOCKED,SPF_HELO_NONE,SPF_PASS, T_SCC_BODY_TEXT_LINE autolearn=ham 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]); Fri, 17 Nov 2023 12:01:40 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1782842765740491990 X-GMAIL-MSGID: 1782842765740491990 Make static variables static and use __le16. Fixes: 8fd6c5142395 ("riscv: Add remaining module relocations") Signed-off-by: Charlie Jenkins Reviewed-by: Samuel Holland Tested-by: Samuel Holland --- arch/riscv/kernel/module.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/riscv/kernel/module.c b/arch/riscv/kernel/module.c index 56a8c78e9e21..9f2dc2c0e436 100644 --- a/arch/riscv/kernel/module.c +++ b/arch/riscv/kernel/module.c @@ -45,9 +45,9 @@ void process_accumulated_relocations(struct module *me); int add_relocation_to_accumulate(struct module *me, int type, void *location, unsigned int hashtable_bits, Elf_Addr v); -struct hlist_head *relocation_hashtable; +static struct hlist_head *relocation_hashtable; -struct list_head used_buckets_list; +static struct list_head used_buckets_list; /* * The auipc+jalr instruction pair can reach any PC-relative offset @@ -64,7 +64,7 @@ static bool riscv_insn_valid_32bit_offset(ptrdiff_t val) static int riscv_insn_rmw(void *location, u32 keep, u32 set) { - u16 *parcel = location; + __le16 *parcel = location; u32 insn = (u32)le16_to_cpu(parcel[0]) | (u32)le16_to_cpu(parcel[1]) << 16; insn &= keep; @@ -77,7 +77,7 @@ static int riscv_insn_rmw(void *location, u32 keep, u32 set) static int riscv_insn_rvc_rmw(void *location, u16 keep, u16 set) { - u16 *parcel = location; + __le16 *parcel = location; u16 insn = le16_to_cpu(*parcel); insn &= keep;