From nobody Wed Jun 17 06:05:31 2026 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id CF7853264DA for ; Mon, 27 Apr 2026 15:12:01 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.133.124 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777302723; cv=none; b=TADnsWx8iuw+QBnuiMX5fpgEpBq8o1bCNT97SRwdibaVNFhdoeXycMtVyAzu4cj3tO7QE/HlTvLxZzjC5TdxYhgOfhwd2aje4jmlm1f4/VTuTneRV/hK6XH2DbYGyvU2Ylg5iX4xxQ9FYg/oI66Rb92LFSxOfhqdjFQBDrZ6Uc4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777302723; c=relaxed/simple; bh=6vx7EVUEeXu+w4Q4EMKcVbjcZH3hUDGdi+p13lmJFzk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=BN4fYkefTngSOCf203jhUdAfevwNe2H9AZ+aLnrZReFdCoym1wiejjervxaJkGv05jojVU0AdNg2Bld8iED3ES5ONxWUNycOnllShImfuEeaceDQ0qvrv0d+DS5kpZli833ss5ypXUcA/27+a9JZGDhaRNseZicQ8iYezqK9iRI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=GAgtFCVy; arc=none smtp.client-ip=170.10.133.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="GAgtFCVy" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1777302720; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=4d8rayQv9Te5MjRAGc+HYTqoPOPUAIqg0Cp2spaG8Zw=; b=GAgtFCVyyL3lEdjMIdXno1hwt2F732rEAiCeaawQQg5kHUNpr67riQ1MQJt0BlAYRhxemU 5enlA3YBGZirs9lhXWB3GmclXt+wzxTCKk/CFf5voaN1SvoMdQQ4/9YWmF+b37gXMUK+OK OFLlt8qnCNyk3GE1oD0aIveoXgOKBWE= Received: from mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-508-2YCjGELPOl6Nysi9yQ852g-1; Mon, 27 Apr 2026 11:11:55 -0400 X-MC-Unique: 2YCjGELPOl6Nysi9yQ852g-1 X-Mimecast-MFC-AGG-ID: 2YCjGELPOl6Nysi9yQ852g_1777302714 Received: from mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.17]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 393DE19560B8; Mon, 27 Apr 2026 15:11:54 +0000 (UTC) Received: from fedora-pc.redhat.corp (headnet01.pony-001.prod.iad2.dc.redhat.com [10.2.32.101]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 3CD56195608E; Mon, 27 Apr 2026 15:11:50 +0000 (UTC) From: Gabriele Monaco To: linux-trace-kernel@vger.kernel.org, linux-kernel@vger.kernel.org, Steven Rostedt , Gabriele Monaco Cc: Nam Cao , Thomas Weissschuh , Tomas Glozar , John Kacur , Wen Yang Subject: [RFC PATCH 01/12] tools/rv: Fix substring match bug in monitor name search Date: Mon, 27 Apr 2026 17:11:23 +0200 Message-ID: <20260427151134.192971-2-gmonaco@redhat.com> In-Reply-To: <20260427151134.192971-1-gmonaco@redhat.com> References: <20260427151134.192971-1-gmonaco@redhat.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.0 on 10.30.177.17 Content-Type: text/plain; charset="utf-8" __ikm_find_monitor_name() relies on strstr() to find a monitor by name, which fails if the target monitor is a substring of a previously listed monitor. Fix it by tokenizing the available_monitors file and matching full tokens instead. Signed-off-by: Gabriele Monaco Reviewed-by: Wen Yang --- tools/verification/rv/src/in_kernel.c | 48 ++++++++++++++------------- 1 file changed, 25 insertions(+), 23 deletions(-) diff --git a/tools/verification/rv/src/in_kernel.c b/tools/verification/rv/= src/in_kernel.c index 4bb746ea6e17..a200b63f4509 100644 --- a/tools/verification/rv/src/in_kernel.c +++ b/tools/verification/rv/src/in_kernel.c @@ -58,38 +58,40 @@ static int __ikm_read_enable(char *monitor_name) */ static int __ikm_find_monitor_name(char *monitor_name, char *out_name) { - char *available_monitors, container[MAX_DA_NAME_LEN+1], *cursor, *end; - int retval =3D 1; + char *available_monitors, *cursor, *line; + int len =3D strlen(monitor_name); + int found =3D 0; =20 available_monitors =3D tracefs_instance_file_read(NULL, "rv/available_mon= itors", NULL); if (!available_monitors) return -1; =20 - cursor =3D strstr(available_monitors, monitor_name); - if (!cursor) { - retval =3D 0; - goto out_free; - } + config_is_container =3D 0; + cursor =3D available_monitors; + while ((line =3D strsep(&cursor, "\n"))) { + char *colon =3D strchr(line, ':'); =20 - for (; cursor > available_monitors; cursor--) - if (*(cursor-1) =3D=3D '\n') - break; - end =3D strstr(cursor, "\n"); - memcpy(out_name, cursor, end-cursor); - out_name[end-cursor] =3D '\0'; - - cursor =3D strstr(out_name, ":"); - if (cursor) - *cursor =3D '/'; - else { - sprintf(container, "%s:", monitor_name); - if (strstr(available_monitors, container)) - config_is_container =3D 1; + if (strcmp(line, monitor_name) && (!colon || strcmp(colon + 1, monitor_n= ame))) + continue; + + strncpy(out_name, line, 2 * MAX_DA_NAME_LEN); + out_name[2 * MAX_DA_NAME_LEN - 1] =3D '\0'; + + if (colon) { + out_name[colon - line] =3D '/'; + } else { + /* If there are children, they are on the next line. */ + line =3D strsep(&cursor, "\n"); + if (line && !strncmp(line, monitor_name, len) && line[len] =3D=3D ':') + config_is_container =3D 1; + } + + found =3D 1; + break; } =20 -out_free: free(available_monitors); - return retval; + return found; } =20 /* --=20 2.53.0 From nobody Wed Jun 17 06:05:31 2026 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 9E5A6329E6A for ; Mon, 27 Apr 2026 15:12:03 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.133.124 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777302725; cv=none; b=u5FdGEcULwZ5rGdVayuVV6jZ7fPdojYmOBRM7mvCCl5XPKpxMvYJD4xCf1X3vAMT6KoLiBenTOwqVBbk8YlgubispwT9FwaBnHk8dHj2gWiK82fPZkq7dkz1LnRSMISDj2c+0UqAv+UIo8NaclpgXnD1HoL/HTJ6DcbVXwbrWYc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777302725; c=relaxed/simple; bh=EwuoDjuH2L2AHR/liN5WQQiaFdedpKkY0KAZL5ARV5A=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=W6gDCVir4nf64z2k2NYoBDpkxZISnqmKhwz+K3wM7LMhKv5qVjee7OMqgLidHQpaKhcohz9UduZtFSgKdQgbEKsly5waxWChxg4QjreLobHxOieQ0n9ctJaYtVLxxtmvnG9fDZbiQFJoq8st12khNyiLdwbB8D1UPDU12NFyH6k= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=iDG/r0fi; arc=none smtp.client-ip=170.10.133.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="iDG/r0fi" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1777302722; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=MmBNXsdb7Q8XvflqmKh8X5KCTV2PWqisH1cnCugKrPM=; b=iDG/r0fi+Ugsa2Ne4q8SyQiEH8ee++P3GCJXfZZ20N5+PXXmOqT6zpCHxnMUICX5Fv6mh0 UNq/2hBKHRGv94oJq4XaPEijImwkTa34QJXbCfDPKx4foOBgo55Jyp9r3Pv4UMvT9Ee0bo jpLh8JB2zTOtOQDyIkSFqe3mbruFYqA= Received: from mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-52-iPKg-v43MFesykaZQDkQ_g-1; Mon, 27 Apr 2026 11:11:59 -0400 X-MC-Unique: iPKg-v43MFesykaZQDkQ_g-1 X-Mimecast-MFC-AGG-ID: iPKg-v43MFesykaZQDkQ_g_1777302718 Received: from mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.17]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 11528195608D; Mon, 27 Apr 2026 15:11:58 +0000 (UTC) Received: from fedora-pc.redhat.corp (headnet01.pony-001.prod.iad2.dc.redhat.com [10.2.32.101]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 56FE6196B8FB; Mon, 27 Apr 2026 15:11:55 +0000 (UTC) From: Gabriele Monaco To: linux-trace-kernel@vger.kernel.org, linux-kernel@vger.kernel.org, Steven Rostedt , Gabriele Monaco Cc: Nam Cao , Thomas Weissschuh , Tomas Glozar , John Kacur , Wen Yang Subject: [RFC PATCH 02/12] tools/rv: Fix substring match when listing container monitors Date: Mon, 27 Apr 2026 17:11:24 +0200 Message-ID: <20260427151134.192971-3-gmonaco@redhat.com> In-Reply-To: <20260427151134.192971-1-gmonaco@redhat.com> References: <20260427151134.192971-1-gmonaco@redhat.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.0 on 10.30.177.17 Content-Type: text/plain; charset="utf-8" When listing monitors within a specific container (rv list ), the tool incorrectly matched monitors if the requested container name was only a prefix of the actual container (e.g., 'rv list sche' would incorrectly list monitors from 'sched:'). Fix this by ensuring the container name is an exact match and is immediately followed by the ':' separator. Signed-off-by: Gabriele Monaco Reviewed-by: Wen Yang --- tools/verification/rv/src/in_kernel.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/tools/verification/rv/src/in_kernel.c b/tools/verification/rv/= src/in_kernel.c index a200b63f4509..95adae321c11 100644 --- a/tools/verification/rv/src/in_kernel.c +++ b/tools/verification/rv/src/in_kernel.c @@ -193,8 +193,12 @@ static int ikm_fill_monitor_definition(char *name, str= uct monitor *ikm, char *co nested_name =3D strstr(name, ":"); if (nested_name) { /* it belongs in container if it starts with "container:" */ - if (container && strstr(name, container) !=3D name) - return 1; + if (container) { + int len =3D strlen(container); + + if (strncmp(name, container, len) || name[len] !=3D ':') + return 1; + } *nested_name =3D '/'; ++nested_name; ikm->nested =3D 1; --=20 2.53.0 From nobody Wed Jun 17 06:05:31 2026 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 4538432C957 for ; Mon, 27 Apr 2026 15:12:05 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.133.124 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777302727; cv=none; b=RbgfXEMxYXVk3O8AmCM+buD06NWU2cbqORx8IYMJVRk9sXZMhczKjYMDuzPiJZZS4bQAcw68bY1BN6y64/86JByoV6uzNT0W1BrXicCO8XVK2CWKhqPndpzOLVZ9kmOAsudXqcBKKlcBq6flSabKLLv6HNcLGzlLEeQCUlaFt98= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777302727; c=relaxed/simple; bh=UWUZk4hkdNL4huLX6YHY2/guG7GJc3afMyJjsvaS+Cg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=fpA4kfWE/ZB7rlaoW9FDHK6lbHvfjXDSzmwzadizr3FLTLGIwzxKKBIJHNBjkZp1sTioT26WWZoaEV9u7rb1h7+4B6n3SFB+MytLVXcc2XB4KJvtuoVk9HExgXWn78IqcJupNw0h5JTkIGYTpfQhWvz1pwIC9j8SUH7DoLEuByo= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=G/kABUDP; arc=none smtp.client-ip=170.10.133.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="G/kABUDP" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1777302725; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=MPiuStO13Gz3S6Lb9B0sQWvORmksHJAodsDQJ8FhIAQ=; b=G/kABUDPodIa1FAbyk0Pv3cZkAmbjE0Jv98NmBC+PfOOo8wqZInJdRx3G1hYFUtfGWAwls clli0nVtlx7ypsMxDZhL0VuAYlMjPojqBua2nkgLkQrmbm9CNsc0PEQa5+Nx+2iHEoN8lu eP8/xP2jA+vrR1sDz5daRnMxT0QdlbQ= Received: from mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-370-UwQGU9B5N-2YeNfAEn8hLQ-1; Mon, 27 Apr 2026 11:12:03 -0400 X-MC-Unique: UwQGU9B5N-2YeNfAEn8hLQ-1 X-Mimecast-MFC-AGG-ID: UwQGU9B5N-2YeNfAEn8hLQ_1777302722 Received: from mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.17]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 74F5118002D1; Mon, 27 Apr 2026 15:12:02 +0000 (UTC) Received: from fedora-pc.redhat.corp (headnet01.pony-001.prod.iad2.dc.redhat.com [10.2.32.101]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 2ACCB195608E; Mon, 27 Apr 2026 15:11:58 +0000 (UTC) From: Gabriele Monaco To: linux-trace-kernel@vger.kernel.org, linux-kernel@vger.kernel.org, Steven Rostedt , Gabriele Monaco Cc: Nam Cao , Thomas Weissschuh , Tomas Glozar , John Kacur , Wen Yang Subject: [RFC PATCH 03/12] tools/rv: Fix exit status when monitor execution fails Date: Mon, 27 Apr 2026 17:11:25 +0200 Message-ID: <20260427151134.192971-4-gmonaco@redhat.com> In-Reply-To: <20260427151134.192971-1-gmonaco@redhat.com> References: <20260427151134.192971-1-gmonaco@redhat.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.0 on 10.30.177.17 Content-Type: text/plain; charset="utf-8" When running "rv mon" on a monitor that is already enabled, the tool fails to start but incorrectly exits with a success status (0). Fix the exit condition to ensure it returns a failure code on any execution error. Signed-off-by: Gabriele Monaco Reviewed-by: Wen Yang --- tools/verification/rv/src/rv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/verification/rv/src/rv.c b/tools/verification/rv/src/rv.c index b8fe24a87d97..6d65f4037581 100644 --- a/tools/verification/rv/src/rv.c +++ b/tools/verification/rv/src/rv.c @@ -127,7 +127,7 @@ static void rv_mon(int argc, char **argv) =20 if (!run) err_msg("rv: monitor %s does not exist\n", monitor_name); - exit(!run); + exit(run <=3D 0); } =20 static void usage(int exit_val, const char *fmt, ...) --=20 2.53.0 From nobody Wed Jun 17 06:05:31 2026 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id F1BD032C942 for ; Mon, 27 Apr 2026 15:12:09 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.129.124 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777302731; cv=none; b=AIhQydSJm4mhJo3JUjchjPRPX9vsnqcXYaK6yrQmAeNeVgrQoNfK8TrtWhPBRouxqRtjukO0+wGhB7u3msEoM2Wns24C4NdAWlMLRU481gEaw5NhQk9777uVLIRDoZEodiBj8G5sg/M7wPPLstnyzalWVUWoVWmv7RsANmL74Dk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777302731; c=relaxed/simple; bh=yanRkr1omWUe7+Y8ve0695lEjPkzp32wA58du4C99I4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=OYcBfWMK0Tru6w5WwUkk/cLXH/lf6y+Wv7C9S5LQEZB/vLlqg/WVq+WVdl+3UJ346CpMNKWGbyYhDTmKRWje/MmZT3cvSwIpG2MmeuO/quwk0/DwmJVoZEGzbXIz/6RPW7w+0q6MXLHPKVUo3zICYzyQgDWQs205wWgPKM2d5x4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=AldtSAxE; arc=none smtp.client-ip=170.10.129.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="AldtSAxE" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1777302729; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=G2CkjPQ41NgjD2YBLAZEQz/znIbuYPYXd0FmuIaxcQE=; b=AldtSAxEUy/gUxo+mE4zWUBfYCfj0DGpe/Suij9cogY7AffZKmLEykZUnBHGVUIDUzE84J 83NAAJI/ZevlrmEaoBdT5/YEq1q5ArBxPuv0WvHrNDpV0Q/xeRIRetQDoGF24kBkmAW8Kg tqx+tRYUN6CRquBv4Tx21eFYurDZBOE= Received: from mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-687-3Ogq1sXDMUqyyvQSGPzLkA-1; Mon, 27 Apr 2026 11:12:07 -0400 X-MC-Unique: 3Ogq1sXDMUqyyvQSGPzLkA-1 X-Mimecast-MFC-AGG-ID: 3Ogq1sXDMUqyyvQSGPzLkA_1777302726 Received: from mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.17]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 7A87219560B7; Mon, 27 Apr 2026 15:12:06 +0000 (UTC) Received: from fedora-pc.redhat.corp (headnet01.pony-001.prod.iad2.dc.redhat.com [10.2.32.101]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id C9366195608E; Mon, 27 Apr 2026 15:12:03 +0000 (UTC) From: Gabriele Monaco To: linux-trace-kernel@vger.kernel.org, linux-kernel@vger.kernel.org, Steven Rostedt , Gabriele Monaco Cc: Nam Cao , Thomas Weissschuh , Tomas Glozar , John Kacur , Wen Yang Subject: [RFC PATCH 04/12] tools/rv: Fix cleanup after failed trace setup Date: Mon, 27 Apr 2026 17:11:26 +0200 Message-ID: <20260427151134.192971-5-gmonaco@redhat.com> In-Reply-To: <20260427151134.192971-1-gmonaco@redhat.com> References: <20260427151134.192971-1-gmonaco@redhat.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.0 on 10.30.177.17 Content-Type: text/plain; charset="utf-8" Currently if ikm_setup_trace_instance() fails, the tool returns without any cleanup, if rv was called with both -t and -r, this means the reactor is not going to be cleared. Jump to the cleanup label to restore the reactor if necessary. Signed-off-by: Gabriele Monaco Reviewed-by: Wen Yang --- tools/verification/rv/src/in_kernel.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/verification/rv/src/in_kernel.c b/tools/verification/rv/= src/in_kernel.c index 95adae321c11..131a6787d639 100644 --- a/tools/verification/rv/src/in_kernel.c +++ b/tools/verification/rv/src/in_kernel.c @@ -809,7 +809,7 @@ int ikm_run_monitor(char *monitor_name, int argc, char = **argv) if (config_trace) { inst =3D ikm_setup_trace_instance(nested_name); if (!inst) - return -1; + goto out_free_instance; } =20 retval =3D ikm_enable(full_name); --=20 2.53.0 From nobody Wed Jun 17 06:05:31 2026 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 27DAC32F765 for ; Mon, 27 Apr 2026 15:12:16 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.133.124 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777302738; cv=none; b=o4M5WJF7K9zY1KSrb0ofiT4iVX2+SwRjE0yLwVs0HA+tgs6l0DsFHO2JJgHY3IxordROHlAO+xD7bQPWwgIfY7VONoHctCpFQsH5rQqcVDq9d/itDs+QNLffSFy1qJKb8mdVhnkxb/nSdghLe92qup/osp/WJ6D3OtAQKqEpJfo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777302738; c=relaxed/simple; bh=d2s25CDEd7vmBO61kiE7QMUIWVBp5w3qtKYO7fcoOfU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=suz6KpZhpqA8GmGoKUqcJxyI6lz+0WyZJbhxD5XpT9Dzltbq6S9Uc1FwKt8nISHSCyENHkE5fsxuPBDrogATfeQk5j0xYDhR2IYjeAYKEk0Py0zmk9Ff/RyinTYQOoWa1CmQs6Q3NimUZlMPQJjL/XM0ao0mVPkdTMkcAXjfEy0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=E7MVR2Gp; arc=none smtp.client-ip=170.10.133.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="E7MVR2Gp" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1777302736; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=MnNs46v1IlxIrFEATbqNNUgbkarNfaXNIgdhbzAh2Ek=; b=E7MVR2GpcV9UaK021i73tw6Vl1R5c8ZZebycdkjveTPHXsfM3//IIqpF0OoZJeOHPx84v1 6dLQ4TAqzOz7NRKj8xsf8m/f9hk+l9GOnI4sdUtPvo1n1nGFES8sVCPWqsj7KzOd2Or3YO yvw3MirOf0RygYNpMxkDNaO7S1y4ZkE= Received: from mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-662-r4-Eo2AmPKiFXhfWTm6T7A-1; Mon, 27 Apr 2026 11:12:12 -0400 X-MC-Unique: r4-Eo2AmPKiFXhfWTm6T7A-1 X-Mimecast-MFC-AGG-ID: r4-Eo2AmPKiFXhfWTm6T7A_1777302731 Received: from mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.17]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 234731956065; Mon, 27 Apr 2026 15:12:11 +0000 (UTC) Received: from fedora-pc.redhat.corp (headnet01.pony-001.prod.iad2.dc.redhat.com [10.2.32.101]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 7EB9A196B8FA; Mon, 27 Apr 2026 15:12:08 +0000 (UTC) From: Gabriele Monaco To: linux-trace-kernel@vger.kernel.org, linux-kernel@vger.kernel.org, Steven Rostedt , Gabriele Monaco Cc: Nam Cao , Thomas Weissschuh , Tomas Glozar , John Kacur , Wen Yang Subject: [RFC PATCH 05/12] tools/rv: Add selftests Date: Mon, 27 Apr 2026 17:11:27 +0200 Message-ID: <20260427151134.192971-6-gmonaco@redhat.com> In-Reply-To: <20260427151134.192971-1-gmonaco@redhat.com> References: <20260427151134.192971-1-gmonaco@redhat.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.0 on 10.30.177.17 Content-Type: text/plain; charset="utf-8" The rv tool needs automated testing to catch regressions and verify correct functionality across different usage scenarios. Add selftests that validate monitor listing (including containers and nested monitors), monitor execution with different configurations (reactors, verbose output, tracing), and trace output format for both per-task and per-cpu monitors. Error handling paths are also tested. Tests use a shared engine for common patterns. Signed-off-by: Gabriele Monaco Reviewed-by: Wen Yang --- tools/verification/rv/Makefile | 5 +- tools/verification/rv/tests/rv_list.t | 48 ++++++++++ tools/verification/rv/tests/rv_mon.t | 95 ++++++++++++++++++++ tools/verification/tests/engine.sh | 124 ++++++++++++++++++++++++++ 4 files changed, 271 insertions(+), 1 deletion(-) create mode 100644 tools/verification/rv/tests/rv_list.t create mode 100644 tools/verification/rv/tests/rv_mon.t create mode 100644 tools/verification/tests/engine.sh diff --git a/tools/verification/rv/Makefile b/tools/verification/rv/Makefile index 5b898360ba48..8ae5fc0d1d17 100644 --- a/tools/verification/rv/Makefile +++ b/tools/verification/rv/Makefile @@ -78,4 +78,7 @@ clean: doc_clean fixdep-clean $(Q)rm -f rv rv-static fixdep FEATURE-DUMP rv-* $(Q)rm -rf feature =20 -.PHONY: FORCE clean +check: $(RV) + RV=3D$(RV) prove -o --directives -f tests/ + +.PHONY: FORCE clean check diff --git a/tools/verification/rv/tests/rv_list.t b/tools/verification/rv/= tests/rv_list.t new file mode 100644 index 000000000000..201af33a52cc --- /dev/null +++ b/tools/verification/rv/tests/rv_list.t @@ -0,0 +1,48 @@ +#!/bin/bash +# SPDX-License-Identifier: GPL-2.0 +source ../tests/engine.sh +test_begin + +set_timeout 30s + +RVDIR=3D/sys/kernel/tracing/rv/ + +# Help and basic tests +check "verify help page" \ + "$RV --help" 0 "usage: rv command" + +check "verify list subcommand help" \ + "$RV list --help" 0 "list all available monitors" + +all_nested=3D$(grep : $RVDIR/available_monitors | cut -d: -f2 | paste -s |= sed 's/\t/\\|/g') +all_non_nested=3D$(grep -v : $RVDIR/available_monitors | cut -d: -f2 | pas= te -s | sed 's/\t/\\|/g') +sched_monitors=3D$(grep sched: $RVDIR/available_monitors | cut -d: -f2 | p= aste -s | sed 's/\t/\\|/g') +description_state=3D"[[:space:]]\+[[:print:]]\+\[\(OFF\|ON\)\]" +line_nested=3D" - \($all_nested\)${description_state}" +line_non_nested=3D"\($all_non_nested\)${description_state}" + +# List monitors and containers +check "list all monitors" \ + "$RV list" 0 "" "" "^\($line_nested\|$line_non_nested\)$" + +check_if_exists "list container" \ + "$RV list sched" "$RVDIR/monitors/sched" \ + "" "-- No monitor found in container sched --" \ + "^\($sched_monitors\)${description_state}$" + +check_if_exists "list non-container" \ + "$RV list wwnr" "$RVDIR/monitors/wwnr" \ + "-- No monitor found in container wwnr --" \ + "^\( - \)\?[[:alnum:]]\+${description_state}$" + +check "list incomplete container name" \ + "$RV list s" 0 "-- No monitor found in container s --" + +# Error handling tests +check "no command" \ + "$RV" 1 "rv requires a command" + +check "invalid command" \ + "$RV invalid" 1 "rv does not know the invalid command" + +test_end diff --git a/tools/verification/rv/tests/rv_mon.t b/tools/verification/rv/t= ests/rv_mon.t new file mode 100644 index 000000000000..cbc346c74c71 --- /dev/null +++ b/tools/verification/rv/tests/rv_mon.t @@ -0,0 +1,95 @@ +#!/bin/bash +# SPDX-License-Identifier: GPL-2.0 +source ../tests/engine.sh +test_begin + +set_timeout 30s + +RVDIR=3D/sys/kernel/tracing/rv/ + +# Help and basic tests +check "verify mon subcommand help" \ + "$RV mon --help" 0 "run a monitor" + +# Error handling tests +check "mon without monitor name" \ + "$RV mon" 1 "usage: rv mon" + +check "invalid monitor name" \ + "$RV mon invalid" 1 "monitor invalid does not exist" + +if [ -d $RVDIR/monitors/wwnr ]; then + +check "invalid reactor name" \ + "$RV mon wwnr -r invalid" 1 "failed to set invalid reactor, is it availab= le?" + +check "monitor name is substring of another monitor" \ + "$RV mon nr" 1 "monitor nr does not exist" + +check "already enabled monitor returns error" \ + "echo 1 > $RVDIR/monitors/wwnr/enable; $RV mon wwnr" 1 \ + "monitor wwnr (in-kernel) is already enabled" +echo 0 > $RVDIR/monitors/wwnr/enable + +fi + +# rv mon runs until terminated +set_expected_timeout 2s + +# Run monitors with different configurations +check_if_exists "run the monitor without parameters" \ + "$RV mon wwnr" "$RVDIR/monitors/wwnr" "" "." + +check_if_exists "run the monitor as verbose" \ + "$RV mon wwnr -v" "$RVDIR/monitors/wwnr" \ + "my pid is \$pid" "\(event\|error\)" + +check_if_exists "run the monitor with a reactor" \ + "$RV mon wwnr -r printk & sleep .5 && cat $RVDIR/monitors/wwnr/reactors &= & wait" \ + "$RVDIR/monitors/wwnr/reactors" "\[printk\]" + +check_if_exists "reactor is restored after exit" \ + "cat $RVDIR/monitors/wwnr/reactors" \ + "$RVDIR/monitors/wwnr/reactors" "\[nop\]" + +check_if_exists "run a nested monitor with a reactor" \ + "$RV mon snroc -r printk & sleep .5 && cat $RVDIR/monitors/sched/snroc/re= actors && wait" \ + "$RVDIR/monitors/sched/snroc/reactors" "\[printk\]" + +check_if_exists "run an explicitly nested monitor with a reactor" \ + "$RV mon sched:sssw -r printk & sleep .5 && cat $RVDIR/monitors/sched/sss= w/reactors && wait" \ + "$RVDIR/monitors/sched/sssw/reactors" "\[printk\]" + +check_if_exists "run container monitor" \ + "$RV mon sched & sleep .5 && cat $RVDIR/monitors/sched/{sssw,sco}/enable = && wait" \ + "$RVDIR/monitors/sched" "1" "0" "^1$" + +# Regexes for the trace +header=3D"^[[:space:]]\+\(\([][A-Z_x<>-]\+\||\)[[:space:]]*\)\+$" +type=3D"\(event\|error\)[[:space:]]\+" +genpid=3D"[0-9]\+[[:space:]]\+" +selfpid=3D"\$pid[[:space:]]\+" +cpu=3D"\[[0-9]\{3\}\][[:space:]]\+" +state=3D"[a-z_]\+ " +trace_task=3D"${genpid}${cpu}${type}${genpid}${state}" +trace_task_self=3D"${genpid}${cpu}${type}${selfpid}${state}" +trace_cpu=3D"${genpid}${cpu}${type}${state}" +trace_cpu_self=3D"${selfpid}${cpu}${type}${state}" + +check_if_exists "run per-task monitor with tracing" \ + "$RV mon sssw -t" "$RVDIR/monitors/sched/sssw" \ + "$header" "$trace_task_self" "\($header\|$trace_task\)" + +check_if_exists "run per-task monitor tracing also self" \ + "$RV mon sched:sssw -t -s" "$RVDIR/monitors/sched/sssw" \ + "$trace_task_self" "" "\($header\|$trace_task\)" + +check_if_exists "run per-cpu monitor with tracing" \ + "$RV mon sched:sco -t" "$RVDIR/monitors/sched/sco" \ + "$header" "$trace_cpu_self" "\($header\|$trace_cpu\)" + +check_if_exists "run per-cpu monitor tracing also self" \ + "$RV mon sco -t -s" "$RVDIR/monitors/sched/sco" \ + "$trace_cpu_self" "" "\($header\|$trace_cpu\)" + +test_end diff --git a/tools/verification/tests/engine.sh b/tools/verification/tests/= engine.sh new file mode 100644 index 000000000000..cd367dabef53 --- /dev/null +++ b/tools/verification/tests/engine.sh @@ -0,0 +1,124 @@ +#!/bin/bash +# SPDX-License-Identifier: GPL-2.0 +test_begin() { + # Count tests to allow the test harness to double-check if all were + # included correctly. + ctr=3D0 + [ -z "$RV" ] && RV=3D"../rv/rv" + [ -n "$TEST_COUNT" ] && echo "1..$TEST_COUNT" +} + +failure() { + fail=3D1 + if [ $# -gt 0 ]; then + failbuf+=3D"$1" + failbuf+=3D$'\n' + fi +} + +report() { + local desc=3D"$1" + + if [ "$fail" -eq 0 ]; then + echo "ok $ctr - $desc" + else + # Add output and exit code as comments in case of failure + echo "not ok $ctr - $desc" + echo -n "$failbuf" + echo "$result" | col -b | while read -r line; do echo "# $line"; done + printf "#\n# exit code %s\n" "$exitcode" + fi +} + +_check() { + local command=3D$2 + local expected_exitcode=3D${3:-0} + local expected_output=3D$4 + local unexpected_output=3D$5 + local all_lines_pattern=3D$6 + + eval "$TIMEOUT" "$command" &> check_output.$$ & + bgpid=3D$! + pid=3D$(pgrep -f "${command%%[|;&>]*}" | tail -n1) + wait $bgpid + exitcode=3D$? + result=3D$(tr -d '\0' < check_output.$$) + rm -f check_output.$$ + + expected_output=3D"${expected_output//\$pid/$pid}" + unexpected_output=3D"${unexpected_output//\$pid/$pid}" + all_lines_pattern=3D"${all_lines_pattern//\$pid/$pid}" + + failbuf=3D'' + fail=3D0 + + # Test if the results matches if requested + if [ -n "$expected_output" ] && ! grep -qe "$expected_output" <<< "$resul= t"; then + failure "# Output match failed: \"$expected_output\"" + fi + + if [ -n "$unexpected_output" ] && grep -qe "$unexpected_output" <<< "$res= ult"; then + failure "# Output non-match failed: \"$unexpected_output\"" + fi + + if [ -n "$all_lines_pattern" ] && grep -vqe "$all_lines_pattern" <<< "$re= sult"; then + failure "# All-lines pattern failed: \"$all_lines_pattern\"" + fi + + if [ $exitcode -ne "$expected_exitcode" ]; then + failure "# Expected exit code $expected_exitcode" + fi +} + +check() { + # Simple check: run the command with given arguments and test exit code. + # If TEST_COUNT is set, run the test. Otherwise, just count. + ctr=3D$((ctr + 1)) + if [ -n "$TEST_COUNT" ]; then + _check "$@" + report "$1" + fi +} + +check_if_exists() { + # Conditional check that skips if a file or folder doesn't exist + local desc=3D$1 + local command=3D$2 + local file=3D$3 + local expected_output=3D$4 + local unexpected_output=3D$5 + local all_lines_pattern=3D$6 + + ctr=3D$((ctr + 1)) + if [ -n "$TEST_COUNT" ]; then + if [ ! -e "$file" ]; then + echo "ok $ctr - $desc # SKIP file not found: $file" + else + _check "$desc" "$command" 0 "$expected_output" \ + "$unexpected_output" "$all_lines_pattern" + report "$desc" + fi + fi +} + +set_timeout() { + TIMEOUT=3D"timeout -v -k 15s $1" +} + +set_expected_timeout() { + TIMEOUT=3D"timeout --preserve-status -k 15s $1" +} + +unset_timeout() { + unset TIMEOUT +} + +test_end() { + # If running without TEST_COUNT, tests are not actually run, just + # counted. In that case, re-run the test with the correct count. + [ -z "$TEST_COUNT" ] && TEST_COUNT=3D$ctr exec bash "$0" || true +} + +# Avoid any environmental discrepancies +export LC_ALL=3DC +unset_timeout --=20 2.53.0 From nobody Wed Jun 17 06:05:31 2026 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 19CA533120C for ; Mon, 27 Apr 2026 15:12:21 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.133.124 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777302743; cv=none; b=X1o/Cl0nUm8HDDf+ZN4C1naRnI1lNGKgtAaxX2/+8MUoz74Gq6tyI6nmclJL1hbcYa7Su03h7GmmCjDBsOGAR8X4q4F2uhahriNjHxHUOrztt6u2TEI1g3AF5nmaMLtYIL0VOTuyhUcP8+cxgAQ+CdMFX0QerG2QUA8iBet5m54= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777302743; c=relaxed/simple; bh=LwZXcmo2Q8kGxa9XafO6NBYohIHs7+CpXx4TqgrXJHU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=RJiur8bClKpnb8R0ZshzJB/S1vvEJQb6km8n8dGuWcbBTFnqgUwaIDvUGzY4uvKLO8b+INaCd/YdlkRRZWdF0dKVELwVbBEhY4rjY90mu1zjcK4rdwkRFlt4TmpqYi3icKRc2nJil68ly/gLY/uQpO8sanSmGlQy9BRlPsKPbYc= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=VUKQklQJ; arc=none smtp.client-ip=170.10.133.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="VUKQklQJ" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1777302740; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=IysWWWGtQm2Ux9tPok2t215f6jp//BYQOA29Tyl6OIc=; b=VUKQklQJmL8K/UvcuF4+4IBFGaovXFd4BXP0S8v5YTLgMyFTv0x31XjXvDnfGphDX1WRoo dGGyyi5mwrK9rqKAdESwTUpa47tpmqMRrCOdeMoK2wMS9bfSRi+f+gjkLRsanUYyD00/3M 6v1k9/YK+YEOAHwRQAzqHyXtpG7NySE= Received: from mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-676-WOCGMCowMnmjou8hzewmlw-1; Mon, 27 Apr 2026 11:12:17 -0400 X-MC-Unique: WOCGMCowMnmjou8hzewmlw-1 X-Mimecast-MFC-AGG-ID: WOCGMCowMnmjou8hzewmlw_1777302735 Received: from mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.17]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 651561800451; Mon, 27 Apr 2026 15:12:15 +0000 (UTC) Received: from fedora-pc.redhat.corp (headnet01.pony-001.prod.iad2.dc.redhat.com [10.2.32.101]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 52524195608E; Mon, 27 Apr 2026 15:12:12 +0000 (UTC) From: Gabriele Monaco To: linux-trace-kernel@vger.kernel.org, linux-kernel@vger.kernel.org, Steven Rostedt , Gabriele Monaco Cc: Nam Cao , Thomas Weissschuh , Tomas Glozar , John Kacur , Wen Yang Subject: [RFC PATCH 06/12] verification/rvgen: Fix options shared among commands Date: Mon, 27 Apr 2026 17:11:28 +0200 Message-ID: <20260427151134.192971-7-gmonaco@redhat.com> In-Reply-To: <20260427151134.192971-1-gmonaco@redhat.com> References: <20260427151134.192971-1-gmonaco@redhat.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.0 on 10.30.177.17 Content-Type: text/plain; charset="utf-8" After rvgen was refactored to use subparsers, the common options (-a and -D) were left in the main parser. This meant that they needed to be called /before/ the subcommand and using them without subcommand was allowed. This is not the original intent. rvgen -D "some description" container -n name Define the options as parent in the subparsers to allow them to be used from both subcommands together with other options. rvgen container -n name -D "some description" Signed-off-by: Gabriele Monaco Reviewed-by: Wen Yang --- tools/verification/rvgen/__main__.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/tools/verification/rvgen/__main__.py b/tools/verification/rvge= n/__main__.py index 3be7f85fe37b..5c923dc10d0f 100644 --- a/tools/verification/rvgen/__main__.py +++ b/tools/verification/rvgen/__main__.py @@ -18,14 +18,16 @@ if __name__ =3D=3D '__main__': import sys =20 parser =3D argparse.ArgumentParser(description=3D'Generate kernel rv m= onitor') - parser.add_argument("-D", "--description", dest=3D"description", requi= red=3DFalse) - parser.add_argument("-a", "--auto_patch", dest=3D"auto_patch", + + parent_parser =3D argparse.ArgumentParser(add_help=3DFalse) + parent_parser.add_argument("-D", "--description", dest=3D"description"= , required=3DFalse) + parent_parser.add_argument("-a", "--auto_patch", dest=3D"auto_patch", action=3D"store_true", required=3DFalse, help=3D"Patch the kernel in place") =20 subparsers =3D parser.add_subparsers(dest=3D"subcmd", required=3DTrue) =20 - monitor_parser =3D subparsers.add_parser("monitor") + monitor_parser =3D subparsers.add_parser("monitor", parents=3D[parent_= parser]) monitor_parser.add_argument('-n', "--model_name", dest=3D"model_name") monitor_parser.add_argument("-p", "--parent", dest=3D"parent", required=3DFalse, help=3D"Create a monitor= nested to parent") @@ -36,7 +38,7 @@ if __name__ =3D=3D '__main__': monitor_parser.add_argument('-t', "--monitor_type", dest=3D"monitor_ty= pe", required=3DTrue, help=3Df"Available options: {', '.join(Mon= itor.monitor_types.keys())}") =20 - container_parser =3D subparsers.add_parser("container") + container_parser =3D subparsers.add_parser("container", parents=3D[par= ent_parser]) container_parser.add_argument('-n', "--model_name", dest=3D"model_name= ", required=3DTrue) =20 params =3D parser.parse_args() --=20 2.53.0 From nobody Wed Jun 17 06:05:31 2026 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B66113264FE for ; Mon, 27 Apr 2026 15:12:35 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.129.124 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777302760; cv=none; b=OXMevzxrjKdCqSr7RFPxhZKU/D4d4L9B/2tDme50zxB/xyISuP3x9uF0DP6HRsZ7VH5wE1WuNUdlAghl+Oqwg+wpbrUnuGepUl2GJdw1LADVeMEmGIcTFTAPzXEsHeDMM7veMtTy0OFsy/HkUpawkUfPoHnCRUWUj5+UtuaeSRk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777302760; c=relaxed/simple; bh=hqGD/qdlBCbajwCaABuFSV43YNYLgus2FlbmhOKRby8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=UPJoXg6c+AHpyMSf/9QlWHAj/uBDkSpaMlzweBR4A92G7BqRgc1CKo5ezKBDF/fZXL1wmeGSmGR9CkaeRh6P9qtXFMtXN2x1oQPILLaFms33HRk3cHmls+4aOwWN24Vw87JdUyWH4mTw5JrfqFQp1G1aaj+Ak/RSTpup6wHkQKU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=Xzz131jR; arc=none smtp.client-ip=170.10.129.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="Xzz131jR" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1777302754; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=213hj4qtwn0xdIzsOH5E2YcNYfu+hyrx0mtAHB3PPoI=; b=Xzz131jRxOiwEJIDguyaNys9xLUp3qaj7NJSByzTsCfSQVsLaiNR2ilDkqrTjAqcWhcOTW FPRwZ/kTT2Xecq0BIaC14ue9rqOQsz8FuftBhLNZwqF+G2ZiYhHIgEusDa1WomjE3RBh70 /l7ckGvEA4/tey/7Ku4kq7W0stkIBnU= Received: from mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-657-YYJVc_OpNbWyzu0y0cFEAg-1; Mon, 27 Apr 2026 11:12:31 -0400 X-MC-Unique: YYJVc_OpNbWyzu0y0cFEAg-1 X-Mimecast-MFC-AGG-ID: YYJVc_OpNbWyzu0y0cFEAg_1777302749 Received: from mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.17]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id C972C18003F6; Mon, 27 Apr 2026 15:12:29 +0000 (UTC) Received: from fedora-pc.redhat.corp (headnet01.pony-001.prod.iad2.dc.redhat.com [10.2.32.101]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 5BA5C195608E; Mon, 27 Apr 2026 15:12:26 +0000 (UTC) From: Gabriele Monaco To: linux-trace-kernel@vger.kernel.org, linux-kernel@vger.kernel.org, Steven Rostedt , Gabriele Monaco Cc: Nam Cao , Thomas Weissschuh , Tomas Glozar , John Kacur , Wen Yang Subject: [RFC PATCH 07/12] verification/rvgen: Add golden and spec folders for tests Date: Mon, 27 Apr 2026 17:11:29 +0200 Message-ID: <20260427151134.192971-8-gmonaco@redhat.com> In-Reply-To: <20260427151134.192971-1-gmonaco@redhat.com> References: <20260427151134.192971-1-gmonaco@redhat.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.0 on 10.30.177.17 Content-Type: text/plain; charset="utf-8" Create reference models specifications and generated files in the golded folder. Those can be used as reference to validate rvgen still generates files as expected in automated tests. Signed-off-by: Gabriele Monaco Reviewed-by: Wen Yang --- .../rvgen/tests/golden/da_global/Kconfig | 9 + .../rvgen/tests/golden/da_global/da_global.c | 95 +++++++ .../rvgen/tests/golden/da_global/da_global.h | 47 ++++ .../tests/golden/da_global/da_global_trace.h | 15 ++ .../tests/golden/da_perobj_parent/Kconfig | 11 + .../da_perobj_parent/da_perobj_parent.c | 110 ++++++++ .../da_perobj_parent/da_perobj_parent.h | 64 +++++ .../da_perobj_parent/da_perobj_parent_trace.h | 15 ++ .../tests/golden/da_pertask_desc/Kconfig | 9 + .../golden/da_pertask_desc/da_pertask_desc.c | 105 ++++++++ .../golden/da_pertask_desc/da_pertask_desc.h | 64 +++++ .../da_pertask_desc/da_pertask_desc_trace.h | 15 ++ .../rvgen/tests/golden/ha_percpu/Kconfig | 9 + .../rvgen/tests/golden/ha_percpu/ha_percpu.c | 244 +++++++++++++++++ .../rvgen/tests/golden/ha_percpu/ha_percpu.h | 72 +++++ .../tests/golden/ha_percpu/ha_percpu_trace.h | 19 ++ .../rvgen/tests/golden/ltl_pertask/Kconfig | 9 + .../tests/golden/ltl_pertask/ltl_pertask.c | 107 ++++++++ .../tests/golden/ltl_pertask/ltl_pertask.h | 108 ++++++++ .../golden/ltl_pertask/ltl_pertask_trace.h | 14 + .../rvgen/tests/golden/test_container/Kconfig | 5 + .../golden/test_container/test_container.c | 35 +++ .../golden/test_container/test_container.h | 3 + .../rvgen/tests/golden/test_da/Kconfig | 9 + .../rvgen/tests/golden/test_da/test_da.c | 95 +++++++ .../rvgen/tests/golden/test_da/test_da.h | 47 ++++ .../tests/golden/test_da/test_da_trace.h | 15 ++ .../rvgen/tests/golden/test_ha/Kconfig | 9 + .../rvgen/tests/golden/test_ha/test_ha.c | 247 ++++++++++++++++++ .../rvgen/tests/golden/test_ha/test_ha.h | 72 +++++ .../tests/golden/test_ha/test_ha_trace.h | 19 ++ .../rvgen/tests/golden/test_ltl/Kconfig | 11 + .../rvgen/tests/golden/test_ltl/test_ltl.c | 108 ++++++++ .../rvgen/tests/golden/test_ltl/test_ltl.h | 108 ++++++++ .../tests/golden/test_ltl/test_ltl_trace.h | 14 + .../rvgen/tests/specs/test_da.dot | 16 ++ .../rvgen/tests/specs/test_da2.dot | 18 ++ .../rvgen/tests/specs/test_ha.dot | 27 ++ .../rvgen/tests/specs/test_invalid.dot | 8 + .../rvgen/tests/specs/test_invalid.ltl | 1 + .../rvgen/tests/specs/test_invalid_ha.dot | 16 ++ .../rvgen/tests/specs/test_ltl.ltl | 1 + 42 files changed, 2025 insertions(+) create mode 100644 tools/verification/rvgen/tests/golden/da_global/Kconfig create mode 100644 tools/verification/rvgen/tests/golden/da_global/da_glob= al.c create mode 100644 tools/verification/rvgen/tests/golden/da_global/da_glob= al.h create mode 100644 tools/verification/rvgen/tests/golden/da_global/da_glob= al_trace.h create mode 100644 tools/verification/rvgen/tests/golden/da_perobj_parent/= Kconfig create mode 100644 tools/verification/rvgen/tests/golden/da_perobj_parent/= da_perobj_parent.c create mode 100644 tools/verification/rvgen/tests/golden/da_perobj_parent/= da_perobj_parent.h create mode 100644 tools/verification/rvgen/tests/golden/da_perobj_parent/= da_perobj_parent_trace.h create mode 100644 tools/verification/rvgen/tests/golden/da_pertask_desc/K= config create mode 100644 tools/verification/rvgen/tests/golden/da_pertask_desc/d= a_pertask_desc.c create mode 100644 tools/verification/rvgen/tests/golden/da_pertask_desc/d= a_pertask_desc.h create mode 100644 tools/verification/rvgen/tests/golden/da_pertask_desc/d= a_pertask_desc_trace.h create mode 100644 tools/verification/rvgen/tests/golden/ha_percpu/Kconfig create mode 100644 tools/verification/rvgen/tests/golden/ha_percpu/ha_perc= pu.c create mode 100644 tools/verification/rvgen/tests/golden/ha_percpu/ha_perc= pu.h create mode 100644 tools/verification/rvgen/tests/golden/ha_percpu/ha_perc= pu_trace.h create mode 100644 tools/verification/rvgen/tests/golden/ltl_pertask/Kconf= ig create mode 100644 tools/verification/rvgen/tests/golden/ltl_pertask/ltl_p= ertask.c create mode 100644 tools/verification/rvgen/tests/golden/ltl_pertask/ltl_p= ertask.h create mode 100644 tools/verification/rvgen/tests/golden/ltl_pertask/ltl_p= ertask_trace.h create mode 100644 tools/verification/rvgen/tests/golden/test_container/Kc= onfig create mode 100644 tools/verification/rvgen/tests/golden/test_container/te= st_container.c create mode 100644 tools/verification/rvgen/tests/golden/test_container/te= st_container.h create mode 100644 tools/verification/rvgen/tests/golden/test_da/Kconfig create mode 100644 tools/verification/rvgen/tests/golden/test_da/test_da.c create mode 100644 tools/verification/rvgen/tests/golden/test_da/test_da.h create mode 100644 tools/verification/rvgen/tests/golden/test_da/test_da_t= race.h create mode 100644 tools/verification/rvgen/tests/golden/test_ha/Kconfig create mode 100644 tools/verification/rvgen/tests/golden/test_ha/test_ha.c create mode 100644 tools/verification/rvgen/tests/golden/test_ha/test_ha.h create mode 100644 tools/verification/rvgen/tests/golden/test_ha/test_ha_t= race.h create mode 100644 tools/verification/rvgen/tests/golden/test_ltl/Kconfig create mode 100644 tools/verification/rvgen/tests/golden/test_ltl/test_ltl= .c create mode 100644 tools/verification/rvgen/tests/golden/test_ltl/test_ltl= .h create mode 100644 tools/verification/rvgen/tests/golden/test_ltl/test_ltl= _trace.h create mode 100644 tools/verification/rvgen/tests/specs/test_da.dot create mode 100644 tools/verification/rvgen/tests/specs/test_da2.dot create mode 100644 tools/verification/rvgen/tests/specs/test_ha.dot create mode 100644 tools/verification/rvgen/tests/specs/test_invalid.dot create mode 100644 tools/verification/rvgen/tests/specs/test_invalid.ltl create mode 100644 tools/verification/rvgen/tests/specs/test_invalid_ha.dot create mode 100644 tools/verification/rvgen/tests/specs/test_ltl.ltl diff --git a/tools/verification/rvgen/tests/golden/da_global/Kconfig b/tool= s/verification/rvgen/tests/golden/da_global/Kconfig new file mode 100644 index 000000000000..799fbf11c3ac --- /dev/null +++ b/tools/verification/rvgen/tests/golden/da_global/Kconfig @@ -0,0 +1,9 @@ +# SPDX-License-Identifier: GPL-2.0-only +# +config RV_MON_DA_GLOBAL + depends on RV + # XXX: add dependencies if there + select DA_MON_EVENTS_IMPLICIT + bool "da_global monitor" + help + auto-generated diff --git a/tools/verification/rvgen/tests/golden/da_global/da_global.c b/= tools/verification/rvgen/tests/golden/da_global/da_global.c new file mode 100644 index 000000000000..ad4b939d2323 --- /dev/null +++ b/tools/verification/rvgen/tests/golden/da_global/da_global.c @@ -0,0 +1,95 @@ +// SPDX-License-Identifier: GPL-2.0 +#include +#include +#include +#include +#include +#include +#include + +#define MODULE_NAME "da_global" + +/* + * XXX: include required tracepoint headers, e.g., + * #include + */ +#include + +/* + * This is the self-generated part of the monitor. Generally, there is no = need + * to touch this section. + */ +#define RV_MON_TYPE RV_MON_GLOBAL +#include "da_global.h" +#include + +/* + * This is the instrumentation part of the monitor. + * + * This is the section where manual work is required. Here the kernel even= ts + * are translated into model's event. + * + */ +static void handle_event_1(void *data, /* XXX: fill header */) +{ + da_handle_event(event_1_da_global); +} + +static void handle_event_2(void *data, /* XXX: fill header */) +{ + /* XXX: validate that this event always leads to the initial state */ + da_handle_start_event(event_2_da_global); +} + +static int enable_da_global(void) +{ + int retval; + + retval =3D da_monitor_init(); + if (retval) + return retval; + + rv_attach_trace_probe("da_global", /* XXX: tracepoint */, handle_event_1); + rv_attach_trace_probe("da_global", /* XXX: tracepoint */, handle_event_2); + + return 0; +} + +static void disable_da_global(void) +{ + rv_this.enabled =3D 0; + + rv_detach_trace_probe("da_global", /* XXX: tracepoint */, handle_event_1); + rv_detach_trace_probe("da_global", /* XXX: tracepoint */, handle_event_2); + + da_monitor_destroy(); +} + +/* + * This is the monitor register section. + */ +static struct rv_monitor rv_this =3D { + .name =3D "da_global", + .description =3D "auto-generated", + .enable =3D enable_da_global, + .disable =3D disable_da_global, + .reset =3D da_monitor_reset_all, + .enabled =3D 0, +}; + +static int __init register_da_global(void) +{ + return rv_register_monitor(&rv_this, NULL); +} + +static void __exit unregister_da_global(void) +{ + rv_unregister_monitor(&rv_this); +} + +module_init(register_da_global); +module_exit(unregister_da_global); + +MODULE_LICENSE("GPL"); +MODULE_AUTHOR("dot2k: auto-generated"); +MODULE_DESCRIPTION("da_global: auto-generated"); diff --git a/tools/verification/rvgen/tests/golden/da_global/da_global.h b/= tools/verification/rvgen/tests/golden/da_global/da_global.h new file mode 100644 index 000000000000..40b1f1c0c681 --- /dev/null +++ b/tools/verification/rvgen/tests/golden/da_global/da_global.h @@ -0,0 +1,47 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* + * Automatically generated C representation of da_global automaton + * For further information about this format, see kernel documentation: + * Documentation/trace/rv/deterministic_automata.rst + */ + +#define MONITOR_NAME da_global + +enum states_da_global { + state_a_da_global, + state_b_da_global, + state_max_da_global, +}; + +#define INVALID_STATE state_max_da_global + +enum events_da_global { + event_1_da_global, + event_2_da_global, + event_max_da_global, +}; + +struct automaton_da_global { + char *state_names[state_max_da_global]; + char *event_names[event_max_da_global]; + unsigned char function[state_max_da_global][event_max_da_global]; + unsigned char initial_state; + bool final_states[state_max_da_global]; +}; + +static const struct automaton_da_global automaton_da_global =3D { + .state_names =3D { + "state_a", + "state_b", + }, + .event_names =3D { + "event_1", + "event_2", + }, + .function =3D { + { state_b_da_global, state_a_da_global }, + { INVALID_STATE, state_a_da_global }, + }, + .initial_state =3D state_a_da_global, + .final_states =3D { 1, 0 }, +}; diff --git a/tools/verification/rvgen/tests/golden/da_global/da_global_trac= e.h b/tools/verification/rvgen/tests/golden/da_global/da_global_trace.h new file mode 100644 index 000000000000..4d2730b71dd0 --- /dev/null +++ b/tools/verification/rvgen/tests/golden/da_global/da_global_trace.h @@ -0,0 +1,15 @@ +/* SPDX-License-Identifier: GPL-2.0 */ + +/* + * Snippet to be included in rv_trace.h + */ + +#ifdef CONFIG_RV_MON_DA_GLOBAL +DEFINE_EVENT(event_da_monitor, event_da_global, + TP_PROTO(char *state, char *event, char *next_state, bool final_stat= e), + TP_ARGS(state, event, next_state, final_state)); + +DEFINE_EVENT(error_da_monitor, error_da_global, + TP_PROTO(char *state, char *event), + TP_ARGS(state, event)); +#endif /* CONFIG_RV_MON_DA_GLOBAL */ diff --git a/tools/verification/rvgen/tests/golden/da_perobj_parent/Kconfig= b/tools/verification/rvgen/tests/golden/da_perobj_parent/Kconfig new file mode 100644 index 000000000000..249ba3aee8d7 --- /dev/null +++ b/tools/verification/rvgen/tests/golden/da_perobj_parent/Kconfig @@ -0,0 +1,11 @@ +# SPDX-License-Identifier: GPL-2.0-only +# +config RV_MON_DA_PEROBJ_PARENT + depends on RV + # XXX: add dependencies if there + depends on RV_MON_PARENT_MON + default y + select DA_MON_EVENTS_ID + bool "da_perobj_parent monitor" + help + auto-generated diff --git a/tools/verification/rvgen/tests/golden/da_perobj_parent/da_pero= bj_parent.c b/tools/verification/rvgen/tests/golden/da_perobj_parent/da_per= obj_parent.c new file mode 100644 index 000000000000..66f3a010876a --- /dev/null +++ b/tools/verification/rvgen/tests/golden/da_perobj_parent/da_perobj_pare= nt.c @@ -0,0 +1,110 @@ +// SPDX-License-Identifier: GPL-2.0 +#include +#include +#include +#include +#include +#include +#include + +#define MODULE_NAME "da_perobj_parent" + +/* + * XXX: include required tracepoint headers, e.g., + * #include + */ +#include +#include + +/* + * This is the self-generated part of the monitor. Generally, there is no = need + * to touch this section. + */ +#define RV_MON_TYPE RV_MON_PER_OBJ +typedef /* XXX: define the target type */ *monitor_target; +#include "da_perobj_parent.h" +#include + +/* + * This is the instrumentation part of the monitor. + * + * This is the section where manual work is required. Here the kernel even= ts + * are translated into model's event. + * + */ +static void handle_event_1(void *data, /* XXX: fill header */) +{ + /* XXX: validate that this event is only valid in the initial state */ + int id =3D /* XXX: how do I get the id? */; + monitor_target t =3D /* XXX: how do I get t? */; + da_handle_start_run_event(id, t, event_1_da_perobj_parent); +} + +static void handle_event_2(void *data, /* XXX: fill header */) +{ + int id =3D /* XXX: how do I get the id? */; + monitor_target t =3D /* XXX: how do I get t? */; + da_handle_event(id, t, event_2_da_perobj_parent); +} + +static void handle_event_3(void *data, /* XXX: fill header */) +{ + int id =3D /* XXX: how do I get the id? */; + monitor_target t =3D /* XXX: how do I get t? */; + da_handle_event(id, t, event_3_da_perobj_parent); +} + +static int enable_da_perobj_parent(void) +{ + int retval; + + retval =3D da_monitor_init(); + if (retval) + return retval; + + rv_attach_trace_probe("da_perobj_parent", /* XXX: tracepoint */, handle_e= vent_1); + rv_attach_trace_probe("da_perobj_parent", /* XXX: tracepoint */, handle_e= vent_2); + rv_attach_trace_probe("da_perobj_parent", /* XXX: tracepoint */, handle_e= vent_3); + + return 0; +} + +static void disable_da_perobj_parent(void) +{ + rv_this.enabled =3D 0; + + rv_detach_trace_probe("da_perobj_parent", /* XXX: tracepoint */, handle_e= vent_1); + rv_detach_trace_probe("da_perobj_parent", /* XXX: tracepoint */, handle_e= vent_2); + rv_detach_trace_probe("da_perobj_parent", /* XXX: tracepoint */, handle_e= vent_3); + + da_monitor_destroy(); +} + +/* + * This is the monitor register section. + */ +static struct rv_monitor rv_this =3D { + .name =3D "da_perobj_parent", + .description =3D "auto-generated", + .enable =3D enable_da_perobj_parent, + .disable =3D disable_da_perobj_parent, + .reset =3D da_monitor_reset_all, + .enabled =3D 0, +}; + +static int __init register_da_perobj_parent(void) +{ + return rv_register_monitor(&rv_this, &rv_parent_mon); +} + +static void __exit unregister_da_perobj_parent(void) +{ + rv_unregister_monitor(&rv_this); +} + +module_init(register_da_perobj_parent); +module_exit(unregister_da_perobj_parent); + +MODULE_LICENSE("GPL"); +MODULE_AUTHOR("dot2k: auto-generated"); +MODULE_DESCRIPTION("da_perobj_parent: auto-generated"); diff --git a/tools/verification/rvgen/tests/golden/da_perobj_parent/da_pero= bj_parent.h b/tools/verification/rvgen/tests/golden/da_perobj_parent/da_per= obj_parent.h new file mode 100644 index 000000000000..3c8dc3b22443 --- /dev/null +++ b/tools/verification/rvgen/tests/golden/da_perobj_parent/da_perobj_pare= nt.h @@ -0,0 +1,64 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* + * Automatically generated C representation of da_perobj_parent automaton + * For further information about this format, see kernel documentation: + * Documentation/trace/rv/deterministic_automata.rst + */ + +#define MONITOR_NAME da_perobj_parent + +enum states_da_perobj_parent { + state_a_da_perobj_parent, + state_b_da_perobj_parent, + state_c_da_perobj_parent, + state_max_da_perobj_parent, +}; + +#define INVALID_STATE state_max_da_perobj_parent + +enum events_da_perobj_parent { + event_1_da_perobj_parent, + event_2_da_perobj_parent, + event_3_da_perobj_parent, + event_max_da_perobj_parent, +}; + +struct automaton_da_perobj_parent { + char *state_names[state_max_da_perobj_parent]; + char *event_names[event_max_da_perobj_parent]; + unsigned char function[state_max_da_perobj_parent][event_max_da_perobj_pa= rent]; + unsigned char initial_state; + bool final_states[state_max_da_perobj_parent]; +}; + +static const struct automaton_da_perobj_parent automaton_da_perobj_parent = =3D { + .state_names =3D { + "state_a", + "state_b", + "state_c", + }, + .event_names =3D { + "event_1", + "event_2", + "event_3", + }, + .function =3D { + { + state_b_da_perobj_parent, + state_c_da_perobj_parent, + INVALID_STATE, + }, + { + INVALID_STATE, + state_a_da_perobj_parent, + state_c_da_perobj_parent, + }, + { + INVALID_STATE, + INVALID_STATE, + INVALID_STATE, + }, + }, + .initial_state =3D state_a_da_perobj_parent, + .final_states =3D { 1, 0, 0 }, +}; diff --git a/tools/verification/rvgen/tests/golden/da_perobj_parent/da_pero= bj_parent_trace.h b/tools/verification/rvgen/tests/golden/da_perobj_parent/= da_perobj_parent_trace.h new file mode 100644 index 000000000000..59bfca8f73d2 --- /dev/null +++ b/tools/verification/rvgen/tests/golden/da_perobj_parent/da_perobj_pare= nt_trace.h @@ -0,0 +1,15 @@ +/* SPDX-License-Identifier: GPL-2.0 */ + +/* + * Snippet to be included in rv_trace.h + */ + +#ifdef CONFIG_RV_MON_DA_PEROBJ_PARENT +DEFINE_EVENT(event_da_monitor_id, event_da_perobj_parent, + TP_PROTO(int id, char *state, char *event, char *next_state, bool fi= nal_state), + TP_ARGS(id, state, event, next_state, final_state)); + +DEFINE_EVENT(error_da_monitor_id, error_da_perobj_parent, + TP_PROTO(int id, char *state, char *event), + TP_ARGS(id, state, event)); +#endif /* CONFIG_RV_MON_DA_PEROBJ_PARENT */ diff --git a/tools/verification/rvgen/tests/golden/da_pertask_desc/Kconfig = b/tools/verification/rvgen/tests/golden/da_pertask_desc/Kconfig new file mode 100644 index 000000000000..c6f350179098 --- /dev/null +++ b/tools/verification/rvgen/tests/golden/da_pertask_desc/Kconfig @@ -0,0 +1,9 @@ +# SPDX-License-Identifier: GPL-2.0-only +# +config RV_MON_DA_PERTASK_DESC + depends on RV + # XXX: add dependencies if there + select DA_MON_EVENTS_ID + bool "da_pertask_desc monitor" + help + Custom description for testing diff --git a/tools/verification/rvgen/tests/golden/da_pertask_desc/da_perta= sk_desc.c b/tools/verification/rvgen/tests/golden/da_pertask_desc/da_pertas= k_desc.c new file mode 100644 index 000000000000..bd76ecc3a998 --- /dev/null +++ b/tools/verification/rvgen/tests/golden/da_pertask_desc/da_pertask_desc= .c @@ -0,0 +1,105 @@ +// SPDX-License-Identifier: GPL-2.0 +#include +#include +#include +#include +#include +#include +#include + +#define MODULE_NAME "da_pertask_desc" + +/* + * XXX: include required tracepoint headers, e.g., + * #include + */ +#include + +/* + * This is the self-generated part of the monitor. Generally, there is no = need + * to touch this section. + */ +#define RV_MON_TYPE RV_MON_PER_TASK +#include "da_pertask_desc.h" +#include + +/* + * This is the instrumentation part of the monitor. + * + * This is the section where manual work is required. Here the kernel even= ts + * are translated into model's event. + * + */ +static void handle_event_1(void *data, /* XXX: fill header */) +{ + /* XXX: validate that this event is only valid in the initial state */ + struct task_struct *p =3D /* XXX: how do I get p? */; + da_handle_start_run_event(p, event_1_da_pertask_desc); +} + +static void handle_event_2(void *data, /* XXX: fill header */) +{ + struct task_struct *p =3D /* XXX: how do I get p? */; + da_handle_event(p, event_2_da_pertask_desc); +} + +static void handle_event_3(void *data, /* XXX: fill header */) +{ + struct task_struct *p =3D /* XXX: how do I get p? */; + da_handle_event(p, event_3_da_pertask_desc); +} + +static int enable_da_pertask_desc(void) +{ + int retval; + + retval =3D da_monitor_init(); + if (retval) + return retval; + + rv_attach_trace_probe("da_pertask_desc", /* XXX: tracepoint */, handle_ev= ent_1); + rv_attach_trace_probe("da_pertask_desc", /* XXX: tracepoint */, handle_ev= ent_2); + rv_attach_trace_probe("da_pertask_desc", /* XXX: tracepoint */, handle_ev= ent_3); + + return 0; +} + +static void disable_da_pertask_desc(void) +{ + rv_this.enabled =3D 0; + + rv_detach_trace_probe("da_pertask_desc", /* XXX: tracepoint */, handle_ev= ent_1); + rv_detach_trace_probe("da_pertask_desc", /* XXX: tracepoint */, handle_ev= ent_2); + rv_detach_trace_probe("da_pertask_desc", /* XXX: tracepoint */, handle_ev= ent_3); + + da_monitor_destroy(); +} + +/* + * This is the monitor register section. + */ +static struct rv_monitor rv_this =3D { + .name =3D "da_pertask_desc", + .description =3D "Custom description for testing", + .enable =3D enable_da_pertask_desc, + .disable =3D disable_da_pertask_desc, + .reset =3D da_monitor_reset_all, + .enabled =3D 0, +}; + +static int __init register_da_pertask_desc(void) +{ + return rv_register_monitor(&rv_this, NULL); +} + +static void __exit unregister_da_pertask_desc(void) +{ + rv_unregister_monitor(&rv_this); +} + +module_init(register_da_pertask_desc); +module_exit(unregister_da_pertask_desc); + +MODULE_LICENSE("GPL"); +MODULE_AUTHOR("dot2k: auto-generated"); +MODULE_DESCRIPTION("da_pertask_desc: Custom description for testing"); diff --git a/tools/verification/rvgen/tests/golden/da_pertask_desc/da_perta= sk_desc.h b/tools/verification/rvgen/tests/golden/da_pertask_desc/da_pertas= k_desc.h new file mode 100644 index 000000000000..837b238754b0 --- /dev/null +++ b/tools/verification/rvgen/tests/golden/da_pertask_desc/da_pertask_desc= .h @@ -0,0 +1,64 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* + * Automatically generated C representation of da_pertask_desc automaton + * For further information about this format, see kernel documentation: + * Documentation/trace/rv/deterministic_automata.rst + */ + +#define MONITOR_NAME da_pertask_desc + +enum states_da_pertask_desc { + state_a_da_pertask_desc, + state_b_da_pertask_desc, + state_c_da_pertask_desc, + state_max_da_pertask_desc, +}; + +#define INVALID_STATE state_max_da_pertask_desc + +enum events_da_pertask_desc { + event_1_da_pertask_desc, + event_2_da_pertask_desc, + event_3_da_pertask_desc, + event_max_da_pertask_desc, +}; + +struct automaton_da_pertask_desc { + char *state_names[state_max_da_pertask_desc]; + char *event_names[event_max_da_pertask_desc]; + unsigned char function[state_max_da_pertask_desc][event_max_da_pertask_de= sc]; + unsigned char initial_state; + bool final_states[state_max_da_pertask_desc]; +}; + +static const struct automaton_da_pertask_desc automaton_da_pertask_desc = =3D { + .state_names =3D { + "state_a", + "state_b", + "state_c", + }, + .event_names =3D { + "event_1", + "event_2", + "event_3", + }, + .function =3D { + { + state_b_da_pertask_desc, + state_c_da_pertask_desc, + INVALID_STATE, + }, + { + INVALID_STATE, + state_a_da_pertask_desc, + state_c_da_pertask_desc, + }, + { + INVALID_STATE, + INVALID_STATE, + INVALID_STATE, + }, + }, + .initial_state =3D state_a_da_pertask_desc, + .final_states =3D { 1, 0, 0 }, +}; diff --git a/tools/verification/rvgen/tests/golden/da_pertask_desc/da_perta= sk_desc_trace.h b/tools/verification/rvgen/tests/golden/da_pertask_desc/da_= pertask_desc_trace.h new file mode 100644 index 000000000000..4e6086c4d86e --- /dev/null +++ b/tools/verification/rvgen/tests/golden/da_pertask_desc/da_pertask_desc= _trace.h @@ -0,0 +1,15 @@ +/* SPDX-License-Identifier: GPL-2.0 */ + +/* + * Snippet to be included in rv_trace.h + */ + +#ifdef CONFIG_RV_MON_DA_PERTASK_DESC +DEFINE_EVENT(event_da_monitor_id, event_da_pertask_desc, + TP_PROTO(int id, char *state, char *event, char *next_state, bool fi= nal_state), + TP_ARGS(id, state, event, next_state, final_state)); + +DEFINE_EVENT(error_da_monitor_id, error_da_pertask_desc, + TP_PROTO(int id, char *state, char *event), + TP_ARGS(id, state, event)); +#endif /* CONFIG_RV_MON_DA_PERTASK_DESC */ diff --git a/tools/verification/rvgen/tests/golden/ha_percpu/Kconfig b/tool= s/verification/rvgen/tests/golden/ha_percpu/Kconfig new file mode 100644 index 000000000000..0cc185ccfddf --- /dev/null +++ b/tools/verification/rvgen/tests/golden/ha_percpu/Kconfig @@ -0,0 +1,9 @@ +# SPDX-License-Identifier: GPL-2.0-only +# +config RV_MON_HA_PERCPU + depends on RV + # XXX: add dependencies if there + select HA_MON_EVENTS_IMPLICIT + bool "ha_percpu monitor" + help + auto-generated diff --git a/tools/verification/rvgen/tests/golden/ha_percpu/ha_percpu.c b/= tools/verification/rvgen/tests/golden/ha_percpu/ha_percpu.c new file mode 100644 index 000000000000..ba7a02a18f81 --- /dev/null +++ b/tools/verification/rvgen/tests/golden/ha_percpu/ha_percpu.c @@ -0,0 +1,244 @@ +// SPDX-License-Identifier: GPL-2.0 +#include +#include +#include +#include +#include +#include +#include + +#define MODULE_NAME "ha_percpu" + +/* + * XXX: include required tracepoint headers, e.g., + * #include + */ +#include + +/* + * This is the self-generated part of the monitor. Generally, there is no = need + * to touch this section. + */ +#define RV_MON_TYPE RV_MON_PER_CPU +/* XXX: If the monitor has several instances, consider HA_TIMER_WHEEL */ +#define HA_TIMER_TYPE HA_TIMER_HRTIMER +#include "ha_percpu.h" +#include + +/* + * This is the instrumentation part of the monitor. + * + * This is the section where manual work is required. Here the kernel even= ts + * are translated into model's event. + * + */ +#define BAR_NS(ha_mon) /* XXX: what is BAR_NS(ha_mon)? */ + +#define FOO_NS /* XXX: what is FOO_NS? */ + +static inline u64 bar_ns(struct ha_monitor *ha_mon) +{ + return /* XXX: what is bar_ns(ha_mon)? */; +} + +static u64 foo_ns =3D /* XXX: default value */; +module_param(foo_ns, ullong, 0644); + +/* + * These functions define how to read and reset the environment variable. + * + * Common environment variables like ns-based and jiffy-based clocks have + * pre-define getters and resetters you can use. The parser can infer the = type + * of the environment variable if you supply a measure unit in the constra= int. + * If you define your own functions, make sure to add appropriate memory + * barriers if required. + * Some environment variables don't require a storage as they read a system + * state (e.g. preemption count). Those variables are never reset, so we d= on't + * define a reset function on monitors only relying on this type of variab= les. + */ +static u64 ha_get_env(struct ha_monitor *ha_mon, enum envs_ha_percpu env, = u64 time_ns) +{ + if (env =3D=3D clk_ha_percpu) + return ha_get_clk_ns(ha_mon, env, time_ns); + else if (env =3D=3D env1_ha_percpu) + return /* XXX: how do I read env1? */ + else if (env =3D=3D env2_ha_percpu) + return /* XXX: how do I read env2? */ + return ENV_INVALID_VALUE; +} + +static void ha_reset_env(struct ha_monitor *ha_mon, enum envs_ha_percpu en= v, u64 time_ns) +{ + if (env =3D=3D clk_ha_percpu) + ha_reset_clk_ns(ha_mon, env, time_ns); +} + +/* + * These functions are used to validate state transitions. + * + * They are generated by parsing the model, there is usually no need to ch= ange them. + * If the monitor requires a timer, there are functions responsible to arm= it when + * the next state has a constraint, cancel it in any other case and to che= ck + * that it didn't expire before the callback run. Transitions to the same = state + * without a reset never affect timers. + * Due to the different representations between invariants and guards, the= re is + * a function to convert it in case invariants or guards are reachable from + * another invariant without reset. Those are not present if not required = in + * the model. This is all automatic but is worth checking because it may s= how + * errors in the model (e.g. missing resets). + */ +static inline bool ha_verify_invariants(struct ha_monitor *ha_mon, + enum states curr_state, enum events event, + enum states next_state, u64 time_ns) +{ + if (curr_state =3D=3D S0_ha_percpu) + return ha_check_invariant_ns(ha_mon, clk_ha_percpu, time_ns); + else if (curr_state =3D=3D S2_ha_percpu) + return ha_check_invariant_ns(ha_mon, clk_ha_percpu, time_ns); + return true; +} + +static inline void ha_convert_inv_guard(struct ha_monitor *ha_mon, + enum states curr_state, enum events event, + enum states next_state, u64 time_ns) +{ + if (curr_state =3D=3D next_state) + return; + if (curr_state =3D=3D S2_ha_percpu) + ha_inv_to_guard(ha_mon, clk_ha_percpu, BAR_NS(ha_mon), time_ns); +} + +static inline bool ha_verify_guards(struct ha_monitor *ha_mon, + enum states curr_state, enum events event, + enum states next_state, u64 time_ns) +{ + bool res =3D true; + + if (curr_state =3D=3D S0_ha_percpu && event =3D=3D event0_ha_percpu) + ha_reset_env(ha_mon, clk_ha_percpu, time_ns); + else if (curr_state =3D=3D S0_ha_percpu && event =3D=3D event1_ha_percpu) + ha_reset_env(ha_mon, clk_ha_percpu, time_ns); + else if (curr_state =3D=3D S1_ha_percpu && event =3D=3D event0_ha_percpu) + ha_reset_env(ha_mon, clk_ha_percpu, time_ns); + else if (curr_state =3D=3D S1_ha_percpu && event =3D=3D event2_ha_percpu)= { + res =3D ha_get_env(ha_mon, env1_ha_percpu, time_ns) =3D=3D 0ull; + ha_reset_env(ha_mon, clk_ha_percpu, time_ns); + } else if (curr_state =3D=3D S2_ha_percpu && event =3D=3D event1_ha_percp= u) + res =3D ha_monitor_env_invalid(ha_mon, clk_ha_percpu) || + ha_get_env(ha_mon, clk_ha_percpu, time_ns) < foo_ns; + else if (curr_state =3D=3D S3_ha_percpu && event =3D=3D event0_ha_percpu) + res =3D ha_monitor_env_invalid(ha_mon, clk_ha_percpu) || + (ha_get_env(ha_mon, clk_ha_percpu, time_ns) < FOO_NS && + ha_get_env(ha_mon, env2_ha_percpu, time_ns) =3D=3D 0ull); + else if (curr_state =3D=3D S3_ha_percpu && event =3D=3D event1_ha_percpu)= { + res =3D ha_monitor_env_invalid(ha_mon, clk_ha_percpu) || + (ha_get_env(ha_mon, clk_ha_percpu, time_ns) < foo_ns && + ha_get_env(ha_mon, env1_ha_percpu, time_ns) =3D=3D 1ull); + ha_reset_env(ha_mon, clk_ha_percpu, time_ns); + } + return res; +} + +static inline void ha_setup_invariants(struct ha_monitor *ha_mon, + enum states curr_state, enum events event, + enum states next_state, u64 time_ns) +{ + if (next_state =3D=3D curr_state && event !=3D event0_ha_percpu) + return; + if (next_state =3D=3D S0_ha_percpu) + ha_start_timer_ns(ha_mon, clk_ha_percpu, bar_ns(ha_mon), time_ns); + else if (next_state =3D=3D S2_ha_percpu) + ha_start_timer_ns(ha_mon, clk_ha_percpu, BAR_NS(ha_mon), time_ns); + else if (curr_state =3D=3D S0_ha_percpu) + ha_cancel_timer(ha_mon); + else if (curr_state =3D=3D S2_ha_percpu) + ha_cancel_timer(ha_mon); +} + +static bool ha_verify_constraint(struct ha_monitor *ha_mon, + enum states curr_state, enum events event, + enum states next_state, u64 time_ns) +{ + if (!ha_verify_invariants(ha_mon, curr_state, event, next_state, time_ns)) + return false; + + ha_convert_inv_guard(ha_mon, curr_state, event, next_state, time_ns); + + if (!ha_verify_guards(ha_mon, curr_state, event, next_state, time_ns)) + return false; + + ha_setup_invariants(ha_mon, curr_state, event, next_state, time_ns); + + return true; +} + +static void handle_event0(void *data, /* XXX: fill header */) +{ + /* XXX: validate that this event always leads to the initial state */ + da_handle_start_event(event0_ha_percpu); +} + +static void handle_event1(void *data, /* XXX: fill header */) +{ + da_handle_event(event1_ha_percpu); +} + +static void handle_event2(void *data, /* XXX: fill header */) +{ + da_handle_event(event2_ha_percpu); +} + +static int enable_ha_percpu(void) +{ + int retval; + + retval =3D da_monitor_init(); + if (retval) + return retval; + + rv_attach_trace_probe("ha_percpu", /* XXX: tracepoint */, handle_event0); + rv_attach_trace_probe("ha_percpu", /* XXX: tracepoint */, handle_event1); + rv_attach_trace_probe("ha_percpu", /* XXX: tracepoint */, handle_event2); + + return 0; +} + +static void disable_ha_percpu(void) +{ + rv_this.enabled =3D 0; + + rv_detach_trace_probe("ha_percpu", /* XXX: tracepoint */, handle_event0); + rv_detach_trace_probe("ha_percpu", /* XXX: tracepoint */, handle_event1); + rv_detach_trace_probe("ha_percpu", /* XXX: tracepoint */, handle_event2); + + da_monitor_destroy(); +} + +/* + * This is the monitor register section. + */ +static struct rv_monitor rv_this =3D { + .name =3D "ha_percpu", + .description =3D "auto-generated", + .enable =3D enable_ha_percpu, + .disable =3D disable_ha_percpu, + .reset =3D da_monitor_reset_all, + .enabled =3D 0, +}; + +static int __init register_ha_percpu(void) +{ + return rv_register_monitor(&rv_this, NULL); +} + +static void __exit unregister_ha_percpu(void) +{ + rv_unregister_monitor(&rv_this); +} + +module_init(register_ha_percpu); +module_exit(unregister_ha_percpu); + +MODULE_LICENSE("GPL"); +MODULE_AUTHOR("dot2k: auto-generated"); +MODULE_DESCRIPTION("ha_percpu: auto-generated"); diff --git a/tools/verification/rvgen/tests/golden/ha_percpu/ha_percpu.h b/= tools/verification/rvgen/tests/golden/ha_percpu/ha_percpu.h new file mode 100644 index 000000000000..2538db4f6a26 --- /dev/null +++ b/tools/verification/rvgen/tests/golden/ha_percpu/ha_percpu.h @@ -0,0 +1,72 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* + * Automatically generated C representation of ha_percpu automaton + * For further information about this format, see kernel documentation: + * Documentation/trace/rv/deterministic_automata.rst + */ + +#define MONITOR_NAME ha_percpu + +enum states_ha_percpu { + S0_ha_percpu, + S1_ha_percpu, + S2_ha_percpu, + S3_ha_percpu, + state_max_ha_percpu, +}; + +#define INVALID_STATE state_max_ha_percpu + +enum events_ha_percpu { + event0_ha_percpu, + event1_ha_percpu, + event2_ha_percpu, + event_max_ha_percpu, +}; + +enum envs_ha_percpu { + clk_ha_percpu, + env1_ha_percpu, + env2_ha_percpu, + env_max_ha_percpu, + env_max_stored_ha_percpu =3D env1_ha_percpu, +}; + +_Static_assert(env_max_stored_ha_percpu <=3D MAX_HA_ENV_LEN, "Not enough s= lots"); +#define HA_CLK_NS + +struct automaton_ha_percpu { + char *state_names[state_max_ha_percpu]; + char *event_names[event_max_ha_percpu]; + char *env_names[env_max_ha_percpu]; + unsigned char function[state_max_ha_percpu][event_max_ha_percpu]; + unsigned char initial_state; + bool final_states[state_max_ha_percpu]; +}; + +static const struct automaton_ha_percpu automaton_ha_percpu =3D { + .state_names =3D { + "S0", + "S1", + "S2", + "S3", + }, + .event_names =3D { + "event0", + "event1", + "event2", + }, + .env_names =3D { + "clk", + "env1", + "env2", + }, + .function =3D { + { S0_ha_percpu, S1_ha_percpu, INVALID_ST= ATE }, + { S0_ha_percpu, INVALID_STATE, S2_ha_per= cpu }, + { INVALID_STATE, S2_ha_percpu, S3_ha_per= cpu }, + { S0_ha_percpu, S1_ha_percpu, INVALID_ST= ATE }, + }, + .initial_state =3D S0_ha_percpu, + .final_states =3D { 1, 0, 0, 0 }, +}; diff --git a/tools/verification/rvgen/tests/golden/ha_percpu/ha_percpu_trac= e.h b/tools/verification/rvgen/tests/golden/ha_percpu/ha_percpu_trace.h new file mode 100644 index 000000000000..074ddff6a60d --- /dev/null +++ b/tools/verification/rvgen/tests/golden/ha_percpu/ha_percpu_trace.h @@ -0,0 +1,19 @@ +/* SPDX-License-Identifier: GPL-2.0 */ + +/* + * Snippet to be included in rv_trace.h + */ + +#ifdef CONFIG_RV_MON_HA_PERCPU +DEFINE_EVENT(event_da_monitor, event_ha_percpu, + TP_PROTO(char *state, char *event, char *next_state, bool final_stat= e), + TP_ARGS(state, event, next_state, final_state)); + +DEFINE_EVENT(error_da_monitor, error_ha_percpu, + TP_PROTO(char *state, char *event), + TP_ARGS(state, event)); + +DEFINE_EVENT(error_env_da_monitor, error_env_ha_percpu, + TP_PROTO(char *state, char *event, char *env), + TP_ARGS(state, event, env)); +#endif /* CONFIG_RV_MON_HA_PERCPU */ diff --git a/tools/verification/rvgen/tests/golden/ltl_pertask/Kconfig b/to= ols/verification/rvgen/tests/golden/ltl_pertask/Kconfig new file mode 100644 index 000000000000..b37f46670bfd --- /dev/null +++ b/tools/verification/rvgen/tests/golden/ltl_pertask/Kconfig @@ -0,0 +1,9 @@ +# SPDX-License-Identifier: GPL-2.0-only +# +config RV_MON_LTL_PERTASK + depends on RV + # XXX: add dependencies if there + select LTL_MON_EVENTS_ID + bool "ltl_pertask monitor" + help + auto-generated diff --git a/tools/verification/rvgen/tests/golden/ltl_pertask/ltl_pertask.= c b/tools/verification/rvgen/tests/golden/ltl_pertask/ltl_pertask.c new file mode 100644 index 000000000000..1b6897200e4b --- /dev/null +++ b/tools/verification/rvgen/tests/golden/ltl_pertask/ltl_pertask.c @@ -0,0 +1,107 @@ +// SPDX-License-Identifier: GPL-2.0 +#include +#include +#include +#include +#include +#include +#include + +#define MODULE_NAME "ltl_pertask" + +/* + * XXX: include required tracepoint headers, e.g., + * #include + */ +#include + + +/* + * This is the self-generated part of the monitor. Generally, there is no = need + * to touch this section. + */ +#include "ltl_pertask.h" +#include + +static void ltl_atoms_fetch(struct task_struct *task, struct ltl_monitor *= mon) +{ + /* + * This is called everytime the Buchi automaton is triggered. + * + * This function could be used to fetch the atomic propositions which + * are expensive to trace. It is possible only if the atomic proposition + * does not need to be updated at precise time. + * + * It is recommended to use tracepoints and ltl_atom_update() instead. + */ +} + +static void ltl_atoms_init(struct task_struct *task, struct ltl_monitor *m= on, bool task_creation) +{ + /* + * This should initialize as many atomic propositions as possible. + * + * @task_creation indicates whether the task is being created. This is + * false if the task is already running before the monitor is enabled. + */ + ltl_atom_set(mon, LTL_EVENT_A, true/false); + ltl_atom_set(mon, LTL_EVENT_B, true/false); +} + +/* + * This is the instrumentation part of the monitor. + * + * This is the section where manual work is required. Here the kernel even= ts + * are translated into model's event. + */ +static void handle_example_event(void *data, /* XXX: fill header */) +{ + ltl_atom_update(task, LTL_EVENT_A, true/false); +} + +static int enable_ltl_pertask(void) +{ + int retval; + + retval =3D ltl_monitor_init(); + if (retval) + return retval; + + rv_attach_trace_probe("ltl_pertask", /* XXX: tracepoint */, handle_exampl= e_event); + + return 0; +} + +static void disable_ltl_pertask(void) +{ + rv_detach_trace_probe("ltl_pertask", /* XXX: tracepoint */, handle_sample= _event); + + ltl_monitor_destroy(); +} + +/* + * This is the monitor register section. + */ +static struct rv_monitor rv_ltl_pertask =3D { + .name =3D "ltl_pertask", + .description =3D "auto-generated", + .enable =3D enable_ltl_pertask, + .disable =3D disable_ltl_pertask, +}; + +static int __init register_ltl_pertask(void) +{ + return rv_register_monitor(&rv_ltl_pertask, NULL); +} + +static void __exit unregister_ltl_pertask(void) +{ + rv_unregister_monitor(&rv_ltl_pertask); +} + +module_init(register_ltl_pertask); +module_exit(unregister_ltl_pertask); + +MODULE_LICENSE("GPL"); +MODULE_AUTHOR(/* TODO */); +MODULE_DESCRIPTION("ltl_pertask: auto-generated"); diff --git a/tools/verification/rvgen/tests/golden/ltl_pertask/ltl_pertask.= h b/tools/verification/rvgen/tests/golden/ltl_pertask/ltl_pertask.h new file mode 100644 index 000000000000..e009b04174db --- /dev/null +++ b/tools/verification/rvgen/tests/golden/ltl_pertask/ltl_pertask.h @@ -0,0 +1,108 @@ +/* SPDX-License-Identifier: GPL-2.0 */ + +/* + * C implementation of Buchi automaton, automatically generated by + * tools/verification/rvgen from the linear temporal logic specification. + * For further information, see kernel documentation: + * Documentation/trace/rv/linear_temporal_logic.rst + */ + +#include + +#define MONITOR_NAME ltl_pertask + +enum ltl_atom { + LTL_EVENT_A, + LTL_EVENT_B, + LTL_NUM_ATOM +}; +static_assert(LTL_NUM_ATOM <=3D RV_MAX_LTL_ATOM); + +static const char *ltl_atom_str(enum ltl_atom atom) +{ + static const char *const names[] =3D { + "ev_a", + "ev_b", + }; + + return names[atom]; +} + +enum ltl_buchi_state { + S0, + S1, + S2, + S3, + S4, + RV_NUM_BA_STATES +}; +static_assert(RV_NUM_BA_STATES <=3D RV_MAX_BA_STATES); + +static void ltl_start(struct task_struct *task, struct ltl_monitor *mon) +{ + bool event_b =3D test_bit(LTL_EVENT_B, mon->atoms); + bool event_a =3D test_bit(LTL_EVENT_A, mon->atoms); + bool val1 =3D !event_a; + + if (val1) + __set_bit(S0, mon->states); + if (True) + __set_bit(S1, mon->states); + if (event_b) + __set_bit(S4, mon->states); +} + +static void +ltl_possible_next_states(struct ltl_monitor *mon, unsigned int state, unsi= gned long *next) +{ + bool event_b =3D test_bit(LTL_EVENT_B, mon->atoms); + bool event_a =3D test_bit(LTL_EVENT_A, mon->atoms); + bool val1 =3D !event_a; + + switch (state) { + case S0: + if (val1) + __set_bit(S0, next); + if (True) + __set_bit(S1, next); + if (event_b) + __set_bit(S4, next); + break; + case S1: + if (True) + __set_bit(S1, next); + if (True && val1) + __set_bit(S2, next); + if (event_b && val1) + __set_bit(S3, next); + if (event_b) + __set_bit(S4, next); + break; + case S2: + if (True) + __set_bit(S1, next); + if (True && val1) + __set_bit(S2, next); + if (event_b && val1) + __set_bit(S3, next); + if (event_b) + __set_bit(S4, next); + break; + case S3: + if (val1) + __set_bit(S0, next); + if (True) + __set_bit(S1, next); + if (event_b) + __set_bit(S4, next); + break; + case S4: + if (val1) + __set_bit(S0, next); + if (True) + __set_bit(S1, next); + if (event_b) + __set_bit(S4, next); + break; + } +} diff --git a/tools/verification/rvgen/tests/golden/ltl_pertask/ltl_pertask_= trace.h b/tools/verification/rvgen/tests/golden/ltl_pertask/ltl_pertask_tra= ce.h new file mode 100644 index 000000000000..ebd53621a5b1 --- /dev/null +++ b/tools/verification/rvgen/tests/golden/ltl_pertask/ltl_pertask_trace.h @@ -0,0 +1,14 @@ +/* SPDX-License-Identifier: GPL-2.0 */ + +/* + * Snippet to be included in rv_trace.h + */ + +#ifdef CONFIG_RV_MON_LTL_PERTASK +DEFINE_EVENT(event_ltl_monitor_id, event_ltl_pertask, + TP_PROTO(struct task_struct *task, char *states, char *atoms, char *= next), + TP_ARGS(task, states, atoms, next)); +DEFINE_EVENT(error_ltl_monitor_id, error_ltl_pertask, + TP_PROTO(struct task_struct *task), + TP_ARGS(task)); +#endif /* CONFIG_RV_MON_LTL_PERTASK */ diff --git a/tools/verification/rvgen/tests/golden/test_container/Kconfig b= /tools/verification/rvgen/tests/golden/test_container/Kconfig new file mode 100644 index 000000000000..2becb65dddad --- /dev/null +++ b/tools/verification/rvgen/tests/golden/test_container/Kconfig @@ -0,0 +1,5 @@ +config RV_MON_TEST_CONTAINER + depends on RV + bool "test_container monitor" + help + Test container for grouping monitors diff --git a/tools/verification/rvgen/tests/golden/test_container/test_cont= ainer.c b/tools/verification/rvgen/tests/golden/test_container/test_contain= er.c new file mode 100644 index 000000000000..984e2eac7196 --- /dev/null +++ b/tools/verification/rvgen/tests/golden/test_container/test_container.c @@ -0,0 +1,35 @@ +// SPDX-License-Identifier: GPL-2.0 +#include +#include +#include +#include + +#define MODULE_NAME "test_container" + +#include "test_container.h" + +struct rv_monitor rv_test_container =3D { + .name =3D "test_container", + .description =3D "Test container for grouping monitors", + .enable =3D NULL, + .disable =3D NULL, + .reset =3D NULL, + .enabled =3D 0, +}; + +static int __init register_test_container(void) +{ + return rv_register_monitor(&rv_test_container, NULL); +} + +static void __exit unregister_test_container(void) +{ + rv_unregister_monitor(&rv_test_container); +} + +module_init(register_test_container); +module_exit(unregister_test_container); + +MODULE_LICENSE("GPL"); +MODULE_AUTHOR("dot2k: auto-generated"); +MODULE_DESCRIPTION("test_container: Test container for grouping monitors"); diff --git a/tools/verification/rvgen/tests/golden/test_container/test_cont= ainer.h b/tools/verification/rvgen/tests/golden/test_container/test_contain= er.h new file mode 100644 index 000000000000..83e434432650 --- /dev/null +++ b/tools/verification/rvgen/tests/golden/test_container/test_container.h @@ -0,0 +1,3 @@ +/* SPDX-License-Identifier: GPL-2.0 */ + +extern struct rv_monitor rv_test_container; diff --git a/tools/verification/rvgen/tests/golden/test_da/Kconfig b/tools/= verification/rvgen/tests/golden/test_da/Kconfig new file mode 100644 index 000000000000..0143a148ef34 --- /dev/null +++ b/tools/verification/rvgen/tests/golden/test_da/Kconfig @@ -0,0 +1,9 @@ +# SPDX-License-Identifier: GPL-2.0-only +# +config RV_MON_TEST_DA + depends on RV + # XXX: add dependencies if there + select DA_MON_EVENTS_IMPLICIT + bool "test_da monitor" + help + auto-generated diff --git a/tools/verification/rvgen/tests/golden/test_da/test_da.c b/tool= s/verification/rvgen/tests/golden/test_da/test_da.c new file mode 100644 index 000000000000..b63bbf4e35c5 --- /dev/null +++ b/tools/verification/rvgen/tests/golden/test_da/test_da.c @@ -0,0 +1,95 @@ +// SPDX-License-Identifier: GPL-2.0 +#include +#include +#include +#include +#include +#include +#include + +#define MODULE_NAME "test_da" + +/* + * XXX: include required tracepoint headers, e.g., + * #include + */ +#include + +/* + * This is the self-generated part of the monitor. Generally, there is no = need + * to touch this section. + */ +#define RV_MON_TYPE RV_MON_PER_CPU +#include "test_da.h" +#include + +/* + * This is the instrumentation part of the monitor. + * + * This is the section where manual work is required. Here the kernel even= ts + * are translated into model's event. + * + */ +static void handle_event_1(void *data, /* XXX: fill header */) +{ + da_handle_event(event_1_test_da); +} + +static void handle_event_2(void *data, /* XXX: fill header */) +{ + /* XXX: validate that this event always leads to the initial state */ + da_handle_start_event(event_2_test_da); +} + +static int enable_test_da(void) +{ + int retval; + + retval =3D da_monitor_init(); + if (retval) + return retval; + + rv_attach_trace_probe("test_da", /* XXX: tracepoint */, handle_event_1); + rv_attach_trace_probe("test_da", /* XXX: tracepoint */, handle_event_2); + + return 0; +} + +static void disable_test_da(void) +{ + rv_this.enabled =3D 0; + + rv_detach_trace_probe("test_da", /* XXX: tracepoint */, handle_event_1); + rv_detach_trace_probe("test_da", /* XXX: tracepoint */, handle_event_2); + + da_monitor_destroy(); +} + +/* + * This is the monitor register section. + */ +static struct rv_monitor rv_this =3D { + .name =3D "test_da", + .description =3D "auto-generated", + .enable =3D enable_test_da, + .disable =3D disable_test_da, + .reset =3D da_monitor_reset_all, + .enabled =3D 0, +}; + +static int __init register_test_da(void) +{ + return rv_register_monitor(&rv_this, NULL); +} + +static void __exit unregister_test_da(void) +{ + rv_unregister_monitor(&rv_this); +} + +module_init(register_test_da); +module_exit(unregister_test_da); + +MODULE_LICENSE("GPL"); +MODULE_AUTHOR("dot2k: auto-generated"); +MODULE_DESCRIPTION("test_da: auto-generated"); diff --git a/tools/verification/rvgen/tests/golden/test_da/test_da.h b/tool= s/verification/rvgen/tests/golden/test_da/test_da.h new file mode 100644 index 000000000000..d55795efbb61 --- /dev/null +++ b/tools/verification/rvgen/tests/golden/test_da/test_da.h @@ -0,0 +1,47 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* + * Automatically generated C representation of test_da automaton + * For further information about this format, see kernel documentation: + * Documentation/trace/rv/deterministic_automata.rst + */ + +#define MONITOR_NAME test_da + +enum states_test_da { + state_a_test_da, + state_b_test_da, + state_max_test_da, +}; + +#define INVALID_STATE state_max_test_da + +enum events_test_da { + event_1_test_da, + event_2_test_da, + event_max_test_da, +}; + +struct automaton_test_da { + char *state_names[state_max_test_da]; + char *event_names[event_max_test_da]; + unsigned char function[state_max_test_da][event_max_test_da]; + unsigned char initial_state; + bool final_states[state_max_test_da]; +}; + +static const struct automaton_test_da automaton_test_da =3D { + .state_names =3D { + "state_a", + "state_b", + }, + .event_names =3D { + "event_1", + "event_2", + }, + .function =3D { + { state_b_test_da, state_a_test_da }, + { INVALID_STATE, state_a_test_da }, + }, + .initial_state =3D state_a_test_da, + .final_states =3D { 1, 0 }, +}; diff --git a/tools/verification/rvgen/tests/golden/test_da/test_da_trace.h = b/tools/verification/rvgen/tests/golden/test_da/test_da_trace.h new file mode 100644 index 000000000000..8bd67115d244 --- /dev/null +++ b/tools/verification/rvgen/tests/golden/test_da/test_da_trace.h @@ -0,0 +1,15 @@ +/* SPDX-License-Identifier: GPL-2.0 */ + +/* + * Snippet to be included in rv_trace.h + */ + +#ifdef CONFIG_RV_MON_TEST_DA +DEFINE_EVENT(event_da_monitor, event_test_da, + TP_PROTO(char *state, char *event, char *next_state, bool final_stat= e), + TP_ARGS(state, event, next_state, final_state)); + +DEFINE_EVENT(error_da_monitor, error_test_da, + TP_PROTO(char *state, char *event), + TP_ARGS(state, event)); +#endif /* CONFIG_RV_MON_TEST_DA */ diff --git a/tools/verification/rvgen/tests/golden/test_ha/Kconfig b/tools/= verification/rvgen/tests/golden/test_ha/Kconfig new file mode 100644 index 000000000000..f4048290c774 --- /dev/null +++ b/tools/verification/rvgen/tests/golden/test_ha/Kconfig @@ -0,0 +1,9 @@ +# SPDX-License-Identifier: GPL-2.0-only +# +config RV_MON_TEST_HA + depends on RV + # XXX: add dependencies if there + select HA_MON_EVENTS_ID + bool "test_ha monitor" + help + auto-generated diff --git a/tools/verification/rvgen/tests/golden/test_ha/test_ha.c b/tool= s/verification/rvgen/tests/golden/test_ha/test_ha.c new file mode 100644 index 000000000000..485fcd0259b6 --- /dev/null +++ b/tools/verification/rvgen/tests/golden/test_ha/test_ha.c @@ -0,0 +1,247 @@ +// SPDX-License-Identifier: GPL-2.0 +#include +#include +#include +#include +#include +#include +#include + +#define MODULE_NAME "test_ha" + +/* + * XXX: include required tracepoint headers, e.g., + * #include + */ +#include + +/* + * This is the self-generated part of the monitor. Generally, there is no = need + * to touch this section. + */ +#define RV_MON_TYPE RV_MON_PER_TASK +/* XXX: If the monitor has several instances, consider HA_TIMER_WHEEL */ +#define HA_TIMER_TYPE HA_TIMER_HRTIMER +#include "test_ha.h" +#include + +/* + * This is the instrumentation part of the monitor. + * + * This is the section where manual work is required. Here the kernel even= ts + * are translated into model's event. + * + */ +#define BAR_NS(ha_mon) /* XXX: what is BAR_NS(ha_mon)? */ + +#define FOO_NS /* XXX: what is FOO_NS? */ + +static inline u64 bar_ns(struct ha_monitor *ha_mon) +{ + return /* XXX: what is bar_ns(ha_mon)? */; +} + +static u64 foo_ns =3D /* XXX: default value */; +module_param(foo_ns, ullong, 0644); + +/* + * These functions define how to read and reset the environment variable. + * + * Common environment variables like ns-based and jiffy-based clocks have + * pre-define getters and resetters you can use. The parser can infer the = type + * of the environment variable if you supply a measure unit in the constra= int. + * If you define your own functions, make sure to add appropriate memory + * barriers if required. + * Some environment variables don't require a storage as they read a system + * state (e.g. preemption count). Those variables are never reset, so we d= on't + * define a reset function on monitors only relying on this type of variab= les. + */ +static u64 ha_get_env(struct ha_monitor *ha_mon, enum envs_test_ha env, u6= 4 time_ns) +{ + if (env =3D=3D clk_test_ha) + return ha_get_clk_ns(ha_mon, env, time_ns); + else if (env =3D=3D env1_test_ha) + return /* XXX: how do I read env1? */ + else if (env =3D=3D env2_test_ha) + return /* XXX: how do I read env2? */ + return ENV_INVALID_VALUE; +} + +static void ha_reset_env(struct ha_monitor *ha_mon, enum envs_test_ha env,= u64 time_ns) +{ + if (env =3D=3D clk_test_ha) + ha_reset_clk_ns(ha_mon, env, time_ns); +} + +/* + * These functions are used to validate state transitions. + * + * They are generated by parsing the model, there is usually no need to ch= ange them. + * If the monitor requires a timer, there are functions responsible to arm= it when + * the next state has a constraint, cancel it in any other case and to che= ck + * that it didn't expire before the callback run. Transitions to the same = state + * without a reset never affect timers. + * Due to the different representations between invariants and guards, the= re is + * a function to convert it in case invariants or guards are reachable from + * another invariant without reset. Those are not present if not required = in + * the model. This is all automatic but is worth checking because it may s= how + * errors in the model (e.g. missing resets). + */ +static inline bool ha_verify_invariants(struct ha_monitor *ha_mon, + enum states curr_state, enum events event, + enum states next_state, u64 time_ns) +{ + if (curr_state =3D=3D S0_test_ha) + return ha_check_invariant_ns(ha_mon, clk_test_ha, time_ns); + else if (curr_state =3D=3D S2_test_ha) + return ha_check_invariant_ns(ha_mon, clk_test_ha, time_ns); + return true; +} + +static inline void ha_convert_inv_guard(struct ha_monitor *ha_mon, + enum states curr_state, enum events event, + enum states next_state, u64 time_ns) +{ + if (curr_state =3D=3D next_state) + return; + if (curr_state =3D=3D S2_test_ha) + ha_inv_to_guard(ha_mon, clk_test_ha, BAR_NS(ha_mon), time_ns); +} + +static inline bool ha_verify_guards(struct ha_monitor *ha_mon, + enum states curr_state, enum events event, + enum states next_state, u64 time_ns) +{ + bool res =3D true; + + if (curr_state =3D=3D S0_test_ha && event =3D=3D event0_test_ha) + ha_reset_env(ha_mon, clk_test_ha, time_ns); + else if (curr_state =3D=3D S0_test_ha && event =3D=3D event1_test_ha) + ha_reset_env(ha_mon, clk_test_ha, time_ns); + else if (curr_state =3D=3D S1_test_ha && event =3D=3D event0_test_ha) + ha_reset_env(ha_mon, clk_test_ha, time_ns); + else if (curr_state =3D=3D S1_test_ha && event =3D=3D event2_test_ha) { + res =3D ha_get_env(ha_mon, env1_test_ha, time_ns) =3D=3D 0ull; + ha_reset_env(ha_mon, clk_test_ha, time_ns); + } else if (curr_state =3D=3D S2_test_ha && event =3D=3D event1_test_ha) + res =3D ha_monitor_env_invalid(ha_mon, clk_test_ha) || + ha_get_env(ha_mon, clk_test_ha, time_ns) < foo_ns; + else if (curr_state =3D=3D S3_test_ha && event =3D=3D event0_test_ha) + res =3D ha_monitor_env_invalid(ha_mon, clk_test_ha) || + (ha_get_env(ha_mon, clk_test_ha, time_ns) < FOO_NS && + ha_get_env(ha_mon, env2_test_ha, time_ns) =3D=3D 0ull); + else if (curr_state =3D=3D S3_test_ha && event =3D=3D event1_test_ha) { + res =3D ha_monitor_env_invalid(ha_mon, clk_test_ha) || + (ha_get_env(ha_mon, clk_test_ha, time_ns) < foo_ns && + ha_get_env(ha_mon, env1_test_ha, time_ns) =3D=3D 1ull); + ha_reset_env(ha_mon, clk_test_ha, time_ns); + } + return res; +} + +static inline void ha_setup_invariants(struct ha_monitor *ha_mon, + enum states curr_state, enum events event, + enum states next_state, u64 time_ns) +{ + if (next_state =3D=3D curr_state && event !=3D event0_test_ha) + return; + if (next_state =3D=3D S0_test_ha) + ha_start_timer_ns(ha_mon, clk_test_ha, bar_ns(ha_mon), time_ns); + else if (next_state =3D=3D S2_test_ha) + ha_start_timer_ns(ha_mon, clk_test_ha, BAR_NS(ha_mon), time_ns); + else if (curr_state =3D=3D S0_test_ha) + ha_cancel_timer(ha_mon); + else if (curr_state =3D=3D S2_test_ha) + ha_cancel_timer(ha_mon); +} + +static bool ha_verify_constraint(struct ha_monitor *ha_mon, + enum states curr_state, enum events event, + enum states next_state, u64 time_ns) +{ + if (!ha_verify_invariants(ha_mon, curr_state, event, next_state, time_ns)) + return false; + + ha_convert_inv_guard(ha_mon, curr_state, event, next_state, time_ns); + + if (!ha_verify_guards(ha_mon, curr_state, event, next_state, time_ns)) + return false; + + ha_setup_invariants(ha_mon, curr_state, event, next_state, time_ns); + + return true; +} + +static void handle_event0(void *data, /* XXX: fill header */) +{ + /* XXX: validate that this event always leads to the initial state */ + struct task_struct *p =3D /* XXX: how do I get p? */; + da_handle_start_event(p, event0_test_ha); +} + +static void handle_event1(void *data, /* XXX: fill header */) +{ + struct task_struct *p =3D /* XXX: how do I get p? */; + da_handle_event(p, event1_test_ha); +} + +static void handle_event2(void *data, /* XXX: fill header */) +{ + struct task_struct *p =3D /* XXX: how do I get p? */; + da_handle_event(p, event2_test_ha); +} + +static int enable_test_ha(void) +{ + int retval; + + retval =3D da_monitor_init(); + if (retval) + return retval; + + rv_attach_trace_probe("test_ha", /* XXX: tracepoint */, handle_event0); + rv_attach_trace_probe("test_ha", /* XXX: tracepoint */, handle_event1); + rv_attach_trace_probe("test_ha", /* XXX: tracepoint */, handle_event2); + + return 0; +} + +static void disable_test_ha(void) +{ + rv_this.enabled =3D 0; + + rv_detach_trace_probe("test_ha", /* XXX: tracepoint */, handle_event0); + rv_detach_trace_probe("test_ha", /* XXX: tracepoint */, handle_event1); + rv_detach_trace_probe("test_ha", /* XXX: tracepoint */, handle_event2); + + da_monitor_destroy(); +} + +/* + * This is the monitor register section. + */ +static struct rv_monitor rv_this =3D { + .name =3D "test_ha", + .description =3D "auto-generated", + .enable =3D enable_test_ha, + .disable =3D disable_test_ha, + .reset =3D da_monitor_reset_all, + .enabled =3D 0, +}; + +static int __init register_test_ha(void) +{ + return rv_register_monitor(&rv_this, NULL); +} + +static void __exit unregister_test_ha(void) +{ + rv_unregister_monitor(&rv_this); +} + +module_init(register_test_ha); +module_exit(unregister_test_ha); + +MODULE_LICENSE("GPL"); +MODULE_AUTHOR("dot2k: auto-generated"); +MODULE_DESCRIPTION("test_ha: auto-generated"); diff --git a/tools/verification/rvgen/tests/golden/test_ha/test_ha.h b/tool= s/verification/rvgen/tests/golden/test_ha/test_ha.h new file mode 100644 index 000000000000..949fa4453403 --- /dev/null +++ b/tools/verification/rvgen/tests/golden/test_ha/test_ha.h @@ -0,0 +1,72 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* + * Automatically generated C representation of test_ha automaton + * For further information about this format, see kernel documentation: + * Documentation/trace/rv/deterministic_automata.rst + */ + +#define MONITOR_NAME test_ha + +enum states_test_ha { + S0_test_ha, + S1_test_ha, + S2_test_ha, + S3_test_ha, + state_max_test_ha, +}; + +#define INVALID_STATE state_max_test_ha + +enum events_test_ha { + event0_test_ha, + event1_test_ha, + event2_test_ha, + event_max_test_ha, +}; + +enum envs_test_ha { + clk_test_ha, + env1_test_ha, + env2_test_ha, + env_max_test_ha, + env_max_stored_test_ha =3D env1_test_ha, +}; + +_Static_assert(env_max_stored_test_ha <=3D MAX_HA_ENV_LEN, "Not enough slo= ts"); +#define HA_CLK_NS + +struct automaton_test_ha { + char *state_names[state_max_test_ha]; + char *event_names[event_max_test_ha]; + char *env_names[env_max_test_ha]; + unsigned char function[state_max_test_ha][event_max_test_ha]; + unsigned char initial_state; + bool final_states[state_max_test_ha]; +}; + +static const struct automaton_test_ha automaton_test_ha =3D { + .state_names =3D { + "S0", + "S1", + "S2", + "S3", + }, + .event_names =3D { + "event0", + "event1", + "event2", + }, + .env_names =3D { + "clk", + "env1", + "env2", + }, + .function =3D { + { S0_test_ha, S1_test_ha, INVALID_STATE }, + { S0_test_ha, INVALID_STATE, S2_test_ha }, + { INVALID_STATE, S2_test_ha, S3_test_ha }, + { S0_test_ha, S1_test_ha, INVALID_STATE }, + }, + .initial_state =3D S0_test_ha, + .final_states =3D { 1, 0, 0, 0 }, +}; diff --git a/tools/verification/rvgen/tests/golden/test_ha/test_ha_trace.h = b/tools/verification/rvgen/tests/golden/test_ha/test_ha_trace.h new file mode 100644 index 000000000000..381bafcb3322 --- /dev/null +++ b/tools/verification/rvgen/tests/golden/test_ha/test_ha_trace.h @@ -0,0 +1,19 @@ +/* SPDX-License-Identifier: GPL-2.0 */ + +/* + * Snippet to be included in rv_trace.h + */ + +#ifdef CONFIG_RV_MON_TEST_HA +DEFINE_EVENT(event_da_monitor_id, event_test_ha, + TP_PROTO(int id, char *state, char *event, char *next_state, bool fi= nal_state), + TP_ARGS(id, state, event, next_state, final_state)); + +DEFINE_EVENT(error_da_monitor_id, error_test_ha, + TP_PROTO(int id, char *state, char *event), + TP_ARGS(id, state, event)); + +DEFINE_EVENT(error_env_da_monitor_id, error_env_test_ha, + TP_PROTO(int id, char *state, char *event, char *env), + TP_ARGS(id, state, event, env)); +#endif /* CONFIG_RV_MON_TEST_HA */ diff --git a/tools/verification/rvgen/tests/golden/test_ltl/Kconfig b/tools= /verification/rvgen/tests/golden/test_ltl/Kconfig new file mode 100644 index 000000000000..e2d0e721f180 --- /dev/null +++ b/tools/verification/rvgen/tests/golden/test_ltl/Kconfig @@ -0,0 +1,11 @@ +# SPDX-License-Identifier: GPL-2.0-only +# +config RV_MON_TEST_LTL + depends on RV + # XXX: add dependencies if there + depends on RV_MON_LTL_PARENT + default y + select LTL_MON_EVENTS_ID + bool "test_ltl monitor" + help + Simple description diff --git a/tools/verification/rvgen/tests/golden/test_ltl/test_ltl.c b/to= ols/verification/rvgen/tests/golden/test_ltl/test_ltl.c new file mode 100644 index 000000000000..92c69b9d9a41 --- /dev/null +++ b/tools/verification/rvgen/tests/golden/test_ltl/test_ltl.c @@ -0,0 +1,108 @@ +// SPDX-License-Identifier: GPL-2.0 +#include +#include +#include +#include +#include +#include +#include + +#define MODULE_NAME "test_ltl" + +/* + * XXX: include required tracepoint headers, e.g., + * #include + */ +#include +#include + + +/* + * This is the self-generated part of the monitor. Generally, there is no = need + * to touch this section. + */ +#include "test_ltl.h" +#include + +static void ltl_atoms_fetch(struct task_struct *task, struct ltl_monitor *= mon) +{ + /* + * This is called everytime the Buchi automaton is triggered. + * + * This function could be used to fetch the atomic propositions which + * are expensive to trace. It is possible only if the atomic proposition + * does not need to be updated at precise time. + * + * It is recommended to use tracepoints and ltl_atom_update() instead. + */ +} + +static void ltl_atoms_init(struct task_struct *task, struct ltl_monitor *m= on, bool task_creation) +{ + /* + * This should initialize as many atomic propositions as possible. + * + * @task_creation indicates whether the task is being created. This is + * false if the task is already running before the monitor is enabled. + */ + ltl_atom_set(mon, LTL_EVENT_A, true/false); + ltl_atom_set(mon, LTL_EVENT_B, true/false); +} + +/* + * This is the instrumentation part of the monitor. + * + * This is the section where manual work is required. Here the kernel even= ts + * are translated into model's event. + */ +static void handle_example_event(void *data, /* XXX: fill header */) +{ + ltl_atom_update(task, LTL_EVENT_A, true/false); +} + +static int enable_test_ltl(void) +{ + int retval; + + retval =3D ltl_monitor_init(); + if (retval) + return retval; + + rv_attach_trace_probe("test_ltl", /* XXX: tracepoint */, handle_example_e= vent); + + return 0; +} + +static void disable_test_ltl(void) +{ + rv_detach_trace_probe("test_ltl", /* XXX: tracepoint */, handle_sample_ev= ent); + + ltl_monitor_destroy(); +} + +/* + * This is the monitor register section. + */ +static struct rv_monitor rv_test_ltl =3D { + .name =3D "test_ltl", + .description =3D "Simple description", + .enable =3D enable_test_ltl, + .disable =3D disable_test_ltl, +}; + +static int __init register_test_ltl(void) +{ + return rv_register_monitor(&rv_test_ltl, &rv_ltl_parent); +} + +static void __exit unregister_test_ltl(void) +{ + rv_unregister_monitor(&rv_test_ltl); +} + +module_init(register_test_ltl); +module_exit(unregister_test_ltl); + +MODULE_LICENSE("GPL"); +MODULE_AUTHOR(/* TODO */); +MODULE_DESCRIPTION("test_ltl: Simple description"); diff --git a/tools/verification/rvgen/tests/golden/test_ltl/test_ltl.h b/to= ols/verification/rvgen/tests/golden/test_ltl/test_ltl.h new file mode 100644 index 000000000000..8484f8224a2b --- /dev/null +++ b/tools/verification/rvgen/tests/golden/test_ltl/test_ltl.h @@ -0,0 +1,108 @@ +/* SPDX-License-Identifier: GPL-2.0 */ + +/* + * C implementation of Buchi automaton, automatically generated by + * tools/verification/rvgen from the linear temporal logic specification. + * For further information, see kernel documentation: + * Documentation/trace/rv/linear_temporal_logic.rst + */ + +#include + +#define MONITOR_NAME test_ltl + +enum ltl_atom { + LTL_EVENT_A, + LTL_EVENT_B, + LTL_NUM_ATOM +}; +static_assert(LTL_NUM_ATOM <=3D RV_MAX_LTL_ATOM); + +static const char *ltl_atom_str(enum ltl_atom atom) +{ + static const char *const names[] =3D { + "ev_a", + "ev_b", + }; + + return names[atom]; +} + +enum ltl_buchi_state { + S0, + S1, + S2, + S3, + S4, + RV_NUM_BA_STATES +}; +static_assert(RV_NUM_BA_STATES <=3D RV_MAX_BA_STATES); + +static void ltl_start(struct task_struct *task, struct ltl_monitor *mon) +{ + bool event_b =3D test_bit(LTL_EVENT_B, mon->atoms); + bool event_a =3D test_bit(LTL_EVENT_A, mon->atoms); + bool val1 =3D !event_a; + + if (val1) + __set_bit(S0, mon->states); + if (True) + __set_bit(S1, mon->states); + if (event_b) + __set_bit(S4, mon->states); +} + +static void +ltl_possible_next_states(struct ltl_monitor *mon, unsigned int state, unsi= gned long *next) +{ + bool event_b =3D test_bit(LTL_EVENT_B, mon->atoms); + bool event_a =3D test_bit(LTL_EVENT_A, mon->atoms); + bool val1 =3D !event_a; + + switch (state) { + case S0: + if (val1) + __set_bit(S0, next); + if (True) + __set_bit(S1, next); + if (event_b) + __set_bit(S4, next); + break; + case S1: + if (True) + __set_bit(S1, next); + if (True && val1) + __set_bit(S2, next); + if (event_b && val1) + __set_bit(S3, next); + if (event_b) + __set_bit(S4, next); + break; + case S2: + if (True) + __set_bit(S1, next); + if (True && val1) + __set_bit(S2, next); + if (event_b && val1) + __set_bit(S3, next); + if (event_b) + __set_bit(S4, next); + break; + case S3: + if (val1) + __set_bit(S0, next); + if (True) + __set_bit(S1, next); + if (event_b) + __set_bit(S4, next); + break; + case S4: + if (val1) + __set_bit(S0, next); + if (True) + __set_bit(S1, next); + if (event_b) + __set_bit(S4, next); + break; + } +} diff --git a/tools/verification/rvgen/tests/golden/test_ltl/test_ltl_trace.= h b/tools/verification/rvgen/tests/golden/test_ltl/test_ltl_trace.h new file mode 100644 index 000000000000..3571b004c114 --- /dev/null +++ b/tools/verification/rvgen/tests/golden/test_ltl/test_ltl_trace.h @@ -0,0 +1,14 @@ +/* SPDX-License-Identifier: GPL-2.0 */ + +/* + * Snippet to be included in rv_trace.h + */ + +#ifdef CONFIG_RV_MON_TEST_LTL +DEFINE_EVENT(event_ltl_monitor_id, event_test_ltl, + TP_PROTO(struct task_struct *task, char *states, char *atoms, char *= next), + TP_ARGS(task, states, atoms, next)); +DEFINE_EVENT(error_ltl_monitor_id, error_test_ltl, + TP_PROTO(struct task_struct *task), + TP_ARGS(task)); +#endif /* CONFIG_RV_MON_TEST_LTL */ diff --git a/tools/verification/rvgen/tests/specs/test_da.dot b/tools/verif= ication/rvgen/tests/specs/test_da.dot new file mode 100644 index 000000000000..e555c239b221 --- /dev/null +++ b/tools/verification/rvgen/tests/specs/test_da.dot @@ -0,0 +1,16 @@ +digraph state_automaton { + {node [shape =3D circle] "state_b"}; + {node [shape =3D plaintext, style=3Dinvis, label=3D""] "__init_state_a"}; + {node [shape =3D doublecircle] "state_a"}; + {node [shape =3D circle] "state_a"}; + "__init_state_a" -> "state_a"; + "state_a" [label =3D "state_a"]; + "state_a" -> "state_a" [ label =3D "event_2" ]; + "state_a" -> "state_b" [ label =3D "event_1" ]; + "state_b" [label =3D "state_b"]; + "state_b" -> "state_a" [ label =3D "event_2" ]; + { rank =3D min ; + "__init_state_a"; + "state_a"; + } +} diff --git a/tools/verification/rvgen/tests/specs/test_da2.dot b/tools/veri= fication/rvgen/tests/specs/test_da2.dot new file mode 100644 index 000000000000..bfee6e535cf7 --- /dev/null +++ b/tools/verification/rvgen/tests/specs/test_da2.dot @@ -0,0 +1,18 @@ +digraph state_automaton { + {node [shape =3D circle] "state_b"}; + {node [shape =3D circle] "state_c"}; + {node [shape =3D plaintext, style=3Dinvis, label=3D""] "__init_state_a"}; + {node [shape =3D doublecircle] "state_a"}; + {node [shape =3D circle] "state_a"}; + "__init_state_a" -> "state_a"; + "state_a" [label =3D "state_a"]; + "state_a" -> "state_b" [ label =3D "event_1" ]; + "state_a" -> "state_c" [ label =3D "event_2" ]; + "state_b" [label =3D "state_b"]; + "state_b" -> "state_a" [ label =3D "event_2" ]; + "state_b" -> "state_c" [ label =3D "event_3" ]; + { rank =3D min ; + "__init_state_a"; + "state_a"; + } +} diff --git a/tools/verification/rvgen/tests/specs/test_ha.dot b/tools/verif= ication/rvgen/tests/specs/test_ha.dot new file mode 100644 index 000000000000..786aa8b22098 --- /dev/null +++ b/tools/verification/rvgen/tests/specs/test_ha.dot @@ -0,0 +1,27 @@ +digraph state_automaton { + center =3D true; + size =3D "7,11"; + {node [shape =3D circle] "S1"}; + {node [shape =3D plaintext, style=3Dinvis, label=3D""] "__init_S0"}; + {node [shape =3D doublecircle] "S0"}; + {node [shape =3D circle] "S0"}; + {node [shape =3D circle] "S2"}; + {node [shape =3D circle] "S3"}; + "__init_S0" -> "S0"; + "S0" [label =3D "S0\nclk < bar_ns()", color =3D green3]; + "S1" [label =3D "S1"]; + "S2" [label =3D "S2\nclk < BAR_NS()"]; + "S3" [label =3D "S3"]; + "S1" -> "S0" [ label =3D "event0;reset(clk)" ]; + "S0" -> "S1" [ label =3D "event1;reset(clk)" ]; + "S0" -> "S0" [ label =3D "event0;reset(clk)" ]; + "S1" -> "S2" [ label =3D "event2;env1 =3D=3D 0;reset(clk)" ]; + "S2" -> "S3" [ label =3D "event2" ]; + "S2" -> "S2" [ label =3D "event1;clk < foo_ns" ]; + "S3" -> "S0" [ label =3D "event0;clk < FOO_NS && env2 =3D=3D 0" ]; + "S3" -> "S1" [ label =3D "event1;clk < foo_ns && env1 =3D=3D 1;reset(clk)= " ]; + { rank =3D min ; + "__init_S0"; + "S0"; + } +} diff --git a/tools/verification/rvgen/tests/specs/test_invalid.dot b/tools/= verification/rvgen/tests/specs/test_invalid.dot new file mode 100644 index 000000000000..17c63fc57f17 --- /dev/null +++ b/tools/verification/rvgen/tests/specs/test_invalid.dot @@ -0,0 +1,8 @@ +digraph invalid { + {node [shape =3D circle] "init"}; + {node [shape =3D circle] "state1"}; + "init" [label =3D "init"]; + "init" -> "state1" [ label =3D "event_a" ]; + "state1" [label =3D "state1"]; + "state1" -> "init" [ label =3D "event_b" ]; +} diff --git a/tools/verification/rvgen/tests/specs/test_invalid.ltl b/tools/= verification/rvgen/tests/specs/test_invalid.ltl new file mode 100644 index 000000000000..cf36307e003c --- /dev/null +++ b/tools/verification/rvgen/tests/specs/test_invalid.ltl @@ -0,0 +1 @@ +RULE =3D A invalid B diff --git a/tools/verification/rvgen/tests/specs/test_invalid_ha.dot b/too= ls/verification/rvgen/tests/specs/test_invalid_ha.dot new file mode 100644 index 000000000000..06de6aa8709f --- /dev/null +++ b/tools/verification/rvgen/tests/specs/test_invalid_ha.dot @@ -0,0 +1,16 @@ +digraph state_automaton { + {node [shape =3D circle] "state_b"}; + {node [shape =3D plaintext, style=3Dinvis, label=3D""] "__init_state_a"}; + {node [shape =3D doublecircle] "state_a"}; + {node [shape =3D circle] "state_a"}; + "__init_state_a" -> "state_a"; + "state_a" [label =3D "state_a;clk < 1"]; + "state_a" -> "state_a" [ label =3D "event_2;reset(clk)" ]; + "state_a" -> "state_b" [ label =3D "event_1;wrong_constraint" ]; + "state_b" [label =3D "state_b"]; + "state_b" -> "state_a" [ label =3D "event_2" ]; + { rank =3D min ; + "__init_state_a"; + "state_a"; + } +} diff --git a/tools/verification/rvgen/tests/specs/test_ltl.ltl b/tools/veri= fication/rvgen/tests/specs/test_ltl.ltl new file mode 100644 index 000000000000..5ed658abd69c --- /dev/null +++ b/tools/verification/rvgen/tests/specs/test_ltl.ltl @@ -0,0 +1 @@ +RULE =3D always (EVENT_A imply eventually EVENT_B) --=20 2.53.0 From nobody Wed Jun 17 06:05:31 2026 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 9DFA7332623 for ; Mon, 27 Apr 2026 15:12:40 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.129.124 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777302763; cv=none; b=FWk1Fa/z6Odp43JrfEeejAt1sx+2wxqzPbSYudr5eMvXG6Tnd9KbyAOZemtS156Na0jALcj05DXKWCBVgy4kHpeqankgpfpCU+m7kNbUDZM6f5V5L+gSIOSfsR8ZFEZRD+0X2LhmUQvXNvV/HGGnGLJXDbKEnzZTqbs/BNpONiI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777302763; c=relaxed/simple; bh=dti/XtzTOyfJkY1DUwMxR2x6gtJ936yTx74HUBVvm3U=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=M0dj8q6bONSLK/qCUXq7cOFLmnUd7ML5dwtr8k46u1sjrszP+ncw1+A/D9YP7uM63SZrKvjTMk/vCC/IBA+H+zei4hxnfLHlSQxWBM2+mxzSv1gqsYnKKHW74wHLmncclCc34URKvddWz0KZmm3K1Ebk6ioCE1fQCxIaA9KfZdE= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=PjbrvF8T; arc=none smtp.client-ip=170.10.129.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="PjbrvF8T" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1777302759; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=b7w4KyQE0yi3t8ZF1U2PmxCFiEQguUTuwofqgy1DZxk=; b=PjbrvF8Tj12YaQtmhsmyrWLzI+vPV1Sxx3OXjPyzS9/6e1y5xEUo1ML+UmR+vq1PDe1kd4 4f1FLKA6NOj6NZKTVFH2e1t7GR0A9zMt+XcmDAX6eIpzy4dsNBmT/LqXytJW/PNE5VkXCx S5ZoBZLAGKlDQ7S1V67TPuIZmkeVgcQ= Received: from mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-645-7xOSmp4MO8qgm_NJB6ghWA-1; Mon, 27 Apr 2026 11:12:36 -0400 X-MC-Unique: 7xOSmp4MO8qgm_NJB6ghWA-1 X-Mimecast-MFC-AGG-ID: 7xOSmp4MO8qgm_NJB6ghWA_1777302754 Received: from mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.17]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 9E0F81956068; Mon, 27 Apr 2026 15:12:34 +0000 (UTC) Received: from fedora-pc.redhat.corp (headnet01.pony-001.prod.iad2.dc.redhat.com [10.2.32.101]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id DD15D195608E; Mon, 27 Apr 2026 15:12:31 +0000 (UTC) From: Gabriele Monaco To: linux-trace-kernel@vger.kernel.org, linux-kernel@vger.kernel.org, Steven Rostedt , Gabriele Monaco Cc: Nam Cao , Thomas Weissschuh , Tomas Glozar , John Kacur , Wen Yang Subject: [RFC PATCH 08/12] verification/rvgen: Add selftests Date: Mon, 27 Apr 2026 17:11:30 +0200 Message-ID: <20260427151134.192971-9-gmonaco@redhat.com> In-Reply-To: <20260427151134.192971-1-gmonaco@redhat.com> References: <20260427151134.192971-1-gmonaco@redhat.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.0 on 10.30.177.17 Content-Type: text/plain; charset="utf-8" The rvgen code generator needs validation to ensure it produces correct monitor implementations from input specifications. Add selftests with golden reference outputs covering all monitor classes (DA, HA, LTL) and types (global, per_cpu, per_task, per_obj), including optional features like descriptions and parent monitors. Container generation and error handling (missing files, invalid specifications, missing arguments) are also validated against expected output. Signed-off-by: Gabriele Monaco Reviewed-by: Wen Yang --- tools/verification/rvgen/Makefile | 4 + .../rvgen/tests/rvgen_container.t | 20 +++++ .../verification/rvgen/tests/rvgen_monitor.t | 87 +++++++++++++++++++ tools/verification/tests/engine.sh | 32 +++++++ 4 files changed, 143 insertions(+) create mode 100644 tools/verification/rvgen/tests/rvgen_container.t create mode 100644 tools/verification/rvgen/tests/rvgen_monitor.t diff --git a/tools/verification/rvgen/Makefile b/tools/verification/rvgen/M= akefile index cfc4056c1e87..2a2b9e64ea42 100644 --- a/tools/verification/rvgen/Makefile +++ b/tools/verification/rvgen/Makefile @@ -13,6 +13,10 @@ all: .PHONY: clean clean: =20 +.PHONY: check +check: + prove -o --directives -f tests/ + .PHONY: install install: $(INSTALL) rvgen/automata.py -D -m 644 $(DESTDIR)$(PYLIB)/rvgen/automata.= py diff --git a/tools/verification/rvgen/tests/rvgen_container.t b/tools/verif= ication/rvgen/tests/rvgen_container.t new file mode 100644 index 000000000000..fa4fb3db8288 --- /dev/null +++ b/tools/verification/rvgen/tests/rvgen_container.t @@ -0,0 +1,20 @@ +#!/bin/bash +# SPDX-License-Identifier: GPL-2.0 +source ../tests/engine.sh +test_begin + +set_timeout 30s + +# Help tests +check "verify container subcommand help" \ + "$RVGEN container -h" 0 "model_name" "class" + +check_and_compare_folder "container with description" \ + "$RVGEN container -n test_container -D 'Test container for grouping monit= ors'" \ + "test_container" "Writing the monitor into the directory test_container" + +# Error handling tests +check "missing required model_name" \ + "$RVGEN container" 2 "the following arguments are required: -n/--model_na= me" + +test_end diff --git a/tools/verification/rvgen/tests/rvgen_monitor.t b/tools/verific= ation/rvgen/tests/rvgen_monitor.t new file mode 100644 index 000000000000..261476504eee --- /dev/null +++ b/tools/verification/rvgen/tests/rvgen_monitor.t @@ -0,0 +1,87 @@ +#!/bin/bash +# SPDX-License-Identifier: GPL-2.0 +source ../tests/engine.sh +test_begin + +set_timeout 30s + +# Help and basic tests +check "verify help page" \ + "$RVGEN --help" 0 "Generate kernel rv monitor" + +check "verify monitor subcommand help" \ + "$RVGEN monitor --help" 0 "Monitor class" + +# DA monitor tests - test all monitor types +check_and_compare_folder "DA per_cpu (default name)" \ + "$RVGEN monitor -c da -s tests/specs/test_da.dot -t per_cpu" \ + "test_da" "obj-\$(CONFIG_RV_MON_TEST_DA) +=3D monitors/test_da/test_da.o" + +check_and_compare_folder "DA global type" \ + "$RVGEN monitor -c da -s tests/specs/test_da.dot -t global -n da_global" \ + "da_global" "DA_MON_EVENTS_IMPLICIT" + +check_and_compare_folder "DA per_task with description" \ + "$RVGEN monitor -c da -s tests/specs/test_da2.dot -t per_task -n da_perta= sk_desc -D 'Custom description for testing'" \ + "da_pertask_desc" "#include " + +check_and_compare_folder "DA per_obj with parent" \ + "$RVGEN monitor -c da -s tests/specs/test_da2.dot -t per_obj -n da_perobj= _parent -p parent_mon" \ + "da_perobj_parent" "DA_MON_EVENTS_ID" + +# HA monitor tests +check_and_compare_folder "HA per_task (default name)" \ + "$RVGEN monitor -c ha -s tests/specs/test_ha.dot -t per_task" \ + "test_ha" "HA_MON_EVENTS_ID" + +check_and_compare_folder "HA per_cpu type" \ + "$RVGEN monitor -c ha -s tests/specs/test_ha.dot -t per_cpu -n ha_percpu"= \ + "ha_percpu" "HA_MON_EVENTS_IMPLICIT" + +# LTL monitor test +check_and_compare_folder "LTL per_task" \ + "$RVGEN monitor -c ltl -s tests/specs/test_ltl.ltl -t per_task -n ltl_per= task" \ + "ltl_pertask" "source \"kernel/trace/rv/monitors/ltl_pertask/Kconfig\"" + +check_and_compare_folder "LTL per_task with parent and description (defaul= t name)" \ + "$RVGEN monitor -c ltl -s tests/specs/test_ltl.ltl -t per_task -p ltl_par= ent -D 'Simple description'" \ + "test_ltl" "LTL_MON_EVENTS_ID" + +# Error handling tests +check "missing required spec argument" \ + "$RVGEN monitor -c da -t per_cpu" 2 \ + "the following arguments are required: -s/--spec" "Traceback (most recent= call last)" + +check "missing required monitor type" \ + "$RVGEN monitor -c da -s tests/specs/test_da.dot" 2 \ + "the following arguments are required: -t/--monitor_type" "Traceback (mos= t recent call last)" + +check "missing required monitor class" \ + "$RVGEN monitor -s tests/specs/test_da.dot -t per_cpu" 2 \ + "the following arguments are required: -c/--class" "Traceback (most recen= t call last)" + +check "invalid monitor class" \ + "$RVGEN monitor -c invalid -s tests/specs/test_da.dot -t per_cpu" 1 \ + "Unknown monitor class" "Traceback (most recent call last)" + +check "missing dot file" \ + "$RVGEN monitor -c da -s tests/specs/nonexistent.dot -t per_cpu" 1 \ + "No such file or directory" "Traceback (most recent call last)" + +check "missing ltl file" \ + "$RVGEN monitor -c ltl -s tests/specs/nonexistent.ltl -t per_task" 1 \ + "No such file or directory" "Traceback (most recent call last)" + +check "invalid dot file syntax" \ + "$RVGEN monitor -c da -s tests/specs/test_invalid.dot -t per_cpu" 1 \ + "Not a valid .dot format" "Traceback (most recent call last)" + +check "invalid ha file syntax" \ + "$RVGEN monitor -c ha -s tests/specs/test_invalid_ha.dot -t per_obj" 1 \ + "Unrecognised event constraint" "Traceback (most recent call last)" + +check "invalid ltl file syntax" \ + "$RVGEN monitor -c ltl -s tests/specs/test_invalid.ltl -t per_task" 1 \ + "Illegal character 'i'" "Traceback (most recent call last)" + +test_end diff --git a/tools/verification/tests/engine.sh b/tools/verification/tests/= engine.sh index cd367dabef53..ef89df9112a4 100644 --- a/tools/verification/tests/engine.sh +++ b/tools/verification/tests/engine.sh @@ -5,6 +5,8 @@ test_begin() { # included correctly. ctr=3D0 [ -z "$RV" ] && RV=3D"../rv/rv" + [ -z "$RVGEN" ] && RVGEN=3D"python ../rvgen" + [ -z "$GOLDEN_DIR" ] && GOLDEN_DIR=3D"tests/golden" [ -n "$TEST_COUNT" ] && echo "1..$TEST_COUNT" } =20 @@ -101,6 +103,36 @@ check_if_exists() { fi } =20 +check_and_compare_folder() { + # Run command, compare generated folder to golden, and cleanup + local desc=3D$1 + local command=3D$2 + local generated_dir=3D$3 + local expected_output=3D$4 + local unexpected_output=3D$5 + local golden_dir=3D"$GOLDEN_DIR/$generated_dir" + + ctr=3D$((ctr + 1)) + if [ -n "$TEST_COUNT" ]; then + _check "$desc" "$command" 0 "$expected_output" "$unexpected_output" + + if [ "$fail" -eq 0 ] && [ ! -d "$generated_dir" ]; then + failure "# Generated directory not found: $generated_dir" + fi + + if [ "$fail" -ne 0 ]; then + : + elif ! diff -r "$generated_dir" "$golden_dir" &> /dev/null; then + failure "# Directories differ:" + failbuf+=3D$(diff -r "$generated_dir" "$golden_dir" 2>&1 | sed 's/^/# = /') + fi + + report "$1" + + rm -rf "$generated_dir" + fi +} + set_timeout() { TIMEOUT=3D"timeout -v -k 15s $1" } --=20 2.53.0 From nobody Wed Jun 17 06:05:31 2026 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A32F0340A43 for ; Mon, 27 Apr 2026 15:12:46 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.133.124 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777302768; cv=none; b=GSIGHj+Cm2FoZ5sFcPr5Amv/uUTLrOOwcW4+2aSbVFL2fE6D45gGSBiwj1AtsC9X2cfWCUq1HypNd/3oakVJG0tSZVKqBdYLs4FL3eoRjMGU8d7N5EaA2mmwd3aAL/LFPofdRH34aBR7UeGUlByf15EF9jqbq2DBpu1rs5y498Q= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777302768; c=relaxed/simple; bh=oEzG6KIS9LOm+BclNKrfGnKYk+0uX4IBFxKkCA3K2qI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=oFD2Cjtj7GZe3X6jmI6kiGsTTYPYXd65DnVlqM+T9x9q0cqpIh4C12msio+oBXsOw7DTHhGJ+T1773IqZLeX51LQaEwzwQfDGlyzHfO2Oz7ML0v0vi+gt69nr3VgHiYYewNMF4VXgONic1NkOUyErvvkKFquvx1CY0q2y/25aH4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=h2gD5fiL; arc=none smtp.client-ip=170.10.133.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="h2gD5fiL" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1777302765; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=1jxEnHj0d2Dslqe17siW0C7arZRD0qgC5bF07E72dZk=; b=h2gD5fiL1AUwF5Y8mYOoo3F9XLxG7X2l+U9EsECkxGNuK/OhjcPcvfFlCTfYbrsN5glZdb kbLy+Z65LiZM4BTwww4zeNetTmvf6gTb569JTzSrtqxsdohkTLxIMFyIdRQ75+RNGfbXUn xDU0kqVpJYyvayawwogsOD1cqRv315M= Received: from mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-210-3hAN9zCEOpKwiSEc3taOfw-1; Mon, 27 Apr 2026 11:12:40 -0400 X-MC-Unique: 3hAN9zCEOpKwiSEc3taOfw-1 X-Mimecast-MFC-AGG-ID: 3hAN9zCEOpKwiSEc3taOfw_1777302759 Received: from mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.17]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 0D9E51956095; Mon, 27 Apr 2026 15:12:39 +0000 (UTC) Received: from fedora-pc.redhat.corp (headnet01.pony-001.prod.iad2.dc.redhat.com [10.2.32.101]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id E5C77195608E; Mon, 27 Apr 2026 15:12:35 +0000 (UTC) From: Gabriele Monaco To: linux-trace-kernel@vger.kernel.org, linux-kernel@vger.kernel.org, Steven Rostedt , Gabriele Monaco , Masami Hiramatsu Cc: Nam Cao , Thomas Weissschuh , Tomas Glozar , John Kacur , Wen Yang Subject: [RFC PATCH 09/12] rv: Add KUnit stub to rv_react() and rv_*_task_monitor_slot() Date: Mon, 27 Apr 2026 17:11:31 +0200 Message-ID: <20260427151134.192971-10-gmonaco@redhat.com> In-Reply-To: <20260427151134.192971-1-gmonaco@redhat.com> References: <20260427151134.192971-1-gmonaco@redhat.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.0 on 10.30.177.17 Content-Type: text/plain; charset="utf-8" Add KUNIT_STATIC_STUB_REDIRECT to allow those functions to be stubbed in a KUnit test. This is useful to catch reaction without creating a custom reactor and going through the effort of setting it from a test. rv_{get/put}_task_monitor_slot() rely on a lock, but this isn't necessary during a unit test, so simply skip the calls. Signed-off-by: Gabriele Monaco Reviewed-by: Wen Yang --- kernel/trace/rv/rv.c | 5 +++++ kernel/trace/rv/rv_reactors.c | 3 +++ 2 files changed, 8 insertions(+) diff --git a/kernel/trace/rv/rv.c b/kernel/trace/rv/rv.c index ee4e68102f17..f59385a24fa1 100644 --- a/kernel/trace/rv/rv.c +++ b/kernel/trace/rv/rv.c @@ -142,6 +142,7 @@ #include #include #include +#include =20 #ifdef CONFIG_RV_MON_EVENTS #define CREATE_TRACE_POINTS @@ -171,6 +172,8 @@ int rv_get_task_monitor_slot(void) { int i; =20 + KUNIT_STATIC_STUB_REDIRECT(rv_get_task_monitor_slot); + lockdep_assert_held(&rv_interface_lock); =20 if (task_monitor_count =3D=3D CONFIG_RV_PER_TASK_MONITORS) @@ -192,6 +195,8 @@ int rv_get_task_monitor_slot(void) =20 void rv_put_task_monitor_slot(int slot) { + KUNIT_STATIC_STUB_REDIRECT(rv_put_task_monitor_slot, slot); + lockdep_assert_held(&rv_interface_lock); =20 if (slot < 0 || slot >=3D CONFIG_RV_PER_TASK_MONITORS) { diff --git a/kernel/trace/rv/rv_reactors.c b/kernel/trace/rv/rv_reactors.c index 460af07f7aba..f9b6a034c022 100644 --- a/kernel/trace/rv/rv_reactors.c +++ b/kernel/trace/rv/rv_reactors.c @@ -63,6 +63,7 @@ =20 #include #include +#include =20 #include "rv.h" =20 @@ -468,6 +469,8 @@ void rv_react(struct rv_monitor *monitor, const char *m= sg, ...) static DEFINE_WAIT_OVERRIDE_MAP(rv_react_map, LD_WAIT_FREE); va_list args; =20 + KUNIT_STATIC_STUB_REDIRECT(rv_react, monitor, msg); + if (!rv_reacting_on() || !monitor->react) return; =20 --=20 2.53.0 From nobody Wed Jun 17 06:05:31 2026 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 0D0E43803DB for ; Mon, 27 Apr 2026 15:12:52 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.133.124 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777302775; cv=none; b=PxO87JJv9hKR+m9owhqx9vPJa+cmKDd2zDimu1WaqI+B2ZiG3Biqw8tDRCC42Cs2gYJ+988D+KNb64F7k0hF1BJg8ssWbbBO9v4rpVJbCPP9M3DmIYxoXYt4UcFtP43/hFyEJucvpviv04lrdjLYkS9aWW7VaWFFMe6RnrwATr4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777302775; c=relaxed/simple; bh=0gzJVh3czryeY5vMqVpJTtLcSoUu1nLwmlRwTmMRNaM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=IygqV2MHG09VTKhuPRaQq8v7/KqjLEKjCfG0wX+x8hs5SDOUDJE5C7CdYzD72jfbVxIuS1YiZua5bzE8kH6HLOoBpKJNgww+Rkoe/NluD5gr1HWEKMzEQJ/QDswoxhNFKo0cCuyXg1BWOTkvXAlyEh3vkTHwCq0qi01gjNxcXho= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=cHDxK+gD; arc=none smtp.client-ip=170.10.133.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="cHDxK+gD" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1777302772; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=JzG+hmGizFFlPYyVCLD4+Ia1+rXUxafT+3z4DUqDlMg=; b=cHDxK+gDjpMPwZ03g+R7EQbiJzzqXAkEV/9/lYTSIbilKnIczA472AaEmKoZfqa8/8coWR GbFUTcZ343Tj9JoIhtUEvjk1XCjMQKt/R97PEX21tK0R7HkTfBmkQs6fh/8vRFKB3WgvDz +NdsmYmJOnIJzsBbNkpsXgZVvblUBIU= Received: from mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-306-yK-LVpVpOZSapDwKFlcUAg-1; Mon, 27 Apr 2026 11:12:48 -0400 X-MC-Unique: yK-LVpVpOZSapDwKFlcUAg-1 X-Mimecast-MFC-AGG-ID: yK-LVpVpOZSapDwKFlcUAg_1777302766 Received: from mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.17]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 0693019560BB; Mon, 27 Apr 2026 15:12:46 +0000 (UTC) Received: from fedora-pc.redhat.corp (headnet01.pony-001.prod.iad2.dc.redhat.com [10.2.32.101]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 4D070195608E; Mon, 27 Apr 2026 15:12:42 +0000 (UTC) From: Gabriele Monaco To: linux-trace-kernel@vger.kernel.org, linux-kernel@vger.kernel.org, Steven Rostedt , Gabriele Monaco , Masami Hiramatsu Cc: Nam Cao , Thomas Weissschuh , Tomas Glozar , John Kacur , Wen Yang Subject: [RFC PATCH 10/12] rv: Add KUnit tests for some DA/HA monitors Date: Mon, 27 Apr 2026 17:11:32 +0200 Message-ID: <20260427151134.192971-11-gmonaco@redhat.com> In-Reply-To: <20260427151134.192971-1-gmonaco@redhat.com> References: <20260427151134.192971-1-gmonaco@redhat.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.0 on 10.30.177.17 Content-Type: text/plain; charset="utf-8" Validate the functionality of DA monitors by injecting events in a controlled environment (KUnit) and expecting reactions. Events handlers are called directly from the monitor source files without using system events and with dummy arguments (e.g. no real tasks). If the provided sequence of events incurs a violation, the test expects the stub version of rv_react() to be called. This testing method can validate the entire monitor implementation since it sits between the monitor and the system (in place of the tracepoints). All sorts of system and timing events can be emulated without affecting the running kernel. Signed-off-by: Gabriele Monaco Reviewed-by: Wen Yang --- include/rv/da_monitor.h | 31 +++++++++++ kernel/trace/rv/Kconfig | 11 ++++ kernel/trace/rv/Makefile | 3 + kernel/trace/rv/monitors/nomiss/nomiss.c | 30 ++++++++++ kernel/trace/rv/monitors/opid/opid.c | 27 +++++++++ kernel/trace/rv/monitors/sco/sco.c | 23 ++++++++ kernel/trace/rv/monitors/sssw/sssw.c | 27 +++++++++ kernel/trace/rv/monitors/sts/sts.c | 35 ++++++++++++ kernel/trace/rv/rv_monitors_test.c | 70 ++++++++++++++++++++++++ kernel/trace/rv/rv_monitors_test.h | 69 +++++++++++++++++++++++ 10 files changed, 326 insertions(+) create mode 100644 kernel/trace/rv/rv_monitors_test.c create mode 100644 kernel/trace/rv/rv_monitors_test.h diff --git a/include/rv/da_monitor.h b/include/rv/da_monitor.h index 39765ff6f098..e85a82ad6c7b 100644 --- a/include/rv/da_monitor.h +++ b/include/rv/da_monitor.h @@ -817,4 +817,35 @@ static inline void da_reset(da_id_type id, monitor_tar= get target) } #endif /* RV_MON_TYPE */ =20 +#ifdef CONFIG_RV_MONITORS_KUNIT_TEST +#include + +/* + * rv_prepare_test - Disable the monitor for a kunit test + */ +static inline void da_teardown_test(void *arg) +{ + struct rv_monitor *rv_this =3D arg; + + rv_this->enabled =3D 0; + da_monitor_destroy(); +} + +/* + * rv_prepare_test - Enable the monitor for a kunit test + * + * Do the bare minimum to set up the monitor, make sure it is not active a= nd + * real tracepoint handlers are NOT attached. + */ +static inline void da_prepare_test(struct kunit *test, struct rv_monitor *= rv_this) +{ + KUNIT_ASSERT_FALSE(test, rv_this->enabled); + da_monitor_init(); + rv_this->enabled =3D 1; + + KUNIT_ASSERT_EQ(test, 0, + kunit_add_action_or_reset(test, da_teardown_test, rv_this)); +} +#endif /* CONFIG_RV_MONITORS_KUNIT_TEST */ + #endif diff --git a/kernel/trace/rv/Kconfig b/kernel/trace/rv/Kconfig index 3884b14df375..d7dba4453bd3 100644 --- a/kernel/trace/rv/Kconfig +++ b/kernel/trace/rv/Kconfig @@ -111,3 +111,14 @@ config RV_REACT_PANIC help Enables the panic reactor. The panic reactor emits a printk() message if an exception is found and panic()s the system. + +config RV_MONITORS_KUNIT_TEST + bool "KUnit tests for RV monitors" if !KUNIT_ALL_TESTS + depends on KUNIT=3Dy && RV + default KUNIT_ALL_TESTS + help + Enable KUnit tests for the RV (Runtime Verification) monitors. + These tests verify that monitors correctly detect violations by + triggering fake events and validating the expected reactions. + + If unsure, say N. diff --git a/kernel/trace/rv/Makefile b/kernel/trace/rv/Makefile index 94498da35b37..6fdf055a57c4 100644 --- a/kernel/trace/rv/Makefile +++ b/kernel/trace/rv/Makefile @@ -24,3 +24,6 @@ obj-$(CONFIG_RV_MON_NOMISS) +=3D monitors/nomiss/nomiss.o obj-$(CONFIG_RV_REACTORS) +=3D rv_reactors.o obj-$(CONFIG_RV_REACT_PRINTK) +=3D reactor_printk.o obj-$(CONFIG_RV_REACT_PANIC) +=3D reactor_panic.o +obj-$(CONFIG_RV_MONITORS_KUNIT_TEST) +=3D rv_monitors_test.o +# Stubbing rv_react triggers the error +CFLAGS_rv_monitors_test.o +=3D -Wno-suggest-attribute=3Dformat diff --git a/kernel/trace/rv/monitors/nomiss/nomiss.c b/kernel/trace/rv/mon= itors/nomiss/nomiss.c index 31f90f3638d8..57b8b7245552 100644 --- a/kernel/trace/rv/monitors/nomiss/nomiss.c +++ b/kernel/trace/rv/monitors/nomiss/nomiss.c @@ -291,3 +291,33 @@ module_exit(unregister_nomiss); MODULE_LICENSE("GPL"); MODULE_AUTHOR("Gabriele Monaco "); MODULE_DESCRIPTION("nomiss: dl entities run to completion before their dea= dline."); + +#ifdef CONFIG_RV_MONITORS_KUNIT_TEST +#include "rv_monitors_test.h" + +void rv_test_nomiss(struct kunit *test) +{ + static struct task_struct *target, *other; + struct rv_kunit_ctx *ctx =3D test->priv; + + da_prepare_test(test, &rv_this); + target =3D kunit_kzalloc(test, sizeof(struct task_struct), GFP_KERNEL); + other =3D kunit_kzalloc(test, sizeof(struct task_struct), GFP_KERNEL); + target->pid =3D 99; + target->policy =3D SCHED_DEADLINE; + target->dl.runtime =3D 10000; + target->dl.deadline =3D 20000; + + handle_newtask(NULL, target, 0); + + /* Task gets preempted and can't terminate before deadline */ + handle_sched_switch(NULL, 0, other, target, TASK_RUNNING); + handle_dl_replenish(NULL, &target->dl, 0, DL_TASK); + udelay(10 / 1000); + handle_sched_switch(NULL, 0, target, other, TASK_RUNNING); + udelay(10 + deadline_thresh / 1000); + handle_sched_switch(NULL, 0, other, target, TASK_RUNNING); + RV_KUNIT_EXPECT_REACTION(test, ctx); +} +EXPORT_SYMBOL_GPL(rv_test_nomiss); +#endif diff --git a/kernel/trace/rv/monitors/opid/opid.c b/kernel/trace/rv/monitor= s/opid/opid.c index 4594c7c46601..cddd84deafdc 100644 --- a/kernel/trace/rv/monitors/opid/opid.c +++ b/kernel/trace/rv/monitors/opid/opid.c @@ -121,3 +121,30 @@ module_exit(unregister_opid); MODULE_LICENSE("GPL"); MODULE_AUTHOR("Gabriele Monaco "); MODULE_DESCRIPTION("opid: operations with preemption and irq disabled."); + +#ifdef CONFIG_RV_MONITORS_KUNIT_TEST +#include "rv_monitors_test.h" + +void rv_test_opid(struct kunit *test) +{ + struct rv_kunit_ctx *ctx =3D test->priv; + + da_prepare_test(test, &rv_this); + + /* + * The handlers are called with an additional level of preemption, + * ensure we start from 0 but apply it here to avoid warnings. + */ + KUNIT_ASSERT_TRUE(test, preemptible()); + guard(preempt)(); + + /* Wakeup with preemption and interrupts enabled */ + handle_sched_waking(NULL, NULL); + RV_KUNIT_EXPECT_REACTION(test, ctx); + + /* Need resched with interrupts enabled */ + scoped_guard(preempt) + handle_sched_need_resched(NULL, NULL, 0, TIF_NEED_RESCHED); +} +EXPORT_SYMBOL_GPL(rv_test_opid); +#endif diff --git a/kernel/trace/rv/monitors/sco/sco.c b/kernel/trace/rv/monitors/= sco/sco.c index 5a3bd5e16e62..5f52400fa452 100644 --- a/kernel/trace/rv/monitors/sco/sco.c +++ b/kernel/trace/rv/monitors/sco/sco.c @@ -83,3 +83,26 @@ module_exit(unregister_sco); MODULE_LICENSE("GPL"); MODULE_AUTHOR("Gabriele Monaco "); MODULE_DESCRIPTION("sco: scheduling context operations."); + +#ifdef CONFIG_RV_MONITORS_KUNIT_TEST +#include "rv_monitors_test.h" + +void rv_test_sco(struct kunit *test) +{ + static struct task_struct *target; + struct rv_kunit_ctx *ctx =3D test->priv; + + da_prepare_test(test, &rv_this); + target =3D kunit_kzalloc(test, sizeof(struct task_struct), GFP_KERNEL); + + /* The handlers are called with preemption disabled. */ + guard(preempt)(); + + /* Set state while scheduling */ + handle_sched_set_state(NULL, target, TASK_INTERRUPTIBLE); + handle_schedule_entry(NULL, false); + handle_sched_set_state(NULL, target, TASK_INTERRUPTIBLE); + RV_KUNIT_EXPECT_REACTION(test, ctx); +} +EXPORT_SYMBOL_GPL(rv_test_sco); +#endif diff --git a/kernel/trace/rv/monitors/sssw/sssw.c b/kernel/trace/rv/monitor= s/sssw/sssw.c index a91321c890cd..7660adf304f7 100644 --- a/kernel/trace/rv/monitors/sssw/sssw.c +++ b/kernel/trace/rv/monitors/sssw/sssw.c @@ -112,3 +112,30 @@ module_exit(unregister_sssw); MODULE_LICENSE("GPL"); MODULE_AUTHOR("Gabriele Monaco "); MODULE_DESCRIPTION("sssw: set state sleep and wakeup."); + +#ifdef CONFIG_RV_MONITORS_KUNIT_TEST +#include "rv_monitors_test.h" + +void rv_test_sssw(struct kunit *test) +{ + static struct task_struct *target, *other; + struct rv_kunit_ctx *ctx =3D test->priv; + + da_prepare_test(test, &rv_this); + target =3D kunit_kzalloc(test, sizeof(struct task_struct), GFP_KERNEL); + other =3D kunit_kzalloc(test, sizeof(struct task_struct), GFP_KERNEL); + + /* Suspend without setting to sleepable */ + handle_sched_set_state(NULL, target, TASK_RUNNING); + handle_sched_switch(NULL, 0, target, other, TASK_INTERRUPTIBLE); + RV_KUNIT_EXPECT_REACTION(test, ctx); + + /* Switch in after suspension without wakeup */ + handle_sched_wakeup(NULL, target); + handle_sched_set_state(NULL, target, TASK_INTERRUPTIBLE); + handle_sched_switch(NULL, 0, target, other, TASK_INTERRUPTIBLE); + handle_sched_switch(NULL, 0, other, target, TASK_RUNNING); + RV_KUNIT_EXPECT_REACTION(test, ctx); +} +EXPORT_SYMBOL_GPL(rv_test_sssw); +#endif diff --git a/kernel/trace/rv/monitors/sts/sts.c b/kernel/trace/rv/monitors/= sts/sts.c index ce031cbf202a..0cb7ab5bc51b 100644 --- a/kernel/trace/rv/monitors/sts/sts.c +++ b/kernel/trace/rv/monitors/sts/sts.c @@ -152,3 +152,38 @@ module_exit(unregister_sts); MODULE_LICENSE("GPL"); MODULE_AUTHOR("Gabriele Monaco "); MODULE_DESCRIPTION("sts: schedule implies task switch."); + +#ifdef CONFIG_RV_MONITORS_KUNIT_TEST +#include "rv_monitors_test.h" + +void rv_test_sts(struct kunit *test) +{ + static struct task_struct *target, *other; + struct rv_kunit_ctx *ctx =3D test->priv; + + da_prepare_test(test, &rv_this); + target =3D kunit_kzalloc(test, sizeof(struct task_struct), GFP_KERNEL); + other =3D kunit_kzalloc(test, sizeof(struct task_struct), GFP_KERNEL); + /* Per-CPU monitor, make sure we don't change CPU mid-test */ + guard(migrate)(); + + handle_schedule_exit(NULL, false); + + /* Switch without disabling interrupts */ + handle_schedule_exit(NULL, false); + handle_schedule_entry(NULL, false); + handle_sched_switch(NULL, 0, target, other, TASK_RUNNING); + RV_KUNIT_EXPECT_REACTION(test, ctx); + + handle_schedule_exit(NULL, false); + + /* Schedule from interrupt context */ + handle_schedule_entry(NULL, false); + handle_irq_disable(NULL, 0, 0); + handle_irq_entry(NULL, 0, NULL); + handle_sched_switch(NULL, 0, target, other, TASK_RUNNING); + handle_irq_enable(NULL, 0, 0); + RV_KUNIT_EXPECT_REACTION(test, ctx); +} +EXPORT_SYMBOL_GPL(rv_test_sts); +#endif diff --git a/kernel/trace/rv/rv_monitors_test.c b/kernel/trace/rv/rv_monito= rs_test.c new file mode 100644 index 000000000000..bffb960ecba7 --- /dev/null +++ b/kernel/trace/rv/rv_monitors_test.c @@ -0,0 +1,70 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * Copyright (C) 2025-2028 Red Hat, Inc. Gabriele Monaco + * + * RV debug trigger kunit tests: + * Tests the RV monitors by triggering fake events to verify monitor + * behavior and reactions. Tests start from the first defined event and + * trigger events in order to verify error detection. + */ +#include "rv_monitors_test.h" +#include +#include +#include +#include + +__printf(2, 3) +static void stub_rv_react(struct rv_monitor *monitor, const char *msg, ...) +{ + struct rv_kunit_ctx *ctx =3D kunit_get_current_test()->priv; + + ++ctx->reactions; +} + +static int stub_rv_get_task_monitor_slot(void) +{ + return 0; +} + +static void stub_rv_put_task_monitor_slot(int slot) +{ +} + +static int rv_trigger_test_init(struct kunit *test) +{ + struct rv_kunit_ctx *ctx; + + ctx =3D kunit_kzalloc(test, sizeof(*ctx), GFP_KERNEL); + KUNIT_ASSERT_NOT_ERR_OR_NULL(test, ctx); + + test->priv =3D ctx; + + kunit_activate_static_stub(test, rv_react, stub_rv_react); + kunit_activate_static_stub(test, rv_get_task_monitor_slot, + stub_rv_get_task_monitor_slot); + kunit_activate_static_stub(test, rv_put_task_monitor_slot, + stub_rv_put_task_monitor_slot); + + return 0; +} + +static struct kunit_case rv_trigger_test_cases[] =3D { + KUNIT_CASE(rv_test_sco), + KUNIT_CASE(rv_test_sssw), + KUNIT_CASE(rv_test_sts), + KUNIT_CASE(rv_test_opid), + KUNIT_CASE(rv_test_nomiss), + {} +}; + +static struct kunit_suite rv_trigger_test_suite =3D { + .name =3D "rv_trigger", + .init =3D rv_trigger_test_init, + .test_cases =3D rv_trigger_test_cases, +}; + +kunit_test_suites(&rv_trigger_test_suite); + +MODULE_AUTHOR("Gabriele Monaco "); +MODULE_DESCRIPTION("RV debug trigger kunit tests: test monitors by trigger= ing reactions"); +MODULE_LICENSE("GPL"); diff --git a/kernel/trace/rv/rv_monitors_test.h b/kernel/trace/rv/rv_monito= rs_test.h new file mode 100644 index 000000000000..968b07565a61 --- /dev/null +++ b/kernel/trace/rv/rv_monitors_test.h @@ -0,0 +1,69 @@ +/* SPDX-License-Identifier: GPL-2.0 */ + +#include +#include + +struct rv_kunit_ctx { + int reactions, expected; + int cpu; + struct task_struct *curr; +}; + +#define RV_KUNIT_EXPECT_REACTION(test, ctx) \ + do { \ + KUNIT_EXPECT_EQ(test, ctx->reactions, ++ctx->expected); \ + if (ctx->reactions !=3D ctx->expected) \ + ctx->expected =3D ctx->reactions; \ + } while (0) + +#define RV_KUNIT_EXPECT_NO_REACTION(test, ctx) \ + do { \ + KUNIT_EXPECT_EQ(test, ctx->reactions, ctx->expected); \ + if (ctx->reactions !=3D ctx->expected) \ + ctx->expected =3D ctx->reactions; \ + } while (0) + +#ifdef CONFIG_RV_MON_SCO +extern void rv_test_sco(struct kunit *test); +#else +static inline void rv_test_sco(struct kunit *test) +{ + kunit_skip(test, "Monitor not enabled\n"); +} +#endif + +#ifdef CONFIG_RV_MON_SSSW +extern void rv_test_sssw(struct kunit *test); +#else +static inline void rv_test_sssw(struct kunit *test) +{ + kunit_skip(test, "Monitor not enabled\n"); +} +#endif + +#ifdef CONFIG_RV_MON_STS +extern void rv_test_sts(struct kunit *test); +#else +static inline void rv_test_sts(struct kunit *test) +{ + kunit_skip(test, "Monitor not enabled\n"); +} +#endif + +#ifdef CONFIG_RV_MON_OPID +extern void rv_test_opid(struct kunit *test); +#else +static inline void rv_test_opid(struct kunit *test) +{ + kunit_skip(test, "Monitor not enabled\n"); +} +#endif + +#ifdef CONFIG_RV_MON_NOMISS +extern void rv_test_nomiss(struct kunit *test); +#else +static inline void rv_test_nomiss(struct kunit *test) +{ + kunit_skip(test, "Monitor not enabled\n"); +} +#endif --=20 2.53.0 From nobody Wed Jun 17 06:05:31 2026 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 8BE4B3D6699 for ; Mon, 27 Apr 2026 15:13:00 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.133.124 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777302783; cv=none; b=p9XI4WimF2wLUiYenOxTzbnbhKaaxRx4+rY2o5BGFTZcNV2OFYJirQ2jXrComyDUvFsp45EjeGASJ9hyo5/evz48qdiID+2QRfNOF6H0a5ZdHob8gjsqPiebJZaC1TA7hq0RQ80To+6UEcGllefFo5TkpCoP+yIxPFAJOiESkls= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777302783; c=relaxed/simple; bh=AomreWSbXYf9vNdf0Q4XY5PD84NzYlMtoWaLJS7/hV0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=uscI2ZCoXSuMVA4LxxTLzL/VONpzunfoeo/IHcMsTDhnraHAr0y8/hOeSHrrw5B/L3/hi2bQatpkcz/O7FoOwOADUftNIZokBxZIEcYyKCk9Estmc5Ys6Na7VJva4+B5SvQaV/m6UmSMug8oV4lhmk1TNnPmMrYCD0AFuaalFVs= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=Tybln+7Y; arc=none smtp.client-ip=170.10.133.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="Tybln+7Y" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1777302779; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=AhysTtM8tcX7StTvUH4XEYwa/yO5ca/AdRwPcNf1hUw=; b=Tybln+7YcXJMDUUW2U299cXAVl7acz+Dz8X50Jpa8AukdYp3ExncLu+1t4KH2/kLHctGuW H02qHlkfJuHKuhiA1e1eaRllenbqOovGMPe0rlMFmpf4q519dR5JoMLtR1t91QlPmp/g9Z b1FDIrh+GI+OifIZPgPK4eeCtjAsFrM= Received: from mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-528-EgUDegOVOu6EXp7PCJIMtA-1; Mon, 27 Apr 2026 11:12:56 -0400 X-MC-Unique: EgUDegOVOu6EXp7PCJIMtA-1 X-Mimecast-MFC-AGG-ID: EgUDegOVOu6EXp7PCJIMtA_1777302771 Received: from mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.17]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id D41A61800370; Mon, 27 Apr 2026 15:12:51 +0000 (UTC) Received: from fedora-pc.redhat.corp (headnet01.pony-001.prod.iad2.dc.redhat.com [10.2.32.101]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id EFD2A196B8FA; Mon, 27 Apr 2026 15:12:48 +0000 (UTC) From: Gabriele Monaco To: linux-trace-kernel@vger.kernel.org, linux-kernel@vger.kernel.org, Steven Rostedt , Gabriele Monaco , Masami Hiramatsu Cc: Nam Cao , Thomas Weissschuh , Tomas Glozar , John Kacur , Wen Yang Subject: [RFC PATCH 11/12] rv: Add KUnit stubs for current and smp_processor_id() Date: Mon, 27 Apr 2026 17:11:33 +0200 Message-ID: <20260427151134.192971-12-gmonaco@redhat.com> In-Reply-To: <20260427151134.192971-1-gmonaco@redhat.com> References: <20260427151134.192971-1-gmonaco@redhat.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.0 on 10.30.177.17 Content-Type: text/plain; charset="utf-8" Some monitors do not only rely on tracepoint arguments but also on the currently executing task and current processor. This makes it more challenging to mock events in KUnit. Define wrapper functions around current and smp_processor_id(), the functionality is stubbed only during KUnit, however the additional function call is necessary whenever the KUnit tests are built in. Signed-off-by: Gabriele Monaco Reviewed-by: Wen Yang --- include/rv/da_monitor.h | 1 + include/rv/kunit_stubs.h | 17 ++++++++++++ include/rv/ltl_monitor.h | 1 + kernel/trace/rv/Kconfig | 3 +++ .../trace/rv/monitors/pagefault/pagefault.c | 2 +- kernel/trace/rv/monitors/sleep/sleep.c | 22 +++++++-------- kernel/trace/rv/rv_monitors_test.c | 27 +++++++++++++++++++ kernel/trace/rv/rv_monitors_test.h | 3 +++ 8 files changed, 64 insertions(+), 12 deletions(-) create mode 100644 include/rv/kunit_stubs.h diff --git a/include/rv/da_monitor.h b/include/rv/da_monitor.h index e85a82ad6c7b..9c2a051608ff 100644 --- a/include/rv/da_monitor.h +++ b/include/rv/da_monitor.h @@ -15,6 +15,7 @@ #define _RV_DA_MONITOR_H =20 #include +#include #include #include #include diff --git a/include/rv/kunit_stubs.h b/include/rv/kunit_stubs.h new file mode 100644 index 000000000000..ed04c56b440f --- /dev/null +++ b/include/rv/kunit_stubs.h @@ -0,0 +1,17 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* + * Copyright (C) 2026-2029 Red Hat, Inc. Gabriele Monaco + * + * Declaration of wrappers to allow stubbing core functionality like curre= nt + * and smp_processor_id(). + * Necessary only when mocking may be needed. If the RV KUnit test is + * enabled, these wrapper incur an additional function call overhead. + */ + +#ifdef CONFIG_RV_MONITORS_KUNIT_TEST +struct task_struct *rv_get_current(void); +int rv_current_cpu(void); +#else +#define rv_get_current() current +#define rv_current_cpu() smp_processor_id() +#endif diff --git a/include/rv/ltl_monitor.h b/include/rv/ltl_monitor.h index eff60cd61106..0f2c3820b9b8 100644 --- a/include/rv/ltl_monitor.h +++ b/include/rv/ltl_monitor.h @@ -9,6 +9,7 @@ #include #include #include +#include #include #include =20 diff --git a/kernel/trace/rv/Kconfig b/kernel/trace/rv/Kconfig index d7dba4453bd3..e76841a6ed35 100644 --- a/kernel/trace/rv/Kconfig +++ b/kernel/trace/rv/Kconfig @@ -121,4 +121,7 @@ config RV_MONITORS_KUNIT_TEST These tests verify that monitors correctly detect violations by triggering fake events and validating the expected reactions. =20 + Enabling this may slighly increase overhead of some monitors even + when the KUnit test is not running. + If unsure, say N. diff --git a/kernel/trace/rv/monitors/pagefault/pagefault.c b/kernel/trace/= rv/monitors/pagefault/pagefault.c index 9fe6123b2200..56abe5079676 100644 --- a/kernel/trace/rv/monitors/pagefault/pagefault.c +++ b/kernel/trace/rv/monitors/pagefault/pagefault.c @@ -38,7 +38,7 @@ static void ltl_atoms_init(struct task_struct *task, stru= ct ltl_monitor *mon, bo static void handle_page_fault(void *data, unsigned long address, struct pt= _regs *regs, unsigned long error_code) { - ltl_atom_pulse(current, LTL_PAGEFAULT, true); + ltl_atom_pulse(rv_get_current(), LTL_PAGEFAULT, true); } =20 static int enable_pagefault(void) diff --git a/kernel/trace/rv/monitors/sleep/sleep.c b/kernel/trace/rv/monit= ors/sleep/sleep.c index 8dfe5ec13e19..7c16967add70 100644 --- a/kernel/trace/rv/monitors/sleep/sleep.c +++ b/kernel/trace/rv/monitors/sleep/sleep.c @@ -102,7 +102,7 @@ static void handle_sched_waking(void *data, struct task= _struct *task) if (this_cpu_read(hardirq_context)) { ltl_atom_pulse(task, LTL_WOKEN_BY_HARDIRQ, true); } else if (in_task()) { - if (current->prio <=3D task->prio) + if (rv_get_current()->prio <=3D task->prio) ltl_atom_pulse(task, LTL_WOKEN_BY_EQUAL_OR_HIGHER_PRIO, true); } else if (in_nmi()) { ltl_atom_pulse(task, LTL_WOKEN_BY_NMI, true); @@ -112,12 +112,12 @@ static void handle_sched_waking(void *data, struct ta= sk_struct *task) static void handle_contention_begin(void *data, void *lock, unsigned int f= lags) { if (flags & LCB_F_RT) - ltl_atom_update(current, LTL_BLOCK_ON_RT_MUTEX, true); + ltl_atom_update(rv_get_current(), LTL_BLOCK_ON_RT_MUTEX, true); } =20 static void handle_contention_end(void *data, void *lock, int ret) { - ltl_atom_update(current, LTL_BLOCK_ON_RT_MUTEX, false); + ltl_atom_update(rv_get_current(), LTL_BLOCK_ON_RT_MUTEX, false); } =20 static void handle_sys_enter(void *data, struct pt_regs *regs, long id) @@ -126,7 +126,7 @@ static void handle_sys_enter(void *data, struct pt_regs= *regs, long id) unsigned long args[6]; int op, cmd; =20 - mon =3D ltl_get_monitor(current); + mon =3D ltl_get_monitor(rv_get_current()); =20 switch (id) { #ifdef __NR_clock_nanosleep @@ -135,11 +135,11 @@ static void handle_sys_enter(void *data, struct pt_re= gs *regs, long id) #ifdef __NR_clock_nanosleep_time64 case __NR_clock_nanosleep_time64: #endif - syscall_get_arguments(current, regs, args); + syscall_get_arguments(rv_get_current(), regs, args); ltl_atom_set(mon, LTL_NANOSLEEP_CLOCK_MONOTONIC, args[0] =3D=3D CLOCK_MO= NOTONIC); ltl_atom_set(mon, LTL_NANOSLEEP_CLOCK_TAI, args[0] =3D=3D CLOCK_TAI); ltl_atom_set(mon, LTL_NANOSLEEP_TIMER_ABSTIME, args[1] =3D=3D TIMER_ABST= IME); - ltl_atom_update(current, LTL_CLOCK_NANOSLEEP, true); + ltl_atom_update(rv_get_current(), LTL_CLOCK_NANOSLEEP, true); break; =20 #ifdef __NR_futex @@ -148,19 +148,19 @@ static void handle_sys_enter(void *data, struct pt_re= gs *regs, long id) #ifdef __NR_futex_time64 case __NR_futex_time64: #endif - syscall_get_arguments(current, regs, args); + syscall_get_arguments(rv_get_current(), regs, args); op =3D args[1]; cmd =3D op & FUTEX_CMD_MASK; =20 switch (cmd) { case FUTEX_LOCK_PI: case FUTEX_LOCK_PI2: - ltl_atom_update(current, LTL_FUTEX_LOCK_PI, true); + ltl_atom_update(rv_get_current(), LTL_FUTEX_LOCK_PI, true); break; case FUTEX_WAIT: case FUTEX_WAIT_BITSET: case FUTEX_WAIT_REQUEUE_PI: - ltl_atom_update(current, LTL_FUTEX_WAIT, true); + ltl_atom_update(rv_get_current(), LTL_FUTEX_WAIT, true); break; } break; @@ -174,7 +174,7 @@ static void handle_sys_enter(void *data, struct pt_regs= *regs, long id) =20 static void handle_sys_exit(void *data, struct pt_regs *regs, long ret) { - struct ltl_monitor *mon =3D ltl_get_monitor(current); + struct ltl_monitor *mon =3D ltl_get_monitor(rv_get_current()); =20 ltl_atom_set(mon, LTL_FUTEX_LOCK_PI, false); ltl_atom_set(mon, LTL_FUTEX_WAIT, false); @@ -182,7 +182,7 @@ static void handle_sys_exit(void *data, struct pt_regs = *regs, long ret) ltl_atom_set(mon, LTL_NANOSLEEP_CLOCK_TAI, false); ltl_atom_set(mon, LTL_NANOSLEEP_TIMER_ABSTIME, false); ltl_atom_set(mon, LTL_EPOLL_WAIT, false); - ltl_atom_update(current, LTL_CLOCK_NANOSLEEP, false); + ltl_atom_update(rv_get_current(), LTL_CLOCK_NANOSLEEP, false); } =20 static void handle_kthread_stop(void *data, struct task_struct *task) diff --git a/kernel/trace/rv/rv_monitors_test.c b/kernel/trace/rv/rv_monito= rs_test.c index bffb960ecba7..a57a40932d34 100644 --- a/kernel/trace/rv/rv_monitors_test.c +++ b/kernel/trace/rv/rv_monitors_test.c @@ -8,6 +8,7 @@ * trigger events in order to verify error detection. */ #include "rv_monitors_test.h" +#include #include #include #include @@ -30,6 +31,30 @@ static void stub_rv_put_task_monitor_slot(int slot) { } =20 +struct task_struct *rv_get_current(void) +{ + KUNIT_STATIC_STUB_REDIRECT(rv_get_current); + return current; +} +int rv_current_cpu(void) +{ + KUNIT_STATIC_STUB_REDIRECT(rv_current_cpu); + return smp_processor_id(); +} + +static struct task_struct *stub_rv_get_current(void) +{ + struct rv_kunit_ctx *ctx =3D kunit_get_current_test()->priv; + + return ctx->curr; +} +static int stub_rv_current_cpu(void) +{ + struct rv_kunit_ctx *ctx =3D kunit_get_current_test()->priv; + + return ctx->cpu; +} + static int rv_trigger_test_init(struct kunit *test) { struct rv_kunit_ctx *ctx; @@ -44,6 +69,8 @@ static int rv_trigger_test_init(struct kunit *test) stub_rv_get_task_monitor_slot); kunit_activate_static_stub(test, rv_put_task_monitor_slot, stub_rv_put_task_monitor_slot); + kunit_activate_static_stub(test, rv_get_current, stub_rv_get_current); + kunit_activate_static_stub(test, rv_current_cpu, stub_rv_current_cpu); =20 return 0; } diff --git a/kernel/trace/rv/rv_monitors_test.h b/kernel/trace/rv/rv_monito= rs_test.h index 968b07565a61..3015943c5dda 100644 --- a/kernel/trace/rv/rv_monitors_test.h +++ b/kernel/trace/rv/rv_monitors_test.h @@ -23,6 +23,9 @@ struct rv_kunit_ctx { ctx->expected =3D ctx->reactions; \ } while (0) =20 +#define rv_mock_current(ctx, task) (ctx->curr =3D task) +#define rv_mock_cpu(ctx, cpu) (ctx->cpu =3D cpu) + #ifdef CONFIG_RV_MON_SCO extern void rv_test_sco(struct kunit *test); #else --=20 2.53.0 From nobody Wed Jun 17 06:05:31 2026 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 0D5633A75BB for ; Mon, 27 Apr 2026 15:13:00 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.133.124 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777302784; cv=none; b=NHL0P/wT4ZdgLIw7+o3aQhWRYwB1OWimbtc/p5AaT5+0DSBGq4NZLj45qX4ICJszNvJkYY5t5o0vZxgYlIYb7Y+91C4wzM6niZCJ+5ZZvjCvb5GCHSsBVW0dahXBapHR6TAGvGrdZaC6KGbhRq+ewiGQRFjQgh0tZe7fSsQEIlY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777302784; c=relaxed/simple; bh=rN3qRNw9cOspQwr/4vIiuMsbZhlrlkaNLivb13A+NKU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=XoV0yd7e64ySgYvT9LxbXLZLbJIauesNXajlnLdI2MA49XhZRrG+S69PeOfkE/8fv2CF5uaiO1qJOVvLWsxEkaBZu8/wG2TGqRvKSdl72xUENP7zmEZSIJjOVLsp2stNCzPqqKUnIG+6EZv82poghs12tALiODxv4YceLUWW+RI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=Q6hN5Yt9; arc=none smtp.client-ip=170.10.133.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="Q6hN5Yt9" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1777302780; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=0MGT5bt/FyhygSpKbLK2htxM7S+wZ3TuN0nSI7tYEyE=; b=Q6hN5Yt9AC+ABatams47IuCON1XBD/smehNs+POcMc1oIb7xrg/t55K2qbV++eoKTNHCVY 5y0cSxWLMYfwAvKi12kXvASnp8+ZUnmDhFRmk8rWB8MwS9aryBlcD8koHOmJDKfuQiYpfu psiosahzN7T8ji3HAdkuKNaH3FSQ5LE= Received: from mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-398-3l_wa5DgOHyx_zqpD-3eUQ-1; Mon, 27 Apr 2026 11:12:58 -0400 X-MC-Unique: 3l_wa5DgOHyx_zqpD-3eUQ-1 X-Mimecast-MFC-AGG-ID: 3l_wa5DgOHyx_zqpD-3eUQ_1777302777 Received: from mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.17]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 1424E18005AA; Mon, 27 Apr 2026 15:12:57 +0000 (UTC) Received: from fedora-pc.redhat.corp (headnet01.pony-001.prod.iad2.dc.redhat.com [10.2.32.101]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id DD6FF195608E; Mon, 27 Apr 2026 15:12:53 +0000 (UTC) From: Gabriele Monaco To: linux-trace-kernel@vger.kernel.org, linux-kernel@vger.kernel.org, Steven Rostedt , Gabriele Monaco , Masami Hiramatsu Cc: Nam Cao , Thomas Weissschuh , Tomas Glozar , John Kacur , Wen Yang Subject: [RFC PATCH 12/12] rv: Add KUnit tests for some LTL monitors Date: Mon, 27 Apr 2026 17:11:34 +0200 Message-ID: <20260427151134.192971-13-gmonaco@redhat.com> In-Reply-To: <20260427151134.192971-1-gmonaco@redhat.com> References: <20260427151134.192971-1-gmonaco@redhat.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.0 on 10.30.177.17 Content-Type: text/plain; charset="utf-8" Validate the functionality of LTL monitors by injecting events in a controlled environment (KUnit) and expecting reactions, just like it is done in DA monitors. Signed-off-by: Gabriele Monaco Reviewed-by: Wen Yang --- include/rv/ltl_monitor.h | 31 ++++++++++++++ .../trace/rv/monitors/pagefault/pagefault.c | 24 +++++++++++ kernel/trace/rv/monitors/sleep/sleep.c | 42 +++++++++++++++++++ kernel/trace/rv/rv_monitors_test.c | 2 + kernel/trace/rv/rv_monitors_test.h | 18 ++++++++ 5 files changed, 117 insertions(+) diff --git a/include/rv/ltl_monitor.h b/include/rv/ltl_monitor.h index 0f2c3820b9b8..49e680b769f6 100644 --- a/include/rv/ltl_monitor.h +++ b/include/rv/ltl_monitor.h @@ -172,3 +172,34 @@ static void __maybe_unused ltl_atom_pulse(struct task_= struct *task, enum ltl_ato ltl_atom_set(mon, atom, !value); ltl_validate(task, mon); } + +#ifdef CONFIG_RV_MONITORS_KUNIT_TEST +#include + +/* + * rv_prepare_test - Disable the monitor for a kunit test + */ +static inline void ltl_teardown_test(void *arg) +{ + struct rv_monitor *rv_this =3D arg; + + rv_this->enabled =3D 0; + ltl_monitor_destroy(); +} + +/* + * rv_prepare_test - Enable the monitor for a kunit test + * + * Do the bare minimum to set up the monitor, make sure it is not active a= nd + * real tracepoint handlers are NOT attached. + */ +static inline void ltl_prepare_test(struct kunit *test, struct rv_monitor = *rv_this) +{ + KUNIT_ASSERT_FALSE(test, rv_this->enabled); + ltl_monitor_init(); + rv_this->enabled =3D 1; + + KUNIT_ASSERT_EQ(test, 0, + kunit_add_action_or_reset(test, ltl_teardown_test, rv_this)); +} +#endif /* CONFIG_RV_MONITORS_KUNIT_TEST */ diff --git a/kernel/trace/rv/monitors/pagefault/pagefault.c b/kernel/trace/= rv/monitors/pagefault/pagefault.c index 56abe5079676..1849d7b81545 100644 --- a/kernel/trace/rv/monitors/pagefault/pagefault.c +++ b/kernel/trace/rv/monitors/pagefault/pagefault.c @@ -86,3 +86,27 @@ module_exit(unregister_pagefault); MODULE_LICENSE("GPL"); MODULE_AUTHOR("Nam Cao "); MODULE_DESCRIPTION("pagefault: Monitor that RT tasks do not raise page fau= lts"); + +#ifdef CONFIG_RV_MONITORS_KUNIT_TEST +#include "rv_monitors_test.h" + +void rv_test_pagefault(struct kunit *test) +{ + static struct task_struct *target; + struct rv_kunit_ctx *ctx =3D test->priv; + + ltl_prepare_test(test, &rv_pagefault); + target =3D kunit_kzalloc(test, sizeof(struct task_struct), GFP_KERNEL); + target->policy =3D SCHED_FIFO; + target->prio =3D MAX_RT_PRIO - 1; + handle_task_newtask(NULL, target, 0); + + ltl_attempt_start(target, ltl_get_monitor(target)); + + /* RT task has a page fault */ + rv_mock_current(ctx, target); + handle_page_fault(NULL, 0, NULL, 0); + RV_KUNIT_EXPECT_REACTION(test, ctx); +} +EXPORT_SYMBOL_GPL(rv_test_pagefault); +#endif diff --git a/kernel/trace/rv/monitors/sleep/sleep.c b/kernel/trace/rv/monit= ors/sleep/sleep.c index 7c16967add70..9388ffb55aa9 100644 --- a/kernel/trace/rv/monitors/sleep/sleep.c +++ b/kernel/trace/rv/monitors/sleep/sleep.c @@ -247,3 +247,45 @@ module_exit(unregister_sleep); MODULE_LICENSE("GPL"); MODULE_AUTHOR("Nam Cao "); MODULE_DESCRIPTION("sleep: Monitor that RT tasks do not undesirably sleep"= ); + +#ifdef CONFIG_RV_MONITORS_KUNIT_TEST +#include "rv_monitors_test.h" + +void rv_test_sleep(struct kunit *test) +{ + static struct task_struct *target, *other; + struct rv_kunit_ctx *ctx =3D test->priv; + unsigned long args[6]; + struct pt_regs regs; + + ltl_prepare_test(test, &rv_sleep); + target =3D kunit_kzalloc(test, sizeof(struct task_struct), GFP_KERNEL); + target->policy =3D SCHED_FIFO; + target->prio =3D MAX_RT_PRIO - 2; + other =3D kunit_kzalloc(test, sizeof(struct task_struct), GFP_KERNEL); + other->policy =3D SCHED_FIFO; + other->prio =3D MAX_RT_PRIO - 1; + handle_task_newtask(NULL, target, 0); + + /* RT task sleeps on a non RT-friendly nanosleep */ + rv_mock_current(ctx, target); + args[0] =3D CLOCK_REALTIME; + syscall_set_arguments(target, ®s, args); + handle_sys_enter(NULL, ®s, __NR_clock_nanosleep); + handle_sys_exit(NULL, NULL, 0); + handle_sched_set_state(NULL, target, TASK_INTERRUPTIBLE); + RV_KUNIT_EXPECT_REACTION(test, ctx); + + /* RT task woken up by lower priority task */ + args[1] =3D FUTEX_WAIT; + syscall_set_arguments(target, ®s, args); + rv_mock_current(ctx, target); + handle_sys_enter(NULL, ®s, __NR_futex); + handle_sched_set_state(NULL, target, TASK_INTERRUPTIBLE); + rv_mock_current(ctx, other); + handle_sched_waking(NULL, target); + handle_sched_wakeup(NULL, target); + RV_KUNIT_EXPECT_REACTION(test, ctx); +} +EXPORT_SYMBOL_GPL(rv_test_sleep); +#endif diff --git a/kernel/trace/rv/rv_monitors_test.c b/kernel/trace/rv/rv_monito= rs_test.c index a57a40932d34..78af77310d56 100644 --- a/kernel/trace/rv/rv_monitors_test.c +++ b/kernel/trace/rv/rv_monitors_test.c @@ -81,6 +81,8 @@ static struct kunit_case rv_trigger_test_cases[] =3D { KUNIT_CASE(rv_test_sts), KUNIT_CASE(rv_test_opid), KUNIT_CASE(rv_test_nomiss), + KUNIT_CASE(rv_test_pagefault), + KUNIT_CASE(rv_test_sleep), {} }; =20 diff --git a/kernel/trace/rv/rv_monitors_test.h b/kernel/trace/rv/rv_monito= rs_test.h index 3015943c5dda..c745edc85991 100644 --- a/kernel/trace/rv/rv_monitors_test.h +++ b/kernel/trace/rv/rv_monitors_test.h @@ -70,3 +70,21 @@ static inline void rv_test_nomiss(struct kunit *test) kunit_skip(test, "Monitor not enabled\n"); } #endif + +#ifdef CONFIG_RV_MON_PAGEFAULT +extern void rv_test_pagefault(struct kunit *test); +#else +static inline void rv_test_pagefault(struct kunit *test) +{ + kunit_skip(test, "Monitor not enabled\n"); +} +#endif + +#ifdef CONFIG_RV_MON_SLEEP +extern void rv_test_sleep(struct kunit *test); +#else +static inline void rv_test_sleep(struct kunit *test) +{ + kunit_skip(test, "Monitor not enabled\n"); +} +#endif --=20 2.53.0