From nobody Wed Apr 9 11:59:33 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1680044374; cv=none; d=zohomail.com; s=zohoarc; b=OZGOHjRERV486DKXFFlQvHGURXo0SjyYfkhVnwnw5MfFHud8CypE7qc0S8GaW6TKECulkiCTolQ9KQyA960dqRH9T3uzxLtcFFz1JsouVOzcbPyXNhXlRqViY+L7IQkqVFcWIM3n4KGeP1MGgmAQkcYxlIuys5ExMfk7LPq+Akw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1680044374; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=HGR1FH4Yfs2yWXOpijdZet2xfEmVpJkhB4HWyQD2rq4=; b=FMNHuPJJN/tiBvUK71+1HgAp6ccQmHLZ7RUuvCIJKzaLAghwBcvGI9rs8aIHkXep99r0XMe6E0WfkP2qcE10Cbo4NX3o9yn2xV6w5LQfSiHNthz0eh6ik1qjHUsC03rY7YMR/xGjrVkbKgR3nvJeiipRtWoH9jvmSem6TUKSvgk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1680044374857833.9858406847605; Tue, 28 Mar 2023 15:59:34 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1phIGn-0006vp-M2; Tue, 28 Mar 2023 18:58:25 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1phIGj-0006tw-PJ for qemu-devel@nongnu.org; Tue, 28 Mar 2023 18:58:22 -0400 Received: from mail-pj1-x102e.google.com ([2607:f8b0:4864:20::102e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1phIGh-00074v-NO for qemu-devel@nongnu.org; Tue, 28 Mar 2023 18:58:21 -0400 Received: by mail-pj1-x102e.google.com with SMTP id p13-20020a17090a284d00b0023d2e945aebso2713343pjf.0 for ; Tue, 28 Mar 2023 15:58:19 -0700 (PDT) Received: from stoup.. ([2602:ae:1541:f901:c23d:b6:6be1:f147]) by smtp.gmail.com with ESMTPSA id jw1-20020a170903278100b0019cd1ee1523sm21670633plb.30.2023.03.28.15.58.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 28 Mar 2023 15:58:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1680044298; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=HGR1FH4Yfs2yWXOpijdZet2xfEmVpJkhB4HWyQD2rq4=; b=pwBvPTSqq7fdAAc0alzxm8HHZXl4skclJn/S76HToqgQU8zIdeBHEARoX737lMrtir XDWRi+rm9zW2qCdVFoiNIlAJQuoR+aSvG/AualkxlMIQWpTe07RrGlPhI/mBLkHT7WDF Si2Omub72dnYqB7HQg/HfVhTOBQUJJhfMBjExtWzW2tqK3qtTUW23Koqb6pV/XF7PBiv wiGvhi6f1XS/wgdS6hAZWI9XcH3BEQtYjjhlQ93LGxnAQDm/lKcyt3mt56Ea6FzlLfHs g4u6ddl/29tQgkTiJhe8WrDVdNGmcrU4f3KrSFQRwOmPfGhWsPbzHm642T3cvAHUthCW 5t5Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680044298; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=HGR1FH4Yfs2yWXOpijdZet2xfEmVpJkhB4HWyQD2rq4=; b=ye0evlnktUUbjAOmuZ7bHuLJohxqF1h2ZsCKvIKu+xNaAmnBtDt5hbKb9/8qg1v2GH BCHvImxDW3eSCx9YEaFnKrr/kBIF5yFnobZ15KNB6UXqcBeU3n634/JpGPm1q+M50xUZ ytUOzenW1j9gcwaOAw1fM5Pc7Dv48zrvMeJyP49MRgzRLS1eqxRzRkeCl5K8TLh9HyMc yAcNk9otr/Yv3Gn+pSVBsn7QKKmAe7Vg3M04xuz1xW7rrYLlRe9I+4uy0TWvX5lIPPCI 87P48Fh3DinmYpFgYMty2vFo2dZLZBIlGp8R5jAi821kF0E8GRtB+2x5ZjkckpQucNlg P88w== X-Gm-Message-State: AAQBX9fYtKbjswahshFWuJXbQXB2Ng+3L+1r2oW78K3If96lfoazoxa7 CqjX/Lkkp72YNXqYzWQKFo450vY7CQFSA7V62XE= X-Google-Smtp-Source: AKy350ZnQxWzvM33+o7BzE8UBjPXMyllt3Ci49CptZ70w0Zj/qZPv7vUu+6x+xpE+0s1KDh/BC78OQ== X-Received: by 2002:a17:903:886:b0:1a1:8b54:ab58 with SMTP id kt6-20020a170903088600b001a18b54ab58mr13982883plb.19.1680044298299; Tue, 28 Mar 2023 15:58:18 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PULL 11/15] include/exec: Change reserved_va semantics to last byte Date: Tue, 28 Mar 2023 15:58:02 -0700 Message-Id: <20230328225806.2278728-12-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230328225806.2278728-1-richard.henderson@linaro.org> References: <20230328225806.2278728-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::102e; envelope-from=richard.henderson@linaro.org; helo=mail-pj1-x102e.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, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1680044376636100005 Change the semantics to be the last byte of the guest va, rather than the following byte. This avoids some overflow conditions. Reviewed-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Richard Henderson --- include/exec/cpu-all.h | 11 ++++++++++- linux-user/arm/target_cpu.h | 2 +- bsd-user/main.c | 10 +++------- bsd-user/mmap.c | 4 ++-- linux-user/elfload.c | 14 +++++++------- linux-user/main.c | 27 +++++++++++++-------------- linux-user/mmap.c | 4 ++-- 7 files changed, 38 insertions(+), 34 deletions(-) diff --git a/include/exec/cpu-all.h b/include/exec/cpu-all.h index 64cb62dc54..090922e4a8 100644 --- a/include/exec/cpu-all.h +++ b/include/exec/cpu-all.h @@ -152,6 +152,15 @@ static inline void tswap64s(uint64_t *s) */ extern uintptr_t guest_base; extern bool have_guest_base; + +/* + * If non-zero, the guest virtual address space is a contiguous subset + * of the host virtual address space, i.e. '-R reserved_va' is in effect + * either from the command-line or by default. The value is the last + * byte of the guest address space e.g. UINT32_MAX. + * + * If zero, the host and guest virtual address spaces are intermingled. + */ extern unsigned long reserved_va; =20 /* @@ -171,7 +180,7 @@ extern unsigned long reserved_va; #define GUEST_ADDR_MAX_ \ ((MIN_CONST(TARGET_VIRT_ADDR_SPACE_BITS, TARGET_ABI_BITS) <=3D 32) ? \ UINT32_MAX : ~0ul) -#define GUEST_ADDR_MAX (reserved_va ? reserved_va - 1 : GUEST_ADDR_MAX_) +#define GUEST_ADDR_MAX (reserved_va ? : GUEST_ADDR_MAX_) =20 #else =20 diff --git a/linux-user/arm/target_cpu.h b/linux-user/arm/target_cpu.h index 89ba274cfc..f6383a7cd1 100644 --- a/linux-user/arm/target_cpu.h +++ b/linux-user/arm/target_cpu.h @@ -30,7 +30,7 @@ static inline unsigned long arm_max_reserved_va(CPUState = *cs) * the high addresses. Restrict linux-user to the * cached write-back RAM in the system map. */ - return 0x80000000ul; + return 0x7ffffffful; } else { /* * We need to be able to map the commpage. diff --git a/bsd-user/main.c b/bsd-user/main.c index 89f225dead..babc3b009b 100644 --- a/bsd-user/main.c +++ b/bsd-user/main.c @@ -68,13 +68,9 @@ bool have_guest_base; # if HOST_LONG_BITS > TARGET_VIRT_ADDR_SPACE_BITS # if TARGET_VIRT_ADDR_SPACE_BITS =3D=3D 32 && \ (TARGET_LONG_BITS =3D=3D 32 || defined(TARGET_ABI32)) -/* - * There are a number of places where we assign reserved_va to a variable - * of type abi_ulong and expect it to fit. Avoid the last page. - */ -# define MAX_RESERVED_VA (0xfffffffful & TARGET_PAGE_MASK) +# define MAX_RESERVED_VA 0xfffffffful # else -# define MAX_RESERVED_VA (1ul << TARGET_VIRT_ADDR_SPACE_BITS) +# define MAX_RESERVED_VA ((1ul << TARGET_VIRT_ADDR_SPACE_BITS) - 1) # endif # else # define MAX_RESERVED_VA 0 @@ -466,7 +462,7 @@ int main(int argc, char **argv) envlist_free(envlist); =20 if (reserved_va) { - mmap_next_start =3D reserved_va; + mmap_next_start =3D reserved_va + 1; } =20 { diff --git a/bsd-user/mmap.c b/bsd-user/mmap.c index 696057551a..565b9f97ed 100644 --- a/bsd-user/mmap.c +++ b/bsd-user/mmap.c @@ -234,7 +234,7 @@ static abi_ulong mmap_find_vma_reserved(abi_ulong start= , abi_ulong size, size =3D HOST_PAGE_ALIGN(size) + alignment; end_addr =3D start + size; if (end_addr > reserved_va) { - end_addr =3D reserved_va; + end_addr =3D reserved_va + 1; } addr =3D end_addr - qemu_host_page_size; =20 @@ -243,7 +243,7 @@ static abi_ulong mmap_find_vma_reserved(abi_ulong start= , abi_ulong size, if (looped) { return (abi_ulong)-1; } - end_addr =3D reserved_va; + end_addr =3D reserved_va + 1; addr =3D end_addr - qemu_host_page_size; looped =3D 1; continue; diff --git a/linux-user/elfload.c b/linux-user/elfload.c index dfae967908..f1370a7a8b 100644 --- a/linux-user/elfload.c +++ b/linux-user/elfload.c @@ -208,7 +208,7 @@ static bool init_guest_commpage(void) * has specified -R reserved_va, which would trigger an assert(). */ if (reserved_va !=3D 0 && - TARGET_VSYSCALL_PAGE + TARGET_PAGE_SIZE >=3D reserved_va) { + TARGET_VSYSCALL_PAGE + TARGET_PAGE_SIZE - 1 > reserved_va) { error_report("Cannot allocate vsyscall page"); exit(EXIT_FAILURE); } @@ -2504,7 +2504,7 @@ static void pgb_have_guest_base(const char *image_nam= e, abi_ulong guest_loaddr, if (guest_hiaddr > reserved_va) { error_report("%s: requires more than reserved virtual " "address space (0x%" PRIx64 " > 0x%lx)", - image_name, (uint64_t)guest_hiaddr + 1, reserved_= va); + image_name, (uint64_t)guest_hiaddr, reserved_va); exit(EXIT_FAILURE); } } else { @@ -2525,7 +2525,7 @@ static void pgb_have_guest_base(const char *image_nam= e, abi_ulong guest_loaddr, if (reserved_va) { guest_loaddr =3D (guest_base >=3D mmap_min_addr ? 0 : mmap_min_addr - guest_base); - guest_hiaddr =3D reserved_va - 1; + guest_hiaddr =3D reserved_va; } =20 /* Reserve the address space for the binary, or reserved_va. */ @@ -2755,7 +2755,7 @@ static void pgb_reserved_va(const char *image_name, a= bi_ulong guest_loaddr, if (guest_hiaddr > reserved_va) { error_report("%s: requires more than reserved virtual " "address space (0x%" PRIx64 " > 0x%lx)", - image_name, (uint64_t)guest_hiaddr + 1, reserved_va); + image_name, (uint64_t)guest_hiaddr, reserved_va); exit(EXIT_FAILURE); } =20 @@ -2768,17 +2768,17 @@ static void pgb_reserved_va(const char *image_name,= abi_ulong guest_loaddr, /* Reserve the memory on the host. */ assert(guest_base !=3D 0); test =3D g2h_untagged(0); - addr =3D mmap(test, reserved_va, PROT_NONE, flags, -1, 0); + addr =3D mmap(test, reserved_va + 1, PROT_NONE, flags, -1, 0); if (addr =3D=3D MAP_FAILED || addr !=3D test) { error_report("Unable to reserve 0x%lx bytes of virtual address " "space at %p (%s) for use as guest address space (che= ck your " "virtual memory ulimit setting, min_mmap_addr or rese= rve less " - "using -R option)", reserved_va, test, strerror(errno= )); + "using -R option)", reserved_va + 1, test, strerror(e= rrno)); exit(EXIT_FAILURE); } =20 qemu_log_mask(CPU_LOG_PAGE, "%s: base @ %p for %lu bytes\n", - __func__, addr, reserved_va); + __func__, addr, reserved_va + 1); } =20 void probe_guest_base(const char *image_name, abi_ulong guest_loaddr, diff --git a/linux-user/main.c b/linux-user/main.c index 39d9bd4d7a..fe03293516 100644 --- a/linux-user/main.c +++ b/linux-user/main.c @@ -109,11 +109,9 @@ static const char *last_log_filename; # if HOST_LONG_BITS > TARGET_VIRT_ADDR_SPACE_BITS # if TARGET_VIRT_ADDR_SPACE_BITS =3D=3D 32 && \ (TARGET_LONG_BITS =3D=3D 32 || defined(TARGET_ABI32)) -/* There are a number of places where we assign reserved_va to a variable - of type abi_ulong and expect it to fit. Avoid the last page. */ -# define MAX_RESERVED_VA(CPU) (0xfffffffful & TARGET_PAGE_MASK) +# define MAX_RESERVED_VA(CPU) 0xfffffffful # else -# define MAX_RESERVED_VA(CPU) (1ul << TARGET_VIRT_ADDR_SPACE_BITS) +# define MAX_RESERVED_VA(CPU) ((1ul << TARGET_VIRT_ADDR_SPACE_BITS) - 1) # endif # else # define MAX_RESERVED_VA(CPU) 0 @@ -379,7 +377,9 @@ static void handle_arg_reserved_va(const char *arg) { char *p; int shift =3D 0; - reserved_va =3D strtoul(arg, &p, 0); + unsigned long val; + + val =3D strtoul(arg, &p, 0); switch (*p) { case 'k': case 'K': @@ -393,10 +393,10 @@ static void handle_arg_reserved_va(const char *arg) break; } if (shift) { - unsigned long unshifted =3D reserved_va; + unsigned long unshifted =3D val; p++; - reserved_va <<=3D shift; - if (reserved_va >> shift !=3D unshifted) { + val <<=3D shift; + if (val >> shift !=3D unshifted) { fprintf(stderr, "Reserved virtual address too big\n"); exit(EXIT_FAILURE); } @@ -405,6 +405,8 @@ static void handle_arg_reserved_va(const char *arg) fprintf(stderr, "Unrecognised -R size suffix '%s'\n", p); exit(EXIT_FAILURE); } + /* The representation is size - 1, with 0 remaining "default". */ + reserved_va =3D val ? val - 1 : 0; } =20 static void handle_arg_singlestep(const char *arg) @@ -793,7 +795,7 @@ int main(int argc, char **argv, char **envp) */ max_reserved_va =3D MAX_RESERVED_VA(cpu); if (reserved_va !=3D 0) { - if (reserved_va % qemu_host_page_size) { + if ((reserved_va + 1) % qemu_host_page_size) { char *s =3D size_to_str(qemu_host_page_size); fprintf(stderr, "Reserved virtual address not aligned mod %s\n= ", s); g_free(s); @@ -804,11 +806,8 @@ int main(int argc, char **argv, char **envp) exit(EXIT_FAILURE); } } else if (HOST_LONG_BITS =3D=3D 64 && TARGET_VIRT_ADDR_SPACE_BITS <= =3D 32) { - /* - * reserved_va must be aligned with the host page size - * as it is used with mmap() - */ - reserved_va =3D max_reserved_va & qemu_host_page_mask; + /* MAX_RESERVED_VA + 1 is a large power of 2, so is aligned. */ + reserved_va =3D max_reserved_va; } =20 { diff --git a/linux-user/mmap.c b/linux-user/mmap.c index 995146f60d..0aa8ae7356 100644 --- a/linux-user/mmap.c +++ b/linux-user/mmap.c @@ -283,7 +283,7 @@ static abi_ulong mmap_find_vma_reserved(abi_ulong start= , abi_ulong size, end_addr =3D start + size; if (start > reserved_va - size) { /* Start at the top of the address space. */ - end_addr =3D ((reserved_va - size) & -align) + size; + end_addr =3D ((reserved_va + 1 - size) & -align) + size; looped =3D true; } =20 @@ -297,7 +297,7 @@ static abi_ulong mmap_find_vma_reserved(abi_ulong start= , abi_ulong size, return (abi_ulong)-1; } /* Re-start at the top of the address space. */ - addr =3D end_addr =3D ((reserved_va - size) & -align) + size; + addr =3D end_addr =3D ((reserved_va + 1 - size) & -align) + si= ze; looped =3D true; } else { prot =3D page_get_flags(addr); --=20 2.34.1