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: 9921 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp585472wru; Mon, 24 Oct 2022 11:08:16 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5LKXzBBYoJZNQR/6zGr3ro8TdDvDJaAZEL5rB1A9Aeo0Cs9mrJcfkFm/96NVGilNI/Jzjg X-Received: by 2002:a17:907:2d1e:b0:7a9:c2f9:2c2c with SMTP id gs30-20020a1709072d1e00b007a9c2f92c2cmr3916996ejc.405.1666634896134; Mon, 24 Oct 2022 11:08:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666634896; cv=none; d=google.com; s=arc-20160816; b=JNueXOA7y173PIBK678+kGwQeYk26iB1XO78wxQ4B38SbqxmejBL+EIBlFqvcKqBcb CePHzUofWT/O6ArSZXxJCc2KyA6j13z/ucQrS7MT4op/tOA9d3M5F31Oe/uiKYuem7jb 4JIxbNTtHop/lP/1JZkliEq4890R9leGleSRfKFSnz1buFU9v93/N3VF/AqC6kTO6LxA iEIymaqbnMO6v+ClUQkh7nhDdxbGeh117Sdlz2dd/q9TxNRdlelajVAZwtDayPtrdsBm oJJ9NSoH4bi6QPKdjSXtNEnvHjOqsSlAKTpfd6eIe8INvzJA0lSDs2d31Mr6S49WsPyU 0U/g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:subject:from:cc:to:content-language:user-agent :mime-version:date:message-id:dkim-signature; bh=891IdAC6CjPU3houg/K1WEgsqjrUAZT4ffved4EQYDA=; b=h1izefNiTogNBQLvq/oYLphdwhYexw3XtXNYZgLmWaUrQF0reoZNlgle8dOH6/Ivq4 evOnVotBuK+s+CHVQRjKFBpzi6KeGIOgNQ6DTVU5jZ7FYJEjcXJsxD5rvvQNqkGPKJnm twWmT3vI15ZfoydbSBlVx7eC8lD3zzrO1oMEKmULvtJaGfjEJxxhemrkmfxKx9AS1fsl Vajg04Rup44w8zkefs5wc7ZiqjqgaFTyd2mEjh6NlMbTqmcTw3zA39MYh/hdV5NNZSXU vNrpLu9K7BYX6MRtwga+S1Dsm0Z0ZpLwmy3ExyDNC9qZ0LFNPD+WmBdHh+GbDHoYmF2/ mMrA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=google header.b=TaRZkPb1; 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=linuxfoundation.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id z12-20020a50cd0c000000b00460ba005641si429639edi.171.2022.10.24.11.07.52; Mon, 24 Oct 2022 11:08:16 -0700 (PDT) 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=@linuxfoundation.org header.s=google header.b=TaRZkPb1; 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=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230209AbiJXR5q (ORCPT + 99 others); Mon, 24 Oct 2022 13:57:46 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50410 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231868AbiJXR5Z (ORCPT ); Mon, 24 Oct 2022 13:57:25 -0400 Received: from mail-io1-xd2e.google.com (mail-io1-xd2e.google.com [IPv6:2607:f8b0:4864:20::d2e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5B190F02C for ; Mon, 24 Oct 2022 09:37:11 -0700 (PDT) Received: by mail-io1-xd2e.google.com with SMTP id l127so8144975iof.12 for ; Mon, 24 Oct 2022 09:37:10 -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=Y7OxrWxbxPk75ihDYmLNIbai+zJx/Tl4vX6aZvsl4YHNrdO8b1h6YuCFTlcJ+F+dfV n7X9eGHejcWlP9wtRYIMiCQdJxn8lNIBQqLNILDg6htL5iugnnUfJlTAX6GDmJW2vb3W VCOZdqARweja2IgIKNVVjhab7rkJaiq9p100Nmzos8tnAAmq2GvwqHlV6/f4jiH++BTX IUJNHv+ATbKjnGaN+9dcx872qJJVa5GROi3QS9kUE3+kDzy3tBwSvlXt8xZlBoO+3CDN VVWK+kP0tUMRCmC9iCD1iqGx9UZnwLDkIqCmzt1uK7W37aciPpWb73vRL4+IJMSgGjyg KdKA== X-Gm-Message-State: ACrzQf3EI3dW1razUS9BlhesgJyNeZsvlVyVA01u2MjBLPKm6kB+s0Y/ Hc43+pc7g44FX+UuO/v4Oe3EAg== 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 X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, 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?1747593352575263530?= X-GMAIL-MSGID: =?utf-8?q?1747593352575263530?= 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