From nobody Tue Jun 27 21:03:48 2023 X-Original-To: dev-commits-src-main@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 4QrHJ42lGLz4kd52; Tue, 27 Jun 2023 21:03:48 +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 4QrHJ421jMz4Ybt; Tue, 27 Jun 2023 21:03:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687899828; 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=kdNyd0TJfJhggjKXNuM3e5fTfBk2/2VaBdwE6hFw09A=; b=fyurZbqwXZODfjNCBsnBpsNsJCp+gH4tGxVUW8S8whZwXCS830WndYOwoBbjsL2Ul0XFxO fYqPx5phGdjQswr+hvZyWVjT72qF+HwBQ9EyqrBWReIxv/g74R9FDEUBwTctpmomWFkg9x RBgMNTPdOQOozDSIeG4HUI23lXH818X53ehjcEO7vAIabIuWg6r9DRDaEAeNKSoA+Zs/HP bQfChwEhozpmkKfvgRPXVMzK8yBfyjpcrfVRrACvz3DBKp9Az4CiBiywxrifNytf+xsAOX B5SiIYI2drmRLSTTkGvpkiSfGgcfnNJ764aACask/rFKaHAVC+qnB68Z900Dxw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687899828; 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=kdNyd0TJfJhggjKXNuM3e5fTfBk2/2VaBdwE6hFw09A=; b=DoSR/yNkGcr1nv0pv8e0K2m1CN1kP9cZ3gZaLZfTT+dPeTykiGSpQ1q41ClIW/+gismSjJ CsazHzgSH6VOQ/uGyLonG7ZDXUrJc+zkPm1wvp4rLpvtt3B5JlqXE3entTjEgxecx9cEcF GaKefBaCKiAGX8IMfHYXq44mKl46fUe6O+4o7kYNoXqcwEDmSHj3UUd1dfjh2f33u08FIt r6+UR85B/DdnegOAC/gQbTWaeTTnGD476RAfhkLitXGUrSeSEBGpKqbujLhgRu+4FIONHY qWe6Jl9DTy8PZ166km4jZAYV7DhxqKN7MlyoCey7tcx0bEMLCrbNenw7q3d7lA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1687899828; a=rsa-sha256; cv=none; b=dxYgrZBuD8T9Ayrl0efaHEb0WJRcDHmS0OZG4TGi89+pP4kFOa1rVQsfM+D1vdJbXi3xIr aM8E02Bm6hhNn8ElgqPgWgPHXVAOkOCdaxl0otGFLSjKtZZLLlk3lSd5rcs+fMewjug9Ej u/4+SHA2ai6+rpFQR2COU2bBABBgAoKPMTmtYeARbio1zWSPwPOoOU4YFqnIpfr/RLRJjJ fRS2riOJ5AAuqJdmmJem4OBw2Z6T01znUUlu5oihKCzXzG02siRhWLdMwqxIHoR/Dw4B2h VNfUtAYFIZSjUpUydzn9NhCCi77cGyLxanpS0Wds6A7fIbkZOnbzX+X+GQ2Mnw== 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 4QrHJ4157Bz16s9; Tue, 27 Jun 2023 21:03:48 +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 35RL3mQw097605; Tue, 27 Jun 2023 21:03:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35RL3mbq097604; Tue, 27 Jun 2023 21:03:48 GMT (envelope-from git) Date: Tue, 27 Jun 2023 21:03:48 GMT Message-Id: <202306272103.35RL3mbq097604@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: ef747607ead4 - main - vm_fault: move FAULT_* return codes out of range for Mach errors List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ef747607ead43552cb3ebb093fadd2c39c56a36d Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=ef747607ead43552cb3ebb093fadd2c39c56a36d commit ef747607ead43552cb3ebb093fadd2c39c56a36d Author: Konstantin Belousov AuthorDate: 2023-06-27 11:41:14 +0000 Commit: Konstantin Belousov CommitDate: 2023-06-27 21:03:14 +0000 vm_fault: move FAULT_* return codes out of range for Mach errors This way a possible clash between FAULT_* and KERN_* numbering is avoided, and panics checks for fault_status confusion become more efficient. Reviewed by: markj Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D40771 --- sys/vm/vm_fault.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/vm/vm_fault.c b/sys/vm/vm_fault.c index 1f9063a5988a..8b4b8ebb7375 100644 --- a/sys/vm/vm_fault.c +++ b/sys/vm/vm_fault.c @@ -161,7 +161,7 @@ struct faultstate { * Return codes for internal fault routines. */ enum fault_status { - FAULT_SUCCESS = 1, /* Return success to user. */ + FAULT_SUCCESS = 10000, /* Return success to user. */ FAULT_FAILURE, /* Return failure to user. */ FAULT_CONTINUE, /* Continue faulting. */ FAULT_RESTART, /* Restart fault. */