From patchwork Tue Feb 28 18:42:44 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?QmrDtnJuIFTDtnBlbA==?= X-Patchwork-Id: 62576 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp3188987wrd; Tue, 28 Feb 2023 10:47:06 -0800 (PST) X-Google-Smtp-Source: AK7set9oFGozvguvXhEKzHB3jgHbflN6tJ8/bU6agqjmTondgeQVoDwUMDFiLYRxWD/dyS62+VUf X-Received: by 2002:a17:90b:3e8b:b0:234:ba6f:c980 with SMTP id rj11-20020a17090b3e8b00b00234ba6fc980mr4267259pjb.17.1677610026028; Tue, 28 Feb 2023 10:47:06 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1677610026; cv=none; d=google.com; s=arc-20160816; b=JL027yu1h3j7gklMSmddHxFV2Zyh0BFNMkfR0LVF+v/fGMxKqDALlswBmQlp/KAp4+ xNagwZKp1qkA32+T6CeKEm8Svy+s6MzZlJmRgKTTmdn4I2JciW3huoSClYBQEg5w1Gnx ab33Mp4/oihe7ChIIkR4+cM3blNCkFEFaSs2VZbgoS9I1L9gTotAtCdAvux4N3oGsjxe 3947/7+HGGd7NTf+5doIn2xBTAQ1VhEJ4fPZDd+zEq13RmUsBpfy4W3NDiLBrLl+4Ysa AQwH0awIW0RUKoVgnPC5QXcLditJiEl8GUMsAJjPqE8HJMbtiuRd6Ps/Hsw7M85VIVuo rzGQ== 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=Pc69Gv/1PwSr85NK6wGYipcAkLMP5uHPYYNZpDrbUyM=; b=nCzol9qN6XmrdmYWD6HVzr417si9NwWsV2ZAtNC6DfHtChwOFhYuW8YuwzliLsvHJ2 mZlN9ACR9O0RWA5nJnMqpBK3DTAFAug8I0ubaMAe4wPWr8/MWHwAwNbRYNSIk6hVN+2b Ll+83WjAD5z8G+gQy/TFpfyU3DjnaC6Fel6D7Au+TXuYVTUYiKCQZc3QAmG+sAMlSnrr 2OrYML4eC+USfZeD3DtIA7F7hvTT5077m4kNcwfsEvpZjbHNd+Q0nsP08DFJI2TfeNK0 3uopPZ7TBTlkMPTix+/VZ+tVWcx1JZoEGr/ru6Ac7rawjwQ57fSfglqG+HHLeq8yRR6N 45tQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=fsrpFMka; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id ct19-20020a17090af59300b0023750b695e1si13405056pjb.156.2023.02.28.10.46.52; Tue, 28 Feb 2023 10:47:06 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=fsrpFMka; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229694AbjB1Sm4 (ORCPT + 99 others); Tue, 28 Feb 2023 13:42:56 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43176 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229537AbjB1Smz (ORCPT ); Tue, 28 Feb 2023 13:42:55 -0500 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 36CB710C8 for ; Tue, 28 Feb 2023 10:42:54 -0800 (PST) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 02135B80EAB for ; Tue, 28 Feb 2023 18:42:53 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 6273AC433D2; Tue, 28 Feb 2023 18:42:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1677609771; bh=bxf6Na4275DAjaKN9Sr8BVZGW0gjDgYTE05rVuIhWwo=; h=From:To:Cc:Subject:Date:From; b=fsrpFMka4rEhDNttlbTgKspj87wKZKL1+GEijCxidZ09ngGHpa2+x+se6dC+QQgX6 fzKhXvYZuB5pOYUYalaQPQ5/49LTwfGl8eBVr/Br6E5sTNqM/ErsTlPRtpEwvGWyOc G4nq7wdtH+7FwJ1YICBYnQ09jhSTBt2KNXPyuhI/KjJ8HzOZNLatqJFSlT4ZGJtwS+ FMYOnlz3Hv2d0mCH2we/Aljk7NVKHs+JbsKtkgNQtgN9QhPWqje8KPPOyauFKDxpPA DUuAeRS+SKqtfrMWmdzze3dAjDxRLYQVb4oO50CJkUyn93lZFG+QL+1lBat3aWZQBy JS9bHptI/iQpQ== From: =?utf-8?b?QmrDtnJuIFTDtnBlbA==?= To: Palmer Dabbelt , Andy Shevchenko , linux-kernel@vger.kernel.org Cc: =?utf-8?b?QmrDtnJuIFTDtnBlbA==?= , Heiko Stuebner , linux-riscv@lists.infradead.org Subject: [PATCH v2 1/2] lib/test_string.c: Make definition less dense Date: Tue, 28 Feb 2023 19:42:44 +0100 Message-Id: <20230228184245.1585775-1-bjorn@kernel.org> X-Mailer: git-send-email 2.37.2 MIME-Version: 1.0 X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_PASS 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-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1759101611052720664?= X-GMAIL-MSGID: =?utf-8?q?1759101611052720664?= From: Björn Töpel Checkpatch seems to have trouble making sense of the situation when struct definitions, variable definitions, and __initconst marking is done in one go. Let's be nicer to checkpatch, and move the struct definition out, which removes the error. Signed-off-by: Björn Töpel --- lib/test_string.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) base-commit: ae3419fbac845b4d3f3a9fae4cc80c68d82cdf6e diff --git a/lib/test_string.c b/lib/test_string.c index c5cb92fb710e..550229084c41 100644 --- a/lib/test_string.c +++ b/lib/test_string.c @@ -179,15 +179,17 @@ static __init int strnchr_selftest(void) return 0; } +struct strspn_test { + const char str[16]; + const char accept[16]; + const char reject[16]; + unsigned int a; + unsigned int r; +}; + static __init int strspn_selftest(void) { - static const struct strspn_test { - const char str[16]; - const char accept[16]; - const char reject[16]; - unsigned a; - unsigned r; - } tests[] __initconst = { + static const struct strspn_test tests[] __initconst = { { "foobar", "", "", 0, 6 }, { "abba", "abc", "ABBA", 4, 4 }, { "abba", "a", "b", 1, 1 }, From patchwork Tue Feb 28 18:42:45 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?QmrDtnJuIFTDtnBlbA==?= X-Patchwork-Id: 62577 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp3189026wrd; Tue, 28 Feb 2023 10:47:12 -0800 (PST) X-Google-Smtp-Source: AK7set+lKEfRlnk2+88EUW8B+2sabdDulfEsSiK79P7qtFB1UyFyMTmPOhILQ4gFfnBafYdgTLyZ X-Received: by 2002:a62:6d85:0:b0:5e0:316a:1ff3 with SMTP id i127-20020a626d85000000b005e0316a1ff3mr2860770pfc.2.1677610031700; Tue, 28 Feb 2023 10:47:11 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1677610031; cv=none; d=google.com; s=arc-20160816; b=pKk0+ijSB27xdLqPVuvjxWXbhCpbFrhjr76kVzuq6MFWn6gCaDOxdVa5oUzOZoDbGQ newNlQoYeQTfxHBL6GXlIrm7WGtD4ECsGPvO+1hJaJqBwwX9smZEHylklCfTdwrKzzBd ONZVUq87c9AKbTAkyeztoMpldrHsTeFdMWiFv1jhJEHengcjVU067zj72gUClCA2cBet 35ZcKV+GQ6ctblOYZzzhy8kDxFPGFaFmFiKMvwXg9Z8Rg07AlsUzo1rXpvsN2qPVDTMW rbkYynsx6wiDZHpayi97lNL4rfPEm/mxIDHMR7ZANIQTjl4fHUqFThNwnS1gvA2VTWTm fKxQ== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=9z9CpT7erO5+R0dGbNNXX4LJy/2cgMYPvdwyGhRcFdA=; b=TqkRY07FpqrZbCbNGFGwlWtBSPTQjfU6IYelZ7kcG2dsc1ZdNI9zQpFLyoXvuLFPUl MEvymQu/XmR06KTCdkOMBNb7bJsO7DyE3cbAGQqMJfcVhdVQdziIreBpzKqSZmKiJ4eo N2NqjPHt55IZ4Y2bVdYqxPiy6UOvS7WLszfjErXzzagG2ODBN3/aD53o6cbmEUVV3JQl Hm8W74V8pNGMV4XlOPcsddOk/ggyg2ODEw2Q7uKZi8gLPB57mSzGf+1A/coC0vxSefJN FSrNrO0gf4OCOWkwvH6Psx5w3nGf1Z3gQAOeL3DJzXPbzuki1unaitM57CNrza1Tu21K kgkg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=oc+8db52; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id t3-20020a655543000000b004e30cc4a2f5si10996832pgr.507.2023.02.28.10.46.58; Tue, 28 Feb 2023 10:47:11 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=oc+8db52; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229726AbjB1Sm6 (ORCPT + 99 others); Tue, 28 Feb 2023 13:42:58 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43212 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229703AbjB1Sm4 (ORCPT ); Tue, 28 Feb 2023 13:42:56 -0500 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 07364136 for ; Tue, 28 Feb 2023 10:42:56 -0800 (PST) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id BF299B80EAC for ; Tue, 28 Feb 2023 18:42:54 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 1C2CEC433EF; Tue, 28 Feb 2023 18:42:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1677609773; bh=pidVvllSN1IUSrHAwpFFAwnr0Xfr4NblI3c7HbGX5aI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=oc+8db52928eVh7Pnnftzyj4a4Sy5e1N4sO8tPy8jVCHNx3zmiRCl0acwKxQojVWK MwtTQu99w1ZoQYaKfMOKZ7FHiP15oeYEpSQgLJdcxo/w1HwJnfodd+x0sHxkjV1QvT 3Pn+a52xCWNhRI3dMAnPw/ojXTXLRcDd2OD+sZqexcWQ1l8C7OsBFy4Ldh1Kr34w0c 2ZAl9oTcK6NjsmAjFKqLCGgh1HiM5p2LROt6xUtrlxa/e1cFXx4ek8E5AEb8D0g9U1 vif7EekWWmAE+yp2rRmezZQmwR5yEAmx2gm1K4w5wP1PlbRAmWzRAT+UYDlPmvOqxz pmZ4hjWQqOb0A== From: =?utf-8?b?QmrDtnJuIFTDtnBlbA==?= To: Palmer Dabbelt , Andy Shevchenko , linux-kernel@vger.kernel.org Cc: Palmer Dabbelt , Heiko Stuebner , linux-riscv@lists.infradead.org, =?utf-8?b?QmrDtnJuIFTDtnBlbA==?= Subject: [PATCH v2 2/2] lib/test_string.c: Add strncmp() tests Date: Tue, 28 Feb 2023 19:42:45 +0100 Message-Id: <20230228184245.1585775-2-bjorn@kernel.org> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20230228184245.1585775-1-bjorn@kernel.org> References: <20230228184245.1585775-1-bjorn@kernel.org> MIME-Version: 1.0 X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_PASS 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-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1759101616932930069?= X-GMAIL-MSGID: =?utf-8?q?1759101616932930069?= From: Palmer Dabbelt The RISC-V strncmp() fails on some inputs, see the linked thread for more details. It turns out there were no strncmp() calls in the self tests, this adds one. Link: https://lore.kernel.org/all/2801162.88bMQJbFj6@diego/ Reported-by: Heiko Stübner Signed-off-by: Palmer Dabbelt Signed-off-by: Björn Töpel --- v1->v2: Added two more tests (pos/neg). (Andy) Minor code style issues. (Andy) Fixed checkpatch errors. --- lib/test_string.c | 43 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) diff --git a/lib/test_string.c b/lib/test_string.c index 550229084c41..b95037eb138b 100644 --- a/lib/test_string.c +++ b/lib/test_string.c @@ -209,6 +209,44 @@ static __init int strspn_selftest(void) return 0; } +struct strncmp_test { + const char *str_a; + const char *str_b; + unsigned long count; + unsigned long max_off; + int retval; +}; + +static __init int strncmp_selftest(void) +{ + size_t i; + static const struct strncmp_test tests[] __initconst = { + { "/dev/vda", "/dev/", 5, 4, 0 }, + { "/dev/vda", "/dev/vdb", 5, 4, 0 }, + { "00000000---11111", "00000000---11112", 12, 4, 0 }, + { "ABC", "AB", 3, 0, 67 }, + { "ABA", "ABZ", 3, 0, -25 }, + { "ABC", "ABC", 3, 0, 0 }, + }; + + for (i = 0; i < ARRAY_SIZE(tests); ++i) { + const struct strncmp_test *s = tests + i; + size_t off; + + for (off = 0; off <= s->max_off; off++) { + int res = strncmp(s->str_a + off, s->str_b + off, s->count - off); + + if (res == 0 && s->retval != 0) + return 0x1000 + 0x100*off + 0x10*i + 0x0; + if (res > 0 && s->retval <= 0) + return 0x1000 + 0x100*off + 0x10*i + 0x1; + if (res < 0 && s->retval >= 0) + return 0x1000 + 0x100*off + 0x10*i + 0x2; + } + } + return 0; +} + static __exit void string_selftest_remove(void) { } @@ -247,6 +285,11 @@ static __init int string_selftest_init(void) if (subtest) goto fail; + test = 7; + subtest = strncmp_selftest(); + if (subtest) + goto fail; + pr_info("String selftests succeeded\n"); return 0; fail: