From patchwork Tue Jul 18 15:17:00 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Shuah Khan X-Patchwork-Id: 13317391 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 C4C50EB64DD for ; Tue, 18 Jul 2023 15:17:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233522AbjGRPRG (ORCPT ); Tue, 18 Jul 2023 11:17:06 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51614 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233513AbjGRPRF (ORCPT ); Tue, 18 Jul 2023 11:17:05 -0400 Received: from mail-io1-xd41.google.com (mail-io1-xd41.google.com [IPv6:2607:f8b0:4864:20::d41]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3824E10FC for ; Tue, 18 Jul 2023 08:17:02 -0700 (PDT) Received: by mail-io1-xd41.google.com with SMTP id ca18e2360f4ac-785d3a53ed6so64608939f.1 for ; Tue, 18 Jul 2023 08:17:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=google; t=1689693421; x=1690298221; h=subject:from:cc:to:content-language:user-agent:mime-version:date :message-id:from:to:cc:subject:date:message-id:reply-to; bh=Uit5IHcZUOtje71ESB8VCjfX0uXPxZdb9ZzqfsupX7M=; b=WCAyixbJfwTNd5ylI4AcRbHT9nSO3M2Vr6/fabfn1NGh9XGOTjCrVKFC8HgrPBOHfe mTnouoVao1brulP3A2S6lNNkh76B57nUgcZbJdYZZK5xETxWeyO+SaEyNkGl6rAyRuUq m59Ezoh/xj+TlyxNYcf5It6Y6oNSbqMpa1mHo= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1689693421; x=1690298221; h=subject:from:cc:to:content-language:user-agent:mime-version:date :message-id:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=Uit5IHcZUOtje71ESB8VCjfX0uXPxZdb9ZzqfsupX7M=; b=eeY/ligIYhLrOhNQTYjwhIAWHHFBqqy+B95q+qM8VtV18U5Ld/KUmMc+50CV2nm9AW JVSe9XU1Gdzm7TDEPLHPzC5pyohUaWhsrM06zfDalS6M6pZ8Xw73vcWn7azi6GV1R6j4 4rsDh6CEpW01Mip8Y93REN+1qjcJX2/2Uywprx8PNDgiwKIzhmE5hZ0+pockMhYdJLZr x2ssoCQG3hlUfQrgO9hRL4K52J7DsIFdCpYeWly4r27hfwD40hmeGU8aHgg2j7DYfXEe vTyM56UfMMa7s1gwQR3XhkpRGM3IkObsg+0T9R2ifdgdbskh1NrVoPrsWsPn+m/OKABZ H2Fg== X-Gm-Message-State: ABy/qLbg7sOoax6Ocms4Qm76Y/1xTiLh6qVGcE9BQECIQbAJNon24z1o sbP+KOYvDjoWRUIAP5DeRCp4mQmjKaSiV2ilQhma8b8K X-Google-Smtp-Source: APBJJlFpFxfSfFJkUXmyItAzu1+1JxlRfE6myFOtKgxzvmpo5M2CxW6pMe0xbSuKfPmTrmjAZ4kfaw== X-Received: by 2002:a05:6602:3799:b0:783:743c:fd01 with SMTP id be25-20020a056602379900b00783743cfd01mr3039265iob.0.1689693421503; Tue, 18 Jul 2023 08:17:01 -0700 (PDT) Received: from [192.168.1.128] ([38.15.45.1]) by smtp.gmail.com with ESMTPSA id q16-20020a6bf210000000b00786dffc04e2sm653977ioh.25.2023.07.18.08.17.01 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 18 Jul 2023 08:17:01 -0700 (PDT) Message-ID: <0d655122-a978-93ce-405c-c1eb1d264708@linuxfoundation.org> Date: Tue, 18 Jul 2023 09:17:00 -0600 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.13.0 Content-Language: en-US To: Linus Torvalds Cc: Shuah Khan , shuah , Mark Brown , John Hubbard , linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org From: Shuah Khan Subject: [GIT PULL] Kselftest fixes update for Linux 6.5-rc3 Precedence: bulk List-ID: X-Mailing-List: linux-kselftest@vger.kernel.org Hi Linus, Please pull the following Kselftest fixes update for Linux 6.5-rc3. This Kselftest fixes update for Linux 6.5-rc3 consists of fixes to bugs that are interfering with arm64 and riscv workflows. This update also includes two fixes to timer and mincore tests that are causing test failures. diff is attached. thanks, -- Shuah ---------------------------------------------------------------- The following changes since commit 06c2afb862f9da8dc5efa4b6076a0e48c3fbaaa5: Linux 6.5-rc1 (2023-07-09 13:53:13 -0700) are available in the Git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest tags/linux-kselftest-fixes-6.5-rc3 for you to fetch changes up to 569f8b501b177f21121d483a96491716ab8905f4: selftests/arm64: fix build failure during the "emit_tests" step (2023-07-14 12:33:35 -0600) ---------------------------------------------------------------- linux-kselftest-fixes-6.5-rc3 This Kselftest fixes update for Linux 6.5-rc3 consists of fixes to bugs that are interfering with arm64 and riscv workflows. This update also includes two fixes to timer and mincore tests that are causing test failures. ---------------------------------------------------------------- John Hubbard (2): selftests/riscv: fix potential build failure during the "emit_tests" step selftests/arm64: fix build failure during the "emit_tests" step Minjie Du (1): tools: timers: fix freq average calculation Ricardo Cañuelo (1): selftests/mincore: fix skip condition for check_huge_pages test tools/testing/selftests/arm64/Makefile | 2 +- tools/testing/selftests/mincore/mincore_selftest.c | 4 ++-- tools/testing/selftests/riscv/Makefile | 2 +- tools/testing/selftests/timers/raw_skew.c | 3 +-- 4 files changed, 5 insertions(+), 6 deletions(-) ---------------------------------------------------------------- diff --git a/tools/testing/selftests/arm64/Makefile b/tools/testing/selftests/arm64/Makefile index 9460cbe81bcc..ace8b67fb22d 100644 --- a/tools/testing/selftests/arm64/Makefile +++ b/tools/testing/selftests/arm64/Makefile @@ -42,7 +42,7 @@ run_tests: all done # Avoid any output on non arm64 on emit_tests -emit_tests: all +emit_tests: @for DIR in $(ARM64_SUBTARGETS); do \ BUILD_TARGET=$(OUTPUT)/$$DIR; \ make OUTPUT=$$BUILD_TARGET -C $$DIR $@; \ diff --git a/tools/testing/selftests/mincore/mincore_selftest.c b/tools/testing/selftests/mincore/mincore_selftest.c index 4c88238fc8f0..e949a43a6145 100644 --- a/tools/testing/selftests/mincore/mincore_selftest.c +++ b/tools/testing/selftests/mincore/mincore_selftest.c @@ -150,8 +150,8 @@ TEST(check_huge_pages) MAP_PRIVATE | MAP_ANONYMOUS | MAP_HUGETLB, -1, 0); if (addr == MAP_FAILED) { - if (errno == ENOMEM) - SKIP(return, "No huge pages available."); + if (errno == ENOMEM || errno == EINVAL) + SKIP(return, "No huge pages available or CONFIG_HUGETLB_PAGE disabled."); else TH_LOG("mmap error: %s", strerror(errno)); } diff --git a/tools/testing/selftests/riscv/Makefile b/tools/testing/selftests/riscv/Makefile index 9dd629cc86aa..f4b3d5c9af5b 100644 --- a/tools/testing/selftests/riscv/Makefile +++ b/tools/testing/selftests/riscv/Makefile @@ -43,7 +43,7 @@ run_tests: all done # Avoid any output on non riscv on emit_tests -emit_tests: all +emit_tests: @for DIR in $(RISCV_SUBTARGETS); do \ BUILD_TARGET=$(OUTPUT)/$$DIR; \ $(MAKE) OUTPUT=$$BUILD_TARGET -C $$DIR $@; \ diff --git a/tools/testing/selftests/timers/raw_skew.c b/tools/testing/selftests/timers/raw_skew.c index 5beceeed0d11..6eba203f9da7 100644 --- a/tools/testing/selftests/timers/raw_skew.c +++ b/tools/testing/selftests/timers/raw_skew.c @@ -129,8 +129,7 @@ int main(int argc, char **argv) printf("%lld.%i(est)", eppm/1000, abs((int)(eppm%1000))); /* Avg the two actual freq samples adjtimex gave us */ - ppm = (tx1.freq + tx2.freq) * 1000 / 2; - ppm = (long long)tx1.freq * 1000; + ppm = (long long)(tx1.freq + tx2.freq) * 1000 / 2; ppm = shift_right(ppm, 16); printf(" %lld.%i(act)", ppm/1000, abs((int)(ppm%1000)));