Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/2217764/?format=api
{ "id": 2217764, "url": "http://patchwork.ozlabs.org/api/patches/2217764/?format=api", "web_url": "http://patchwork.ozlabs.org/project/qemu-devel/patch/20260330143123.1685142-3-peter.maydell@linaro.org/", "project": { "id": 14, "url": "http://patchwork.ozlabs.org/api/projects/14/?format=api", "name": "QEMU Development", "link_name": "qemu-devel", "list_id": "qemu-devel.nongnu.org", "list_email": "qemu-devel@nongnu.org", "web_url": "", "scm_url": "", "webscm_url": "", "list_archive_url": "", "list_archive_url_format": "", "commit_url_format": "" }, "msgid": "<20260330143123.1685142-3-peter.maydell@linaro.org>", "list_archive_url": null, "date": "2026-03-30T14:31:23", "name": "[2/2] include/user/guest-host.h: Provide g2h etc for both abi_ptr and vaddr", "commit_ref": null, "pull_url": null, "state": "new", "archived": false, "hash": "93f396752345d70cfa88d3260a1bc62d3f7fee9f", "submitter": { "id": 5111, "url": "http://patchwork.ozlabs.org/api/people/5111/?format=api", "name": "Peter Maydell", "email": "peter.maydell@linaro.org" }, "delegate": null, "mbox": "http://patchwork.ozlabs.org/project/qemu-devel/patch/20260330143123.1685142-3-peter.maydell@linaro.org/mbox/", "series": [ { "id": 498040, "url": "http://patchwork.ozlabs.org/api/series/498040/?format=api", "web_url": "http://patchwork.ozlabs.org/project/qemu-devel/list/?series=498040", "date": "2026-03-30T14:31:22", "name": "linux-user: Fix incorrect sign-extension of guest addresses", "version": 1, "mbox": "http://patchwork.ozlabs.org/series/498040/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/2217764/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/2217764/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>", "X-Original-To": "incoming@patchwork.ozlabs.org", "Delivered-To": "patchwork-incoming@legolas.ozlabs.org", "Authentication-Results": [ "legolas.ozlabs.org;\n\tdkim=pass (2048-bit key;\n unprotected) header.d=linaro.org header.i=@linaro.org header.a=rsa-sha256\n header.s=google header.b=jUnDI7FR;\n\tdkim-atps=neutral", "legolas.ozlabs.org;\n spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org\n (client-ip=209.51.188.17; helo=lists.gnu.org;\n envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org;\n receiver=patchwork.ozlabs.org)" ], "Received": [ "from lists.gnu.org (lists.gnu.org [209.51.188.17])\n\t(using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits))\n\t(No client certificate requested)\n\tby legolas.ozlabs.org (Postfix) with ESMTPS id 4fktxg3sXmz1yG8\n\tfor <incoming@patchwork.ozlabs.org>; Tue, 31 Mar 2026 01:32:23 +1100 (AEDT)", "from localhost ([::1] helo=lists1p.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.90_1)\n\t(envelope-from <qemu-devel-bounces@nongnu.org>)\n\tid 1w7Deq-0001Aa-RX; Mon, 30 Mar 2026 10:32:00 -0400", "from eggs.gnu.org ([2001:470:142:3::10])\n by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)\n (Exim 4.90_1) (envelope-from <peter.maydell@linaro.org>)\n id 1w7DeS-00015S-M7\n for qemu-devel@nongnu.org; Mon, 30 Mar 2026 10:31:39 -0400", "from mail-wm1-x335.google.com ([2a00:1450:4864:20::335])\n by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128)\n (Exim 4.90_1) (envelope-from <peter.maydell@linaro.org>)\n id 1w7DeM-0002dO-Nt\n for qemu-devel@nongnu.org; Mon, 30 Mar 2026 10:31:34 -0400", "by mail-wm1-x335.google.com with SMTP id\n 5b1f17b1804b1-48557c8ad47so34809085e9.0\n for <qemu-devel@nongnu.org>; Mon, 30 Mar 2026 07:31:30 -0700 (PDT)", "from lanath.. (wildly.archaic.org.uk. [81.2.115.145])\n by smtp.gmail.com with ESMTPSA id\n 5b1f17b1804b1-48722d49c18sm279767145e9.14.2026.03.30.07.31.26\n (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n Mon, 30 Mar 2026 07:31:26 -0700 (PDT)" ], "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n d=linaro.org; s=google; t=1774881089; x=1775485889; darn=nongnu.org;\n h=content-transfer-encoding:mime-version:references:in-reply-to\n :message-id:date:subject:cc:to:from:from:to:cc:subject:date\n :message-id:reply-to;\n bh=FyGLkbR92NTumPuyUeCJS2oJhBp8cITIz5HhLWLYSAU=;\n b=jUnDI7FRjkaXoaHRp7sPfQcoldAh6Wz4CaXm5U4HTuKwtxJq7r4h82Py5RlXq13AhX\n dA+PNwHB5BQDnfQ/uAPVOq9WWi0kwQtjr63OXgJiua/qt96IEL4H+7gYdLLJRFqq8n5P\n 1mwGssqotHI6RG/yhxXRxHJklnQxIaMV2wmFAh6zDSADBzVrb2GYRkVi8XyDbK3UhvVY\n FcjefGY6MdLm1/iQU3+dH8tj8oOKcHqlB+PzSxJ5EwfkA/NzniUNUBYgNqx3szjxImp+\n AqpmN+OkpgLL5J+57OUUPFXqo+3iFWBLvi3RXfBqknYLGQMPJ+UnFvQtmaHd58gLLC7Z\n r6xg==", "X-Google-DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n d=1e100.net; s=20251104; t=1774881089; x=1775485889;\n h=content-transfer-encoding:mime-version:references:in-reply-to\n :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from\n :to:cc:subject:date:message-id:reply-to;\n bh=FyGLkbR92NTumPuyUeCJS2oJhBp8cITIz5HhLWLYSAU=;\n b=d+dnrPEyX30UG9ZzWu+EwB4bI/1xe84S+EWbKxsRwjeapLkx2FdwwT8trlKmtp0n/0\n 0QS0P7G8CBzxQRyxm0+1tofZQ3J9me902N3W+FduQZL/yT+Bi32greIhsfMIAo87W2Cq\n IH6zlR+Munzx1JzwsEjYaCtFcYj0PM8jHqF6U/VtSWEN6FDX6s5ttaFDtv4TFTBPBVGa\n HzSTUWZ0SxDbsfard0bTU7OvWuUa5Zw9SlY8TDzO2ThVEJFot9RTMz/vw9v6Rhy7VGec\n 43fb1KLymrKFh/x49fqUlOcJ8BvxhLZvYVCFlUUa5+zgUZjixRk0nXCVtL6WRl9E5Yth\n 2axQ==", "X-Gm-Message-State": "AOJu0Ywsb+Uw19eZL1RbVu9+0QyD7eTpRL0tPv2yhHwUvhmrfYxoWe2N\n PmX6wKJTUFWjm5yeToLvgDBSvVXRRit6dWDqIKpt+k90rVWRbIRVekT1MsD484V61Q0DYn3dzB0\n a+SgvctY=", "X-Gm-Gg": "ATEYQzzl4KFPvZ5XM895ZPSEnJ2Fz7L8CzMfoStydJCBCyQlIHWhuOPjFSodXPmTaSz\n l5TATVO8QkroNlYpJlTySMxbxOq7qEljWAHhTBNnxiKRhC2fgX0RRYGcbfg8DyFFH3ORr3PPPzo\n 8pHjrNefhq22TKKSVAIsBQ0W0Q9Q8sE+uxzkKsqb+4Z+tYoZHhFe3bZril6RoGK80P7/GYuhqYd\n ozoJ9eYceA0r8J+bayYHFvzBbVc6O4EcWnR5Ynv9Le/fumYpC2xf/dRYOmPydnowarAV1rOv4ML\n g0syb/hYkhR9Gd7jmKe9B6+ff31zcoryEOnEdUzPnC7EnarukMH635S2tWvbHiFhme+fc30IL/w\n VcHlz3TUNb4HpjSLPqL3OaX7g1Wh7HKXICdEsIuSjoEOnyhhK6lI/KvZyeblZXmla6LALsVujuu\n UzFq9E025O4zAcqDPjXLrszstT3YEpNDTKdBGRd1uylKhoqwcYZjWOQ+Q4GY0bAno2Il6dN5KcL\n gOi94saRUMOS7vLLo2mDKhYP9r2cCI=", "X-Received": "by 2002:a05:600c:a06:b0:487:1108:48af with SMTP id\n 5b1f17b1804b1-48727d59ce3mr229984535e9.4.1774881088735;\n Mon, 30 Mar 2026 07:31:28 -0700 (PDT)", "From": "Peter Maydell <peter.maydell@linaro.org>", "To": "qemu-devel@nongnu.org", "Cc": "qemu-stable@nongnu.org, Richard Henderson <richard.henderson@linaro.org>,\n Warner Losh <imp@bsdimp.com>, Kyle Evans <kevans@freebsd.org>,\n Laurent Vivier <laurent@vivier.eu>,\n Pierrick Bouvier <pierrick.bouvier@linaro.org>", "Subject": "[PATCH 2/2] include/user/guest-host.h: Provide g2h etc for both\n abi_ptr and vaddr", "Date": "Mon, 30 Mar 2026 15:31:23 +0100", "Message-ID": "<20260330143123.1685142-3-peter.maydell@linaro.org>", "X-Mailer": "git-send-email 2.43.0", "In-Reply-To": "<20260330143123.1685142-1-peter.maydell@linaro.org>", "References": "<20260330143123.1685142-1-peter.maydell@linaro.org>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "Received-SPF": "pass client-ip=2a00:1450:4864:20::335;\n envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x335.google.com", "X-Spam_score_int": "-20", "X-Spam_score": "-2.1", "X-Spam_bar": "--", "X-Spam_report": "(-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1,\n DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1,\n RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001,\n SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no", "X-Spam_action": "no action", "X-BeenThere": "qemu-devel@nongnu.org", "X-Mailman-Version": "2.1.29", "Precedence": "list", "List-Id": "qemu development <qemu-devel.nongnu.org>", "List-Unsubscribe": "<https://lists.nongnu.org/mailman/options/qemu-devel>,\n <mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>", "List-Archive": "<https://lists.nongnu.org/archive/html/qemu-devel>", "List-Post": "<mailto:qemu-devel@nongnu.org>", "List-Help": "<mailto:qemu-devel-request@nongnu.org?subject=help>", "List-Subscribe": "<https://lists.nongnu.org/mailman/listinfo/qemu-devel>,\n <mailto:qemu-devel-request@nongnu.org?subject=subscribe>", "Errors-To": "qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org", "Sender": "qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org" }, "content": "In commit 7804c84a (\"include/user: Use vaddr in guest-host.h\") we\nchanged all the functions in guest-host.h that took or returned their\nguest address argument in type abi_ptr to instead use vaddr.\n\nThis introduced regressions for the case of a 32-bit guest and an\naddress above 2GB for the common situation where the address is a\nsyscall argument stored in a variable of type 'abi_long'. With\nabi_ptr (which will be an unsigned 32-bit type for 32-bit guests),\nthe address is cast to unsigned 32-bit, and then zero-extended to\n64-bits in g2h_untagged_vaddr(). With the switch to vaddr (which is\nalways a 64-bit unsigned type), the guest address will instead be\nsign-extended to 64 bits, which gives the wrong answer.\n\nFix this by providing two versions of the affected functions: the\nstandard names (g2h(), g2h_untagged(), guest_addr_valid_untagged(),\nguest_range_valid_untagged(), cpu_untagged_addr()) return to using\nthe logically-correct abi_ptr type; new versions with a _vaddr()\nprefix use the vaddr type.\n\naccel/tcg/user-exec.c must change to use the _vaddr() versions; this\nis the only file that uses guest-host.h that we want to compile once.\nAll the other uses are in linux-user and bsd-user code that\ninherently has to know the sizes of target-ABI types.\n\nCc: qemu-stable@nongnu.org\nFixes: 7804c84a (\"include/user: Use vaddr in guest-host.h\")\nResolves: https://gitlab.com/qemu-project/qemu/-/work_items/3333\nSigned-off-by: Peter Maydell <peter.maydell@linaro.org>\n---\n accel/tcg/user-exec.c | 26 ++++++++--------\n include/user/guest-host.h | 62 +++++++++++++++++++++++++++++++++++----\n 2 files changed, 69 insertions(+), 19 deletions(-)", "diff": "diff --git a/accel/tcg/user-exec.c b/accel/tcg/user-exec.c\nindex f8b4a26711..d283d3cc72 100644\n--- a/accel/tcg/user-exec.c\n+++ b/accel/tcg/user-exec.c\n@@ -647,7 +647,7 @@ void tb_lock_page0(tb_page_addr_t address)\n \n if (prot & PAGE_WRITE) {\n pageflags_set_clear(start, last, 0, PAGE_WRITE);\n- mprotect(g2h_untagged(start), last - start + 1,\n+ mprotect(g2h_untagged_vaddr(start), last - start + 1,\n prot & (PAGE_READ | PAGE_EXEC) ? PROT_READ : PROT_NONE);\n }\n }\n@@ -734,7 +734,7 @@ int page_unprotect(CPUState *cpu, tb_page_addr_t address, uintptr_t pc)\n if (prot & PAGE_EXEC) {\n prot = (prot & ~PAGE_EXEC) | PAGE_READ;\n }\n- mprotect((void *)g2h_untagged(start), len, prot & PAGE_RWX);\n+ mprotect((void *)g2h_untagged_vaddr(start), len, prot & PAGE_RWX);\n }\n mmap_unlock();\n \n@@ -763,7 +763,7 @@ static int probe_access_internal(CPUArchState *env, vaddr addr,\n g_assert_not_reached();\n }\n \n- if (guest_addr_valid_untagged(addr)) {\n+ if (guest_addr_valid_untagged_vaddr(addr)) {\n int page_flags = page_get_flags(addr);\n if (page_flags & acc_flag) {\n if (access_type != MMU_INST_FETCH\n@@ -792,7 +792,7 @@ int probe_access_flags(CPUArchState *env, vaddr addr, int size,\n \n g_assert(-(addr | TARGET_PAGE_MASK) >= size);\n flags = probe_access_internal(env, addr, size, access_type, nonfault, ra);\n- *phost = (flags & TLB_INVALID_MASK) ? NULL : g2h(env_cpu(env), addr);\n+ *phost = (flags & TLB_INVALID_MASK) ? NULL : g2h_vaddr(env_cpu(env), addr);\n return flags;\n }\n \n@@ -805,13 +805,13 @@ void *probe_access(CPUArchState *env, vaddr addr, int size,\n flags = probe_access_internal(env, addr, size, access_type, false, ra);\n g_assert((flags & ~TLB_MMIO) == 0);\n \n- return size ? g2h(env_cpu(env), addr) : NULL;\n+ return size ? g2h_vaddr(env_cpu(env), addr) : NULL;\n }\n \n void *tlb_vaddr_to_host(CPUArchState *env, vaddr addr,\n MMUAccessType access_type, int mmu_idx)\n {\n- return g2h(env_cpu(env), addr);\n+ return g2h_vaddr(env_cpu(env), addr);\n }\n \n tb_page_addr_t get_page_addr_code_hostp(CPUArchState *env, vaddr addr,\n@@ -822,7 +822,7 @@ tb_page_addr_t get_page_addr_code_hostp(CPUArchState *env, vaddr addr,\n flags = probe_access_internal(env, addr, 1, MMU_INST_FETCH, false, 0);\n g_assert(flags == 0);\n \n- *hostp = g2h_untagged(addr);\n+ *hostp = g2h_untagged_vaddr(addr);\n return addr;\n }\n \n@@ -938,7 +938,7 @@ static void *cpu_mmu_lookup(CPUState *cpu, vaddr addr,\n cpu_loop_exit_sigbus(cpu, addr, type, ra);\n }\n \n- ret = g2h(cpu, addr);\n+ ret = g2h_vaddr(cpu, addr);\n set_helper_retaddr(ra);\n return ret;\n }\n@@ -968,7 +968,7 @@ int cpu_memory_rw_debug(CPUState *cpu, vaddr addr,\n }\n if (is_write) {\n if (flags & PAGE_WRITE) {\n- memcpy(g2h(cpu, addr), buf, l);\n+ memcpy(g2h_vaddr(cpu, addr), buf, l);\n } else {\n /* Bypass the host page protection using ptrace. */\n if (fd == -1) {\n@@ -987,13 +987,13 @@ int cpu_memory_rw_debug(CPUState *cpu, vaddr addr,\n */\n tb_invalidate_phys_range(NULL, addr, addr + l - 1);\n written = pwrite(fd, buf, l,\n- (off_t)(uintptr_t)g2h_untagged(addr));\n+ (off_t)(uintptr_t)g2h_untagged_vaddr(addr));\n if (written != l) {\n goto out_close;\n }\n }\n } else if (flags & PAGE_READ) {\n- memcpy(buf, g2h(cpu, addr), l);\n+ memcpy(buf, g2h_vaddr(cpu, addr), l);\n } else {\n /* Bypass the host page protection using ptrace. */\n if (fd == -1) {\n@@ -1003,7 +1003,7 @@ int cpu_memory_rw_debug(CPUState *cpu, vaddr addr,\n }\n }\n if (pread(fd, buf, l,\n- (off_t)(uintptr_t)g2h_untagged(addr)) != l) {\n+ (off_t)(uintptr_t)g2h_untagged_vaddr(addr)) != l) {\n goto out_close;\n }\n }\n@@ -1231,7 +1231,7 @@ static void *atomic_mmu_lookup(CPUState *cpu, vaddr addr, MemOpIdx oi,\n cpu_loop_exit_atomic(cpu, retaddr);\n }\n \n- ret = g2h(cpu, addr);\n+ ret = g2h_vaddr(cpu, addr);\n set_helper_retaddr(retaddr);\n return ret;\n }\ndiff --git a/include/user/guest-host.h b/include/user/guest-host.h\nindex 8f7ef75896..ef83ad8a18 100644\n--- a/include/user/guest-host.h\n+++ b/include/user/guest-host.h\n@@ -29,7 +29,12 @@ extern unsigned long reserved_va;\n */\n extern unsigned long guest_addr_max;\n \n-static inline vaddr cpu_untagged_addr(CPUState *cs, vaddr x)\n+/*\n+ * These functions take the guest virtual address as a vaddr,\n+ * and are suitable for use from target-independent code.\n+ */\n+\n+static inline vaddr cpu_untagged_addr_vaddr(CPUState *cs, vaddr x)\n {\n const TCGCPUOps *tcg_ops = cs->cc->tcg_ops;\n if (tcg_ops->untagged_addr) {\n@@ -39,22 +44,22 @@ static inline vaddr cpu_untagged_addr(CPUState *cs, vaddr x)\n }\n \n /* All direct uses of g2h and h2g need to go away for usermode softmmu. */\n-static inline void *g2h_untagged(vaddr x)\n+static inline void *g2h_untagged_vaddr(vaddr x)\n {\n return (void *)((uintptr_t)(x) + guest_base);\n }\n \n-static inline void *g2h(CPUState *cs, vaddr x)\n+static inline void *g2h_vaddr(CPUState *cs, vaddr x)\n {\n- return g2h_untagged(cpu_untagged_addr(cs, x));\n+ return g2h_untagged_vaddr(cpu_untagged_addr_vaddr(cs, x));\n }\n \n-static inline bool guest_addr_valid_untagged(vaddr x)\n+static inline bool guest_addr_valid_untagged_vaddr(vaddr x)\n {\n return x <= guest_addr_max;\n }\n \n-static inline bool guest_range_valid_untagged(vaddr start, vaddr len)\n+static inline bool guest_range_valid_untagged_vaddr(vaddr start, vaddr len)\n {\n return len - 1 <= guest_addr_max && start <= guest_addr_max - len + 1;\n }\n@@ -73,4 +78,49 @@ static inline bool guest_range_valid_untagged(vaddr start, vaddr len)\n h2g_nocheck(x); \\\n })\n \n+#ifdef COMPILING_PER_TARGET\n+\n+/*\n+ * These functions take the guest virtual address as an abi_ptr. This\n+ * is an important difference from a vaddr for the common case where\n+ * the address is a syscall argument in a variable of type abi_long,\n+ * which may be smaller than the vaddr type. If you pass an address in\n+ * an abi_long to these functions then the value will be converted to\n+ * an unsigned type and then zero extended to give the vaddr. If you\n+ * use the g2h_vaddr() and similar functions which take an argument of\n+ * type vaddr, then the value will be sign-extended, giving the wrong\n+ * answer for addresses above the 2GB mark on 32-bit guests.\n+ *\n+ * Providing these functions with their traditional QEMU semantics is\n+ * less bug-prone than requiring many callsites to remember to cast\n+ * their abi_long variable to an abi_ptr before calling.\n+ */\n+\n+static inline void *g2h(CPUState *cs, abi_ptr x)\n+{\n+ return g2h_vaddr(cs, x);\n+}\n+\n+static inline void *g2h_untagged(abi_ptr x)\n+{\n+ return g2h_untagged_vaddr(x);\n+}\n+\n+static inline bool guest_addr_valid_untagged(abi_ptr x)\n+{\n+ return guest_addr_valid_untagged_vaddr(x);\n+}\n+\n+static inline bool guest_range_valid_untagged(abi_ptr start, abi_ptr len)\n+{\n+ return guest_range_valid_untagged_vaddr(start, len);\n+}\n+\n+static inline abi_ptr cpu_untagged_addr(CPUState *cs, abi_ptr x)\n+{\n+ return cpu_untagged_addr_vaddr(cs, x);\n+}\n+\n+#endif\n+\n #endif\n", "prefixes": [ "2/2" ] }