From nobody Sun Oct 9 17:03:11 2022 X-Original-To: dev-commits-src-branches@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 4MlpJv2Mwxz4f6Cc; Sun, 9 Oct 2022 17:03:11 +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 4MlpJv1rcWz44T1; Sun, 9 Oct 2022 17:03:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1665334991; 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=69OYXY1NSQGxJ1JMSKsisSGtWqOCzZMjqe0ho37+8EY=; b=MdMtvOloyvk5KO9Z6ClvSoPw+AAaPxoj/qXJbMiOX3n21nd3JQ/d8oqoQZtcUH7xIdJRY3 2p7YNIYRQLcA1WnqOvOMQdf2hm2y+o4SPOcA+BIasEkAIv42hyAa2aP3CCwFh/jGq7rVhI Djm34A/jwbzTxtZzTnreYZ7y3ZT6y8+LAjijY8+7K13cC+s65D3LbVs7insJo9PSPTsGxy oft2AjnflnN6F8w7M952xt2YHOeeEIrA9PLXog5/bz2J6ekurSPy7AYr8BXjGEKprBF+MU Ma76mPecK/0RzdKJNmUAsnJrrIKffSgCR3BLnhXtwY8V6CoyN+AhtFMw4d8nXg== 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 4MlpJv0yfrzLZ0; Sun, 9 Oct 2022 17:03:11 +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 299H3Bik056780; Sun, 9 Oct 2022 17:03:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 299H3Bfh056779; Sun, 9 Oct 2022 17:03:11 GMT (envelope-from git) Date: Sun, 9 Oct 2022 17:03:11 GMT Message-Id: <202210091703.299H3Bfh056779@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mitchell Horne Subject: git: 3fd429a7ba29 - stable/13 - riscv: better CTR messages in pmap_enter_l2() List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 3fd429a7ba29e0d143f5597c1e5b2eb3a3e611f6 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1665334991; 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=69OYXY1NSQGxJ1JMSKsisSGtWqOCzZMjqe0ho37+8EY=; b=jzYsDh9DK//mA1KWu3/7rf/DQqjT1apWJSZPaCErUIUU/QvmGMsnW2AuzFiBoc9gcZmv69 AqSYH8+KKcJ6DkTE8of2fxbVm99D6qX+bb+mvorcAj+XCf0STR5k7vP1T1R7FzpaS15bnC GhqDJJ3KXfx8EoQ6n34ji/9Xsx1kLv6gRRjzVvTfIPsuy8aXjP5h2C3XSTSfGRiWWF2AJk 5bFJtFbgBgS+TbsTfJ+MB9Qn+TUubw02+eJR9j+duNryka6yJJOMwqiDzYolgdvdHWuPK3 wte06792wKkOgFXnBTlb9qoWUVIBsdUvyZWEbdaBSA+4bizp3d5JWscQh9rw+Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1665334991; a=rsa-sha256; cv=none; b=mWZvMl/iPXuM9Tq7/Oc3bZtwl2BOkhglMtiVybK3Ck54T7XEqHehaYsI9vxW/bCTy3CyNQ 195U3WPhsKW2pLTzuLsznmyNnbkPz5xgjvPoVaxOMIYv61SmYD5U8t/ljLTPWEAQEC3F0y KBEys/0zFJmm7vmmOjgoFDcdcZE+1xaMFMbtpS22EQFTMmAZir10ETRqf5F/ULmF9o+nsP ouA/tyHq+ZVc7Qwc75CHT0HkDHnAeYLU/FnwT19EIXeXEGJySp/ltcqaTe/ya5/Jj70UJL qKvJPA+kh1kOmNS92NM7YQG9qAUoqyDfJYjlNgFOdkA4mlvH42h0VPrTdQOmvg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=3fd429a7ba29e0d143f5597c1e5b2eb3a3e611f6 commit 3fd429a7ba29e0d143f5597c1e5b2eb3a3e611f6 Author: Mitchell Horne AuthorDate: 2022-08-25 20:08:41 +0000 Commit: Mitchell Horne CommitDate: 2022-10-09 17:02:31 +0000 riscv: better CTR messages in pmap_enter_l2() Disambiguate the failure cases. Reviewed by: jhb MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D36562 (cherry picked from commit dd18b62cec6228c17aef428a575f44152ea55d53) --- sys/riscv/riscv/pmap.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/sys/riscv/riscv/pmap.c b/sys/riscv/riscv/pmap.c index 686d4278902a..3581708acce9 100644 --- a/sys/riscv/riscv/pmap.c +++ b/sys/riscv/riscv/pmap.c @@ -3174,8 +3174,8 @@ pmap_enter_l2(pmap_t pmap, vm_offset_t va, pd_entry_t new_l2, u_int flags, if ((l2pg = pmap_alloc_l2(pmap, va, (flags & PMAP_ENTER_NOSLEEP) != 0 ? NULL : lockp)) == NULL) { - CTR2(KTR_PMAP, "pmap_enter_l2: failure for va %#lx in pmap %p", - va, pmap); + CTR2(KTR_PMAP, "pmap_enter_l2: failed to allocate PT page" + " for va %#lx in pmap %p", va, pmap); return (KERN_RESOURCE_SHORTAGE); } @@ -3187,8 +3187,8 @@ pmap_enter_l2(pmap_t pmap, vm_offset_t va, pd_entry_t new_l2, u_int flags, if ((flags & PMAP_ENTER_NOREPLACE) != 0) { l2pg->ref_count--; CTR2(KTR_PMAP, - "pmap_enter_l2: failure for va %#lx in pmap %p", - va, pmap); + "pmap_enter_l2: failed to replace existing mapping" + " for va %#lx in pmap %p", va, pmap); return (KERN_FAILURE); } SLIST_INIT(&free); @@ -3234,8 +3234,8 @@ pmap_enter_l2(pmap_t pmap, vm_offset_t va, pd_entry_t new_l2, u_int flags, vm_page_free_pages_toq(&free, true); } CTR2(KTR_PMAP, - "pmap_enter_l2: failure for va %#lx in pmap %p", - va, pmap); + "pmap_enter_l2: failed to create PV entry" + " for va %#lx in pmap %p", va, pmap); return (KERN_RESOURCE_SHORTAGE); } if ((new_l2 & PTE_W) != 0)