From patchwork Thu Mar 2 07:19:34 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: 63260 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp4095385wrd; Wed, 1 Mar 2023 23:28:28 -0800 (PST) X-Google-Smtp-Source: AK7set9qEzvl9B79bpqipembe+jsj9SYjCBJH9cWyqXJmfpNn/nGi1cDQaiywDEagUg4QZHyvKNv X-Received: by 2002:a62:7958:0:b0:5a8:c693:c7b4 with SMTP id u85-20020a627958000000b005a8c693c7b4mr8886132pfc.30.1677742107803; Wed, 01 Mar 2023 23:28:27 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1677742107; cv=none; d=google.com; s=arc-20160816; b=QNIa8iUnZP0w1B9xu4w/V5+tGai5KVRNYiP2rAhnzKGvQ5zWCRLE4+NA9nBz+bBzvS lCSQOLgS/qmoLOEmluZ/kDR90ZhwxAMDPiWoqjrWY+aXJrhemoGRwpWGR3Zh/gBo5vX6 S/etXslkM/BYj9Z1VNZ6qHpOequyxoDjniXJq+Gx/JJuWZqKPjZyYfCSRW5xRb4VvxNx G0+hFH2eboefZD4G9PdsZ+WVoow/+rt2FKAnuV360OtHw0rhQadu22hfA0+05V/eChpI 7Hdy7nCpqyJQoAhzjRXx9bG6T2mB6GFd0qxNzE2Anr5hegxyfJgaOM1ApE7YHx8ftSxy AXMg== 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=TH3R4dC7FHCrJc7s3NwJI1fowywEAuW50fnXPRfdb4U=; b=HI6R+juLjEWonVMJgMslnMKSRKsPdyEdRX9h7ahlTYTGqwhjpMCT0ti/Evi1v0S6/J 5WwmMNzdc+tQCZfeK2i5HzqAEDKncNBaJA3Oqx8hgwMMiR1GcnOIrytxRnN10EvbhKR2 GxPEepKmqoWhaoNhcJst60VFthy1tUBLOhiiVJNbuFoL7uhoA9uqJgMZ3EIUfO+tsX/O d1cN6ydonsdnT1Ayben8oalynP5N0CxWIa7bqQdtjSMcrh/l1dGOAYpppwjFfSaV6tEa jSt1PzKtN5jR/OlbOyre99WGRXLMZytteAbKCulyTtKiU+pko+KZypj+SkkO9xnk5ZH2 uGjw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=Mc1t119H; 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 g70-20020a636b49000000b00501f660e12dsi13854566pgc.295.2023.03.01.23.28.14; Wed, 01 Mar 2023 23:28:27 -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=Mc1t119H; 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 S229916AbjCBHUA (ORCPT + 99 others); Thu, 2 Mar 2023 02:20:00 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38420 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229938AbjCBHTw (ORCPT ); Thu, 2 Mar 2023 02:19:52 -0500 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2A6FAA24E for ; Wed, 1 Mar 2023 23:19:48 -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 dfw.source.kernel.org (Postfix) with ESMTPS id 9A61A614B3 for ; Thu, 2 Mar 2023 07:19:47 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 82CCCC433EF; Thu, 2 Mar 2023 07:19:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1677741587; bh=x+GFgv/5i/F5V9VZV9k4Y/49cV0Hpjtg26OJcDxewj8=; h=From:To:Cc:Subject:Date:From; b=Mc1t119H+fFTJ5RrU80t7GhKlmv/qjrH+mvhXlveKB67C1AQ4FMzc80kZNoe9oo94 KSa4dFTh8HI/IX/kcGJ2SfvH3QhldduBNyjJR887Ly5uPX32PBNhO9HK/p4P6syoNj nubTohYX8lJvEQI5fslphaa9UE/i4nDfrY1IXIqZ3MsO7ar1ggZDiDv9rDK28HxVHv yTPGisaq68blznooFT3VJdtIYLJuAwXpcUHQPfQM+uYcDi8aeZ7CnZet12hepRajRk GdfGhUKdkHzBuWKr6FY7LOTN7VYiRNRhL+URhyFNhyb6aLsZNdecMY52Jq3CcXc3Z5 0G/lTmkqyvTCQ== 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 v3] lib/test_string.c: Add strncmp() tests Date: Thu, 2 Mar 2023 08:19:34 +0100 Message-Id: <20230302071934.254111-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?1759240108765458262?= X-GMAIL-MSGID: =?utf-8?q?1759240108765458262?= 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. Reported-by: Heiko Stübner Link: https://lore.kernel.org/all/2801162.88bMQJbFj6@diego/ Signed-off-by: Palmer Dabbelt Signed-off-by: Björn Töpel Reviewed-by: Andy Shevchenko --- Change back to it's original form. Checkpatch still complains about __initconst, but there's a patch addressing that [1]. [1] https://lore.kernel.org/all/20230301094320.15954-1-bjorn@kernel.org/ v2->v3: Removed the "checkpatch fix" patch Added one more test v1->v2: Added two more tests (pos/neg). (Andy) Minor code style issues. (Andy) Fixed checkpatch errors. --- lib/test_string.c | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) base-commit: c0927a7a5391f7d8e593e5e50ead7505a23cadf9 diff --git a/lib/test_string.c b/lib/test_string.c index c5cb92fb710e..f18a34578f1f 100644 --- a/lib/test_string.c +++ b/lib/test_string.c @@ -207,6 +207,43 @@ static __init int strspn_selftest(void) return 0; } +static __init int strncmp_selftest(void) +{ + size_t i; + static const struct strncmp_test { + const char *str_a; + const char *str_b; + unsigned long count; + unsigned long max_off; + int retval; + } tests[] __initconst = { + { "/dev/vda", "/dev/", 5, 4, 0 }, + { "/dev/vda", "/dev/vdb", 5, 4, 0 }, + { "00000000---11111", "00000000---11112", 12, 4, 0 }, + { "/dev/vda", "/dev/vd\0", 8, 0, 97 }, + { "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) { } @@ -245,6 +282,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: