From nobody Thu Jan 18 17:22:06 2024 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 4TG8gf6VZTz56XXX; Thu, 18 Jan 2024 17:22:06 +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 4TG8gf5tpCz44kk; Thu, 18 Jan 2024 17:22:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705598526; 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=sxzB6VYucobm3QWadap1gB/1o7XiYVR2nqFCkg7hDkc=; b=HdbjNQRUqPfqYN3/x8ouSAYG5cWMqlNtcCHSQJTMRmmfzS84eS9YKoPVlwLgm07R7VH8hu PqTuff0VESxSSzxZWPUYI7/QcH1OfPHD1ZI2v4f0fPRgvaUTt2xq3Ck0HWKX1YdzOovrXb OJiu+opeL6RJKzPTc1/HemQMTb3IlFD6inHfGnjaabsTE60X/XcLIG5oy2xtBoxriWtp+Z Z5vFajsnvgrSgYJ909yamvhq+mWWzlKwjcXVRkwWU0OrBw9CLZnKxA432+zVBY6LRtcU4S s14by1U2tP28JwOq48j1s6o0+VnInfoEbndJPbC1f1BGWm9vAewEPzCdfaCUxA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705598526; 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=sxzB6VYucobm3QWadap1gB/1o7XiYVR2nqFCkg7hDkc=; b=ajXwa5LELP5QiwSiuxL7guhYEPh0QDaadyRaneg1HsnSRvz/qxqx/rl0PR1MvqH7deCNgR 1nARE0ZvgHkvrNuf41RToiay3Uu6QIDZIJQ984U41RRz7JBPemrhk84xolctUGu7vCij+n ps+1uTbtJkIw9rvL5pKW/1OPc+9zvRkYDYDYuXl+hDrzu+XfEfh0W7i8rTaV8HGlBd1Tru i36SqKVTPvXfbwxEYktqJfp7PonBe2F/CaGKD/Sb0fVUk5OLHl0ALD6pvJPz0BYHxL4m1T Jw5TKuglf+ROnsxOlYzu1t5HPaENThFctVhD12ozUr1Bp0GZbZcxBKlxnQ7JBg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1705598526; a=rsa-sha256; cv=none; b=lfd/+0VNL1FVGcqVb5KyD0Q8nyHZheVBjasTk4kaSftzAYi03R2gg2oF6hG+SzP4i9rGAW e1xqQXzNyHXKo+NOb9LJFMtOYWEyaz1vxyvWwDa/gyWW8oNZZ5jUCEiwoww+VfYe9x5/l7 eVvcW+tgrLP1fkvjdAJilIk14vBQ26UUYvBPfdHPbO84dg+0kyG8TpMIxww1ZLTjjjk7/j 0dRmswtKv5vJIrke67IL9JD3gWQ7g73K/ihJjqf2LqPfemLQyOLbelA1jjFBgHy5LbCZFn u0MlgNGQ25zyzEpoYEZOv7nePMw4ZIVGe9itG+braf5jEd8idhhD8gNNVvthyA== 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 4TG8gf4yhLzGhk; Thu, 18 Jan 2024 17:22:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 40IHM64p078783; Thu, 18 Jan 2024 17:22:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40IHM6U8078780; Thu, 18 Jan 2024 17:22:06 GMT (envelope-from git) Date: Thu, 18 Jan 2024 17:22:06 GMT Message-Id: <202401181722.40IHM6U8078780@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: 9c2e1a54f71a - main - arm64: fix db_read_bytes() for size == 8 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: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9c2e1a54f71a399fc4645c4b8bed044705629143 Auto-Submitted: auto-generated The branch main has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=9c2e1a54f71a399fc4645c4b8bed044705629143 commit 9c2e1a54f71a399fc4645c4b8bed044705629143 Author: Mitchell Horne AuthorDate: 2024-01-17 16:45:41 +0000 Commit: Mitchell Horne CommitDate: 2024-01-18 17:20:42 +0000 arm64: fix db_read_bytes() for size == 8 There is a mistake in the cast, resulting in a truncated read to tmp64. Switch from int to uint64_t, and adjust the other casts for clarity. Add a comment explaining why we do this at all. Reported by: dfr Reviewed by: dfr, mmel, emaste, jhb (all a previous version) PR: 276406 MFC after: 3 days Fixes: a67687fcd8f5 ("Use native-sized accesses when accessing memory from kdb") Differential Revision: https://reviews.freebsd.org/D43479 --- sys/arm64/arm64/db_interface.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/sys/arm64/arm64/db_interface.c b/sys/arm64/arm64/db_interface.c index 8d97ab46a837..0b1c58ca88a0 100644 --- a/sys/arm64/arm64/db_interface.c +++ b/sys/arm64/arm64/db_interface.c @@ -124,14 +124,20 @@ db_read_bytes(vm_offset_t addr, size_t size, char *data) if (ret == 0) { src = (const char *)addr; + + /* + * Perform a native-sized memory access, if possible. This + * enables reading from MMIO devices that don't support single + * byte access. + */ if (size == 8 && (addr & 7) == 0) { - tmp64 = *((const int *)src); + tmp64 = *((const uint64_t *)src); src = (const char *)&tmp64; } else if (size == 4 && (addr & 3) == 0) { - tmp32 = *((const int *)src); + tmp32 = *((const uint32_t *)src); src = (const char *)&tmp32; } else if (size == 2 && (addr & 1) == 0) { - tmp16 = *((const short *)src); + tmp16 = *((const uint16_t *)src); src = (const char *)&tmp16; } while (size-- > 0)