From patchwork Thu Feb 15 06:19:46 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 772862 Delivered-To: patch@linaro.org Received: by 2002:adf:9dc2:0:b0:33b:4db1:f5b3 with SMTP id q2csp681446wre; Wed, 14 Feb 2024 22:25:36 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCWwC3/M9bLgTHZSLqhlxdClplcvHADC9vwvoVna0FmatJnDImD0+wQ48DO7VVVuxxf3O4aoy+mjYLJVC9bLFDXg X-Google-Smtp-Source: AGHT+IGMdoUVWgut2ooRhzbsUbv9JJrrLosHarqAWYaKqdHg6I6KWt+LAj2yqDVWugXaciVGo5SF X-Received: by 2002:a05:620a:10a5:b0:785:c02d:9762 with SMTP id h5-20020a05620a10a500b00785c02d9762mr6636151qkk.19.1707978336575; Wed, 14 Feb 2024 22:25:36 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1707978336; cv=none; d=google.com; s=arc-20160816; b=LtdYmINFXy+s9144DhsFvyjE5n+099qkGppgHv+ZfBKQM6YuDu7jvoAdLsXzKW96xT hkXARe8PrQ//sHDj12b9VDjQlOJVTQXnuQV6jKX6wxtL+0q4SavYFlUZoRVGvZYkmwOr SaXPBGTMupyNeM0VhPZrBIO+yi9hsQj1PfiKAHLUhNFaTgdzKn81mJXAH4oXan+WpWaN 43VCD/TQoS7uO22t1+YhNn5fdZUIUzZ/9Q9tp2T6sv0kK+xcQGz5432/LD6C69b/dPX6 fc4vVMA4qkeKKu0STGrI48puck/XHJbNCS6qwydffRxv4maFkAS/+aMmlm9+5cPoiLpQ xPZQ== 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=Bhq/S13VfihOVnnYi8cdcfrHcq4G1EwJdAWP437jNUw=; fh=v7v6q89OJlq+NxHejbJ/ziw7VE+fSww09twjGPM2dQM=; b=FRS4YyobhzYwd8s/tPT7yj93NP7qi8pB6hvuFurXbgvWnKO686NOJwfN1/+kEO2iaZ rRs6B3o0gOXwidSNoXrEj5I85S+EtPp5qYHsr7AE7DVuen3hY+mjB+cPfvX8tnAne0f6 TEgnFrtGAGdOo52jEVmy0PpxtdLI6fT3erUQ37X5sG7ckBlcQgbJFloLXh6+ricq3/c6 O+wPkS+L086zQUT/4vlcYTxt/oxglxUwgd0SeuaceuPRgOdCxrOevUt3cdT5trxwmaBc h4JX84ZlyTo+BiTq7e1+7ywrHKqF/jRuLVWPRJJoyiUpHeUlTrEwsHTRTcAwiRqdK3+8 MgAw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=PoZHd75W; 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 l24-20020ac84a98000000b0042a09d5d0aesi663771qtq.788.2024.02.14.22.25.36 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 14 Feb 2024 22:25:36 -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=PoZHd75W; 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 1raV6n-0002I0-13; Thu, 15 Feb 2024 01:20:33 -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 1raV6j-0002FT-Jt for qemu-devel@nongnu.org; Thu, 15 Feb 2024 01:20:29 -0500 Received: from mail-pl1-x636.google.com ([2607:f8b0:4864:20::636]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1raV6h-0005Kv-VT for qemu-devel@nongnu.org; Thu, 15 Feb 2024 01:20:29 -0500 Received: by mail-pl1-x636.google.com with SMTP id d9443c01a7336-1d9b2400910so4240035ad.0 for ; Wed, 14 Feb 2024 22:20:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1707978027; x=1708582827; 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=Bhq/S13VfihOVnnYi8cdcfrHcq4G1EwJdAWP437jNUw=; b=PoZHd75WBc6LC2ahvP1zKctqUDqlM0VsZrH1A84+kemCZRB1g8khlO934k9XwgkzjK nOmeKsZm+NNxKsodDpKTbHjCaZbzgC0HZWlNwuL92/tPIHrSNIzkKufJ81CxPWHxRQZ7 eWZR12OfdrF5PK5NvcnYfwXv1WLw60Q0k7+JzsNoYRyGv3Y7Tf0QzRPA3IyeFLSzOEUB 2ZEVQFLJ8c0L1Jy/wolIK0VsJeCbtakOzGshEZgtycTDcckzZbZfWutTu9IH/cubGIw0 mI/Okzz2Sm7uOZNSM7afHYLHIbnE3HCt3CKzqlAz/asaTOwO68WgwfVbapRsOqPqx9TH 2eFw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1707978027; x=1708582827; 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=Bhq/S13VfihOVnnYi8cdcfrHcq4G1EwJdAWP437jNUw=; b=fIH1ths7PoO4pAt3puGuSPGJrKqIcfCMP4F6Yw3FIrVztewwBqPkbCG93E2nAi/nK9 r//+zPf+HsTjduWiLGU+DKU653/MNXmsWeia+FJ+feSdpX9KJQeS2Q8t7RHMGo2VQtSq iWVtkqXm6cW/ReDJeTKxFUkbUV1Oq4rFyWWZutkjBMKq9eHvJLJN5OXWjK5vVDUTJmCY vvSRcxWWoPfTO1mTl20B9+2ZKFbaG3DHq2OBka/pkODI4ZjCSwi6UomumFCoa6rZLclo lDVUV85A0ikEtGqD4b019jgSHPqIupqKOo0p2y5IjHAHRMXOvaGYcQBkUc5FQZUb7lDe UQNA== X-Gm-Message-State: AOJu0Yym2N8XVAPRMR4EWxyHK0lrrSYWAZn0nBgl72Bi4oItT7ihwSv1 vsb9W6wjaUXXPGVNOiLp2l/iPssQEU5kb2x/ziBqVFKv0Iy1DEXgxeqxyTJo0X7SyTd8nts6vQG X X-Received: by 2002:a17:902:d549:b0:1da:2b5e:6728 with SMTP id z9-20020a170902d54900b001da2b5e6728mr1600826plf.21.1707978026750; Wed, 14 Feb 2024 22:20:26 -0800 (PST) Received: from stoup.. (173-197-098-125.biz.spectrum.com. [173.197.98.125]) by smtp.gmail.com with ESMTPSA id d5-20020a170902b70500b001d6f29c12f7sm464418pls.135.2024.02.14.22.20.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 14 Feb 2024 22:20:26 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Cc: Ilya Leoshkevich , Pierrick Bouvier , Helge Deller Subject: [PATCH v4 04/36] linux-user: Remove qemu_host_page_size from create_elf_tables Date: Wed, 14 Feb 2024 20:19:46 -1000 Message-Id: <20240215062018.795056-5-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240215062018.795056-1-richard.henderson@linaro.org> References: <20240215062018.795056-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::636; envelope-from=richard.henderson@linaro.org; helo=mail-pl1-x636.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 AT_PAGESZ is supposed to advertise the guest page size. The random adjustment made here using qemu_host_page_size does not match anything else within linux-user. The idea here is good, but should be done more systemically via adjustment to TARGET_PAGE_SIZE. Signed-off-by: Richard Henderson Reviewed-by: Ilya Leoshkevich Reviewed-by: Pierrick Bouvier Acked-by: Helge Deller Message-Id: <20240102015808.132373-5-richard.henderson@linaro.org> --- linux-user/elfload.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/linux-user/elfload.c b/linux-user/elfload.c index e84a201448..dfb152bfcb 100644 --- a/linux-user/elfload.c +++ b/linux-user/elfload.c @@ -2679,13 +2679,7 @@ static abi_ulong create_elf_tables(abi_ulong p, int argc, int envc, NEW_AUX_ENT(AT_PHDR, (abi_ulong)(info->load_addr + exec->e_phoff)); NEW_AUX_ENT(AT_PHENT, (abi_ulong)(sizeof (struct elf_phdr))); NEW_AUX_ENT(AT_PHNUM, (abi_ulong)(exec->e_phnum)); - if ((info->alignment & ~qemu_host_page_mask) != 0) { - /* Target doesn't support host page size alignment */ - NEW_AUX_ENT(AT_PAGESZ, (abi_ulong)(TARGET_PAGE_SIZE)); - } else { - NEW_AUX_ENT(AT_PAGESZ, (abi_ulong)(MAX(TARGET_PAGE_SIZE, - qemu_host_page_size))); - } + NEW_AUX_ENT(AT_PAGESZ, (abi_ulong)(TARGET_PAGE_SIZE)); NEW_AUX_ENT(AT_BASE, (abi_ulong)(interp_info ? interp_info->load_addr : 0)); NEW_AUX_ENT(AT_FLAGS, (abi_ulong)0); NEW_AUX_ENT(AT_ENTRY, info->entry);