From patchwork Thu Feb 15 06:20:05 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 772852 Delivered-To: patch@linaro.org Received: by 2002:adf:9dc2:0:b0:33b:4db1:f5b3 with SMTP id q2csp681201wre; Wed, 14 Feb 2024 22:24:39 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCWst3Nqc8gADvjeKLOTvMtIIO+4AA9lsLxWdMm7hcd0PUJGPfKbjsOZ9lf6Mo1M/pLAlk0YA8aMbaZNrlRd1fKt X-Google-Smtp-Source: AGHT+IFZoxjpccmnmMt1BeqioBy2mPXErzMGyaNESbHpwn5HenvgPzj+zdE+Gl1qJEhnpWX0kKuy X-Received: by 2002:a05:6902:2504:b0:dc7:5a17:6c3 with SMTP id dt4-20020a056902250400b00dc75a1706c3mr808509ybb.53.1707978279655; Wed, 14 Feb 2024 22:24:39 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1707978279; cv=none; d=google.com; s=arc-20160816; b=DaqrTThqcauBH6PRAiDFWjH7dzOSsuWjkKVJT3gcOSL8Z+DgvE8naNiwNj2E+bq8Xs P77HGvvEqogzynyzditrsaui2dFKnA/8VlHgtwJpqaMb09Lq9BWx8KINUVQYVS+v1iJ+ 2zJxc2tw2Vsd9MqpjB1KEVjWPbBVG3BplDR2H1+W6zAJuAuq59Bnh7PykEW2japg3t+F vFaWpdl113q6NBj/tkY9shFBRRdFEicUNJQYQ8sLYfqu8G4JNJGlteOHEYJskfImvhdF bffr3lLQEwrCtPdqPh7yx97rkzhVzxbbHh+dtlEslxBq/j6hdJFIqQHjByrR4PeAXv2K NkWQ== 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=F+mIi8OQkXxgV79040kdu3+FCdCNzpLRNnazUCypFlE=; fh=akUSvRccVt8SjEp97fUPeSLjFmLWLgFk16EYqCeIvf8=; b=zvPzSQUqCmc4V3G8xuamP2hb59oQpD5SYembUdU9t5nQyJqcmfmQTlD2LigJYHrBjy iuQYR1rNs7xaBPDhyivozMGH0Nh+lE6LjnPpeLqKrnoU/OFKaXAuVCAK5rpOFwzR5p2P fZrtvvKhfik/Q6hq0eqRjZOIASyzqG0+JYjKpDsCmuU5aP0PcnBoPcTV82CVqPRnZ0F/ MSvhuqCxgXxMgCV21IwUAFtsHYrtuEo9qUyC2k2pSazW4+9tt84l//3mhwDUF+g08R5d DlzyG6EKAievkqh8DTXeN49br3VNLIzpy0djIHrB6eKigkgSGYt0dAMOu+njWpJZTs4Z P4oQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=I1gJsuOM; 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 u30-20020a05622a199e00b0042dd0754ff0si216900qtc.529.2024.02.14.22.24.39 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 14 Feb 2024 22:24:39 -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=I1gJsuOM; 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 1raV7D-0002Qy-2V; Thu, 15 Feb 2024 01:20:59 -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 1raV7B-0002Q3-21 for qemu-devel@nongnu.org; Thu, 15 Feb 2024 01:20:57 -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 1raV79-0005YH-Cd for qemu-devel@nongnu.org; Thu, 15 Feb 2024 01:20:56 -0500 Received: by mail-pl1-x62f.google.com with SMTP id d9443c01a7336-1d8ef977f1eso4471285ad.0 for ; Wed, 14 Feb 2024 22:20:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1707978054; x=1708582854; 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=F+mIi8OQkXxgV79040kdu3+FCdCNzpLRNnazUCypFlE=; b=I1gJsuOM7IPHx7yaCrH9hBzyJsXrjcnTa1LQ952KwH31emA65soTeAAjjS0sxMjhco ER4P9OOLh2VWboDUJKZ8xlQi7/K3/P3Zhk29MoEF6yq1r7doNQcUPuGRtmq9lY2UJPUe P4MlAhaoGhnSGYZrW4VqpQh+HOe/ioOzgSe9CBcxagRWKrsJAMGSq3FdQ8CkVg+e9lL3 X/lL5GYtXbq27Nycc3cjo2qyv2D4CiqMdB06CAmj2K2Z7edbE/GB5NWW7m9aoessFEj8 s7mY1Dr0+oeDytn+MFQVMaW1zX3kmp5TIZ+UjmXlNTAuZNx99x0IAFJecqjBBnCrF9Of A88A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1707978054; x=1708582854; 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=F+mIi8OQkXxgV79040kdu3+FCdCNzpLRNnazUCypFlE=; b=oiuQaki6IYr7oTRV83IjMpuk34g/M+QmXIfBamFx/swj4N2VnQufzuwE4PdnMWkRfJ bEy2Hj3SFESF0+qyMLt3UJ6wFb4uIL3oU96iSeRqywI15vlgXo2LVmbmDQFeDpjRS1k9 T5sNHaeWrhrRjlwxo0ktFW0zXQfUvIhAiLfDUDJ2kcEvvPbEilMtgQDTc3QbqFt243Rm a7yNjKHKgldE9UnDTmJtgFBVlulPDF8E4xs8EygyBFMbvv1yAJ1k8FmieiRa4Eb7mysU u9IZt6eZRpCauJCNf87HaJNI1zcLX2GbULevEoOAJS3RZbR6G9IaQSeCIkdC80qR7XVo 2XUw== X-Gm-Message-State: AOJu0YztmzDBpPeqYepqtX2T3FFACKZc1QbOwrFyLv2dcvO1d9qeOLAz HuN1S+ivXJP3avH3h6OFDu4na9lJJr6OcNKwhCMyIRyHKeChJnJdMOWraSdMLHwrpUqmDaXTIJS q X-Received: by 2002:a17:902:d584:b0:1db:8a13:81c0 with SMTP id k4-20020a170902d58400b001db8a1381c0mr648959plh.49.1707978054034; Wed, 14 Feb 2024 22:20:54 -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.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 14 Feb 2024 22:20:53 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Cc: Pierrick Bouvier , Helge Deller Subject: [PATCH v4 23/36] linux-user: Split out mmap_h_eq_g Date: Wed, 14 Feb 2024 20:20:05 -1000 Message-Id: <20240215062018.795056-24-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::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 Move the MAX_FIXED_NOREPLACE check for reserved_va earlier. Move the computation of host_prot earlier. Signed-off-by: Richard Henderson Reviewed-by: Pierrick Bouvier Acked-by: Helge Deller Message-Id: <20240102015808.132373-22-richard.henderson@linaro.org> --- linux-user/mmap.c | 68 ++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 55 insertions(+), 13 deletions(-) diff --git a/linux-user/mmap.c b/linux-user/mmap.c index cbcd31e941..d3556bcc14 100644 --- a/linux-user/mmap.c +++ b/linux-user/mmap.c @@ -542,6 +542,33 @@ static abi_long mmap_end(abi_ulong start, abi_ulong last, return start; } +/* + * Special case host page size == target page size, + * where there are no edge conditions. + */ +static abi_long mmap_h_eq_g(abi_ulong start, abi_ulong len, + int host_prot, int flags, int page_flags, + int fd, off_t offset) +{ + void *p, *want_p = g2h_untagged(start); + abi_ulong last; + + p = mmap(want_p, len, host_prot, flags, fd, offset); + if (p == MAP_FAILED) { + return -1; + } + /* If the host kernel does not support MAP_FIXED_NOREPLACE, emulate. */ + if ((flags & MAP_FIXED_NOREPLACE) && p != want_p) { + do_munmap(p, len); + errno = EEXIST; + return -1; + } + + start = h2g(p); + last = start + len - 1; + return mmap_end(start, last, start, last, flags, page_flags); +} + static abi_long target_mmap__locked(abi_ulong start, abi_ulong len, int target_prot, int flags, int page_flags, int fd, off_t offset) @@ -550,6 +577,7 @@ static abi_long target_mmap__locked(abi_ulong start, abi_ulong len, abi_ulong ret, last, real_start, real_last, retaddr, host_len; abi_ulong passthrough_start = -1, passthrough_last = 0; off_t host_offset; + int host_prot; real_start = start & -host_page_size; host_offset = offset & -host_page_size; @@ -558,16 +586,33 @@ static abi_long target_mmap__locked(abi_ulong start, abi_ulong len, * For reserved_va, we are in full control of the allocation. * Find a suitable hole and convert to MAP_FIXED. */ - if (reserved_va && !(flags & (MAP_FIXED | MAP_FIXED_NOREPLACE))) { - host_len = len + offset - host_offset; - start = mmap_find_vma(real_start, host_len, - MAX(host_page_size, TARGET_PAGE_SIZE)); - if (start == (abi_ulong)-1) { - errno = ENOMEM; - return -1; + if (reserved_va) { + if (flags & MAP_FIXED_NOREPLACE) { + /* Validate that the chosen range is empty. */ + if (!page_check_range_empty(start, start + len - 1)) { + errno = EEXIST; + return -1; + } + flags = (flags & ~MAP_FIXED_NOREPLACE) | MAP_FIXED; + } else if (!(flags & MAP_FIXED)) { + size_t real_len = len + offset - host_offset; + abi_ulong align = MAX(host_page_size, TARGET_PAGE_SIZE); + + start = mmap_find_vma(real_start, real_len, align); + if (start == (abi_ulong)-1) { + errno = ENOMEM; + return -1; + } + start += offset - host_offset; + flags |= MAP_FIXED; } - start += offset - host_offset; - flags |= MAP_FIXED; + } + + host_prot = target_to_host_prot(target_prot); + + if (host_page_size == TARGET_PAGE_SIZE) { + return mmap_h_eq_g(start, len, host_prot, flags, + page_flags, fd, offset); } /* @@ -603,12 +648,10 @@ static abi_long target_mmap__locked(abi_ulong start, abi_ulong len, if (!(flags & (MAP_FIXED | MAP_FIXED_NOREPLACE))) { uintptr_t host_start; - int host_prot; void *p; host_len = len + offset - host_offset; host_len = ROUND_UP(host_len, host_page_size); - host_prot = target_to_host_prot(target_prot); /* Note: we prefer to control the mapping address. */ p = mmap(g2h_untagged(start), host_len, host_prot, @@ -731,8 +774,7 @@ static abi_long target_mmap__locked(abi_ulong start, abi_ulong len, len1 = real_last - real_start + 1; want_p = g2h_untagged(real_start); - p = mmap(want_p, len1, target_to_host_prot(target_prot), - flags, fd, offset1); + p = mmap(want_p, len1, host_prot, flags, fd, offset1); if (p != want_p) { if (p != MAP_FAILED) { do_munmap(p, len1);