From nobody Thu Jan 26 19:25:42 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 4P2rK312xDz3bTVh; Thu, 26 Jan 2023 19:25:43 +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 4P2rK30Wkrz4HRx; Thu, 26 Jan 2023 19:25:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674761143; 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=Zx4OadS06J4ffl/Ro0RLrEhMyA/vGZoMmQzhnYd3ddk=; b=hAyMsLl3tOE7Q/ZsIv/qOxwP6y7fXctBRsDgUyFx0/kM1uj4XvNKEvvgtwtYN/CVn/9hJS wFeTrF5rFB8Qyu2a/5jDHGAreLwQEaGEYxdzE6XJxdIlIA9tMS1HVV3H8LA6izLPhLGQk9 Cx637uL0JOaGVzNDLbn6zrXjieMZEhqQnkNdOeHOr1EK9goqUyz+CvnDpRkzz00sA5YM0z k7SWmHUyDLGN4sObl5oip6a+E1XdMgVny7yHDLzDU6fFBb0GlYukxh3bS2FkRjxPMfuZ3+ Ib4357zjDNNW1UXZjzrN6TYQUGHsw9+k35mB/hZLyEIcjiJJgGZTllAQ5xdLEQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674761143; 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=Zx4OadS06J4ffl/Ro0RLrEhMyA/vGZoMmQzhnYd3ddk=; b=TUdBNpogwB3gffZfAQtS39rL4bwJ3+pwFW+b2I4gdL1CyOpciz6m3kLv2CMhu/ZDZmnaJf 9N9YUYR67OrQAs1FXkRHSfuDgk6rmLw70ZTW7RDTT+re00Yl7Qs3xuTp+N7U1Uj5zhN2fN mNwe1ANNyWTRBGAM5Ne1n9FhgKA2DYST/9pfcLCl87ouVMq49G9BblUEtznSnhZRfLuxSI 4QfKIUt7NGty7zaYqfxL9jooh0eknIZ85K/l3oAsttp6XauxfpLe67lFgvLjReMswH+HE2 9zACte0djqaNnMl7mSw5sZ2hW8DX1ZSlS6L6TYFCtNgh/rm0jtiuyAXnowU3Gg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1674761143; a=rsa-sha256; cv=none; b=mQ63ubcHDBjQ25r2i2ovZIljsdyL7nIIQ6ebXUtMspVN2PBW2SArDl4YcY0NiQr/J4iZPw NgXvYJmZSvwG5l1/E/eWttorE77vHw5jTGtmICntT6YuL6CknTzqbYv5llenrLwX62M7ny ZT+pRZdJImAV5qnUx7ZiGcQDSxGXm0c1w0W0Azf9hOhAXcjAGS8xqmo5v0XGOs7l3zNO7t nM9QFp8FYCed8io/LQRhD3V5qslEvZTQGQ7X9lEXJ72tDIvkxXkHidMJglNPKVIj/zc8wn p2WPe+ACfmRinaJ/9uVI1qE6ztZ6J9sZ6afSb/gj5GfTrX+xh7OM/FNCh+CKUw== 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 4P2rK26hgczgss; Thu, 26 Jan 2023 19:25:42 +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 30QJPgGo077791; Thu, 26 Jan 2023 19:25:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30QJPgPv077790; Thu, 26 Jan 2023 19:25:42 GMT (envelope-from git) Date: Thu, 26 Jan 2023 19:25:42 GMT Message-Id: <202301261925.30QJPgPv077790@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: 7e8e5b8b80ae - stable/13 - bhyve: enhance debug info for memory range clash 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: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 7e8e5b8b80ae0d23ebd63ac9162396617d434c3b Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=7e8e5b8b80ae0d23ebd63ac9162396617d434c3b commit 7e8e5b8b80ae0d23ebd63ac9162396617d434c3b Author: Robert Crowston AuthorDate: 2021-04-10 19:16:02 +0000 Commit: John Baldwin CommitDate: 2023-01-26 19:11:36 +0000 bhyve: enhance debug info for memory range clash Explain what the two clashing regions are. Reivewed by: grehan, jhb Differential Revision: https://reviews.freebsd.org/D29696 Pull Request: https://github.com/freebsd/freebsd-src/pull/463 (cherry picked from commit efec757b20425ac68171acc7f9cec8be750db688) --- usr.sbin/bhyve/mem.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/usr.sbin/bhyve/mem.c b/usr.sbin/bhyve/mem.c index 7482174bfc32..0ea9c56192c6 100644 --- a/usr.sbin/bhyve/mem.c +++ b/usr.sbin/bhyve/mem.c @@ -110,9 +110,11 @@ mmio_rb_add(struct mmio_rb_tree *rbt, struct mmio_rb_range *new) if (overlap != NULL) { #ifdef RB_DEBUG - printf("overlap detected: new %lx:%lx, tree %lx:%lx\n", + printf("overlap detected: new %lx:%lx, tree %lx:%lx, '%s' " + "claims region already claimed for '%s'\n", new->mr_base, new->mr_end, - overlap->mr_base, overlap->mr_end); + overlap->mr_base, overlap->mr_end, + new->mr_param.name, overlap->mr_param.name); #endif return (EEXIST);