From patchwork Thu Apr 18 17:49:41 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Michael Tokarev X-Patchwork-Id: 789822 Delivered-To: patch@linaro.org Received: by 2002:adf:e6ca:0:b0:346:15ad:a2a with SMTP id y10csp696128wrm; Thu, 18 Apr 2024 10:54:43 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCU/XMeDNZVuLm7K+lC7Hwgjqsg1U+40UfhWBx7ynxZbGVFDK+bwRei+VbxbmwYR6PBOxZ16GCY9+AKyEl/6GYaP X-Google-Smtp-Source: AGHT+IFWaMwiBfL3ufMm9jxwhcz/o6A96DXBT3Ajh9lLvNiMGiXiDQn0F2YvTXzMe5+u0aOjjxJO X-Received: by 2002:a05:622a:1a1b:b0:437:872c:2407 with SMTP id f27-20020a05622a1a1b00b00437872c2407mr5423228qtb.28.1713462883672; Thu, 18 Apr 2024 10:54:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1713462883; cv=none; d=google.com; s=arc-20160816; b=ZYTSyeLY53SK3fp5vG4+zof1Quxtged3z9MU7lxf52lnMsd8fEoaVbA4ceuNMlgiEX JyS4gi10wxRUFZsqkT/0kd6oRE5Ip9lkyGCRYgVguUVRIlRXVRfWWQHFkpbPp4prlodZ o7AjrY1XG0lC0OIgW413UB/4uwb5WIIkTcW2ouGG5DhmUB+QUUdAvGaT3OuNzKZ9GMLN OI4IVgcSPPa5FwD73v3mYdeKT/GR6kb8tBOIJBX4ABImPuzJT1BoywjMNUJdcP9lhs8b fV3kC0Y7Bcl4IABglNRxBYBS7rSKVG+4EefAo6wP8nePTpuWfLgdw0rqEOVufenTyvjP ApqA== 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; bh=amr7pG90Pp3rONB2/DMpZE9ovsKzkJn0KXlnm4Ssalc=; fh=K4abbxCgZAPvqzOXA+PZ7RIZh+KufMVJze7rXLOwES0=; b=D+6gaiAE7YIeHC3108VwMXtl5QX/xyFZDGzs9qeu4uMONrcVfbHNB3ndvUR2VbtqtA 94gWfHYOZ689DrBOW/lRvk27J2GXK3dVuaBrX6UFRUBUV8lfiylc7pAcymKjbOcFT4wb Gg/jwpUB23p/LLEvlBxt0PLm6vRnLED8lLGYmLVlTB0QL0g1l7NhIIvgPxOaZqg6hl0m NNMSPdUJAKF9r3cm3lBBBlsOxmazm6Z54igmjfDwziZ4Z3c2wyt7ppl7vjltk9kcJpfu 1BdahC6+2oJj6fWV5Py1LJ1W4AkdLXfayzWaxlPj68ijVFLXFa/LW+Zt7dC8ulEcM7WM fVHw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; 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" Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id v12-20020a05622a130c00b00434363526f9si2121776qtk.125.2024.04.18.10.54.43 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 18 Apr 2024 10:54:43 -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; 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" Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rxVvW-0003zX-O9; Thu, 18 Apr 2024 13:52:02 -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 1rxVvF-0003Ab-H4; Thu, 18 Apr 2024 13:51:46 -0400 Received: from isrv.corpit.ru ([86.62.121.231]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rxVvD-0007hR-IF; Thu, 18 Apr 2024 13:51:45 -0400 Received: from tsrv.corpit.ru (tsrv.tls.msk.ru [192.168.177.2]) by isrv.corpit.ru (Postfix) with ESMTP id 72C5B5FD78; Thu, 18 Apr 2024 20:50:05 +0300 (MSK) Received: from tls.msk.ru (mjt.wg.tls.msk.ru [192.168.177.130]) by tsrv.corpit.ru (Postfix) with SMTP id C3E54B9352; Thu, 18 Apr 2024 20:50:02 +0300 (MSK) Received: (nullmailer pid 947875 invoked by uid 1000); Thu, 18 Apr 2024 17:49:55 -0000 From: Michael Tokarev To: qemu-devel@nongnu.org Cc: qemu-stable@nongnu.org, Richard Henderson , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Michael Tokarev Subject: [Stable-8.2.3 111/116] linux-user/x86_64: Handle the vsyscall page in open_self_maps_{2, 4} Date: Thu, 18 Apr 2024 20:49:41 +0300 Message-Id: <20240418174955.947730-24-mjt@tls.msk.ru> X-Mailer: git-send-email 2.39.2 In-Reply-To: References: MIME-Version: 1.0 Received-SPF: pass client-ip=86.62.121.231; envelope-from=mjt@tls.msk.ru; helo=isrv.corpit.ru X-Spam_score_int: -68 X-Spam_score: -6.9 X-Spam_bar: ------ X-Spam_report: (-6.9 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_HI=-5, 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 From: Richard Henderson This is the only case in which we expect to have no host memory backing for a guest memory page, because in general linux user processes cannot map any pages in the top half of the 64-bit address space. Resolves: https://gitlab.com/qemu-project/qemu/-/issues/2170 Reviewed-by: Philippe Mathieu-Daudé Signed-off-by: Richard Henderson (cherry picked from commit 4ef1f559f270c66b3ffc23f6c845ff3d008c6356) Signed-off-by: Michael Tokarev diff --git a/linux-user/syscall.c b/linux-user/syscall.c index 834a254895..11c75e3b4e 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c @@ -7994,6 +7994,10 @@ static void open_self_maps_4(const struct open_self_maps_data *d, path = "[heap]"; } else if (start == info->vdso) { path = "[vdso]"; +#ifdef TARGET_X86_64 + } else if (start == TARGET_VSYSCALL_PAGE) { + path = "[vsyscall]"; +#endif } /* Except null device (MAP_ANON), adjust offset for this fragment. */ @@ -8082,6 +8086,18 @@ static int open_self_maps_2(void *opaque, target_ulong guest_start, uintptr_t host_start = (uintptr_t)g2h_untagged(guest_start); uintptr_t host_last = (uintptr_t)g2h_untagged(guest_end - 1); +#ifdef TARGET_X86_64 + /* + * Because of the extremely high position of the page within the guest + * virtual address space, this is not backed by host memory at all. + * Therefore the loop below would fail. This is the only instance + * of not having host backing memory. + */ + if (guest_start == TARGET_VSYSCALL_PAGE) { + return open_self_maps_3(opaque, guest_start, guest_end, flags); + } +#endif + while (1) { IntervalTreeNode *n = interval_tree_iter_first(d->host_maps, host_start, host_start);