From nobody Thu Oct 06 22:05:37 2022 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 4Mk59F6f5Zz4VBC2; Thu, 6 Oct 2022 22:05:37 +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 4Mk59F5tpGz3tP5; Thu, 6 Oct 2022 22:05:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1665093937; 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=hK/lnm+ZHAqdQsDioDnUugjn8tQFtVY1ASKSijbYp1E=; b=N68KBZ3KcTFIJ1UyWt0jEE+bxkUQbUqT5AkNONGT2Ic8jn/1oui5AJIJugiYUGDP+YsN5r +LGpjOuJdLAvkwUKoADYps1BIEQVZh+omfzb63TxU4TGWgf5NdEinMyi4GWTR8gemk67TF V4rpE3xnjNJKEiiFQE/8kjBQ+g0Iw3hIsSpaNpg6alJVI4cRArEQO/4Be6MTPmTFSqnUTb xzMgfb9nz8jHStZUDhWRzRRkFWGPaXU0pWZ2B5RSrsXAChzSZdTUwqYT2opL5TqpoU5zia 5FNO3o1E3Mc6l8En65TOF4p4xetLfh13kfKTOD4w1Rd2FVdSULK45xpHde/MRA== 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 4Mk59F4vVyzP0h; Thu, 6 Oct 2022 22:05:37 +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 296M5bw3056087; Thu, 6 Oct 2022 22:05:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 296M5bBv056086; Thu, 6 Oct 2022 22:05:37 GMT (envelope-from git) Date: Thu, 6 Oct 2022 22:05:37 GMT Message-Id: <202210062205.296M5bBv056086@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mitchell Horne Subject: git: dd18b62cec62 - main - riscv: better CTR messages in pmap_enter_l2() 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: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: dd18b62cec6228c17aef428a575f44152ea55d53 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1665093937; 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=hK/lnm+ZHAqdQsDioDnUugjn8tQFtVY1ASKSijbYp1E=; b=yheysVpA8mcIrTidDT1dKRttkLDKwoNF5kOeBLz4RRjWPKx0LYKAoWKKttvBqt0dMpy4jN T0Sjfor0PC3Ng3D5aksUSKy4yLbrwY1CS3aWslv2/lMIYL44O8G85JR9RiTCAugIrexkha +OCyv+lf+aKepnCMVvrlSGCFhGTBtWcHFg8La//WVEjhpGyKqBszym/WcL4cuLuPHhu44m Rimr+tI28ZXAjNEMVDd3e9AoB9sFJXTw/ld7ihLsjFs7iSClnGPln8Oeat7QahSY2efHEa jyFjtdR++oflI4OKWuR2ZTZnljk9pg7g6vpc5EqIUxXKLPJkevcWVk+pVlAWvA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1665093937; a=rsa-sha256; cv=none; b=McUAjHp5+KkD1hobt/LL9kM0YZYjforhT8O2DDyCe6dcNWMeOOK/ixyBW7P0/OINwMLxyD dRtfJ6INRMSkhyI+IRfnT8+F1cCF+o32g7q+rtlePv0zUGDOVDDA2JEu3XMqpkYEpH6gis BjQGUNBYXLj4gPB4tKWYrmJXlobWSw5VIHjIxqBr2szxkNcrdMan4L4m9XvCq/jy4VNizU sEVE/ysgVXEgZ6s3teoRiOv1LokvmjR8KglMpgKtZv8AUC0Bj89tIsmsn50XLEfqyYJKKx TotSQqWF0cTHfgOk04TQSe6m8/hQwriu6XRkA22xBGXkA51rVLB2OL+ylVwcEQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=dd18b62cec6228c17aef428a575f44152ea55d53 commit dd18b62cec6228c17aef428a575f44152ea55d53 Author: Mitchell Horne AuthorDate: 2022-08-25 20:08:41 +0000 Commit: Mitchell Horne CommitDate: 2022-10-06 22:02:37 +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 --- 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 1171b7fe9b17..aa9eb5255c82 100644 --- a/sys/riscv/riscv/pmap.c +++ b/sys/riscv/riscv/pmap.c @@ -3172,8 +3172,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); } @@ -3185,8 +3185,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); @@ -3232,8 +3232,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)