From patchwork Fri Mar 1 23:05:39 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 777077 Delivered-To: patch@linaro.org Received: by 2002:adf:e94d:0:b0:33d:f458:43ce with SMTP id m13csp1600838wrn; Fri, 1 Mar 2024 15:07:15 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCWOUj7CbvwUEvoU2OjIB/SgBvEe06wz9hO9X5Z8gV0s/aEtbm0hutWfdDaT56mrJZiVfRIXILMWx7CZDWc4vjoM X-Google-Smtp-Source: AGHT+IHqFHqPCeT2mnjg0oxwgC6clzk7BR7H5Dca+MuPuRfSBJw0HGb9cmbGrD8aJFcZOsUXd9If X-Received: by 2002:ad4:4ae9:0:b0:68f:6260:f71f with SMTP id cp9-20020ad44ae9000000b0068f6260f71fmr2749939qvb.49.1709334435181; Fri, 01 Mar 2024 15:07:15 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1709334435; cv=none; d=google.com; s=arc-20160816; b=ivvugQ9R0J4dNII1j67K4SsdfkSITT2Vrh/QVVwkRwUIhyrSYIK29pDwzo1P9gIpep jUuapUTZC/GPcG3nR4taxImeHUJz/UbjTfUFVdTZSWa3123Fkn/4Dl11BXAAWJGCjHtT XRRS8gGi2NWIxoZDdhPUqu7s0P+8rQHRmDo9UfEkIxQpJHKM4cspxuREoQW4z0lyQRw4 aYSIQiFeulr9pmAScyMEYaxrGwkOugr/ePSe98/oQ42PzUn2kzCPJ/GIU6BcgaaWvcPl 2JhN0fnKxcV4kIW4nEC2zMXQBu8a8naFn3JnlpZeXFGHqaH3gMBJwBVM8mdO0tp7Xwqj Sfsw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=vVQmqpHBlbE8lrIqY5LVT+yiAGVzo/DdsXrDpEqGU+A=; fh=v7v6q89OJlq+NxHejbJ/ziw7VE+fSww09twjGPM2dQM=; b=cYnoTaK5ed2V/bmDNlGALAOEH6TGDe0YLPd+APmUDosWijflmnkG5L9C7UVBwvDxeJ Vq9V4kd9TMNBqpysO6YlhMgyBf/mhjuyDJkioc63EcNkfAxbePlx/y1O6PZlr2fVMlaV IZ+uPgTDKlBSYykqfCrkf5SXfWlREvUXRlhisAN7nUkJxVysXlh0oLT117z7tLte+dDO 6ZW/2SEKGR8UaLrYyyzgaAfa6MX6AD5OpLAWcX/fTHKRuoU9UbtQ80itm2LkQQ3sDsah VqYeQyUy9iJgY1jde2nYDcxnOFAzJ5fE03leoTr3txyKLZnJAawelQnj0z6czM652oVU PXug==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=QC8u9SM7; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id fq5-20020a056214258500b0068f57292ab9si4471466qvb.123.2024.03.01.15.07.15 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 01 Mar 2024 15:07:15 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=QC8u9SM7; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rgBy9-0005Tr-Ql; Fri, 01 Mar 2024 18:07:09 -0500 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 1rgBxs-0004vx-IN for qemu-devel@nongnu.org; Fri, 01 Mar 2024 18:06:52 -0500 Received: from mail-pl1-x62f.google.com ([2607:f8b0:4864:20::62f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rgBxq-0004GQ-W0 for qemu-devel@nongnu.org; Fri, 01 Mar 2024 18:06:52 -0500 Received: by mail-pl1-x62f.google.com with SMTP id d9443c01a7336-1dc49afb495so26079125ad.2 for ; Fri, 01 Mar 2024 15:06:50 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1709334409; x=1709939209; darn=nongnu.org; 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=vVQmqpHBlbE8lrIqY5LVT+yiAGVzo/DdsXrDpEqGU+A=; b=QC8u9SM7bNDosgwI+clfqLFG6VJp3t5zHlkUDPyhLdXIWBxmgmfFx6HcfW9Y5uWObJ ZidDUeBK/AxZhJb94PL4A9q/8QBRT3x0uHlcujHQl17T42U3cs8NRCmH2ezj7+YMFpSb POJdWKmP1W5LatBayGVIxeQjbMGoQafcKy9Yvd2nDMpRnnddrf55RCWM6Zr/0e15I8rM bKlofvtMUWm2s2+dZUHwrW4I7ZmI+lmpqqbV/ctgJfy4Ov8ZVVesQOr8oefmaZTdXwq0 k2tcWh9qUNETx7ipgm5pp9musgOeL7wX4Xccc8jK9H3E7rlQpmPI2Hio6iSbeperP1Uc 5/zw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709334409; x=1709939209; 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=vVQmqpHBlbE8lrIqY5LVT+yiAGVzo/DdsXrDpEqGU+A=; b=cSTQ1ui4uprUD518uIkktQhgZfKmX+vEiac1ZjvVLQCogxSZl95K1CJ3QnSnNOOPjY 6DOPL7rz07N/9q2gdKd3eQ/DCdoCMz2fnJQzOcL2jwQ1ofblTSPn1ZBz7jKJMt48Dnnh jhxzih48euZhQ+OtmeeFbNIujX7Wu5wQgjgGqzFG8rIePisipzd7Mtde4UN+RNQNZ8GG QTkyaz7rfPgn6GqXRaZv2Xr8HYAsxxoA38vaQL6gAEn5jViZO36iP80Nll/Reg4L8xB5 TbJAunoSSCJfU1LLcovEhIeLmzvn+tVtuenFrOqbxYoVnOhNXYTfUhvfiVyLNe6cddUj b+lg== X-Gm-Message-State: AOJu0YwJxhJkKdcMBeXnkuOMU4Tmf/lV2oq+ifv+Ay6+jwFzHDBR5sAl JD1x849Pgr3xDX6zVcYeqhd3Cf6syT7iQofxNfCqD3PM4rPbljRUSlrmOeRHFA91dbDuJdvCell L X-Received: by 2002:a17:902:ee42:b0:1dc:b16c:63fd with SMTP id 2-20020a170902ee4200b001dcb16c63fdmr2947113plo.65.1709334409531; Fri, 01 Mar 2024 15:06:49 -0800 (PST) Received: from stoup.. (098-147-055-211.res.spectrum.com. [98.147.55.211]) by smtp.gmail.com with ESMTPSA id lc11-20020a170902fa8b00b001dc668e145asm3988580plb.200.2024.03.01.15.06.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 01 Mar 2024 15:06:49 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Cc: Ilya Leoshkevich , Pierrick Bouvier , Helge Deller Subject: [PATCH 20/60] linux-user: Remove qemu_host_page_{size, mask} in probe_guest_base Date: Fri, 1 Mar 2024 13:05:39 -1000 Message-Id: <20240301230619.661008-21-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240301230619.661008-1-richard.henderson@linaro.org> References: <20240301230619.661008-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::62f; envelope-from=richard.henderson@linaro.org; helo=mail-pl1-x62f.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, T_SCC_BODY_TEXT_LINE=-0.01 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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org The host SHMLBA is by definition a multiple of the host page size. Thus the remaining component of qemu_host_page_size is the target page size. Signed-off-by: Richard Henderson Reviewed-by: Ilya Leoshkevich Reviewed-by: Pierrick Bouvier Acked-by: Helge Deller Message-Id: <20240102015808.132373-4-richard.henderson@linaro.org> --- linux-user/elfload.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/linux-user/elfload.c b/linux-user/elfload.c index a51518f817..561c11ff37 100644 --- a/linux-user/elfload.c +++ b/linux-user/elfload.c @@ -2893,7 +2893,7 @@ static bool pgb_addr_set(PGBAddrs *ga, abi_ulong guest_loaddr, /* Add any HI_COMMPAGE not covered by reserved_va. */ if (reserved_va < HI_COMMPAGE) { - ga->bounds[n][0] = HI_COMMPAGE & qemu_host_page_mask; + ga->bounds[n][0] = HI_COMMPAGE & qemu_real_host_page_mask(); ga->bounds[n][1] = HI_COMMPAGE + TARGET_PAGE_SIZE - 1; n++; } @@ -3075,7 +3075,7 @@ void probe_guest_base(const char *image_name, abi_ulong guest_loaddr, abi_ulong guest_hiaddr) { /* In order to use host shmat, we must be able to honor SHMLBA. */ - uintptr_t align = MAX(SHMLBA, qemu_host_page_size); + uintptr_t align = MAX(SHMLBA, TARGET_PAGE_SIZE); /* Sanity check the guest binary. */ if (reserved_va) {