From nobody Sat Jun 3 20:03:31 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QYW5b5vFtz4ZZdx; Sat, 3 Jun 2023 20:03:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QYW5b5Nwkz3wsb; Sat, 3 Jun 2023 20:03:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1685822611; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8k63inhe3etp9joc8Xzq4krUDdNVfC4AjyM3NH20tFk=; b=qTN0IJo3NLt6TKIQxhUGZch9ZqXyFM1ObBfIWq2qZLwypwFHelE7oMI30YoB5SQMrHIFs5 xmjr8sdYaqlRd22QxZggEyegu8qsL99R9WCk2C0d74YYGuWE3v9uV2AUaoFD2NS06FHGCB X9mlIridiaBN2DT9uF6T5MkM19PPq6TntT0ogoFJr+ofKFpDRr7NnNyTiXpi3ufV50tUa2 Ve3npo1FVIvpI09Awo60b/gI7/8gpKS3P71C2P/YlgCRKGmihsLprZ7Rt9VF+fwGCccef0 y2rjW8lE1Pl2YiJYy20B9lZStJMPHgKejxLdVkHYHXKiXS0UwInjjbD73epuQg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1685822611; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8k63inhe3etp9joc8Xzq4krUDdNVfC4AjyM3NH20tFk=; b=uDvX7+gkGm4xKCkyEdoJqxlkFo/56NOnlfwJxf0JVFcZYmb8iS3gggUGQrotOzBGWxtObW xR6oH+hfQKb+JxYzSmE+RZHUOc29Zpcr0WnmdPtEs06pvGMES/0ccTp/Zvxw4ULYAkDo01 jSMPFza4LC7BjHlqkJj/qpZP1CP8yQqcA5i+toOFXjsaxt/WLnuQD+H+zvtctSRMbEsoEu RR+QWj6Y2ualy6EQ3D7N9qkP30G+9tu9/kLzKhMKGLHFv2IEB6cl3U+JmA3JxAFWWUtbcn cXK89ETqgMwLpsDZK7t2cVHLlMdYKTMPWcr4Q5GCrZ+qoNjItEiZQGt1/hU5MQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1685822611; a=rsa-sha256; cv=none; b=FgN842l6x4oEh1lM+ct7UcqI51e9ev0S1DF0NtdEiNKsIBhG35d2FozUdCPzgjUo+TXPUh D8rpBb91AC/9GoQx7RULdL3MkqUoRgExvlxto+61mvQ5PDriKUjt78NJ2tHwAwoFcG6hZm pEeJ4Rj+CeHCe3HF79ixexCJQOhgfp7KVVC5XB9HJH1QwVJaz11lYz9RgoN1Ie+XdDv+qH NWf014PzXKGZpMXnsvolIDqPIkk2htuW+/+foLdc3F+Pt5oMBertiQqMoAJoi+vhND+sxK RR3uG1PfrFS60soMsSu5mPn9JpIbZCh1Xt5AJNkayOvNG3m60U4HLxEpdQlvmw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4QYW5b4Rhpzf84; Sat, 3 Jun 2023 20:03:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 353K3V2Z016778; Sat, 3 Jun 2023 20:03:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 353K3Vv1016777; Sat, 3 Jun 2023 20:03:31 GMT (envelope-from git) Date: Sat, 3 Jun 2023 20:03:31 GMT Message-Id: <202306032003.353K3Vv1016777@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Christos Margiolis Subject: git: d434607b3d51 - main - kinst: use bool where appropriate List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d434607b3d5182d38b82f23fe0586b3744dd0273 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=d434607b3d5182d38b82f23fe0586b3744dd0273 commit d434607b3d5182d38b82f23fe0586b3744dd0273 Author: Christos Margiolis AuthorDate: 2023-06-03 20:02:53 +0000 Commit: Christos Margiolis CommitDate: 2023-06-03 20:02:53 +0000 kinst: use bool where appropriate Reviewed by: markj Approved by: markj (mentor) Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D40412 --- sys/cddl/dev/kinst/amd64/kinst_isa.c | 4 ++-- sys/cddl/dev/kinst/kinst.c | 16 ++++++++-------- sys/cddl/dev/kinst/kinst.h | 4 ++-- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/sys/cddl/dev/kinst/amd64/kinst_isa.c b/sys/cddl/dev/kinst/amd64/kinst_isa.c index d29f1cd4181f..f8bfad8fae60 100644 --- a/sys/cddl/dev/kinst/amd64/kinst_isa.c +++ b/sys/cddl/dev/kinst/amd64/kinst_isa.c @@ -611,8 +611,8 @@ kinst_md_deinit(void) /* * Exclude machine-dependent functions that are not safe-to-trace. */ -int +bool kinst_md_excluded(const char *name) { - return (0); + return (false); } diff --git a/sys/cddl/dev/kinst/kinst.c b/sys/cddl/dev/kinst/kinst.c index e30b813e0400..ea55b6fe5d0a 100644 --- a/sys/cddl/dev/kinst/kinst.c +++ b/sys/cddl/dev/kinst/kinst.c @@ -86,11 +86,11 @@ kinst_memcpy(volatile void *dst, volatile const void *src, size_t len) return (dst); } -int +bool kinst_excluded(const char *name) { if (kinst_md_excluded(name)) - return (1); + return (true); /* * Anything beginning with "dtrace_" may be called from probe context @@ -99,7 +99,7 @@ kinst_excluded(const char *name) */ if (strncmp(name, "dtrace_", strlen("dtrace_")) == 0 && strncmp(name, "dtrace_safe_", strlen("dtrace_safe_")) != 0) - return (1); + return (true); /* * Omit instrumentation of functions that are probably in DDB. It @@ -110,7 +110,7 @@ kinst_excluded(const char *name) */ if (strncmp(name, "db_", strlen("db_")) == 0 || strncmp(name, "kdb_", strlen("kdb_")) == 0) - return (1); + return (true); /* * Lock owner methods may be called from probe context. @@ -119,7 +119,7 @@ kinst_excluded(const char *name) strcmp(name, "owner_rm") == 0 || strcmp(name, "owner_rw") == 0 || strcmp(name, "owner_sx") == 0) - return (1); + return (true); /* * When DTrace is built into the kernel we need to exclude the kinst @@ -127,13 +127,13 @@ kinst_excluded(const char *name) */ #ifndef _KLD_MODULE if (strncmp(name, "kinst_", strlen("kinst_")) == 0) - return (1); + return (true); #endif if (strcmp(name, "trap_check") == 0) - return (1); + return (true); - return (0); + return (false); } void diff --git a/sys/cddl/dev/kinst/kinst.h b/sys/cddl/dev/kinst/kinst.h index 1107a274333f..831526cb8a20 100644 --- a/sys/cddl/dev/kinst/kinst.h +++ b/sys/cddl/dev/kinst/kinst.h @@ -47,8 +47,8 @@ struct linker_file; struct linker_symval; volatile void *kinst_memcpy(volatile void *, volatile const void *, size_t); -int kinst_excluded(const char *); -int kinst_md_excluded(const char *); +bool kinst_excluded(const char *); +bool kinst_md_excluded(const char *); int kinst_invop(uintptr_t, struct trapframe *, uintptr_t); int kinst_make_probe(struct linker_file *, int, struct linker_symval *, void *);