From patchwork Thu Mar 21 21:59:53 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Hildenbrand X-Patchwork-Id: 13599394 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2E17AC54E58 for ; Thu, 21 Mar 2024 22:00:22 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id A5B496B0088; Thu, 21 Mar 2024 18:00:21 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id A0A4A6B0089; Thu, 21 Mar 2024 18:00:21 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 8AC346B008A; Thu, 21 Mar 2024 18:00:21 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id 777D96B0088 for ; Thu, 21 Mar 2024 18:00:21 -0400 (EDT) Received: from smtpin28.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id 3AD7C40BBC for ; Thu, 21 Mar 2024 22:00:21 +0000 (UTC) X-FDA: 81922415442.28.A123FF4 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf29.hostedemail.com (Postfix) with ESMTP id 74C2512002C for ; Thu, 21 Mar 2024 22:00:19 +0000 (UTC) Authentication-Results: imf29.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=gDa9OqjW; spf=pass (imf29.hostedemail.com: domain of david@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=david@redhat.com; dmarc=pass (policy=none) header.from=redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1711058419; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=I/TUj8l6v7W+3WhwmC9vyikgxzfujRZI8v2Khs5cepE=; b=yy2VAWYF57+mEF35RZUuDZBz14nn5h9rPW76ZJiZA0o5/WLVRwN/Zi6j4kjTVT3VghgjBA yM9ZytFe8VHbxPVPKh5Gyg49cBvLoaTzQ9Z3mD9lKSD5qdTJSF2Hc7O0ZtLfEZc5tJu4Yf SctUd2kQH0swZFdZzIjGvser2VArILw= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1711058419; a=rsa-sha256; cv=none; b=W55kL+cCvadqYd1z6AJCuq5gXDezNAQq9ugYXi4MoqxQSvQCk2udy+Zf5LzKi8krfCsO2z jqo8YqNbEfsMoZwKMloWl1NCGXG0uAhonZFcX5QrE5xp4zm5FbjnpbAErTFhPg9/mEJibd HmMYuzDWR4UCAdJvoQgdA1ox9aNdXss= ARC-Authentication-Results: i=1; imf29.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=gDa9OqjW; spf=pass (imf29.hostedemail.com: domain of david@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=david@redhat.com; dmarc=pass (policy=none) header.from=redhat.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1711058418; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=I/TUj8l6v7W+3WhwmC9vyikgxzfujRZI8v2Khs5cepE=; b=gDa9OqjWjwH75xMtonOuQPCfMci4I7p4VKlGkpkRBU/VDS8FmypJu5AsYo21NK6rLlA2WH jp/GwEKkO6/5e3AoqFUXwJRlJ8KdKMj6a/EXjmCQqKeN6yv44RrT77mmnOY5dUt2q//Pkl 5M+rxGxBimlTY+k9bUugkE7MB5VvMEs= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-524-jcbu2gX6Mr6wqRm3UnAAQA-1; Thu, 21 Mar 2024 18:00:15 -0400 X-MC-Unique: jcbu2gX6Mr6wqRm3UnAAQA-1 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 32BB3803F6A; Thu, 21 Mar 2024 22:00:14 +0000 (UTC) Received: from t14s.redhat.com (unknown [10.39.192.95]) by smtp.corp.redhat.com (Postfix) with ESMTP id 887341C060CE; Thu, 21 Mar 2024 22:00:06 +0000 (UTC) From: David Hildenbrand To: linux-kernel@vger.kernel.org Cc: linux-mm@kvack.org, David Hildenbrand , Christian Borntraeger , Janosch Frank , Claudio Imbrenda , Heiko Carstens , Vasily Gorbik , Andrew Morton , Peter Xu , Alexander Gordeev , Sven Schnelle , Gerald Schaefer , Andrea Arcangeli , kvm@vger.kernel.org, linux-s390@vger.kernel.org Subject: [PATCH v1 1/2] mm/userfaultfd: don't place zeropages when zeropages are disallowed Date: Thu, 21 Mar 2024 22:59:53 +0100 Message-ID: <20240321215954.177730-2-david@redhat.com> In-Reply-To: <20240321215954.177730-1-david@redhat.com> References: <20240321215954.177730-1-david@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.7 X-Rspamd-Queue-Id: 74C2512002C X-Rspam-User: X-Stat-Signature: x58sprcetwqwqh5o7jzh7xfcnhicgy4r X-Rspamd-Server: rspam03 X-HE-Tag: 1711058419-311914 X-HE-Meta: U2FsdGVkX18HY0mmGmGeRBI0B6LPfyX61Dl304oYtEbg+pA9JkwP8fQeluzgMGM0j/KvearKaHEZ4SSR97BHB0lZAXBSybL6C67oucI2/3tzdRPpkz5pJd2th3gxGKzS+Ge0KtKKjzZapObxT4Fo29WwIbL/XCsi3MsiXnSdYBHApRhrxtM9+CBZA8FoPxfTsXiwYHXGdgh8kDkYi6G8YaUiRfs80W8hINzjDcHDW3C/ey0j/QDnCP5395pPGEtcWR1rsfZBuUQCzhTEkKAMJRCDzdpGcuCZQu2JgxuOW4iZoRvs4CseSbslECU1jgj7+rDsi1Gr0LiDHxgmodvQqxXf2DzUc2QiTgHjrYasvMlIVHHV7SswkvjFKycLTeVf3SP3dqcwVTvsxxStaLhPY4G8gOcVM9XCkQNva73fouBV3xmi1IfIrUWTUb0lBucBmYoEJik7/lEei+PppyOMvXmLnDs7dgelzYkq2NoQnA2qiU6eVRAE2Vr2nNtn8UBAZcLHX+YPIFJtCw6PEKBXmlvV+duSH68tj5Hd07uG8n65Wv1OKOls6s7sbH6Qf8FQ3k+3GYXZQzecmon++MzrSZ5mpc9O+FaHL/sGVcocsTmTSv21f6vZOD4wA9PSD52u/Ky6nido+31XpNl2aqK7ylWA/uYkBHB7zypP/0JZpCTy0RflteeH9LqU91scHCOj1MPyR3z7I/0lm4nymi6iT9Ojl5En7+BLKBOtHhTycHVY30EzdaySOljujwZeP47Org77O5TuU8tXj/4P8lflJObvxfE+Klw7jlAq+6NH/xyCEXNIPBTfGHocv9dn4DPCbQl5uL0sW2I/4gm0VAaAoyIrqsYzuVie5TakmU9GX8bM8QkqEXPA8afCtyF5ctQJ32hkCVEVKs4zG43wBnn25eA9jnztVzhVu6F1T/m/vXFx8ZkKfBCpXm8uaPd/1ilxvUJANIVKHDu6+be048I 3cqpw/S+ 6iy4jNQmiIBbyTUZuT500C9vxGHrh/0j/xJe+9/wdf086w4Wcz//mxe42uBdrbpgIieX/2xhleDpVK/HjAiVgDhflb0droImP78RaB0VsiAk3s52HqjNd/u6quDStx8+w8x6bFXRvV6B2OjJuEih77jz+tT38NXSquGi6SZVM3zkarcg= X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: s390x must disable shared zeropages for processes running VMs, because the VMs could end up making use of "storage keys" or protected virtualization, which are incompatible with shared zeropages. Yet, with userfaultfd it is possible to insert shared zeropages into such processes. Let's fallback to simply allocating a fresh zeroed anonymous folio and insert that instead. mm_forbids_zeropage() was introduced in commit 593befa6ab74 ("mm: introduce mm_forbids_zeropage function"), briefly before userfaultfd went upstream. Note that we don't want to fail the UFFDIO_ZEROPAGE request like we do for hugetlb, it would be rather unexpected. Further, we also cannot really indicated "not supported" to user space ahead of time: it could be that the MM disallows zeropages after userfaultfd was already registered. Fixes: c1a4de99fada ("userfaultfd: mcopy_atomic|mfill_zeropage: UFFDIO_COPY|UFFDIO_ZEROPAGE preparation") Signed-off-by: David Hildenbrand Reviewed-by: Peter Xu --- mm/userfaultfd.c | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/mm/userfaultfd.c b/mm/userfaultfd.c index 712160cd41eca..1d1061ccd1dea 100644 --- a/mm/userfaultfd.c +++ b/mm/userfaultfd.c @@ -316,6 +316,38 @@ static int mfill_atomic_pte_copy(pmd_t *dst_pmd, goto out; } +static int mfill_atomic_pte_zeroed_folio(pmd_t *dst_pmd, + struct vm_area_struct *dst_vma, unsigned long dst_addr) +{ + struct folio *folio; + int ret; + + folio = vma_alloc_zeroed_movable_folio(dst_vma, dst_addr); + if (!folio) + return -ENOMEM; + + ret = -ENOMEM; + if (mem_cgroup_charge(folio, dst_vma->vm_mm, GFP_KERNEL)) + goto out_put; + + /* + * The memory barrier inside __folio_mark_uptodate makes sure that + * preceding stores to the page contents become visible before + * the set_pte_at() write. + */ + __folio_mark_uptodate(folio); + + ret = mfill_atomic_install_pte(dst_pmd, dst_vma, dst_addr, + &folio->page, true, 0); + if (ret) + goto out_put; + + return 0; +out_put: + folio_put(folio); + return ret; +} + static int mfill_atomic_pte_zeropage(pmd_t *dst_pmd, struct vm_area_struct *dst_vma, unsigned long dst_addr) @@ -324,6 +356,9 @@ static int mfill_atomic_pte_zeropage(pmd_t *dst_pmd, spinlock_t *ptl; int ret; + if (mm_forbids_zeropage(dst_vma->mm)) + return mfill_atomic_pte_zeroed_folio(dst_pmd, dst_vma, dst_addr); + _dst_pte = pte_mkspecial(pfn_pte(my_zero_pfn(dst_addr), dst_vma->vm_page_prot)); ret = -EAGAIN; From patchwork Thu Mar 21 21:59:54 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Hildenbrand X-Patchwork-Id: 13599395 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id A7EDDC6FD1F for ; Thu, 21 Mar 2024 22:00:32 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 2E0D56B008A; Thu, 21 Mar 2024 18:00:32 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 290DE6B008C; Thu, 21 Mar 2024 18:00:32 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 1582D6B0092; Thu, 21 Mar 2024 18:00:32 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id 04C216B008A for ; Thu, 21 Mar 2024 18:00:32 -0400 (EDT) Received: from smtpin12.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id D26A41A0B0D for ; Thu, 21 Mar 2024 22:00:31 +0000 (UTC) X-FDA: 81922415862.12.09F8374 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by imf22.hostedemail.com (Postfix) with ESMTP id 5BF3CC0030 for ; Thu, 21 Mar 2024 22:00:29 +0000 (UTC) Authentication-Results: imf22.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=NmXPeu4p; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf22.hostedemail.com: domain of david@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=david@redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1711058429; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=FiO3y3umMto8FnK2E3T77NFhOADuMo7Sjd92ggduofA=; b=YM/XwKYgq/Qk5eT1p9EsZhtKjHloAUl3fSMPjjnzi87psgkIKB19ziqSeMWgs58yYQ6YrL YZO2Hp3Wom8n5vWuSrLdaH6OHX/bLf6hRvb25cMCVSqMFhtQw9sLGUWF5wdB8lG9DDi1ET XyxbXD5M0bNiiaUPvGRllA9tnkxnMfI= ARC-Authentication-Results: i=1; imf22.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=NmXPeu4p; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf22.hostedemail.com: domain of david@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=david@redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1711058429; a=rsa-sha256; cv=none; b=Sc9x1JB5Aa9kZj06zrZWMj0EePJdEGr+YTlEMTg5h/KoXkvWTx+mMgQB9WB8nxePF94c1d +EXxZqK+jdnBkwUJTdMpl8KLj9xqz5Afbzn6kKikB2XlT/EWd2iOeLKYjBvub2ICnSNbqi 2qV3YIqTasrD1Q7a3/guNUkGWXnZCzs= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1711058428; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=FiO3y3umMto8FnK2E3T77NFhOADuMo7Sjd92ggduofA=; b=NmXPeu4p9D4SJTjDmey6iNji7IOaUhu2oTPvAZmyrNKA6JGywT223zFlM/9agOR+KsofVa 87m9BogqCzsZwqpkrnghCFDSCFYlxQSca4pJHs4QxBSCOV9fpsD79ZnSLcobDI0laVSy0l zZU5/kvj2aQbQAdPNsaZMiDyeTmY0DA= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-25-0JgY-lULNcqeK6jD_iaRbA-1; Thu, 21 Mar 2024 18:00:24 -0400 X-MC-Unique: 0JgY-lULNcqeK6jD_iaRbA-1 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 7B0F8101A56C; Thu, 21 Mar 2024 22:00:23 +0000 (UTC) Received: from t14s.redhat.com (unknown [10.39.192.95]) by smtp.corp.redhat.com (Postfix) with ESMTP id 856A81C060D0; Thu, 21 Mar 2024 22:00:14 +0000 (UTC) From: David Hildenbrand To: linux-kernel@vger.kernel.org Cc: linux-mm@kvack.org, David Hildenbrand , Christian Borntraeger , Janosch Frank , Claudio Imbrenda , Heiko Carstens , Vasily Gorbik , Andrew Morton , Peter Xu , Alexander Gordeev , Sven Schnelle , Gerald Schaefer , Andrea Arcangeli , kvm@vger.kernel.org, linux-s390@vger.kernel.org Subject: [PATCH v1 2/2] s390/mm: re-enable the shared zeropage for !PV and !skeys KVM guests Date: Thu, 21 Mar 2024 22:59:54 +0100 Message-ID: <20240321215954.177730-3-david@redhat.com> In-Reply-To: <20240321215954.177730-1-david@redhat.com> References: <20240321215954.177730-1-david@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.7 X-Rspamd-Queue-Id: 5BF3CC0030 X-Rspam-User: X-Rspamd-Server: rspam02 X-Stat-Signature: od4hjjt6keskzd5u7zifpzagwn33ykyn X-HE-Tag: 1711058429-751487 X-HE-Meta: U2FsdGVkX1/azCvFI0KmBaFT37dl1MacZQ25PdDAbD+hCZ0ZRztcEyLV4cUmYTsUnOwDQplGmefuWnIinRwqS2Kasgg3r267kIjOxIwpyu4LYmIf4OnhdMf1rAl9HfMrIu5/kYgCFvGi7FDZM1T0NyM2VmhUWtyksz3kBOdf0ED65w1h5B+p1n2HNYb2+rKMAmIqbGYrlWskGaUgkw17bYyMJMff81DFoppQhVZmBlvHGm4R7zorXqraJDn/m5XNII0Ae5HqdS+QvTAoWLMU4ZwZXc6bWvJ57B4SoqEvgaq+H9gG0qJ2/wmd7dNFW6FUDwCed7nSWAtGgAUaUrsfdkaoyCos4mtTWPxnvNLjj2mqRuKWKYN0MygrjZE4agx/OfNMq6d9h/Q+GbsXYcPjgxjY/m3KOOnHhK4qrO0DceKvQa7mJ0FZxLpp1mLZeyhMnLfJU8LKnByeJz24Ca+U2QFsfvIIZEADZ6l4X/ZazvWhiLRDEfFBfEMHx4uhWj8CZR9lYezGRH05YhjsaH9UL5b8Hz0GZco8xohK68PIeczhXow6v+2akkQRd0TwvFJOBtgms4TC6dO3QDspOt656lYxIadYA4M+tmQSDuOHmBdExgRzhvdnXJlllbelc2THc+ClBiIG83WNV7K2T3Sg6SYsHhxfhQPC68PN+nng3xSDQ2EE1gnIaTO5+DsagrBNfIalme/3HrsSiX8V2N8dAuBvNqeeevXlpVRMVuGq5TblfhliKUE287dS1M5BWaSanNjrZ3q/CGZQ3J8wSPgpeawIo6rU2irMCDvIaZFq8UMsFX+f7TIDa3sON6zm7CGRteTxd+4U3Z8Mn1BQjiiSCqZ86jJbi2h2g4DcY1D/8Th12wBGcN5dK4TpbhOp7J7DAC3qc/E1R2fe4ZCyoEFEQnVijneCYcyNHEtFvA9tzijVig3AbLljgo01POuTPc+XDhrwStDGps/ve+fpRoX /h8kFpbl KL2qPwykkvy7DMd7qWNL/v7rHbTz0/zIsCc96DqWm4rHxwLF1F8iFGgKkZLQxwCKVMJmRGdp0S27scqAUORIRlzW9YtUUghLQeIX10gAjzYXkGbtThkYtAIvHztxD2Gl6snmMVs9V6T15eWoiZ8ojDCB/udKHPuOa1vTLGM7APp11omZrddcBWpBPUJcIoHVr1TBjwwjtrW/bBKls8IH1fcBn9g== X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: commit fa41ba0d08de ("s390/mm: avoid empty zero pages for KVM guests to avoid postcopy hangs") introduced an undesired side effect when combined with memory ballooning and VM migration: memory part of the inflated memory balloon will consume memory. Assuming we have a 100GiB VM and inflated the balloon to 40GiB. Our VM will consume ~60GiB of memory. If we now trigger a VM migration, hypervisors like QEMU will read all VM memory. As s390x does not support the shared zeropage, we'll end up allocating for all previously-inflated memory part of the memory balloon: 50 GiB. So we might easily (unexpectedly) crash the VM on the migration source. Even worse, hypervisors like QEMU optimize for zeropage migration to not consume memory on the migration destination: when migrating a "page full of zeroes", on the migration destination they check whether the target memory is already zero (by reading the destination memory) and avoid writing to the memory to not allocate memory: however, s390x will also allocate memory here, implying that also on the migration destination, we will end up allocating all previously-inflated memory part of the memory balloon. This is especially bad if actual memory overcommit was not desired, when memory ballooning is used for dynamic VM memory resizing, setting aside some memory during boot that can be added later on demand. Alternatives like virtio-mem that would avoid this issue are not yet available on s390x. There could be ways to optimize some cases in user space: before reading memory in an anonymous private mapping on the migration source, check via /proc/self/pagemap if anything is already populated. Similarly check on the migration destination before reading. While that would avoid populating tables full of shared zeropages on all architectures, it's harder to get right and performant, and requires user space changes. Further, with posctopy live migration we must place a page, so there, "avoid touching memory to avoid allocating memory" is not really possible. (Note that a previously we would have falsely inserted shared zeropages into processes using UFFDIO_ZEROPAGE where mm_forbids_zeropage() would have actually forbidden it) PV is currently incompatible with memory ballooning, and in the common case, KVM guests don't make use of storage keys. Instead of zapping zeropages when enabling storage keys / PV, that turned out to be problematic in the past, let's do exactly the same we do with KSM pages: trigger unsharing faults to replace the shared zeropages by proper anonymous folios. What about added latency when enabling storage kes? Having a lot of zeropages in applicable environments (PV, legacy guests, unittests) is unexpected. Further, KSM could today already unshare the zeropages and unmerging KSM pages when enabling storage kets would unshare the KSM-placed zeropages in the same way, resulting in the same latency. Signed-off-by: David Hildenbrand Reviewed-by: Christian Borntraeger Tested-by: Christian Borntraeger --- arch/s390/include/asm/gmap.h | 2 +- arch/s390/include/asm/mmu.h | 5 + arch/s390/include/asm/mmu_context.h | 1 + arch/s390/include/asm/pgtable.h | 15 ++- arch/s390/kvm/kvm-s390.c | 4 +- arch/s390/mm/gmap.c | 163 +++++++++++++++++++++------- 6 files changed, 143 insertions(+), 47 deletions(-) diff --git a/arch/s390/include/asm/gmap.h b/arch/s390/include/asm/gmap.h index 5cc46e0dde620..9725586f42597 100644 --- a/arch/s390/include/asm/gmap.h +++ b/arch/s390/include/asm/gmap.h @@ -146,7 +146,7 @@ int gmap_mprotect_notify(struct gmap *, unsigned long start, void gmap_sync_dirty_log_pmd(struct gmap *gmap, unsigned long dirty_bitmap[4], unsigned long gaddr, unsigned long vmaddr); -int gmap_mark_unmergeable(void); +int s390_disable_cow_sharing(void); void s390_unlist_old_asce(struct gmap *gmap); int s390_replace_asce(struct gmap *gmap); void s390_uv_destroy_pfns(unsigned long count, unsigned long *pfns); diff --git a/arch/s390/include/asm/mmu.h b/arch/s390/include/asm/mmu.h index bb1b4bef1878b..4c2dc7abc2858 100644 --- a/arch/s390/include/asm/mmu.h +++ b/arch/s390/include/asm/mmu.h @@ -32,6 +32,11 @@ typedef struct { unsigned int uses_skeys:1; /* The mmu context uses CMM. */ unsigned int uses_cmm:1; + /* + * The mmu context allows COW-sharing of memory pages (KSM, zeropage). + * Note that COW-sharing during fork() is currently always allowed. + */ + unsigned int allow_cow_sharing:1; /* The gmaps associated with this context are allowed to use huge pages. */ unsigned int allow_gmap_hpage_1m:1; } mm_context_t; diff --git a/arch/s390/include/asm/mmu_context.h b/arch/s390/include/asm/mmu_context.h index 929af18b09081..a7789a9f62186 100644 --- a/arch/s390/include/asm/mmu_context.h +++ b/arch/s390/include/asm/mmu_context.h @@ -35,6 +35,7 @@ static inline int init_new_context(struct task_struct *tsk, mm->context.has_pgste = 0; mm->context.uses_skeys = 0; mm->context.uses_cmm = 0; + mm->context.allow_cow_sharing = 1; mm->context.allow_gmap_hpage_1m = 0; #endif switch (mm->context.asce_limit) { diff --git a/arch/s390/include/asm/pgtable.h b/arch/s390/include/asm/pgtable.h index 60950e7a25f58..1a71cb19c0891 100644 --- a/arch/s390/include/asm/pgtable.h +++ b/arch/s390/include/asm/pgtable.h @@ -566,10 +566,19 @@ static inline pud_t set_pud_bit(pud_t pud, pgprot_t prot) } /* - * In the case that a guest uses storage keys - * faults should no longer be backed by zero pages + * As soon as the guest uses storage keys or enables PV, we deduplicate all + * mapped shared zeropages and prevent new shared zeropages from getting + * mapped. */ -#define mm_forbids_zeropage mm_has_pgste +static inline int mm_forbids_zeropage(struct mm_struct *mm) +{ +#ifdef CONFIG_PGSTE + if (!mm->context.allow_cow_sharing) + return 1; +#endif + return 0; +} + static inline int mm_uses_skeys(struct mm_struct *mm) { #ifdef CONFIG_PGSTE diff --git a/arch/s390/kvm/kvm-s390.c b/arch/s390/kvm/kvm-s390.c index 5147b943a864a..db3392f0be212 100644 --- a/arch/s390/kvm/kvm-s390.c +++ b/arch/s390/kvm/kvm-s390.c @@ -2631,9 +2631,7 @@ static int kvm_s390_handle_pv(struct kvm *kvm, struct kvm_pv_cmd *cmd) if (r) break; - mmap_write_lock(current->mm); - r = gmap_mark_unmergeable(); - mmap_write_unlock(current->mm); + r = s390_disable_cow_sharing(); if (r) break; diff --git a/arch/s390/mm/gmap.c b/arch/s390/mm/gmap.c index 094b43b121cd5..9233b0acac895 100644 --- a/arch/s390/mm/gmap.c +++ b/arch/s390/mm/gmap.c @@ -2549,41 +2549,6 @@ static inline void thp_split_mm(struct mm_struct *mm) } #endif /* CONFIG_TRANSPARENT_HUGEPAGE */ -/* - * Remove all empty zero pages from the mapping for lazy refaulting - * - This must be called after mm->context.has_pgste is set, to avoid - * future creation of zero pages - * - This must be called after THP was disabled. - * - * mm contracts with s390, that even if mm were to remove a page table, - * racing with the loop below and so causing pte_offset_map_lock() to fail, - * it will never insert a page table containing empty zero pages once - * mm_forbids_zeropage(mm) i.e. mm->context.has_pgste is set. - */ -static int __zap_zero_pages(pmd_t *pmd, unsigned long start, - unsigned long end, struct mm_walk *walk) -{ - unsigned long addr; - - for (addr = start; addr != end; addr += PAGE_SIZE) { - pte_t *ptep; - spinlock_t *ptl; - - ptep = pte_offset_map_lock(walk->mm, pmd, addr, &ptl); - if (!ptep) - break; - if (is_zero_pfn(pte_pfn(*ptep))) - ptep_xchg_direct(walk->mm, addr, ptep, __pte(_PAGE_INVALID)); - pte_unmap_unlock(ptep, ptl); - } - return 0; -} - -static const struct mm_walk_ops zap_zero_walk_ops = { - .pmd_entry = __zap_zero_pages, - .walk_lock = PGWALK_WRLOCK, -}; - /* * switch on pgstes for its userspace process (for kvm) */ @@ -2601,22 +2566,140 @@ int s390_enable_sie(void) mm->context.has_pgste = 1; /* split thp mappings and disable thp for future mappings */ thp_split_mm(mm); - walk_page_range(mm, 0, TASK_SIZE, &zap_zero_walk_ops, NULL); mmap_write_unlock(mm); return 0; } EXPORT_SYMBOL_GPL(s390_enable_sie); -int gmap_mark_unmergeable(void) +static int find_zeropage_pte_entry(pte_t *pte, unsigned long addr, + unsigned long end, struct mm_walk *walk) +{ + unsigned long *found_addr = walk->private; + + /* Return 1 of the page is a zeropage. */ + if (is_zero_pfn(pte_pfn(*pte))) { + + /* + * Shared zeropage in e.g., a FS DAX mapping? We cannot do the + * right thing and likely don't care: FAULT_FLAG_UNSHARE + * currently only works in COW mappings, which is also where + * mm_forbids_zeropage() is checked. + */ + if (!is_cow_mapping(walk->vma->vm_flags)) + return -EFAULT; + + *found_addr = addr; + return 1; + } + return 0; +} + +static const struct mm_walk_ops find_zeropage_ops = { + .pte_entry = find_zeropage_pte_entry, + .walk_lock = PGWALK_WRLOCK, +}; + +/* + * Unshare all shared zeropages, replacing them by anonymous pages. Note that + * we cannot simply zap all shared zeropages, because this could later + * trigger unexpected userfaultfd missing events. + * + * This must be called after mm->context.allow_cow_sharing was + * set to 0, to avoid future mappings of shared zeropages. + * + * mm contracts with s390, that even if mm were to remove a page table, + * and racing with walk_page_range_vma() calling pte_offset_map_lock() + * would fail, it will never insert a page table containing empty zero + * pages once mm_forbids_zeropage(mm) i.e. + * mm->context.allow_cow_sharing is set to 0. + */ +static int __s390_unshare_zeropages(struct mm_struct *mm) +{ + struct vm_area_struct *vma; + VMA_ITERATOR(vmi, mm, 0); + unsigned long addr; + int rc; + + for_each_vma(vmi, vma) { + /* + * We could only look at COW mappings, but it's more future + * proof to catch unexpected zeropages in other mappings and + * fail. + */ + if ((vma->vm_flags & VM_PFNMAP) || is_vm_hugetlb_page(vma)) + continue; + addr = vma->vm_start; + +retry: + rc = walk_page_range_vma(vma, addr, vma->vm_end, + &find_zeropage_ops, &addr); + if (rc <= 0) + continue; + + /* addr was updated by find_zeropage_pte_entry() */ + rc = handle_mm_fault(vma, addr, + FAULT_FLAG_UNSHARE | FAULT_FLAG_REMOTE, + NULL); + if (rc & VM_FAULT_OOM) + return -ENOMEM; + /* + * See break_ksm(): even after handle_mm_fault() returned 0, we + * must start the lookup from the current address, because + * handle_mm_fault() may back out if there's any difficulty. + * + * VM_FAULT_SIGBUS and VM_FAULT_SIGSEGV are unexpected but + * maybe they could trigger in the future on concurrent + * truncation. In that case, the shared zeropage would be gone + * and we can simply retry and make progress. + */ + cond_resched(); + goto retry; + } + + return rc; +} + +static int __s390_disable_cow_sharing(struct mm_struct *mm) { + int rc; + + if (!mm->context.allow_cow_sharing) + return 0; + + mm->context.allow_cow_sharing = 0; + + /* Replace all shared zeropages by anonymous pages. */ + rc = __s390_unshare_zeropages(mm); /* * Make sure to disable KSM (if enabled for the whole process or * individual VMAs). Note that nothing currently hinders user space * from re-enabling it. */ - return ksm_disable(current->mm); + if (!rc) + rc = ksm_disable(mm); + if (rc) + mm->context.allow_cow_sharing = 1; + return rc; +} + +/* + * Disable most COW-sharing of memory pages for the whole process: + * (1) Disable KSM and unmerge/unshare any KSM pages. + * (2) Disallow shared zeropages and unshare any zerpages that are mapped. + * + * Not that we currently don't bother with COW-shared pages that are shared + * with parent/child processes due to fork(). + */ +int s390_disable_cow_sharing(void) +{ + int rc; + + mmap_write_lock(current->mm); + rc = __s390_disable_cow_sharing(current->mm); + mmap_write_unlock(current->mm); + return rc; } -EXPORT_SYMBOL_GPL(gmap_mark_unmergeable); +EXPORT_SYMBOL_GPL(s390_disable_cow_sharing); /* * Enable storage key handling from now on and initialize the storage @@ -2685,7 +2768,7 @@ int s390_enable_skey(void) goto out_up; mm->context.uses_skeys = 1; - rc = gmap_mark_unmergeable(); + rc = __s390_disable_cow_sharing(mm); if (rc) { mm->context.uses_skeys = 0; goto out_up;