From patchwork Fri Mar 1 23:05:46 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 777093 Delivered-To: patch@linaro.org Received: by 2002:adf:e94d:0:b0:33d:f458:43ce with SMTP id m13csp1602767wrn; Fri, 1 Mar 2024 15:13:22 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCWrmH/41oBt94AXyD5gKgm9z+d2ouPANpv0w2HXomT8u8NH7FlVY6GO+dahJwO1WkJykWC1zO4mzOJubIvh0t6m X-Google-Smtp-Source: AGHT+IG6MtQHGmPZ9DK2y0e6zINRJ7Rs3y9FbZ33jtdjQvRIcmBqtTtF1uDlYgkUQueJ2rIBvW9g X-Received: by 2002:a05:6358:e4a2:b0:17b:af7b:febb with SMTP id by34-20020a056358e4a200b0017baf7bfebbmr2983040rwb.1.1709334802598; Fri, 01 Mar 2024 15:13:22 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1709334802; cv=none; d=google.com; s=arc-20160816; b=fysj5mlC5eI0l0cLOy6L0Cz19qblPb/LNAMnjCI4R3cUC8C3qW1hZg5UqIvNqhP5Th 5qYBFL28gV5njDNJFVar8konfcpsQLl7bjYYlpP+osE+zwemlo/AdfokcP4VHzxAQ6c4 bJxXw/9vBC/NiyoY+LV6Zi/VIj7Ta/y+PRDyJZa5bVjXz2Dqc9omghQayfh5DXVtfI2P q8BT/uXMP+nTigRbcObafMHFCxa3D0HPSHf4/Q7E2utnz6wN1zLxET5UpPJ8O3rZG1pk g+XtzO5kihFiWmeTTJ+3OGFnp4s8HJv83GA2doykO++83v8LMvy9MQUtdzHQ6OPMQmhG 0dgg== 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=QqsG1I779d9YjbXcffYW5wImE5mXquA1bGyFgIG+R5A=; fh=H/IsS+LNYM6dBDHt5BZPsM5V9tnyjdUlJ92VVuTs62g=; b=mTW68MAVsCyquQ7jyIk4uTULwgPukMQWfTLDWsNZwcaOaeYrm3WOFu+/qqxcS0gB/i ycKvRCwh7DJeUBz6PIE7khnipVwGUka1/DLZbHWNeyJTEO9k23rw/1DHTMDKQlbtu8HU kfGC9SNP+Xb+BrjSdkGLflClb+KF70XUJqVj5nu0TMph+wkyc/x6UALjpJ6IV9dscWkt tz/CNCwBch06rxA1RkMhXrWsIVpRCT+3pzIe83RqrBW06jIngFEn0oid7qKyH+NI3tSM q+7gZfEbj4e0rxVjpc7g6e0QDBRsnJddU9BCCTvvreEUketCW39Se6xuw0oZJGfivZbg p/sA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=ikvwTk5y; 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 t1-20020a05621421a100b0068c6cb82b51si4647200qvc.192.2024.03.01.15.13.22 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 01 Mar 2024 15:13:22 -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=ikvwTk5y; 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 1rgByT-00063y-9r; Fri, 01 Mar 2024 18:07:29 -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 1rgBy4-000584-9a for qemu-devel@nongnu.org; Fri, 01 Mar 2024 18:07:04 -0500 Received: from mail-pl1-x62c.google.com ([2607:f8b0:4864:20::62c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rgBy2-0004J7-Cv for qemu-devel@nongnu.org; Fri, 01 Mar 2024 18:07:03 -0500 Received: by mail-pl1-x62c.google.com with SMTP id d9443c01a7336-1dcafff3c50so23002275ad.0 for ; Fri, 01 Mar 2024 15:07:01 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1709334420; x=1709939220; 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=QqsG1I779d9YjbXcffYW5wImE5mXquA1bGyFgIG+R5A=; b=ikvwTk5y0KRuD4wIwHa1ztsD8rcdsNzvoErFQECKfbaIbr2ev/oFgMfIcK/KKJjDck QmiH/Ke085/ObIJPytUowPI6vZgGPTARI0wGY7jyBgFwZq234ttCq9RvFdc4bYdxHKDg Ne8UtE3DjIq0wrVPaE8FjyIWhm288yoiEAUDk8BRgwhNDx2BDqSJ4+MiWLRMAOpX6ndk o1ObqvwDRpnZmVk9gGYC2/DvY0p2Ca242qx6oWatVs5LSsrRJ2Drg2wkihuU9fDuS/0j ceB72HFqHUMH53zlRHZuHsmegK/S3UcvYhyVZSRM0d/khyM/rZHp2RUG6EXyVcsuGD0x 7T5g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709334420; x=1709939220; 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=QqsG1I779d9YjbXcffYW5wImE5mXquA1bGyFgIG+R5A=; b=oJZXM+IqFcEAtSdKLYMJbP+jUktGjFyZdXXuXPxTzbrvGbPvIe51pooN4IXWOMof1q MGXQywUhbwHJEC5dmkoMqba8RDQlCIJbqBjxFojrLUZb2IT77EcalRGDnwDYqZqR1Vmq 2iLoYvf6LIay0qvy4UxsgchBv0ZuQ+r2o7Q1MNU6j1C88T0eJiU38L7x/eip51YKNShE KVDh6sCyizfHSsNtrED8eTijzAKaCJKh5KKd3JgcEBBMAZ+yLfjWoouEanzUipvorBYT ms6H+WuX9sm2vNLvtBTpoHaEDa/GZmOmVefZch7qblhyA9buystc59guIN8o/ezDhtnF VqJw== X-Gm-Message-State: AOJu0Yz2H0Ze4qVm1oiUOkfEO1p4zYNxig/NzP03L/p2cm4lZs9Q03Vy uMIn+kIvaGUUWzLWkSqeUyY7EAAz9OxOm8ysrJ4C6K7A1zY0jXH2QNa2eWmFZAkgivudFwHUDdv c X-Received: by 2002:a17:902:6b02:b0:1db:7181:c5ba with SMTP id o2-20020a1709026b0200b001db7181c5bamr2773290plk.62.1709334420287; Fri, 01 Mar 2024 15:07:00 -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.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 01 Mar 2024 15:06:59 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Ilya Leoshkevich , Helge Deller Subject: [PATCH 27/60] linux-user: Remove REAL_HOST_PAGE_ALIGN from mmap.c Date: Fri, 1 Mar 2024 13:05:46 -1000 Message-Id: <20240301230619.661008-28-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::62c; envelope-from=richard.henderson@linaro.org; helo=mail-pl1-x62c.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 We already have qemu_real_host_page_size() in a local variable. Reviewed-by: Philippe Mathieu-Daudé Signed-off-by: Richard Henderson Reviewed-by: Ilya Leoshkevich Acked-by: Helge Deller Message-Id: <20240102015808.132373-10-richard.henderson@linaro.org> --- linux-user/mmap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/linux-user/mmap.c b/linux-user/mmap.c index 4d3c8717b9..53e5486cc8 100644 --- a/linux-user/mmap.c +++ b/linux-user/mmap.c @@ -585,7 +585,7 @@ abi_long target_mmap(abi_ulong start, abi_ulong len, int target_prot, * the hosts real pagesize. Additional anonymous maps * will be created beyond EOF. */ - len = REAL_HOST_PAGE_ALIGN(sb.st_size - offset); + len = ROUND_UP(sb.st_size - offset, host_page_size); } }