From nobody Sat Mar 29 00:19:43 2025 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 4ZPdLm1MKwz5rgCB; Sat, 29 Mar 2025 00:19:44 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZPdLl6whlz3NwW; Sat, 29 Mar 2025 00:19:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1743207584; 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=p35JA4UxoTw6JMqFuUnlw1g/oWkgNKEuf13DIWs5gKw=; b=DdnhOrnZHrL/JUa9R30YxfAYyZsXzi2VPLyzsVSHKCyhBLK2DQDkIPkx91M+bUuOHcfStC 87CMub2jyyOj7RjgZpsxfZFvvL6EXqFOhOHy5jA8idXoRgMszjD8NNYZ1kmA1lIDH4TkEc Z5FJCP8EvGMHMHAhqy+C5v4SLelehdLQQvCgXnsGyUFFm71jZCfEEyuYHkv/5szbfAJZ1e p9MXZRfdDmbWzQWU286A0KyAxv1Ovr5yfmkBmLyp0DHPnnf817T+TPXzfuYmsYxxS8b9lo Y1KAuIc+3ze6k88crnWSlRHkbXEIIHstU6E448OrC0VaXekjGmsx2PB7lja0BQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1743207584; a=rsa-sha256; cv=none; b=vDFRvw2D4RhJlEQxdT4UGb6XE6uD/WBU+2qJwjyEBxu5381efbwaMlh+SWLpLtI9vYTgmq 3VEMqbwDtoYHWHlwxM1IjIDME0v0oMoP0RB46tlUCbS9oSHkH2VaKur8DZ/0uND2ywCojc skcgpVR2QkezD7o2Z61G/gbyOw9nedssFyxRoIVAYi4u3zmjAWtWpw1GIUniU0JONqWKQF QYngC5JEKbaJb7kXzRA1gf4bykhUXepRugnzmv3hdVKIzzIrQZxHlX/tGT1F43a9FGVkxo /fNot81iptsYdGOQ6i70tXj6vkKEHUK08Tr+PVxwXz13un3wCKgNv6C0REoNHQ== 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=1743207584; 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=p35JA4UxoTw6JMqFuUnlw1g/oWkgNKEuf13DIWs5gKw=; b=Ir75hOOuEKM92yjoKm9h7IQuJjhRKowOFAdAzb7dBMMeoKqjSpZ0EMEEevYmVngx9to4a8 kNt1ZG6di5E7hGPZOuLoDk9+2ofwT02TH685f9KjafV493j2wJbTf65mK2mTbJUDsOKT82 gpc63PX0H/yDAgTRgyHQXZPkuPHEBRf/610NZMOdsdzRV8MbP1otpymKeKrv3jjrQHdZPo 6xrFGKnvK24P0Ta3cVXwimx/W5XXVELXO5/oW6Ehid1lBO8pHbCK6oyyrfCe0oMkbSv+lr pLhNILbsH8PbQVh9aYHUGUW17AcXRm2lsN9A+hi1MOaxyIeW3YBh5jf5DK9QCw== 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 4ZPdLl66Fwz14lZ; Sat, 29 Mar 2025 00:19:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 52T0JhWp003014; Sat, 29 Mar 2025 00:19:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52T0JhHj003011; Sat, 29 Mar 2025 00:19:43 GMT (envelope-from git) Date: Sat, 29 Mar 2025 00:19:43 GMT Message-Id: <202503290019.52T0JhHj003011@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Justin Hibbits Subject: git: 7a4907250452 - main - powerpc/trap: Change prediction of NOFAULTING in trap_pfault() 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhibbits X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7a4907250452de0818dcd4c084a138b03f153f55 Auto-Submitted: auto-generated The branch main has been updated by jhibbits: URL: https://cgit.FreeBSD.org/src/commit/?id=7a4907250452de0818dcd4c084a138b03f153f55 commit 7a4907250452de0818dcd4c084a138b03f153f55 Author: Justin Hibbits AuthorDate: 2025-03-29 00:03:39 +0000 Commit: Justin Hibbits CommitDate: 2025-03-29 00:19:33 +0000 powerpc/trap: Change prediction of NOFAULTING in trap_pfault() This was probably intended to match the amd64 check, but that tests NOFAULTING against non-zero, while this checks against 0. We're most likely to end up in this function when faulting is allowed, so predict_true is the better option. --- sys/powerpc/powerpc/trap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/powerpc/powerpc/trap.c b/sys/powerpc/powerpc/trap.c index d919b7715664..203d270a504b 100644 --- a/sys/powerpc/powerpc/trap.c +++ b/sys/powerpc/powerpc/trap.c @@ -794,7 +794,7 @@ trap_pfault(struct trapframe *frame, bool user, int *signo, int *ucode) return (true); #endif - if (__predict_false((td->td_pflags & TDP_NOFAULTING) == 0)) { + if (__predict_true((td->td_pflags & TDP_NOFAULTING) == 0)) { /* * If we get a page fault while in a critical section, then * it is most likely a fatal kernel page fault. The kernel