From nobody Sun Sep 17 10:37:25 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 4RpPWV1d4Cz4tTsx; Sun, 17 Sep 2023 10:37:26 +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 4RpPWV11RKz4W1D; Sun, 17 Sep 2023 10:37:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694947046; 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=vU1t+Ck88ByxiF8BrtJmBSy4bkmUe2i5ZtGZ0ll6TPw=; b=PeKZHMETDKw8Nn/xmePZwVUUmaQWfe0wH2ma5QoR1Koxeg8+qGpV/lrGIbW0QZh5aAaawG N5Az+/N9+lFd6HhXo/zn8dyFi1IuLOAQzV41Ng3mbAJgjtQYrFBwK3WrmtyJUwIZyL9MV7 kMmfRvQuq8BQpwVHpbtdXeHkSNGdALU32aTj1P42P7DM2XatR5sku+gvs/49iP+szO/rwL wZcK82p4McaERunGYzZZDnvcl0V0fbFFgpaqPrDoxcZ+bZE/4ZDaHsFmX5mkL/zEGff2VS oc2ThYFwk2tnVj4oFRAxMOAQOWrW3z/VjRfE0bh92z6QIc/Fq9cjAeCx8Mce8g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694947046; a=rsa-sha256; cv=none; b=RGmytZXMkfXesEtCjJgmP5g07aSkdYvN01yWzThtvMqJxu81TeH7mS0h00QfEnewlrvqH+ pyUg7JLK6r/V/FwlmpqU1HeI56QRKqJddaN40a/F9VUVfnCZptPhWg0iLOizsNScGeUNCH j2/6RoVFsxurpJwfBasv0S0dP3OQ47hUoxS4VsnGPFyEm1lLjaiYVmnE0Wt6TlgmCgWPSf dVA4B0PJmNFsKp09+HFRquSr62bhdAZmTHTlKsHTjWRZ5JQJimaoVfKVxhyIE6vvwaZ3TT ff2HGqLD2MRM8iF7r7/LQCvZqfQMHmXUmNMN+FgqZ3weBJOkhBl7CIWb2SFjMA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694947046; 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=vU1t+Ck88ByxiF8BrtJmBSy4bkmUe2i5ZtGZ0ll6TPw=; b=yK8OnzzxYGEjdnKs/iRlUSSmgMbzVK2B4eH0uOgoKOkbw4Dva0lCbg8nUSi9lAXTwJy+Yr L7Owiot5y0EddT+ZOwKl9YniJNVCzYKy0QhfqfYrT1TMuNgfm1+bAJYUMa3zDX37E8IUkZ Ij6zR1Oi80HIwOu3qmZqHSzkeh7eFMzfF7DtKmK4vk57/jtSebkMsp8jiuKzNb2ad9Ijub MEA6OtQZCAHMNmGc7YPTou0A+sS7g+7TzGTC7h8rnLbe6bsM/IQabG7W8j3SJDvpZAjZZj 3ZjxWSm7d1ahAX8xX4PZrfO6QgO5JC2KplSZ3ZMLgRyjKCZoVAze0Fbsufe9Mg== 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 4RpPWV03R5zlwy; Sun, 17 Sep 2023 10:37:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38HAbPgq023885; Sun, 17 Sep 2023 10:37:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38HAbPJG023882; Sun, 17 Sep 2023 10:37:25 GMT (envelope-from git) Date: Sun, 17 Sep 2023 10:37:25 GMT Message-Id: <202309171037.38HAbPJG023882@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: f7c733e4fe5d - main - amd64: Convert a cheap DIAGNOSTIC check to a KASSERT 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: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f7c733e4fe5d55fd78cd2b0c27483eeaff3f79a3 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=f7c733e4fe5d55fd78cd2b0c27483eeaff3f79a3 commit f7c733e4fe5d55fd78cd2b0c27483eeaff3f79a3 Author: Mark Johnston AuthorDate: 2023-08-11 15:54:34 +0000 Commit: Mark Johnston CommitDate: 2023-09-17 10:27:31 +0000 amd64: Convert a cheap DIAGNOSTIC check to a KASSERT MFC after: 1 week --- sys/amd64/amd64/trap.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/sys/amd64/amd64/trap.c b/sys/amd64/amd64/trap.c index 0d9a660abdb8..4d5887369207 100644 --- a/sys/amd64/amd64/trap.c +++ b/sys/amd64/amd64/trap.c @@ -1188,12 +1188,9 @@ amd64_syscall(struct thread *td, int traced) kmsan_mark(td->td_frame, sizeof(*td->td_frame), KMSAN_STATE_INITED); -#ifdef DIAGNOSTIC - if (!TRAPF_USERMODE(td->td_frame)) { - panic("syscall"); - /* NOT REACHED */ - } -#endif + KASSERT(TRAPF_USERMODE(td->td_frame), + ("%s: not from user mode", __func__)); + syscallenter(td); /*