From patchwork Mon Oct 24 16:35:43 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Shuah Khan X-Patchwork-Id: 13017925 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 66020FA373F for ; Mon, 24 Oct 2022 18:08:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231357AbiJXSIS (ORCPT ); Mon, 24 Oct 2022 14:08:18 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55514 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230490AbiJXSIA (ORCPT ); Mon, 24 Oct 2022 14:08:00 -0400 Received: from mail-il1-x129.google.com (mail-il1-x129.google.com [IPv6:2607:f8b0:4864:20::129]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CF3741ABEC5 for ; Mon, 24 Oct 2022 09:49:12 -0700 (PDT) Received: by mail-il1-x129.google.com with SMTP id q5so2847840ilt.13 for ; Mon, 24 Oct 2022 09:49:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=google; h=subject:from:cc:to:content-language:user-agent:mime-version:date :message-id:from:to:cc:subject:date:message-id:reply-to; bh=891IdAC6CjPU3houg/K1WEgsqjrUAZT4ffved4EQYDA=; b=TaRZkPb1/z/kV9Db//RMXbx8MK5LTkSyccyxyw5nqO7feqrdkaBAosOG6rCahvTmgV WSeg5F3DIzLWcbeoMHg8junZ4TJp56Ag24+XkrnsRJstzOYeddbehVKhQBtP2wzCm7dB JPQiAI2pt+Zk6vY6E7M0nbGL19LaLXNVnMT/k= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=891IdAC6CjPU3houg/K1WEgsqjrUAZT4ffved4EQYDA=; b=XuEwBDLVbMFpWB4vC985fHT/WdjUHJ6EtoXW/s8wfeToDT84SnpS5LGRhlWT8VFK8a XDhLzt95qeo1bwqlBuVEYNrY5TT7DPCiRvm/Tr8plPhigJfDyWClDKkFMfCGINRy4Kxg dLyQyfBIQuzwnpmFBBXapXLRQYN1QzukOC9dVP4MwEzbKXbSw4oXhsqOJeQZBkXkQwCG oPnu6Vchr+QbdD456fFTrpl4DQu50fFgj1ybS8nYJoRREyxYycHC8A/sda1BGelx5tIP QLTBMgOyLjQlWEZcQvSykO36RywuGrXF2k1+br276/v3UJGSMceG37ytxt4R9fsw/9+5 9ZUQ== X-Gm-Message-State: ACrzQf3HzYs82MPaEOW4mjKc5wIn24V6/fbZ4lewvndQuuDbMZCpmD2d YgWIocGTl6VT9brmouuObnS/iv0zLUcT+A== X-Google-Smtp-Source: AMsMyM4X95FvpzI6NSk3WYvl5Tu0S3diBPj6eWa8tZDZ5IW9thNvqA27Rjt3z5OhnWbilf42kMfWqA== X-Received: by 2002:a05:6602:3410:b0:6bc:c4b2:3577 with SMTP id n16-20020a056602341000b006bcc4b23577mr20608128ioz.52.1666629344157; Mon, 24 Oct 2022 09:35:44 -0700 (PDT) Received: from [192.168.1.128] ([38.15.45.1]) by smtp.gmail.com with ESMTPSA id m2-20020a0566022e8200b00689257fef39sm101581iow.4.2022.10.24.09.35.43 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 24 Oct 2022 09:35:43 -0700 (PDT) Message-ID: Date: Mon, 24 Oct 2022 10:35:43 -0600 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.2.2 Content-Language: en-US To: Linus Torvalds Cc: Shuah Khan , linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org From: Shuah Khan Subject: [GIT PULL] Kselftest fixes update for Linux 6.1-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.1-rc3. This Kselftest fixes update for Linux 6.1-rc3 consists of: - futex, intel_pstate, kexec build fixes - ftrace dynamic_events dependency check fix - memory-hotplug fix to remove redundant warning from test report diff for this pull request is attached. thanks, -- Shuah ---------------------------------------------------------------- The following changes since commit 9abf2313adc1ca1b6180c508c25f22f9395cc780: Linux 6.1-rc1 (2022-10-16 15:36:24 -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.1-rc3 for you to fetch changes up to cb05c81ada76a30a25a5f79b249375e33473af33: selftests/ftrace: fix dynamic_events dependency check (2022-10-18 14:27:23 -0600) ---------------------------------------------------------------- linux-kselftest-fixes-6.1-rc3 This Kselftest fixes update for Linux 6.1-rc3 consists of: - futex, intel_pstate, kexec build fixes - ftrace dynamic_events dependency check fix - memory-hotplug fix to remove redundant warning from test report ---------------------------------------------------------------- Ricardo Cañuelo (3): selftests/futex: fix build for clang selftests/intel_pstate: fix build for ARCH=x86_64 selftests/kexec: fix build for ARCH=x86_64 Sven Schnelle (1): selftests/ftrace: fix dynamic_events dependency check Zhao Gongyi (1): selftests/memory-hotplug: Remove the redundant warning information tools/testing/selftests/ftrace/test.d/dynevent/test_duplicates.tc | 2 +- .../ftrace/test.d/trigger/inter-event/trigger-synthetic-eprobe.tc | 2 +- tools/testing/selftests/futex/functional/Makefile | 6 ++---- tools/testing/selftests/intel_pstate/Makefile | 6 +++--- tools/testing/selftests/kexec/Makefile | 6 +++--- tools/testing/selftests/memory-hotplug/mem-on-off-test.sh | 1 - 6 files changed, 10 insertions(+), 13 deletions(-) ---------------------------------------------------------------- diff --git a/tools/testing/selftests/ftrace/test.d/dynevent/test_duplicates.tc b/tools/testing/selftests/ftrace/test.d/dynevent/test_duplicates.tc index db522577ff78..d3a79da215c8 100644 --- a/tools/testing/selftests/ftrace/test.d/dynevent/test_duplicates.tc +++ b/tools/testing/selftests/ftrace/test.d/dynevent/test_duplicates.tc @@ -1,7 +1,7 @@ #!/bin/sh # SPDX-License-Identifier: GPL-2.0 # description: Generic dynamic event - check if duplicate events are caught -# requires: dynamic_events "e[:[/]] . []":README +# requires: dynamic_events "e[:[/][]] . []":README echo 0 > events/enable diff --git a/tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-synthetic-eprobe.tc b/tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-synthetic-eprobe.tc index 914fe2e5d030..6461c375694f 100644 --- a/tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-synthetic-eprobe.tc +++ b/tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-synthetic-eprobe.tc @@ -1,7 +1,7 @@ #!/bin/sh # SPDX-License-Identifier: GPL-2.0 # description: event trigger - test inter-event histogram trigger eprobe on synthetic event -# requires: dynamic_events synthetic_events events/syscalls/sys_enter_openat/hist "e[:[/]] . []":README +# requires: dynamic_events synthetic_events events/syscalls/sys_enter_openat/hist "e[:[/][]] . []":README echo 0 > events/enable diff --git a/tools/testing/selftests/futex/functional/Makefile b/tools/testing/selftests/futex/functional/Makefile index 732149011692..5a0e0df8de9b 100644 --- a/tools/testing/selftests/futex/functional/Makefile +++ b/tools/testing/selftests/futex/functional/Makefile @@ -3,11 +3,11 @@ INCLUDES := -I../include -I../../ -I../../../../../usr/include/ CFLAGS := $(CFLAGS) -g -O2 -Wall -D_GNU_SOURCE -pthread $(INCLUDES) $(KHDR_INCLUDES) LDLIBS := -lpthread -lrt -HEADERS := \ +LOCAL_HDRS := \ ../include/futextest.h \ ../include/atomic.h \ ../include/logging.h -TEST_GEN_FILES := \ +TEST_GEN_PROGS := \ futex_wait_timeout \ futex_wait_wouldblock \ futex_requeue_pi \ @@ -24,5 +24,3 @@ TEST_PROGS := run.sh top_srcdir = ../../../../.. DEFAULT_INSTALL_HDR_PATH := 1 include ../../lib.mk - -$(TEST_GEN_FILES): $(HEADERS) diff --git a/tools/testing/selftests/intel_pstate/Makefile b/tools/testing/selftests/intel_pstate/Makefile index 39f0fa2a8fd6..05d66ef50c97 100644 --- a/tools/testing/selftests/intel_pstate/Makefile +++ b/tools/testing/selftests/intel_pstate/Makefile @@ -2,10 +2,10 @@ CFLAGS := $(CFLAGS) -Wall -D_GNU_SOURCE LDLIBS += -lm -uname_M := $(shell uname -m 2>/dev/null || echo not) -ARCH ?= $(shell echo $(uname_M) | sed -e s/i.86/x86/ -e s/x86_64/x86/) +ARCH ?= $(shell uname -m 2>/dev/null || echo not) +ARCH_PROCESSED := $(shell echo $(ARCH) | sed -e s/i.86/x86/ -e s/x86_64/x86/) -ifeq (x86,$(ARCH)) +ifeq (x86,$(ARCH_PROCESSED)) TEST_GEN_FILES := msr aperf endif diff --git a/tools/testing/selftests/kexec/Makefile b/tools/testing/selftests/kexec/Makefile index 806a150648c3..67fe7a46cb62 100644 --- a/tools/testing/selftests/kexec/Makefile +++ b/tools/testing/selftests/kexec/Makefile @@ -1,10 +1,10 @@ # SPDX-License-Identifier: GPL-2.0-only # Makefile for kexec tests -uname_M := $(shell uname -m 2>/dev/null || echo not) -ARCH ?= $(shell echo $(uname_M) | sed -e s/i.86/x86/ -e s/x86_64/x86/) +ARCH ?= $(shell uname -m 2>/dev/null || echo not) +ARCH_PROCESSED := $(shell echo $(ARCH) | sed -e s/i.86/x86/ -e s/x86_64/x86/) -ifeq ($(ARCH),$(filter $(ARCH),x86 ppc64le)) +ifeq ($(ARCH_PROCESSED),$(filter $(ARCH_PROCESSED),x86 ppc64le)) TEST_PROGS := test_kexec_load.sh test_kexec_file_load.sh TEST_FILES := kexec_common_lib.sh diff --git a/tools/testing/selftests/memory-hotplug/mem-on-off-test.sh b/tools/testing/selftests/memory-hotplug/mem-on-off-test.sh index 74ee5067a8ce..611be86eaf3d 100755 --- a/tools/testing/selftests/memory-hotplug/mem-on-off-test.sh +++ b/tools/testing/selftests/memory-hotplug/mem-on-off-test.sh @@ -138,7 +138,6 @@ online_all_offline_memory() { for memory in `hotpluggable_offline_memory`; do if ! online_memory_expect_success $memory; then - echo "$FUNCNAME $memory: unexpected fail" >&2 retval=1 fi done