Message ID | 20230517152654.7193-3-mathieu.desnoyers@efficios.com |
---|---|
State | New |
Headers |
Return-Path: <linux-kernel-owner@vger.kernel.org> Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:6358:3046:b0:115:7a1d:dabb with SMTP id p6csp1104259rwl; Wed, 17 May 2023 08:32:13 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5k7drjsyU+6KguG3ARsetoY6e9kMrNIRrNgdrzGvq+PTr5D8j5HaabyhFrktZZXEAUvpL4 X-Received: by 2002:a17:902:d2c7:b0:1a9:90bc:c3c6 with SMTP id n7-20020a170902d2c700b001a990bcc3c6mr53187420plc.16.1684337532810; Wed, 17 May 2023 08:32:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1684337532; cv=none; d=google.com; s=arc-20160816; b=i1ufv6LL/1udtljp9nNo9tqjImgxUiBlMhZKaeqahEXxU9EHWoN4NalZOmRNVNca9e qS0d/yx+HgHsPAqYmg47x3mfaupO8K9K1bK7dMG7fJBAoPKTsHIbzne/VrQdGS/EvcHc okYdzE41qc3iOsArK6AA3fsoXnYRkpotMAgL8HWN/SXkGF1LCwief07LPwk3XfonLDKG FK9fBaPRna4uNwNl/tnMFLMIVomgQKtnKHXbhW3W+wwpWu2hoCZOGVqdfWrDleSkQTb2 uv8f3WoTe3kK2SuFY1iz+FeehRQEjMlrnaZ3Q/ziJr5UVRRyVdsYGha5+pnX/2h77ZOb VnbQ== 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=rFwpm2TeJ0c+EdYWU70YKVNWl31vEZpFl0AiI2tATUw=; b=aOZo41zLtLdaIkuluyUVnkThEsqKP/IzjvnVYeMgV6YTf0oMpayrj4l1vdsJIJIGpX CZZiQqHJbndT1bbFKjbM8V34lUmgQXcN8dv8J6Scu2wDDs6/Q0vcp4PP/KCvcbG1fwrx EceYwNiis4VDcvEP4tgQnvo7mP3MvknmRCoEeWQEc9e7yIOy/GQIuJNm9LFKkWjFb0dV jkdz7liMobqUsPUF7B+KmFj0JYVUAsCGunDYowEt6KvGszF9IYPYqMMuLEMvILk6+lKl P9N55LVZFlfc3kMfNdz86Uy9Tav0C9bOKaHWae/1I3xoYWcuDtzpLmvekKA27iLK1b9c It0A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@efficios.com header.s=smtpout1 header.b=xJVyQm7G; 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=efficios.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id h6-20020a170902eec600b001aaccc51d45si20194864plb.398.2023.05.17.08.31.59; Wed, 17 May 2023 08:32:12 -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=@efficios.com header.s=smtpout1 header.b=xJVyQm7G; 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=efficios.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232432AbjEQP2F (ORCPT <rfc822;abdi.embedded@gmail.com> + 99 others); Wed, 17 May 2023 11:28:05 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56172 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232356AbjEQP1U (ORCPT <rfc822;linux-kernel@vger.kernel.org>); Wed, 17 May 2023 11:27:20 -0400 Received: from smtpout.efficios.com (unknown [IPv6:2607:5300:203:b2ee::31e5]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4FEE6E8; Wed, 17 May 2023 08:27:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=efficios.com; s=smtpout1; t=1684337224; bh=cGY+UUiS0WxsYW24i8f6zUJg+b2UGm/oIzYRyqAGABQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=xJVyQm7GdpTCkFgl5YFT51SZEn4RQShO5JKmoP4KqC6BkFLube50vwhpFwOY/n/s2 DO7VeKFwt9vnBWPd2OjzuULKWw0xMd3AdrBR1R4ts2sGCjsEYEnVgurvrvZvLHHHPZ gCaMCjEFGlI3+lLXub5gTl9TAqIEe4NIT3OAuWjzmXBMZV0t7tLiHW18Ai+jIwUV/i w5wbQqzRrKevyVI8TyZgcTq4vIXWS85zvCR7AEywByqoJ/OL9qe9ZaCkTJJWLO8hAi um0Nw0ZLy0DpWzOAZYKjBDH/vRGmO6eWQxAANn9/74b+NtfaGEadt5DYLjmg/OSdqx YR32xMs+jOIEw== Received: from localhost.localdomain (192-222-143-198.qc.cable.ebox.net [192.222.143.198]) by smtpout.efficios.com (Postfix) with ESMTPSA id 4QLxmS1S00z12Mc; Wed, 17 May 2023 11:27:04 -0400 (EDT) From: Mathieu Desnoyers <mathieu.desnoyers@efficios.com> To: Peter Zijlstra <peterz@infradead.org> Cc: linux-kernel@vger.kernel.org, Thomas Gleixner <tglx@linutronix.de>, "Paul E . McKenney" <paulmck@kernel.org>, Boqun Feng <boqun.feng@gmail.com>, "H . Peter Anvin" <hpa@zytor.com>, Paul Turner <pjt@google.com>, linux-api@vger.kernel.org, Christian Brauner <brauner@kernel.org>, Florian Weimer <fw@deneb.enyo.de>, David.Laight@ACULAB.COM, carlos@redhat.com, Peter Oskolkov <posk@posk.io>, Alexander Mikhalitsyn <alexander@mihalicyn.com>, Chris Kennelly <ckennelly@google.com>, Ingo Molnar <mingo@redhat.com>, Darren Hart <dvhart@infradead.org>, Davidlohr Bueso <dave@stgolabs.net>, =?utf-8?q?Andr=C3=A9_Almeida?= <andrealmeid@igalia.com>, libc-alpha@sourceware.org, Steven Rostedt <rostedt@goodmis.org>, Jonathan Corbet <corbet@lwn.net>, Mathieu Desnoyers <mathieu.desnoyers@efficios.com> Subject: [RFC PATCH 2/4] selftests/rseq: Add sched_state rseq field and getter Date: Wed, 17 May 2023 11:26:52 -0400 Message-Id: <20230517152654.7193-3-mathieu.desnoyers@efficios.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230517152654.7193-1-mathieu.desnoyers@efficios.com> References: <20230517152654.7193-1-mathieu.desnoyers@efficios.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-1.3 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RDNS_NONE,SPF_HELO_NONE, SPF_PASS,T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=no 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: <linux-kernel.vger.kernel.org> X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1766155912630561471?= X-GMAIL-MSGID: =?utf-8?q?1766155912630561471?= |
Series |
Extend rseq with sched_state field
|
|
Commit Message
Mathieu Desnoyers
May 17, 2023, 3:26 p.m. UTC
Extend struct rseq in the rseq selftests to include the sched_state
field. Implement a getter function for this field.
Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
---
tools/testing/selftests/rseq/rseq-abi.h | 17 +++++++++++++++++
tools/testing/selftests/rseq/rseq.h | 5 +++++
2 files changed, 22 insertions(+)
Comments
Hello, kernel test robot noticed "kernel-selftests.kvm.make.fail" on: commit: 1f70aced56e5ae7bcdaba5f55ff62e610c105089 ("[RFC PATCH 2/4] selftests/rseq: Add sched_state rseq field and getter") url: https://github.com/intel-lab-lkp/linux/commits/Mathieu-Desnoyers/rseq-Add-sched_state-field-to-struct-rseq/20230517-233229 base: https://git.kernel.org/cgit/linux/kernel/git/shuah/linux-kselftest.git next patch link: https://lore.kernel.org/all/20230517152654.7193-3-mathieu.desnoyers@efficios.com/ patch subject: [RFC PATCH 2/4] selftests/rseq: Add sched_state rseq field and getter in testcase: kernel-selftests version: kernel-selftests-x86_64-60acb023-1_20230329 with following parameters: group: kvm test-description: The kernel contains a set of "self tests" under the tools/testing/selftests/ directory. These are intended to be small unit tests to exercise individual code paths in the kernel. test-url: https://www.kernel.org/doc/Documentation/kselftest.txt compiler: gcc-11 test machine: 224 threads 2 sockets Intel(R) Xeon(R) Platinum 8480+ (Sapphire Rapids) with 256G memory (please refer to attached dmesg/kmsg for entire log/backtrace) If you fix the issue, kindly add following tag | Reported-by: kernel test robot <oliver.sang@intel.com> | Closes: https://lore.kernel.org/oe-lkp/202305282101.a1fb6386-oliver.sang@intel.com In file included from ../rseq/rseq.h:20, from ../rseq/rseq.c:35, from rseq_test.c:23: ../rseq/rseq-abi.h:40:6: error: redeclaration of ‘enum rseq_sched_state’ 40 | enum rseq_sched_state { | ^~~~~~~~~~~~~~~~ In file included from rseq_test.c:16: /usr/src/perf_selftests-x86_64-rhel-8.3-kvm-1f70aced56e5ae7bcdaba5f55ff62e610c105089/usr/include/linux/rseq.h:40:6: note: originally defined here 40 | enum rseq_sched_state { | ^~~~~~~~~~~~~~~~ ../rseq/rseq-abi.h:44:9: error: redeclaration of enumerator ‘RSEQ_SCHED_STATE_ON_CPU’ 44 | RSEQ_SCHED_STATE_ON_CPU = (1U << 0), | ^~~~~~~~~~~~~~~~~~~~~~~ /usr/src/perf_selftests-x86_64-rhel-8.3-kvm-1f70aced56e5ae7bcdaba5f55ff62e610c105089/usr/include/linux/rseq.h:44:9: note: previous definition of ‘RSEQ_SCHED_STATE_ON_CPU’ with type ‘enum rseq_sched_state’ 44 | RSEQ_SCHED_STATE_ON_CPU = (1U << 0), | ^~~~~~~~~~~~~~~~~~~~~~~ cc1: note: unrecognized command-line option ‘-Wno-gnu-variable-sized-type-not-at-end’ may have been intended to silence earlier diagnostics make: *** [../lib.mk:147: /usr/src/perf_selftests-x86_64-rhel-8.3-kvm-1f70aced56e5ae7bcdaba5f55ff62e610c105089/tools/testing/selftests/kvm/rseq_test] Error 1 make: *** Waiting for unfinished jobs.... make: Leaving directory '/usr/src/perf_selftests-x86_64-rhel-8.3-kvm-1f70aced56e5ae7bcdaba5f55ff62e610c105089/tools/testing/selftests/kvm' 2023-05-27 01:58:33 make quicktest=1 run_tests -C kvm make: Entering directory '/usr/src/perf_selftests-x86_64-rhel-8.3-kvm-1f70aced56e5ae7bcdaba5f55ff62e610c105089/tools/testing/selftests/kvm' gcc -Wall -Wstrict-prototypes -Wuninitialized -O2 -g -std=gnu99 -Wno-gnu-variable-sized-type-not-at-end -fno-builtin-memcmp -fno-builtin-memcpy -fno-builtin-memset -fno-stack-protector -fno-PIE -I/usr/src/perf_selftests-x86_64-rhel-8.3-kvm-1f70aced56e5ae7bcdaba5f55ff62e610c105089/tools/testing/selftests/../../../tools/include -I/usr/src/perf_selftests-x86_64-rhel-8.3-kvm-1f70aced56e5ae7bcdaba5f55ff62e610c105089/tools/testing/selftests/../../../tools/arch/x86/include -I/usr/src/perf_selftests-x86_64-rhel-8.3-kvm-1f70aced56e5ae7bcdaba5f55ff62e610c105089/tools/testing/selftests/../../../usr/include/ -Iinclude -I. -Iinclude/x86_64 -I ../rseq -I.. -isystem /usr/src/perf_selftests-x86_64-rhel-8.3-kvm-1f70aced56e5ae7bcdaba5f55ff62e610c105089/tools/testing/selftests/../../../usr/include -pthread -no-pie rseq_test.c /usr/src/perf_selftests-x86_64-rhel-8.3-kvm-1f70aced56e5ae7bcdaba5f55ff62e610c105089/tools/testing/selftests/kvm/lib/assert.o /usr/src/perf_selftests-x86_64-rhel-8.3-kvm-1f70aced56e5ae7bcdaba5f55ff62e610c105089/tools/testing/selftests/kvm/lib/elf.o /usr/src/perf_selftests-x86_64-rhel-8.3-kvm-1f70aced56e5ae7bcdaba5f55ff62e610c105089/tools/testing/selftests/kvm/lib/guest_modes.o /usr/src/perf_selftests-x86_64-rhel-8.3-kvm-1f70aced56e5ae7bcdaba5f55ff62e610c105089/tools/testing/selftests/kvm/lib/io.o /usr/src/perf_selftests-x86_64-rhel-8.3-kvm-1f70aced56e5ae7bcdaba5f55ff62e610c105089/tools/testing/selftests/kvm/lib/kvm_util.o /usr/src/perf_selftests-x86_64-rhel-8.3-kvm-1f70aced56e5ae7bcdaba5f55ff62e610c105089/tools/testing/selftests/kvm/lib/memstress.o /usr/src/perf_selftests-x86_64-rhel-8.3-kvm-1f70aced56e5ae7bcdaba5f55ff62e610c105089/tools/testing/selftests/kvm/lib/rbtree.o /usr/src/perf_selftests-x86_64-rhel-8.3-kvm-1f70aced56e5ae7bcdaba5f55ff62e610c105089/tools/testing/selftests/kvm/lib/sparsebit.o /usr/src/perf_selftests-x86_64-rhel-8.3-kvm-1f70aced56e5ae7bcdaba5f55ff62e610c105089/tools/testing/selftests/kvm/lib/test_util.o /usr/src/perf_selftests-x86_64-rhel-8.3-kvm-1f70aced56e5ae7bcdaba5f55ff62e610c105089/tools/testing/selftests/kvm/lib/ucall_common.o /usr/src/perf_selftests-x86_64-rhel-8.3-kvm-1f70aced56e5ae7bcdaba5f55ff62e610c105089/tools/testing/selftests/kvm/lib/userfaultfd_util.o /usr/src/perf_selftests-x86_64-rhel-8.3-kvm-1f70aced56e5ae7bcdaba5f55ff62e610c105089/tools/testing/selftests/kvm/lib/x86_64/apic.o /usr/src/perf_selftests-x86_64-rhel-8.3-kvm-1f70aced56e5ae7bcdaba5f55ff62e610c105089/tools/testing/selftests/kvm/lib/x86_64/hyperv.o /usr/src/perf_selftests-x86_64-rhel-8.3-kvm-1f70aced56e5ae7bcdaba5f55ff62e610c105089/tools/testing/selftests/kvm/lib/x86_64/memstress.o /usr/src/perf_selftests-x86_64-rhel-8.3-kvm-1f70aced56e5ae7bcdaba5f55ff62e610c105089/tools/testing/selftests/kvm/lib/x86_64/processor.o /usr/src/perf_selftests-x86_64-rhel-8.3-kvm-1f70aced56e5ae7bcdaba5f55ff62e610c105089/tools/testing/selftests/kvm/lib/x86_64/svm.o /usr/src/perf_selftests-x86_64-rhel-8.3-kvm-1f70aced56e5ae7bcdaba5f55ff62e610c105089/tools/testing/selftests/kvm/lib/x86_64/ucall.o /usr/src/perf_selftests-x86_64-rhel-8.3-kvm-1f70aced56e5ae7bcdaba5f55ff62e610c105089/tools/testing/selftests/kvm/lib/x86_64/vmx.o /usr/src/perf_selftests-x86_64-rhel-8.3-kvm-1f70aced56e5ae7bcdaba5f55ff62e610c105089/tools/testing/selftests/kvm/lib/x86_64/handlers.o /usr/src/perf_selftests-x86_64-rhel-8.3-kvm-1f70aced56e5ae7bcdaba5f55ff62e610c105089/tools/testing/selftests/kvm/lib/string_override.o -ldl -o /usr/src/perf_selftests-x86_64-rhel-8.3-kvm-1f70aced56e5ae7bcdaba5f55ff62e610c105089/tools/testing/selftests/kvm/rseq_test In file included from ../rseq/rseq.h:20, from ../rseq/rseq.c:35, from rseq_test.c:23: ../rseq/rseq-abi.h:40:6: error: redeclaration of ‘enum rseq_sched_state’ 40 | enum rseq_sched_state { | ^~~~~~~~~~~~~~~~ In file included from rseq_test.c:16: /usr/src/perf_selftests-x86_64-rhel-8.3-kvm-1f70aced56e5ae7bcdaba5f55ff62e610c105089/usr/include/linux/rseq.h:40:6: note: originally defined here 40 | enum rseq_sched_state { | ^~~~~~~~~~~~~~~~ ../rseq/rseq-abi.h:44:9: error: redeclaration of enumerator ‘RSEQ_SCHED_STATE_ON_CPU’ 44 | RSEQ_SCHED_STATE_ON_CPU = (1U << 0), | ^~~~~~~~~~~~~~~~~~~~~~~ /usr/src/perf_selftests-x86_64-rhel-8.3-kvm-1f70aced56e5ae7bcdaba5f55ff62e610c105089/usr/include/linux/rseq.h:44:9: note: previous definition of ‘RSEQ_SCHED_STATE_ON_CPU’ with type ‘enum rseq_sched_state’ 44 | RSEQ_SCHED_STATE_ON_CPU = (1U << 0), | ^~~~~~~~~~~~~~~~~~~~~~~ cc1: note: unrecognized command-line option ‘-Wno-gnu-variable-sized-type-not-at-end’ may have been intended to silence earlier diagnostics make: *** [../lib.mk:147: /usr/src/perf_selftests-x86_64-rhel-8.3-kvm-1f70aced56e5ae7bcdaba5f55ff62e610c105089/tools/testing/selftests/kvm/rseq_test] Error 1 make: Leaving directory '/usr/src/perf_selftests-x86_64-rhel-8.3-kvm-1f70aced56e5ae7bcdaba5f55ff62e610c105089/tools/testing/selftests/kvm' To reproduce: git clone https://github.com/intel/lkp-tests.git cd lkp-tests sudo bin/lkp install job.yaml # job file is attached in this email bin/lkp split-job --compatible job.yaml # generate the yaml file for lkp run sudo bin/lkp run generated-yaml-file # if come across any failure that blocks the test, # please remove ~/.lkp and /lkp dir to run from a clean state.
diff --git a/tools/testing/selftests/rseq/rseq-abi.h b/tools/testing/selftests/rseq/rseq-abi.h index fb4ec8a75dd4..15ec333e9eec 100644 --- a/tools/testing/selftests/rseq/rseq-abi.h +++ b/tools/testing/selftests/rseq/rseq-abi.h @@ -37,6 +37,13 @@ enum rseq_abi_cs_flags { (1U << RSEQ_ABI_CS_FLAG_NO_RESTART_ON_MIGRATE_BIT), }; +enum rseq_sched_state { + /* + * Task is currently running on a CPU if bit is set. + */ + RSEQ_SCHED_STATE_ON_CPU = (1U << 0), +}; + /* * struct rseq_abi_cs is aligned on 4 * 8 bytes to ensure it is always * contained within a single cache-line. It is usually declared as @@ -164,6 +171,16 @@ struct rseq_abi { */ __u32 mm_cid; + /* + * Restartable sequences sched_state field. Updated by the kernel. Read + * by user-space with single-copy atomicity semantics. This fields can + * be read by any userspace thread. Aligned on 32-bit. Contains a + * bitmask of enum rseq_sched_state. This field is provided as a hint + * by the scheduler, and requires that the page holding struct rseq is + * faulted-in for the state update to be performed by the scheduler. + */ + __u32 sched_state; + /* * Flexible array member at end of structure, after last feature field. */ diff --git a/tools/testing/selftests/rseq/rseq.h b/tools/testing/selftests/rseq/rseq.h index d7364ea4d201..348e9385cb2b 100644 --- a/tools/testing/selftests/rseq/rseq.h +++ b/tools/testing/selftests/rseq/rseq.h @@ -236,6 +236,11 @@ static inline void rseq_prepare_unload(void) rseq_clear_rseq_cs(); } +static inline uint32_t rseq_current_sched_state(void) +{ + return RSEQ_ACCESS_ONCE(rseq_get_abi()->sched_state); +} + static inline __attribute__((always_inline)) int rseq_cmpeqv_storev(enum rseq_mo rseq_mo, enum rseq_percpu_mode percpu_mode, intptr_t *v, intptr_t expect,