From patchwork Fri Sep 1 02:23:19 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 719467 Delivered-To: patch@linaro.org Received: by 2002:ab3:1981:0:b0:23f:8cfb:5ad7 with SMTP id 1csp16730lti; Thu, 31 Aug 2023 19:24:38 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGXmdk1eJDuKY8ZFpEjR0odRlrVkNtzyXjGgrpfJF8yRmXNIBr0u9ySgCQaKBlbXZmzyNsf X-Received: by 2002:a0c:f449:0:b0:63d:eef:c3f6 with SMTP id h9-20020a0cf449000000b0063d0eefc3f6mr1124379qvm.38.1693535078474; Thu, 31 Aug 2023 19:24:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1693535078; cv=none; d=google.com; s=arc-20160816; b=SEHoUM7fnF2Ki/9ORiJL5xj5ShNSvP8gFZCCz9ZMM6/ai3x5TXYk1gqOYjGtpDrOxV mCUhOzdWVPvEV96hEAJ3CIEqzqUraBkiLLfcmSKM24enyfBz1jszZEkLSiJZ4gXYez/Q M9Y0bgh0KD1dFAIovyTU+4h+MvLvdLJJ3AeR+VH0m3l3tshKaShj0mncSWzEe5m8qTaB QOpLnP8WR2BAVvKYK50FaxaM1Srm1FkmgtazjM1MyP3pDdehsOwb6hbkjuJCMwWBXP4t 9Ob3+fvVv0P2+yRMXzSmJs2VUh8MDAolM2+kjDQHoarPNvWlo+ORuPF9DBeVpTT3OFfl PcSg== 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=ySu5X2pwP/FjpufFI3frCgcVNyTN0K5y3i0eNXjPfK8=; fh=r1cPj2GlTGSV4V8jQu3jfCKsZwpJ5ktYEUy+P7GD/+s=; b=s+tqXwJn/7BnWZ59ghJVNGM/3hHCZu8n1w9NYBsYGJ/jOJ4OBaexmLlouHMA7vcMRX 0VjfHCpr69vWunet0CkCBjDfOfZAHHYW9QfiX80c4/BLnElN2CpVD7I8h9x8/nNwXIPb fN6AhqE7Nq6EqQOnZItbZ2w6d5fhj5z9BgZbcToOLMmqGuJNPAjDjmOvgGIbYsmsVRkk DUuzZ9pJ8DcYTaNgsciBXndKjdRfrIC1C0ODxWkZF5Zdg0smNg6KpNTTlMHaYUkV3ENd cxS6wv3x8w3D5UCVPRw9DvMAdNZZ83iN9lxLMhxhuylSotUULzJKP/DiXTLNlG9z8ukm kKcA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=COZdD1pD; 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 ot6-20020a05620a818600b007680efdb225si1712899qkn.152.2023.08.31.19.24.38 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 31 Aug 2023 19:24:38 -0700 (PDT) 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=COZdD1pD; 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 1qbtpF-0006be-Bf; Thu, 31 Aug 2023 22:23:57 -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 1qbtpB-0006aJ-CT for qemu-devel@nongnu.org; Thu, 31 Aug 2023 22:23:53 -0400 Received: from mail-pf1-x42e.google.com ([2607:f8b0:4864:20::42e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qbtp9-0001Rj-0t for qemu-devel@nongnu.org; Thu, 31 Aug 2023 22:23:53 -0400 Received: by mail-pf1-x42e.google.com with SMTP id d2e1a72fcca58-68a6f6a66e1so1239906b3a.2 for ; Thu, 31 Aug 2023 19:23:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1693535030; x=1694139830; 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=ySu5X2pwP/FjpufFI3frCgcVNyTN0K5y3i0eNXjPfK8=; b=COZdD1pD9e7njNRlZ8m1pZdOMje/SwHzh0BqSB7/HcJc7FYesnjxycyfEv9My/1tAy MRzJv2jsgW2XpLZHyw3lyUkIG/NXwiBYAXbbw9aLryPieg/6nI2XsJR7rz8qFFqQX/B3 pB9L0DpuwD4naVqNO81m0gfztYLY8RuTKDHuFnd7MfoeeSNACL0N5wjx+K8dZA7wImTn pH12w8hjx7hFvIK4a1m/ESn1zlI/S9Z/CzOskucrK7IVlzkogudjsuwrCVFEL7mLTgtQ CVaGXREe4PYvAUb/FJl+vthH9Qpvfq/N+qAIeAqspWR+opS3ExIZpJHHXAzDSg07vj5j Nz6Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1693535030; x=1694139830; 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=ySu5X2pwP/FjpufFI3frCgcVNyTN0K5y3i0eNXjPfK8=; b=KsX7r8juWiEbUWKcgwLzgkTevZzE9YnyBE3T1NSP8r1cWuDuGxshnepokqMt+BySdS JaLB1soT759deNWNtGsCXU6pFWox1X7wgmPpNhkJ0OS5/BCb5u3DXxU5u64exVZXMs30 fU4cVXzJ0p6q3xwjw7POj85AMkY1FrlywuscihR5v4iETGdvjsCqvaLtJxAzYOxIjRoY lzzjxZBhU0UwX80yTXHQXvD+x5ATVQkFCyqp1+WuWlr5nkgp7h0dnMuFjci7vgQp5zUQ xCWBCtqoT62JEr0Gpgam30HMTA98bAcYFYhE8FJ6TKfOoovIg+pVvuh5r6rd2mUCYI0y dWdg== X-Gm-Message-State: AOJu0YwTEPT5rzfYRm8akgVGGnnYAaqtVK8BnfIeEIqPYKwlUOz0kUOu EZnUCuN3a6SJLoHvpRc48Ff1Xt7SoR5nMyXlYRg= X-Received: by 2002:a05:6a00:c93:b0:68a:8552:c024 with SMTP id a19-20020a056a000c9300b0068a8552c024mr1962371pfv.7.1693535029813; Thu, 31 Aug 2023 19:23:49 -0700 (PDT) Received: from stoup.. ([71.212.131.115]) by smtp.gmail.com with ESMTPSA id c25-20020aa781d9000000b0068a54866ca8sm1906977pfn.134.2023.08.31.19.23.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 31 Aug 2023 19:23:49 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: laurent@vivier.eu, alex.bennee@linaro.org Subject: [PATCH v2 21/33] linux-user: Split out mmap_h_eq_g Date: Thu, 31 Aug 2023 19:23:19 -0700 Message-Id: <20230901022331.115247-22-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230901022331.115247-1-richard.henderson@linaro.org> References: <20230901022331.115247-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::42e; envelope-from=richard.henderson@linaro.org; helo=mail-pf1-x42e.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+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 --- linux-user/mmap.c | 66 +++++++++++++++++++++++++++++++++++++---------- 1 file changed, 53 insertions(+), 13 deletions(-) diff --git a/linux-user/mmap.c b/linux-user/mmap.c index 7d482df06d..7a0c0c1f35 100644 --- a/linux-user/mmap.c +++ b/linux-user/mmap.c @@ -482,6 +482,31 @@ 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 ((flags & MAP_FIXED_NOREPLACE) && p != want_p) { + 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) @@ -490,6 +515,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; @@ -498,16 +524,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 suitible 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); } /* @@ -543,12 +586,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, @@ -671,8 +712,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) { munmap(p, len1);