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 372A7C77B7A for ; Wed, 24 May 2023 17:50:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236308AbjEXRuC (ORCPT ); Wed, 24 May 2023 13:50:02 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59730 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232199AbjEXRt6 (ORCPT ); Wed, 24 May 2023 13:49:58 -0400 Received: from bg4.exmail.qq.com (bg4.exmail.qq.com [43.154.221.58]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A085F122; Wed, 24 May 2023 10:49:54 -0700 (PDT) X-QQ-mid: bizesmtp84t1684950589taqcvbsf Received: from linux-lab-host.localdomain ( [116.30.125.36]) by bizesmtp.qq.com (ESMTP) with id ; Thu, 25 May 2023 01:49:48 +0800 (CST) X-QQ-SSF: 00200000000000D0V000000A0000000 X-QQ-FEAT: uGhnJwy6xZIUNwFWUkTcVZC7g8QNyKiY+XzJriACbUL4oqMszlNtgYpAkhLex cwihvRwjjgmsdDZeCDPBF1DQ938pSja9bqh13OBnuTww50GACW6NmZRGD621FTL2iQ3QVmZ 3HkI3ZEvZW3yLng05TVWCIwUhYuPiSBwb0uYCZ2D0qnkqyOSDmeRKNiGa4kRHpIhHm7YHPU M+DcW0gUtbzTW69JkDGyC5dTxiYptZzlvCJn1XJGMlllb0F9TAExPLOZnvDJwVcyv4oUI5Y ue15DAsGTU3Ke9lTyUtaRF1ixOTRnyGTK0aokkIreZiU8hdYxCiI4zKZzp6KpnUehGaYkIe EmHYz1QP6NJqwxJyJLXzjh4+56x/vuIlsuhL/BW/dMwVCVkSckCr2+nK3wZ+NdVB6t/VW7q X-QQ-GoodBg: 0 X-BIZMAIL-ID: 17354439834397082086 From: Zhangjin Wu To: w@1wt.eu Cc: falcon@tinylab.org, linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org, linux-riscv@lists.infradead.org, palmer@dabbelt.com, paul.walmsley@sifive.com, thomas@t-8ch.de Subject: [PATCH 04/13] selftests/nolibc: syscall_args: use __NR_statx for rv32 Date: Thu, 25 May 2023 01:48:11 +0800 Message-Id: X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-QQ-SENDSIZE: 520 Feedback-ID: bizesmtp:tinylab.org:qybglogicsvrsz:qybglogicsvrsz3a-3 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org When compile nolibc-test.c for rv32, we got such error: tools/testing/selftests/nolibc/nolibc-test.c:599:57: error: ‘__NR_fstat’ undeclared (first use in this function) 599 | CASE_TEST(syscall_args); EXPECT_SYSER(1, syscall(__NR_fstat, 0, NULL), -1, EFAULT); break; The generic include/uapi/asm-generic/unistd.h used by rv32 doesn't support __NR_fstat, use __NR_statx instead: Running test 'syscall' 69 syscall_noargs = 1 [OK] 70 syscall_args = -1 EFAULT [OK] As tools/include/nolibc/sys.h shows, __NR_statx is either not supported by all platforms, so, both __NR_fstat and __NR_statx are required. Btw, the latest riscv libc6-dev package is required, otherwise, we would also get such error: In file included from /usr/riscv64-linux-gnu/include/sys/cdefs.h:452, from /usr/riscv64-linux-gnu/include/features.h:461, from /usr/riscv64-linux-gnu/include/bits/libc-header-start.h:33, from /usr/riscv64-linux-gnu/include/limits.h:26, from /usr/lib/gcc-cross/riscv64-linux-gnu/9/include/limits.h:194, from /usr/lib/gcc-cross/riscv64-linux-gnu/9/include/syslimits.h:7, from /usr/lib/gcc-cross/riscv64-linux-gnu/9/include/limits.h:34, from /labs/linux-lab/src/linux-stable/tools/testing/selftests/nolibc/nolibc-test.c:6: /usr/riscv64-linux-gnu/include/bits/wordsize.h:28:3: error: #error "rv32i-based targets are not supported" 28 | # error "rv32i-based targets are not supported" The glibc commit 5b6113d62efa ("RISC-V: Support the 32-bit ABI implementation") fixed up above error, so, glibc >= 2.33 (who includes this commit) is required. Signed-off-by: Zhangjin Wu --- tools/testing/selftests/nolibc/nolibc-test.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/tools/testing/selftests/nolibc/nolibc-test.c b/tools/testing/selftests/nolibc/nolibc-test.c index 227ef2a3ebba..c86ff6018c7f 100644 --- a/tools/testing/selftests/nolibc/nolibc-test.c +++ b/tools/testing/selftests/nolibc/nolibc-test.c @@ -501,6 +501,17 @@ static int test_fork(void) } } +static int test_syscall_args(void) +{ +#ifdef __NR_fstat + return syscall(__NR_fstat, 0, NULL); +#elif defined(__NR_statx) + return syscall(__NR_statx, 0, NULL, 0, 0, NULL); +#else +#error Neither __NR_fstat nor __NR_statx defined, cannot implement syscall_args test +#endif +} + /* Run syscall tests between IDs and . * Return 0 on success, non-zero on failure. */ @@ -597,7 +608,7 @@ int run_syscall(int min, int max) CASE_TEST(write_badf); EXPECT_SYSER(1, write(-1, &tmp, 1), -1, EBADF); break; CASE_TEST(write_zero); EXPECT_SYSZR(1, write(1, &tmp, 0)); break; CASE_TEST(syscall_noargs); EXPECT_SYSEQ(1, syscall(__NR_getpid), getpid()); break; - CASE_TEST(syscall_args); EXPECT_SYSER(1, syscall(__NR_fstat, 0, NULL), -1, EFAULT); break; + CASE_TEST(syscall_args); EXPECT_SYSER(1, test_syscall_args(), -1, EFAULT); break; case __LINE__: return ret; /* must be last */ /* note: do not set any defaults so as to permit holes above */ -- 2.25.1 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 81FCAC77B7A for ; Wed, 24 May 2023 17:50: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=fEJNMnFiZX5wb3QZO2lPJluN5Yqo7maq53c8UAWoW2E=; b=GFWErLQ0VZ6ueo BN7j9yuGygK6AqBYLczcJs+xjnv4ytELkNXHIMKu9318Ff6neM8JkxqCrKrBfano2KsL7br/YPUpn J+h/tANAd5A0DXc3Qyd+9jZ8/ZFtbLp/oyOxuDhsfdJ+Z2BLJMightYeue6Fbb9A8ld3RmBv/tUCU rRz424aCLLu5uJh0m641elqFttCd4kIeWIA1kBXlCWqSLg7IRAntO+fog2IPtUx8quetQ0n64waI5 8j37vqvrdmXiQrEFHZbtC+31rRgkcLTBkb8rndTJTq161QpJ48PvkDZ4kbsNcMS5i06xE98WwdYS5 QlsJqULHjVvIZZ9aLoPg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1q1sce-00EG5j-2n; Wed, 24 May 2023 17:50:04 +0000 Received: from bg4.exmail.qq.com ([43.154.54.12]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1q1scZ-00EG46-0l for linux-riscv@lists.infradead.org; Wed, 24 May 2023 17:50:00 +0000 X-QQ-mid: bizesmtp84t1684950589taqcvbsf Received: from linux-lab-host.localdomain ( [116.30.125.36]) by bizesmtp.qq.com (ESMTP) with id ; Thu, 25 May 2023 01:49:48 +0800 (CST) X-QQ-SSF: 00200000000000D0V000000A0000000 X-QQ-FEAT: uGhnJwy6xZIUNwFWUkTcVZC7g8QNyKiY+XzJriACbUL4oqMszlNtgYpAkhLex cwihvRwjjgmsdDZeCDPBF1DQ938pSja9bqh13OBnuTww50GACW6NmZRGD621FTL2iQ3QVmZ 3HkI3ZEvZW3yLng05TVWCIwUhYuPiSBwb0uYCZ2D0qnkqyOSDmeRKNiGa4kRHpIhHm7YHPU M+DcW0gUtbzTW69JkDGyC5dTxiYptZzlvCJn1XJGMlllb0F9TAExPLOZnvDJwVcyv4oUI5Y ue15DAsGTU3Ke9lTyUtaRF1ixOTRnyGTK0aokkIreZiU8hdYxCiI4zKZzp6KpnUehGaYkIe EmHYz1QP6NJqwxJyJLXzjh4+56x/vuIlsuhL/BW/dMwVCVkSckCr2+nK3wZ+NdVB6t/VW7q X-QQ-GoodBg: 0 X-BIZMAIL-ID: 17354439834397082086 From: Zhangjin Wu To: w@1wt.eu Cc: falcon@tinylab.org, linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org, linux-riscv@lists.infradead.org, palmer@dabbelt.com, paul.walmsley@sifive.com, thomas@t-8ch.de Subject: [PATCH 04/13] selftests/nolibc: syscall_args: use __NR_statx for rv32 Date: Thu, 25 May 2023 01:48:11 +0800 Message-Id: X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 X-QQ-SENDSIZE: 520 Feedback-ID: bizesmtp:tinylab.org:qybglogicsvrsz:qybglogicsvrsz3a-3 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230524_104959_575110_7AF3EA9A X-CRM114-Status: GOOD ( 11.72 ) 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 V2hlbiBjb21waWxlIG5vbGliYy10ZXN0LmMgZm9yIHJ2MzIsIHdlIGdvdCBzdWNoIGVycm9yOgoK ICAgIHRvb2xzL3Rlc3Rpbmcvc2VsZnRlc3RzL25vbGliYy9ub2xpYmMtdGVzdC5jOjU5OTo1Nzog ZXJyb3I6IOKAmF9fTlJfZnN0YXTigJkgdW5kZWNsYXJlZCAoZmlyc3QgdXNlIGluIHRoaXMgZnVu Y3Rpb24pCiAgICAgIDU5OSB8ICAgQ0FTRV9URVNUKHN5c2NhbGxfYXJncyk7ICAgICAgRVhQRUNU X1NZU0VSKDEsIHN5c2NhbGwoX19OUl9mc3RhdCwgMCwgTlVMTCksIC0xLCBFRkFVTFQpOyBicmVh azsKClRoZSBnZW5lcmljIGluY2x1ZGUvdWFwaS9hc20tZ2VuZXJpYy91bmlzdGQuaCB1c2VkIGJ5 IHJ2MzIgZG9lc24ndApzdXBwb3J0IF9fTlJfZnN0YXQsIHVzZSBfX05SX3N0YXR4IGluc3RlYWQ6 CgogICAgUnVubmluZyB0ZXN0ICdzeXNjYWxsJwogICAgNjkgc3lzY2FsbF9ub2FyZ3MgPSAxICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBbT0tdCiAgICA3MCBzeXNj YWxsX2FyZ3MgPSAtMSBFRkFVTFQgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg IFtPS10KCkFzIHRvb2xzL2luY2x1ZGUvbm9saWJjL3N5cy5oIHNob3dzLCBfX05SX3N0YXR4IGlz IGVpdGhlciBub3Qgc3VwcG9ydGVkCmJ5IGFsbCBwbGF0Zm9ybXMsIHNvLCBib3RoIF9fTlJfZnN0 YXQgYW5kIF9fTlJfc3RhdHggYXJlIHJlcXVpcmVkLgoKQnR3LCB0aGUgbGF0ZXN0IHJpc2N2IGxp YmM2LWRldiBwYWNrYWdlIGlzIHJlcXVpcmVkLCBvdGhlcndpc2UsIHdlIHdvdWxkCmFsc28gZ2V0 IHN1Y2ggZXJyb3I6CgogICAgSW4gZmlsZSBpbmNsdWRlZCBmcm9tIC91c3IvcmlzY3Y2NC1saW51 eC1nbnUvaW5jbHVkZS9zeXMvY2RlZnMuaDo0NTIsCiAgICAgICAgICAgICAgICAgICAgIGZyb20g L3Vzci9yaXNjdjY0LWxpbnV4LWdudS9pbmNsdWRlL2ZlYXR1cmVzLmg6NDYxLAogICAgICAgICAg ICAgICAgICAgICBmcm9tIC91c3IvcmlzY3Y2NC1saW51eC1nbnUvaW5jbHVkZS9iaXRzL2xpYmMt aGVhZGVyLXN0YXJ0Lmg6MzMsCiAgICAgICAgICAgICAgICAgICAgIGZyb20gL3Vzci9yaXNjdjY0 LWxpbnV4LWdudS9pbmNsdWRlL2xpbWl0cy5oOjI2LAogICAgICAgICAgICAgICAgICAgICBmcm9t IC91c3IvbGliL2djYy1jcm9zcy9yaXNjdjY0LWxpbnV4LWdudS85L2luY2x1ZGUvbGltaXRzLmg6 MTk0LAogICAgICAgICAgICAgICAgICAgICBmcm9tIC91c3IvbGliL2djYy1jcm9zcy9yaXNjdjY0 LWxpbnV4LWdudS85L2luY2x1ZGUvc3lzbGltaXRzLmg6NywKICAgICAgICAgICAgICAgICAgICAg ZnJvbSAvdXNyL2xpYi9nY2MtY3Jvc3MvcmlzY3Y2NC1saW51eC1nbnUvOS9pbmNsdWRlL2xpbWl0 cy5oOjM0LAogICAgICAgICAgICAgICAgICAgICBmcm9tIC9sYWJzL2xpbnV4LWxhYi9zcmMvbGlu dXgtc3RhYmxlL3Rvb2xzL3Rlc3Rpbmcvc2VsZnRlc3RzL25vbGliYy9ub2xpYmMtdGVzdC5jOjY6 CiAgICAvdXNyL3Jpc2N2NjQtbGludXgtZ251L2luY2x1ZGUvYml0cy93b3Jkc2l6ZS5oOjI4OjM6 IGVycm9yOiAjZXJyb3IgInJ2MzJpLWJhc2VkIHRhcmdldHMgYXJlIG5vdCBzdXBwb3J0ZWQiCiAg ICAgICAyOCB8ICMgZXJyb3IgInJ2MzJpLWJhc2VkIHRhcmdldHMgYXJlIG5vdCBzdXBwb3J0ZWQi CgpUaGUgZ2xpYmMgY29tbWl0IDViNjExM2Q2MmVmYSAoIlJJU0MtVjogU3VwcG9ydCB0aGUgMzIt Yml0IEFCSQppbXBsZW1lbnRhdGlvbiIpIGZpeGVkIHVwIGFib3ZlIGVycm9yLCBzbywgZ2xpYmMg Pj0gMi4zMyAod2hvIGluY2x1ZGVzCnRoaXMgY29tbWl0KSBpcyByZXF1aXJlZC4KClNpZ25lZC1v ZmYtYnk6IFpoYW5namluIFd1IDxmYWxjb25AdGlueWxhYi5vcmc+Ci0tLQogdG9vbHMvdGVzdGlu Zy9zZWxmdGVzdHMvbm9saWJjL25vbGliYy10ZXN0LmMgfCAxMyArKysrKysrKysrKystCiAxIGZp bGUgY2hhbmdlZCwgMTIgaW5zZXJ0aW9ucygrKSwgMSBkZWxldGlvbigtKQoKZGlmZiAtLWdpdCBh L3Rvb2xzL3Rlc3Rpbmcvc2VsZnRlc3RzL25vbGliYy9ub2xpYmMtdGVzdC5jIGIvdG9vbHMvdGVz dGluZy9zZWxmdGVzdHMvbm9saWJjL25vbGliYy10ZXN0LmMKaW5kZXggMjI3ZWYyYTNlYmJhLi5j ODZmZjYwMThjN2YgMTAwNjQ0Ci0tLSBhL3Rvb2xzL3Rlc3Rpbmcvc2VsZnRlc3RzL25vbGliYy9u b2xpYmMtdGVzdC5jCisrKyBiL3Rvb2xzL3Rlc3Rpbmcvc2VsZnRlc3RzL25vbGliYy9ub2xpYmMt dGVzdC5jCkBAIC01MDEsNiArNTAxLDE3IEBAIHN0YXRpYyBpbnQgdGVzdF9mb3JrKHZvaWQpCiAJ fQogfQogCitzdGF0aWMgaW50IHRlc3Rfc3lzY2FsbF9hcmdzKHZvaWQpCit7CisjaWZkZWYgX19O Ul9mc3RhdAorCXJldHVybiBzeXNjYWxsKF9fTlJfZnN0YXQsIDAsIE5VTEwpOworI2VsaWYgZGVm aW5lZChfX05SX3N0YXR4KQorCXJldHVybiBzeXNjYWxsKF9fTlJfc3RhdHgsIDAsIE5VTEwsIDAs IDAsIE5VTEwpOworI2Vsc2UKKyNlcnJvciBOZWl0aGVyIF9fTlJfZnN0YXQgbm9yIF9fTlJfc3Rh dHggZGVmaW5lZCwgY2Fubm90IGltcGxlbWVudCBzeXNjYWxsX2FyZ3MgdGVzdAorI2VuZGlmCit9 CisKIC8qIFJ1biBzeXNjYWxsIHRlc3RzIGJldHdlZW4gSURzIDxtaW4+IGFuZCA8bWF4Pi4KICAq IFJldHVybiAwIG9uIHN1Y2Nlc3MsIG5vbi16ZXJvIG9uIGZhaWx1cmUuCiAgKi8KQEAgLTU5Nyw3 ICs2MDgsNyBAQCBpbnQgcnVuX3N5c2NhbGwoaW50IG1pbiwgaW50IG1heCkKIAkJQ0FTRV9URVNU KHdyaXRlX2JhZGYpOyAgICAgICAgRVhQRUNUX1NZU0VSKDEsIHdyaXRlKC0xLCAmdG1wLCAxKSwg LTEsIEVCQURGKTsgYnJlYWs7CiAJCUNBU0VfVEVTVCh3cml0ZV96ZXJvKTsgICAgICAgIEVYUEVD VF9TWVNaUigxLCB3cml0ZSgxLCAmdG1wLCAwKSk7IGJyZWFrOwogCQlDQVNFX1RFU1Qoc3lzY2Fs bF9ub2FyZ3MpOyAgICBFWFBFQ1RfU1lTRVEoMSwgc3lzY2FsbChfX05SX2dldHBpZCksIGdldHBp ZCgpKTsgYnJlYWs7Ci0JCUNBU0VfVEVTVChzeXNjYWxsX2FyZ3MpOyAgICAgIEVYUEVDVF9TWVNF UigxLCBzeXNjYWxsKF9fTlJfZnN0YXQsIDAsIE5VTEwpLCAtMSwgRUZBVUxUKTsgYnJlYWs7CisJ CUNBU0VfVEVTVChzeXNjYWxsX2FyZ3MpOyAgICAgIEVYUEVDVF9TWVNFUigxLCB0ZXN0X3N5c2Nh bGxfYXJncygpLCAtMSwgRUZBVUxUKTsgYnJlYWs7CiAJCWNhc2UgX19MSU5FX186CiAJCQlyZXR1 cm4gcmV0OyAvKiBtdXN0IGJlIGxhc3QgKi8KIAkJLyogbm90ZTogZG8gbm90IHNldCBhbnkgZGVm YXVsdHMgc28gYXMgdG8gcGVybWl0IGhvbGVzIGFib3ZlICovCi0tIAoyLjI1LjEKCgpfX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpsaW51eC1yaXNjdiBtYWls aW5nIGxpc3QKbGludXgtcmlzY3ZAbGlzdHMuaW5mcmFkZWFkLm9yZwpodHRwOi8vbGlzdHMuaW5m cmFkZWFkLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2xpbnV4LXJpc2N2Cg==