From patchwork Mon Mar 3 13:30:07 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nikita Kalyazin X-Patchwork-Id: 13998836 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 BAEA5C282CD for ; Mon, 3 Mar 2025 13:30:42 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 525BC6B008C; Mon, 3 Mar 2025 08:30:42 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 4D59C6B0092; Mon, 3 Mar 2025 08:30:42 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 3C4CB6B0093; Mon, 3 Mar 2025 08:30:42 -0500 (EST) 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 1C65C6B008C for ; Mon, 3 Mar 2025 08:30:42 -0500 (EST) Received: from smtpin08.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id CA122160976 for ; Mon, 3 Mar 2025 13:30:41 +0000 (UTC) X-FDA: 83180324682.08.686896B Received: from smtp-fw-9106.amazon.com (smtp-fw-9106.amazon.com [207.171.188.206]) by imf25.hostedemail.com (Postfix) with ESMTP id 76BEDA0020 for ; Mon, 3 Mar 2025 13:30:39 +0000 (UTC) Authentication-Results: imf25.hostedemail.com; dkim=pass header.d=amazon.com header.s=amazon201209 header.b="D/xn8CJH"; spf=pass (imf25.hostedemail.com: domain of "prvs=150a0b0d2=kalyazin@amazon.co.uk" designates 207.171.188.206 as permitted sender) smtp.mailfrom="prvs=150a0b0d2=kalyazin@amazon.co.uk"; dmarc=pass (policy=quarantine) header.from=amazon.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1741008639; 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-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=bUaunioKjZGZ2DQ4BkT3SKTdDYEcp1DDV2tTW0nbWvg=; b=sTRPrWTgcf6WlLDwx8QBqBdPw9uMnOzCPUMfQVxqp4QR+JRIGFUPFjUo+Mfe1X15QryPB/ ZAzAjvHr2RT6RjOaUnSHx+wxVLlQSnycveYYkKUBisEVlHtyuwaRSGF+uL74g1f5L15ADl VQEhqU/Ky+HYxi+sRPJ4ozRVfW7kRes= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1741008639; a=rsa-sha256; cv=none; b=NaFgSyd3r7RzK8D5OqZx58jgpFFu/7jHc2OiCC4vatc0SdeIeTs8LcEuOh8i3jPEwbF2ga Jl9XnswPKd54XAd+1mDjXkQmWt+9Gmwqxr+THyxWzBMpSKiJmVDMPTyN9vYHlbP/vrqfas B2DYjVlOh2CTRurYEZJ+uLIGi1T5WHI= ARC-Authentication-Results: i=1; imf25.hostedemail.com; dkim=pass header.d=amazon.com header.s=amazon201209 header.b="D/xn8CJH"; spf=pass (imf25.hostedemail.com: domain of "prvs=150a0b0d2=kalyazin@amazon.co.uk" designates 207.171.188.206 as permitted sender) smtp.mailfrom="prvs=150a0b0d2=kalyazin@amazon.co.uk"; dmarc=pass (policy=quarantine) header.from=amazon.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amazon.com; i=@amazon.com; q=dns/txt; s=amazon201209; t=1741008640; x=1772544640; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=bUaunioKjZGZ2DQ4BkT3SKTdDYEcp1DDV2tTW0nbWvg=; b=D/xn8CJHvIJPjSt3Y6f0xbqG+vObuAn0Pp4s0Lobx/yO349QTTU6w4UF lIagexGWCH9QOJ6zfTqhoSBZ9iDxAugw6tRFQ50eNhUxr95qMbw7yu0cY XZWowDg3bPaB2GkTc8OnImVMrozKdtfYL/W0+mN4Uk57OXqGr50Ma8wqm 4=; X-IronPort-AV: E=Sophos;i="6.13,329,1732579200"; d="scan'208";a="803691335" Received: from pdx4-co-svc-p1-lb2-vlan2.amazon.com (HELO smtpout.prod.us-west-2.prod.farcaster.email.amazon.dev) ([10.25.36.210]) by smtp-border-fw-9106.sea19.amazon.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 03 Mar 2025 13:30:34 +0000 Received: from EX19MTAUWA002.ant.amazon.com [10.0.7.35:49609] by smtpin.naws.us-west-2.prod.farcaster.email.amazon.dev [10.0.21.102:2525] with esmtp (Farcaster) id 568d5078-4118-4f5e-91c9-1ef7962d1e6b; Mon, 3 Mar 2025 13:30:32 +0000 (UTC) X-Farcaster-Flow-ID: 568d5078-4118-4f5e-91c9-1ef7962d1e6b Received: from EX19D003UWB004.ant.amazon.com (10.13.138.24) by EX19MTAUWA002.ant.amazon.com (10.250.64.202) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA) id 15.2.1544.14; Mon, 3 Mar 2025 13:30:29 +0000 Received: from EX19MTAUWA001.ant.amazon.com (10.250.64.204) by EX19D003UWB004.ant.amazon.com (10.13.138.24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA) id 15.2.1544.14; Mon, 3 Mar 2025 13:30:29 +0000 Received: from email-imr-corp-prod-pdx-all-2c-c4413280.us-west-2.amazon.com (10.25.36.214) by mail-relay.amazon.com (10.250.64.204) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA) id 15.2.1544.14 via Frontend Transport; Mon, 3 Mar 2025 13:30:29 +0000 Received: from dev-dsk-kalyazin-1a-a12e27e2.eu-west-1.amazon.com (dev-dsk-kalyazin-1a-a12e27e2.eu-west-1.amazon.com [172.19.103.116]) by email-imr-corp-prod-pdx-all-2c-c4413280.us-west-2.amazon.com (Postfix) with ESMTPS id C461CA039C; Mon, 3 Mar 2025 13:30:26 +0000 (UTC) From: Nikita Kalyazin To: , , CC: , , , , , , , , , , , , , , , , Subject: [RFC PATCH 1/5] KVM: guest_memfd: add kvm_gmem_vma_is_gmem Date: Mon, 3 Mar 2025 13:30:07 +0000 Message-ID: <20250303133011.44095-2-kalyazin@amazon.com> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250303133011.44095-1-kalyazin@amazon.com> References: <20250303133011.44095-1-kalyazin@amazon.com> MIME-Version: 1.0 X-Stat-Signature: gde5jjc4b4xjtk4unu5d1s9bareuagjq X-Rspamd-Queue-Id: 76BEDA0020 X-Rspam-User: X-Rspamd-Server: rspam01 X-HE-Tag: 1741008639-924089 X-HE-Meta: U2FsdGVkX197/Z+dmtR8c8EyKVfRSmaAfmpJ/0RXqtinMX/1Pm01jKgrcEcwi91rJoBEIX1qbmIWAu+rvPS10rzedXXBmpVmzlvw2svoXYmb5EvMQslzenJ+In0kS1Hl0+TbQKCxCPb1ClMsgm7UZXgl3+MfA8I+AUGXPC6iyt+7R12iW81uVA4UDOf4F0XBNJpx/KuSomNXSZj4FCYDcopBVW80awUgISpXzT1v3Tr4i5+YdX06o2CzbXQ7+N854y0GaCUsqfDTrq8eQnxBOOUzfAQZb0KC6SIZRBoKgOAmgJQTEw038tEOHUjaHk3GTvlGPQfKJ0BJPRNuKDWEjQ0nb0Pw4yhNVD/tAudmHikub6BKTKXjqgvuIGMPIKynMoCs01vyAyv7IP59Z/1tOIjyF+M+F0V5XhJ3wKh+yFROww74ApmavMvDtSdSl9HL21UFc3FSWn+l83uJFDu48KHC6/GT+m1K0yi2tMfBdyT9retPEJ6iS60aYi9/di96dvW/XIB9KmyTOvs9G6CUlNNL+XTPuTS6F1XJwleGugaZDZMRGgTRtOm8JrvRYkbJ42yW2OuHc1WbuxrfycPEalPtrqiTfc7CV6nenn/A66MomrNowTpNBr34Rgfz35M1AY2/KhMCd5PvWw6rR9Zf5lNyTipW5Gl/ZouTuEkU/UejgX4FIZthX63VFfq6Ie+ooZF2jvXXgQ90yXMWe6nCTeoZzC/WDUNDpjOPT/JEFEfnBrIJAZ3NASsPBpPFK8Vs+wYGpPa9KLGucLom/9CP2GbXOdwMHRiVR/hMPP7urIxAtdbMqdLJzVydVleAWWkyT4H9plOWCs99pn6ObvhO1dK1otMTV75hvzEAMWIyrd0b4k0nYoXZAa63kde88QB4B6HRcrQQL6GJEuhnxhgVrEYQqMR9NNQF3LiAoqrDSRZlZpm0Cw4qiWRHmhsovFA5pyynI+BEdxZR1k+z/uT 8iDPxdrn DrreevaqqUm5PBGm8iYBIbptj3bSUBN2ZBTN2p+FNVEZJ/xcRspuzQ5uuQjb3VvgAOONqMtTWGSZ+cA1tJiuju4BWGQbDD0E3hovbD8CtMy8hfNMCcvMj8cNt6hoF4V9EQfHmMZW+wvnIGAaIVPARU3BFVNlzGIIRx7iPUFnTugtaNmL/oHpmA9okHw9s2ble/w0WIZ/4YuNwVRAXXxf34HPtzendKsACuu6gbAFhC/B+ZERsjoNfcbYyZVG3MvQrTPZdbK0BIAIpxeZW1H/SqpWwyqNtW3HYK4RrqWtxG61up7UfO2U+iaGOKMS5+FmZ+5ev+DX0nQMLMeJB8LOhCqDbOEgXqTCRpZ4VdAD2bJOrJ/QWKW6ERZWmigBPYiobgwa1XizOvLJXT320ujqj+AmoLIKB9nRV2ZLWYd3R0o5pXJt3GRNw97ZAP7cfy7/sFgor3oGnWd1qd9kIdur4TwBfOR4CgZXU8xBueKD2i0+6lNcWip+6qVxP9DRQdyjOWfHYl5zom1dLt4M78Dq9PTGfLWSj77JLYb7ASX1ohv6c1Mk= 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: It will be used to distinguish the vma type in userfaultfd code. This likely needs to be done in the guestmem library. Signed-off-by: Nikita Kalyazin --- virt/kvm/guest_memfd.c | 5 +++++ virt/kvm/kvm_mm.h | 1 + 2 files changed, 6 insertions(+) diff --git a/virt/kvm/guest_memfd.c b/virt/kvm/guest_memfd.c index f93fe5835173..af825f7494ea 100644 --- a/virt/kvm/guest_memfd.c +++ b/virt/kvm/guest_memfd.c @@ -500,6 +500,11 @@ static ssize_t kvm_kmem_gmem_write(struct file *file, const char __user *buf, return ret && start == (*offset >> PAGE_SHIFT) ? ret : *offset - (start << PAGE_SHIFT); } + +bool kvm_gmem_vma_is_gmem(struct vm_area_struct *vma) +{ + return vma->vm_ops == &kvm_gmem_vm_ops; +} #endif /* CONFIG_KVM_GMEM_SHARED_MEM */ static struct file_operations kvm_gmem_fops = { diff --git a/virt/kvm/kvm_mm.h b/virt/kvm/kvm_mm.h index acef3f5c582a..09fcdf18a072 100644 --- a/virt/kvm/kvm_mm.h +++ b/virt/kvm/kvm_mm.h @@ -73,6 +73,7 @@ int kvm_gmem_create(struct kvm *kvm, struct kvm_create_guest_memfd *args); int kvm_gmem_bind(struct kvm *kvm, struct kvm_memory_slot *slot, unsigned int fd, loff_t offset); void kvm_gmem_unbind(struct kvm_memory_slot *slot); +bool kvm_gmem_vma_is_gmem(struct vm_area_struct *vma); #else static inline void kvm_gmem_init(struct module *module) { From patchwork Mon Mar 3 13:30:08 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nikita Kalyazin X-Patchwork-Id: 13998851 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 A685CC282CD for ; Mon, 3 Mar 2025 13:30:57 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 2B5256B0093; Mon, 3 Mar 2025 08:30:57 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 2647B6B0095; Mon, 3 Mar 2025 08:30:57 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 12CBE6B0096; Mon, 3 Mar 2025 08:30:57 -0500 (EST) 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 E76B16B0093 for ; Mon, 3 Mar 2025 08:30:56 -0500 (EST) Received: from smtpin03.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id 3236D16099D for ; Mon, 3 Mar 2025 13:30:56 +0000 (UTC) X-FDA: 83180325312.03.AF97C94 Received: from smtp-fw-6001.amazon.com (smtp-fw-6001.amazon.com [52.95.48.154]) by imf26.hostedemail.com (Postfix) with ESMTP id 89FE5140011 for ; Mon, 3 Mar 2025 13:30:50 +0000 (UTC) Authentication-Results: imf26.hostedemail.com; dkim=pass header.d=amazon.com header.s=amazon201209 header.b=EE76lk97; spf=pass (imf26.hostedemail.com: domain of "prvs=150a0b0d2=kalyazin@amazon.co.uk" designates 52.95.48.154 as permitted sender) smtp.mailfrom="prvs=150a0b0d2=kalyazin@amazon.co.uk"; dmarc=pass (policy=quarantine) header.from=amazon.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1741008650; 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-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=J7/xtyBJVACA1f5rni1kJ1y38BiqCsgl928AjTc2EPg=; b=o7PzIqUM0UA6Q9oNTeMXmEHAdnVZnvsjoXeBGuwvgY4Kbp5GJVOQICbno0iI1v0zN7FMOr n26eVgj3I+jMXncsks+zYmHBF9RdshBf7i14OJX8FT5kltEfwlAYVqAsieWTElXVLmkhqr zk+/k5Um+qOU4owjrKWFwmd8fiS0xIM= ARC-Authentication-Results: i=1; imf26.hostedemail.com; dkim=pass header.d=amazon.com header.s=amazon201209 header.b=EE76lk97; spf=pass (imf26.hostedemail.com: domain of "prvs=150a0b0d2=kalyazin@amazon.co.uk" designates 52.95.48.154 as permitted sender) smtp.mailfrom="prvs=150a0b0d2=kalyazin@amazon.co.uk"; dmarc=pass (policy=quarantine) header.from=amazon.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1741008650; a=rsa-sha256; cv=none; b=wPahdwwjEDyt2xRnsALh9WfZb4WMSlQaov2QGAQkvvmNPx3Lru9vHygmQFbRxW75g/YaXr JqA0/H7QkKclYpVjv8yTgUsdUOCBn0eOHdYVvD1AKDsr4ZDt97/ZorL0m1KS1q92XtIovy Bta02FsI3TrCR+VR3jFOnxC1uwhem1c= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amazon.com; i=@amazon.com; q=dns/txt; s=amazon201209; t=1741008651; x=1772544651; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=J7/xtyBJVACA1f5rni1kJ1y38BiqCsgl928AjTc2EPg=; b=EE76lk97+6gXjNeC/Er8mlxx2nEdBVW5+5OiBa/QmpZiSiDgLIgc5vKB SZn/pSjtjxd3ukmFeWps3qlTB4KAsqdVjNwIrui5bSTI+nOPAJ2SE7ArE yNZsmuhoJbxPNPX6nkjiMuQv2A3F0khsLgPMe2uM3VROIMMuyUF4KEFuT Y=; X-IronPort-AV: E=Sophos;i="6.13,329,1732579200"; d="scan'208";a="467377029" Received: from iad12-co-svc-p1-lb1-vlan2.amazon.com (HELO smtpout.prod.us-west-2.prod.farcaster.email.amazon.dev) ([10.43.8.2]) by smtp-border-fw-6001.iad6.amazon.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 03 Mar 2025 13:30:47 +0000 Received: from EX19MTAEUA001.ant.amazon.com [10.0.43.254:58431] by smtpin.naws.eu-west-1.prod.farcaster.email.amazon.dev [10.0.2.142:2525] with esmtp (Farcaster) id 95972e55-02f1-4ae5-bb4d-b9d69caeff17; Mon, 3 Mar 2025 13:30:45 +0000 (UTC) X-Farcaster-Flow-ID: 95972e55-02f1-4ae5-bb4d-b9d69caeff17 Received: from EX19D004EUA003.ant.amazon.com (10.252.50.230) by EX19MTAEUA001.ant.amazon.com (10.252.50.50) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA) id 15.2.1544.14; Mon, 3 Mar 2025 13:30:42 +0000 Received: from EX19MTAUEA001.ant.amazon.com (10.252.134.203) by EX19D004EUA003.ant.amazon.com (10.252.50.230) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA) id 15.2.1544.14; Mon, 3 Mar 2025 13:30:41 +0000 Received: from email-imr-corp-prod-iad-1box-1a-9bbde7a3.us-east-1.amazon.com (10.43.8.2) by mail-relay.amazon.com (10.252.134.102) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA) id 15.2.1544.14 via Frontend Transport; Mon, 3 Mar 2025 13:30:41 +0000 Received: from dev-dsk-kalyazin-1a-a12e27e2.eu-west-1.amazon.com (dev-dsk-kalyazin-1a-a12e27e2.eu-west-1.amazon.com [172.19.103.116]) by email-imr-corp-prod-iad-1box-1a-9bbde7a3.us-east-1.amazon.com (Postfix) with ESMTPS id 3176540617; Mon, 3 Mar 2025 13:30:40 +0000 (UTC) From: Nikita Kalyazin To: , , CC: , , , , , , , , , , , , , , , , Subject: [RFC PATCH 2/5] KVM: guest_memfd: add support for uffd missing Date: Mon, 3 Mar 2025 13:30:08 +0000 Message-ID: <20250303133011.44095-3-kalyazin@amazon.com> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250303133011.44095-1-kalyazin@amazon.com> References: <20250303133011.44095-1-kalyazin@amazon.com> MIME-Version: 1.0 X-Rspam-User: X-Rspamd-Queue-Id: 89FE5140011 X-Rspamd-Server: rspam09 X-Stat-Signature: zhbck19mig1z673tf9th6mewekohngmy X-HE-Tag: 1741008650-189777 X-HE-Meta: U2FsdGVkX1/UUArkfrgpw5WnNs5dACXD/V2N/+Pw6sKpEMHGiODn4/khO/tp7A9TbhgJhFqrpZvBiCm4mNz4frkBHdxE2sML+ZMOLdamJEEtsXB0m0BhOy6Ga4lu5NZrxImpKFS6Xe6K+zDF7026RfEWSFNmxrQ4jYrzvK9Pbe5JS2rXvDK+e6Za/XvRDuqho08L5Pc5ClFcZl9VEHBmcZiY6BqzhtLNYSbGzcay/af2S2PamZyrqtDT89QxX5gMMHCktrg3lXe+z1MbkbCqt/igJvPTdlsFv/DgBtQJaWgly4lTs6Z5uZ/sGfx8C4FNKd8G2ft+iWNzcW6LSFYOkLFpgvD3xpIY+W+A2v0rzy+yysH+M4o5lVMoe67+2Pt8RmsaBwmkIxthOGI8nkui4Dw9CnXsGhsiP3o+Na74gpCrSgzKkdY+r3sVaVCADWXrTvECXaJlGElb6f6sNTK40NRiI8HUn7tmAqXBldJZ8G4lPE7Z4MUDKC20QVeSm900O2l6Nby4RU7qDMItGXagYKt4YvBoiRsLBNlTnD2436S/ydH+vhrC9m2jR+wW+DarXE4B1kh+DZn/9VewwLT+IjZVzBthxFrmxNOdw89AkGu8uxRyihPr1/D2TGIBqm5CWqAmVRupG2I1mQCIaSSqwKhK/r3ZkAn5z/+t3kaGDBp1ubne8edHY3iDyRw62gP5BgOGv/b7tuJEarY//Y2Bat2W9oj/VHZ0j/9LIbivgS6AEeWK6q+nXmov9otkjLhggNN7b8dqlVmRO/3VaaFjE3S4f8aaQDv8I6VpAGoiTLwB8E8Ue4qMyyP2CuK/M87sqCoRTSSKro32duiD53tHJaWmuCcqbZcy7somWH5n63oENxtc/96kLC0IprwFO0MbDLHgUaYSNegfVUGSovtOMGaGEEoBBTdk1MFEzjucPJeQWPse733r9PvCCULwqrWK9hIpim6ApB2/ezlzSZD tbpGfTwy kwsB1qs/J7m4OVbikGSW0WRDzqFaB1XnNttggd3O/bsNUJgZax8RrFLnX07sFvzMDylveIDzfSEZGEKcnejXBkkD/EGDLWENIXy2RO4sn9YWI9L4oSNdFrCmH91SltcWlMV1QQv3vF46Sxlr0046Hrxg5DrZqjdpKZ+sKs4eftZPlmCI8Fx2BL87Beg9DrAGzNJQaiXm5ju/FDeZeMjXCZFn/HWcHLa2PIepCE2vbJwX/5Rpyq4y5TcLqKpo6z3YzPMuXCaA9kxne7xMVgwR83rXppOSqvUZd0ZFM6znDtSc2kJcfqQRdCE4xV48iZYQKTv7m3WQOsbjIBub81PrDo1Ud4aK4FJUj7aoTbh/iYNDyKq1g2yCQVK3mB2l3U+ZLLY3XgIgMa6+X8Em0e+7pV5m33uMMQ9EQ/sFF/iiON7T45APCLkGWF6Ty5ujjWF3H1x2SuKSXt+XOhe2VGh8hGxqEnQ46j7PdZFM6vTA793fglztHVLCOp9oH8rxOg6d3J3S5T8K7OuiaEgKccOMZTvyAcWbFZebppen0jQOHG1A5VW9cPFDKo7SVbStDuJdFQclzmKzdm/5+mco= 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: Add support for sending a pagefault event if userfaultfd is registered. Only page missing event is currently supported. Signed-off-by: Nikita Kalyazin --- virt/kvm/guest_memfd.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/virt/kvm/guest_memfd.c b/virt/kvm/guest_memfd.c index af825f7494ea..358c3776ed66 100644 --- a/virt/kvm/guest_memfd.c +++ b/virt/kvm/guest_memfd.c @@ -4,6 +4,9 @@ #include #include #include +#ifdef CONFIG_KVM_PRIVATE_MEM +#include +#endif /* CONFIG_KVM_PRIVATE_MEM */ #include "kvm_mm.h" @@ -332,9 +335,16 @@ static vm_fault_t kvm_gmem_fault(struct vm_fault *vmf) struct folio *folio; vm_fault_t ret = VM_FAULT_LOCKED; + folio = filemap_get_entry(inode->i_mapping, vmf->pgoff); + if (!folio && userfaultfd_missing(vmf->vma)) + return handle_userfault(vmf, VM_UFFD_MISSING); + if (folio) + folio_lock(folio); + filemap_invalidate_lock_shared(inode->i_mapping); - folio = kvm_gmem_get_folio(inode, vmf->pgoff); + if (!folio) + folio = kvm_gmem_get_folio(inode, vmf->pgoff); if (IS_ERR(folio)) { switch (PTR_ERR(folio)) { case -EAGAIN: From patchwork Mon Mar 3 13:30:09 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nikita Kalyazin X-Patchwork-Id: 13998852 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 D749DC282D1 for ; Mon, 3 Mar 2025 13:31:01 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 6B0A36B0096; Mon, 3 Mar 2025 08:31:01 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 65DEB6B0098; Mon, 3 Mar 2025 08:31:01 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 4FE706B0099; Mon, 3 Mar 2025 08:31:01 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id 3126B6B0096 for ; Mon, 3 Mar 2025 08:31:01 -0500 (EST) Received: from smtpin05.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id 83DD8120993 for ; Mon, 3 Mar 2025 13:31:00 +0000 (UTC) X-FDA: 83180325480.05.E1FD0A0 Received: from smtp-fw-9106.amazon.com (smtp-fw-9106.amazon.com [207.171.188.206]) by imf24.hostedemail.com (Postfix) with ESMTP id 862CA18002B for ; Mon, 3 Mar 2025 13:30:57 +0000 (UTC) Authentication-Results: imf24.hostedemail.com; dkim=pass header.d=amazon.com header.s=amazon201209 header.b=VzsappMV; dmarc=pass (policy=quarantine) header.from=amazon.com; spf=pass (imf24.hostedemail.com: domain of "prvs=150a0b0d2=kalyazin@amazon.co.uk" designates 207.171.188.206 as permitted sender) smtp.mailfrom="prvs=150a0b0d2=kalyazin@amazon.co.uk" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1741008658; 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-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=V1vY8tCYPxCY4hbQpuMez7lxmv4c2waMAS4LksLgaxQ=; b=rUX7Aqinyci3aQ2hzCB5UY4YdzYcxNnRZYU2uIIjYbTD3oP8Usg8rEOUJWcYv+LFLGw9YW mB8EvTQ+Y+tvqrwsfbu60uf1gB0Klt2R7Wvm1yPa9vwz5bc+jlbW6/JsfX6F2HbqS28ZJc sQaau/Z6ZQShb22wGCe7QWW1Tx0yuk8= ARC-Authentication-Results: i=1; imf24.hostedemail.com; dkim=pass header.d=amazon.com header.s=amazon201209 header.b=VzsappMV; dmarc=pass (policy=quarantine) header.from=amazon.com; spf=pass (imf24.hostedemail.com: domain of "prvs=150a0b0d2=kalyazin@amazon.co.uk" designates 207.171.188.206 as permitted sender) smtp.mailfrom="prvs=150a0b0d2=kalyazin@amazon.co.uk" ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1741008658; a=rsa-sha256; cv=none; b=Imr9uLOwYwh/UivnL1txKAu3qxmnSzD0hHb2fLb25X3O6l+5YtHFcvxKcq6kP1/Ubt4cGD neN2tXC7Rh7bcYzScB3uUgIKP/vNLy4RcxYFkzh0royBN6auGjx2omYc0LPOoahBcc2SJs flVhd2zKQwiyLplyyMmtq+BLOjVxNNw= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amazon.com; i=@amazon.com; q=dns/txt; s=amazon201209; t=1741008658; x=1772544658; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=V1vY8tCYPxCY4hbQpuMez7lxmv4c2waMAS4LksLgaxQ=; b=VzsappMVe+uMF9FL8QZwBs7coX7WCMQFxCGGwVcuZ4iLrTy8fWR6RTgN NUuwTvJuMjAhm57ShmOnJXzLnrkejOMlhzB9o6Xsq5EbpuN5p2Zls3RcV hvSB2yalX/wWV6e/f9WN+u1D+3QySesr1n+zD/k3AdOnWus4dgtFaVkq/ 4=; X-IronPort-AV: E=Sophos;i="6.13,329,1732579200"; d="scan'208";a="803691401" Received: from pdx4-co-svc-p1-lb2-vlan2.amazon.com (HELO smtpout.prod.us-west-2.prod.farcaster.email.amazon.dev) ([10.25.36.210]) by smtp-border-fw-9106.sea19.amazon.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 03 Mar 2025 13:30:56 +0000 Received: from EX19MTAUWC001.ant.amazon.com [10.0.7.35:32907] by smtpin.naws.us-west-2.prod.farcaster.email.amazon.dev [10.0.58.163:2525] with esmtp (Farcaster) id 415691d2-e1c3-4608-9ed6-87a92ed11fa8; Mon, 3 Mar 2025 13:30:55 +0000 (UTC) X-Farcaster-Flow-ID: 415691d2-e1c3-4608-9ed6-87a92ed11fa8 Received: from EX19D020UWC002.ant.amazon.com (10.13.138.147) by EX19MTAUWC001.ant.amazon.com (10.250.64.174) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA) id 15.2.1544.14; Mon, 3 Mar 2025 13:30:54 +0000 Received: from EX19MTAUWC002.ant.amazon.com (10.250.64.143) by EX19D020UWC002.ant.amazon.com (10.13.138.147) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA) id 15.2.1544.14; Mon, 3 Mar 2025 13:30:54 +0000 Received: from email-imr-corp-prod-iad-all-1b-8410187a.us-east-1.amazon.com (10.25.36.210) by mail-relay.amazon.com (10.250.64.149) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA) id 15.2.1544.14 via Frontend Transport; Mon, 3 Mar 2025 13:30:54 +0000 Received: from dev-dsk-kalyazin-1a-a12e27e2.eu-west-1.amazon.com (dev-dsk-kalyazin-1a-a12e27e2.eu-west-1.amazon.com [172.19.103.116]) by email-imr-corp-prod-iad-all-1b-8410187a.us-east-1.amazon.com (Postfix) with ESMTPS id 77107406A9; Mon, 3 Mar 2025 13:30:52 +0000 (UTC) From: Nikita Kalyazin To: , , CC: , , , , , , , , , , , , , , , , Subject: [RFC PATCH 3/5] mm: userfaultfd: allow to register userfaultfd for guest_memfd Date: Mon, 3 Mar 2025 13:30:09 +0000 Message-ID: <20250303133011.44095-4-kalyazin@amazon.com> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250303133011.44095-1-kalyazin@amazon.com> References: <20250303133011.44095-1-kalyazin@amazon.com> MIME-Version: 1.0 X-Rspamd-Server: rspam04 X-Rspamd-Queue-Id: 862CA18002B X-Rspam-User: X-Stat-Signature: e1negzdzoxfu17af8i9acsjpqtp1d5xe X-HE-Tag: 1741008657-346788 X-HE-Meta: U2FsdGVkX1/l4Vm2trsdV5FObYCUUZG/TkX023cySaUT6j9zJIjhIfSkXPzPLd0VFk3UcCuIDongn6ASyL+q7io9MGSVJlMaM/hSUmEOeVGT+xoGs0e1WnXp4jywWnO2V+2pLsl0UtaOmsBw5unch4Chqs91nLqPCFnrcIHf/7EuPilOpdb+e1y6EW1AS6A+8bFYgE43DBEPnxR0SGMUodKqfm2lkYd+PpSDY3Thq8hLDLUQzfyAW23in6m66OptRZgYUSIwo3eFeSxxMc9HtaQTnGywicZXAD8f42OoNH/XuAFQaj49EyN8qtDJ6BwdxjetBvkB5V7Idq1zi0HnCSHXJnoiYkHXXBlwdayZF4XzCawxaHprPuxIPS2eCbYin9Ho+VhDchktES7ZWvAuSZmainhOfqSX3YpIXI/7oI4Ns3CWItR6qzvI5xQu38LziJ3qVLuSJDo8YddCtKGJeCaVHxseZs02RhGEo3u2+2MYUHcn2soWdcEzXMqU9zAi5HMXzHPGd1BOaf74tbczVZUKs7gGd2aV+AR+OpOOzwZ1nzrZNJcPKRnuxSKUXNDc1BW6EqDLdWFvsOsWvkbSd5Kl624Ucl3lwxK/1cGSZVxLbzXbq7FX0APL1D+ntsml7qs8tolPzXBtTuLUyTZuGzmldEtk6JdAbQWp7BwXtMeSsZKR6P15sscabYFL+lTYphQxjlO0/Daw12BkmKNCmL+o5275rVdqkHkAdmBP+ko65Jml5zasw6VEMdF2meNsiJai4CTWIkSZacOHXR0FohxzATiFqtaSmTFo1xV7rAXxoK4fw29P6yhQaiThI7Qwvw5zIXPXYQ8CONedvwSRibw9+KN0yRABKcdEpBCPYx3OmJ2RTPxtj/m4xA5rK24Ifr3cjmfe3Apwz1NQeDUohWgt+t67LzOWgDoUbTxIPt9KRQXAotIaKvBheAcGaT5fb0dcWWFdmUmIzqKv7nU Rm0aZuYH 4RLeR5DtguTAoJ/h+KwKLpwMprqQ0Tmri+kpIy8LnonA/E/vo1uEOTy+HLXIciv3m7hXSDxbPdFjcbC6ppgVKr5BBmmz09AtbjgieHYMoufB9/DhZqLLVR3sazEyLHyAGu8+j47FfAZA0hsRH6QGGx6nkIno+qjRmFaN3swQL7LFBrOYJgYFNzA4uIGEAQeSK0GjvuTNRHTtl9gyXA3GO3lqNj+GUjFWtE8ph8pfLPRYnVgswNu3ymJjyuoa3koD/Yk5aGSQWkBX8Mw0pIqNSVaJEi67B6MWfbYO6rHJGMC3i8LuLEZlNJxg+RAHnjU4t0yY1Y0l82KI1D5Hmn6h9vRb/eu/5HOC1FtV1dz9mqQZKM8IQQNbeByKF4w1IanPW38hVpDQbFVigWX6KjuaJyIi5lEfHZn1tSBxpheQcwQ/IQJrr+kiqyA6q1ZTmj2lLfmjzGKgX3DA5l/yJW/uDOfzJGtfTGZ8h/H5rxig2tMCU4H6yCENxFgUHsSCwf8Eo90m+YE+FAXwgdtlCVBn+jN6QcV8nYsyRKJI3SN5hco1wEe5bKqy+7Rl7zvA2ftTrwiICVvuOwpHYbFs= 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: Signed-off-by: Nikita Kalyazin --- include/linux/userfaultfd_k.h | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/include/linux/userfaultfd_k.h b/include/linux/userfaultfd_k.h index 75342022d144..440d38903359 100644 --- a/include/linux/userfaultfd_k.h +++ b/include/linux/userfaultfd_k.h @@ -20,6 +20,10 @@ #include #include +#ifdef CONFIG_KVM_PRIVATE_MEM +bool kvm_gmem_vma_is_gmem(struct vm_area_struct *vma); +#endif + /* The set of all possible UFFD-related VM flags. */ #define __VM_UFFD_FLAGS (VM_UFFD_MISSING | VM_UFFD_WP | VM_UFFD_MINOR) @@ -242,6 +246,11 @@ static inline bool vma_can_userfault(struct vm_area_struct *vma, return false; #endif +#ifdef CONFIG_KVM_PRIVATE_MEM + if (kvm_gmem_vma_is_gmem(vma)) + return true; +#endif + /* By default, allow any of anon|shmem|hugetlb */ return vma_is_anonymous(vma) || is_vm_hugetlb_page(vma) || vma_is_shmem(vma); From patchwork Mon Mar 3 13:30:10 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nikita Kalyazin X-Patchwork-Id: 13998853 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 DF33DC282D1 for ; Mon, 3 Mar 2025 13:31:24 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 7494F6B0099; Mon, 3 Mar 2025 08:31:24 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 6F9166B009A; Mon, 3 Mar 2025 08:31:24 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 5C1086B009B; Mon, 3 Mar 2025 08:31:24 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id 3CD766B0099 for ; Mon, 3 Mar 2025 08:31:24 -0500 (EST) Received: from smtpin04.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id B63BE12098E for ; Mon, 3 Mar 2025 13:31:23 +0000 (UTC) X-FDA: 83180326446.04.415C174 Received: from smtp-fw-80008.amazon.com (smtp-fw-80008.amazon.com [99.78.197.219]) by imf25.hostedemail.com (Postfix) with ESMTP id 46AEEA0020 for ; Mon, 3 Mar 2025 13:31:21 +0000 (UTC) Authentication-Results: imf25.hostedemail.com; dkim=pass header.d=amazon.com header.s=amazon201209 header.b=s2W5wGeI; dmarc=pass (policy=quarantine) header.from=amazon.com; spf=pass (imf25.hostedemail.com: domain of "prvs=150a0b0d2=kalyazin@amazon.co.uk" designates 99.78.197.219 as permitted sender) smtp.mailfrom="prvs=150a0b0d2=kalyazin@amazon.co.uk" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1741008681; 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-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=JIXEK8fZmfp3pTHcHhhnyrOSlMvjIkeSF6WjbQ+OQL4=; b=bmCgRwWud5QR4/iSQvD37cD7b4N6qRaIZbJaK3ELVCLkV6F8rTKdxoEAgSLwj415MB2fXI CDFChfiDIRHWO6INGkQ1Kdl6FePogbztFk/k2w9MR99ZZbek4z58/MQvrZoTE6zpqGmx6d sXOtCmCNHMWzZJkHaHFbe/XYIfgKAn0= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1741008681; a=rsa-sha256; cv=none; b=kAxyCTqMMS5tV9OubXQUk2D6HZ0YGIIGprwGTladKXpWHr1diZXovCiMsi6ljGoVRJ7k0g jcfkeBa61aNASeL/4qBTifCKQiQ0f/syae4pqCCNI+oOcLuzZbPDvC4jZtZpCw+1GFoMYD rbnMxoIZTJIuVBSU541geolZI2rhrCI= ARC-Authentication-Results: i=1; imf25.hostedemail.com; dkim=pass header.d=amazon.com header.s=amazon201209 header.b=s2W5wGeI; dmarc=pass (policy=quarantine) header.from=amazon.com; spf=pass (imf25.hostedemail.com: domain of "prvs=150a0b0d2=kalyazin@amazon.co.uk" designates 99.78.197.219 as permitted sender) smtp.mailfrom="prvs=150a0b0d2=kalyazin@amazon.co.uk" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amazon.com; i=@amazon.com; q=dns/txt; s=amazon201209; t=1741008681; x=1772544681; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=JIXEK8fZmfp3pTHcHhhnyrOSlMvjIkeSF6WjbQ+OQL4=; b=s2W5wGeISK7yaueIJ+ZGrClco8ruRCd4Zm+jUiREvyygUaoNVUWP8Jgg wnNWjeDtZ8UQPE6TWR9wRo2W9gvx/h1MoixTUR/uRPEz/KaWv93ebFqvb 2JtUkQCZToqMQEyRjWh+VN2vALxw2jhZOgFAD2e9xmpL/QvQgZdDVy9lI E=; X-IronPort-AV: E=Sophos;i="6.13,329,1732579200"; d="scan'208";a="174959912" Received: from pdx4-co-svc-p1-lb2-vlan3.amazon.com (HELO smtpout.prod.us-east-1.prod.farcaster.email.amazon.dev) ([10.25.36.214]) by smtp-border-fw-80008.pdx80.corp.amazon.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 03 Mar 2025 13:31:17 +0000 Received: from EX19MTAUWA001.ant.amazon.com [10.0.7.35:29532] by smtpin.naws.us-west-2.prod.farcaster.email.amazon.dev [10.0.9.61:2525] with esmtp (Farcaster) id 1338de01-a28d-410f-a789-9dc43131ae5f; Mon, 3 Mar 2025 13:31:16 +0000 (UTC) X-Farcaster-Flow-ID: 1338de01-a28d-410f-a789-9dc43131ae5f Received: from EX19D003UWB004.ant.amazon.com (10.13.138.24) by EX19MTAUWA001.ant.amazon.com (10.250.64.204) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA) id 15.2.1544.14; Mon, 3 Mar 2025 13:31:08 +0000 Received: from EX19MTAUWC002.ant.amazon.com (10.250.64.143) by EX19D003UWB004.ant.amazon.com (10.13.138.24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA) id 15.2.1544.14; Mon, 3 Mar 2025 13:31:07 +0000 Received: from email-imr-corp-prod-pdx-all-2c-785684ef.us-west-2.amazon.com (10.25.36.210) by mail-relay.amazon.com (10.250.64.149) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA) id 15.2.1544.14 via Frontend Transport; Mon, 3 Mar 2025 13:31:07 +0000 Received: from dev-dsk-kalyazin-1a-a12e27e2.eu-west-1.amazon.com (dev-dsk-kalyazin-1a-a12e27e2.eu-west-1.amazon.com [172.19.103.116]) by email-imr-corp-prod-pdx-all-2c-785684ef.us-west-2.amazon.com (Postfix) with ESMTPS id 27701A1025; Mon, 3 Mar 2025 13:31:05 +0000 (UTC) From: Nikita Kalyazin To: , , CC: , , , , , , , , , , , , , , , , Subject: [RFC PATCH 4/5] mm: userfaultfd: support continue for guest_memfd Date: Mon, 3 Mar 2025 13:30:10 +0000 Message-ID: <20250303133011.44095-5-kalyazin@amazon.com> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250303133011.44095-1-kalyazin@amazon.com> References: <20250303133011.44095-1-kalyazin@amazon.com> MIME-Version: 1.0 X-Rspam-User: X-Rspamd-Server: rspam12 X-Rspamd-Queue-Id: 46AEEA0020 X-Stat-Signature: ezagbd7d13uxgpd76o3hu35mgz668xj4 X-HE-Tag: 1741008681-945509 X-HE-Meta: U2FsdGVkX19ILz+a3muvJ/QQcBufITqBktrBBJZRSMLhmEZrAhYgrbuV4ATIgE+Kuvt2YbGleCgk1GeUCWAGmqOjkZLwC+Spal4jNjcLQywWanheyLmDdBlovRy1h6K0ffu4VRXUk2PTymyONTX4a6UasapppzTnu6Hs9mJuhCm1B/S4IZU40mkngaUEUZqM7u3T/cyMKMOs7a6pbNVXRkcU/6FBcpIDAJjuufWK0NjicL95QGZo11bLg4lq6AI8d+0Qf4lZsnlYtB+i6uJzlDIze8johIsgzwLwXzu2x4buAKepCuj+jNlimHIqI4ANOLAPN1YKvttfrRScJDlOqeeJ7OKhj+kOO6VmQ5szMaL6aTgQxFXuqb/tUzspIN1fzRmByCM0LUIfOpkXVkaxiOF58CLa0rrkJUb1JVT2dywO2tflfx+fMRC4rTD/nEzq0rPd3+oGoCBarbQk9LxbXea26/g/sMYrBhaPoy5A/5JuwSpCUxsw/UApGhpQLjY7fZWM/SBwHuYtxbYOmFGIb0fhEaGx8b7z+PcHpo3Rzuxl0E+w7OaPjHpU003XuIob6ayGrex2OXMWHBx0UvCVbmbXoF7P9IFEeW6F2meHw78b74OzuKEghe92awIGGo7bg6pV28q+hJ1zV9E7tw36nUiN58CZ5Kt2DJ6lcY/WNyssZwyliQ2kT5OI69RY/6zYd6ZENlI9Qkw5KSpbW4B8a77I/zfA2y6Mb4ZcjxskcscvO82hnVb+m8ixaF0Vc1dtFnaOByHxmD6IuI2Z9sM7AYYLRnJGb6x9DfJcrj/1m18yETWRHvAmBQLd+qNnv68n/dWZTLfYymRZ1GALb+TUpeTxjqm8tIdxOfiCte71mUz+VMkY7mzrFn777BfNs8GESyOUYapl/bdlp22fpDbsx2iGIr0pYwUbFMxP61+Xgt70h2Ue+RfuPyMEhqQoA3jNXkPsQ0Co1yjPkWvKwtR KBPg4cCF 01+/HFFgXgjToVFX/VYbgCbvQJ04mY39nXdBTeyo4e7t+BOCGcgSlgVJMYyNjiPe3lVVnHtx1ZmSVlYlm7A7zqRjkrBo5z+6/YMWnTmlDq89JL7qTVtYzxybFgmrlsXRL+75Ta/ivMxSBkRIottBKkKUSwi9t1frg0h1FmjiNdGFOr5gablcsWxpQzZUM6ko98XT8Aa60tK7gu5hlkvpnyEWpiHGhXU7trBsiuPT8jnlTv2araedvDVuY2WH66oA+Qf9GPy1uFH+Ibuf42Ha+SRxqk4DIBeYYtUxO61qK8VyzY7hB5hdt2PyqYuaYzCPuOpCW74EPo5VRiNSHFN7dMrHhuICZKAzNlXu5vS9j3GdcpvCOnfDFD4ieYJlLe3DOZGR/zK+k1kJe19ke3KPlTgH1VoJoSPr07S2mUdKpHBFOwwx76Ql4b7N7cvBSOwcNGoXsXZIu/pn6T0H4HpSW2T7SxaVSngKabC+SCS5aLUMNLgdwDwA3svGaogalesVt6bOYeyR9cmI19ncy1teZLkx8SmsEYkGLHHhkzoDYhsbx5W0= 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: When userspace receives a page missing event, it is supposed to populate the missing page in guest_memfd pagecache via the write syscall and unblock the faulting process via UFFDIO_CONTINUE. Signed-off-by: Nikita Kalyazin --- mm/userfaultfd.c | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/mm/userfaultfd.c b/mm/userfaultfd.c index af3dfc3633db..aaff66a7f15b 100644 --- a/mm/userfaultfd.c +++ b/mm/userfaultfd.c @@ -19,6 +19,10 @@ #include #include "internal.h" +#ifdef CONFIG_KVM_PRIVATE_MEM +bool kvm_gmem_vma_is_gmem(struct vm_area_struct *vma); +#endif + static __always_inline bool validate_dst_vma(struct vm_area_struct *dst_vma, unsigned long dst_end) { @@ -391,6 +395,16 @@ static int mfill_atomic_pte_continue(pmd_t *dst_pmd, struct page *page; int ret; +#ifdef CONFIG_KVM_PRIVATE_MEM + if (kvm_gmem_vma_is_gmem(dst_vma)) { + ret = 0; + folio = filemap_get_entry(inode->i_mapping, pgoff); + if (IS_ERR(folio)) + ret = PTR_ERR(folio); + else + folio_lock(folio); + } else +#endif ret = shmem_get_folio(inode, pgoff, 0, &folio, SGP_NOALLOC); /* Our caller expects us to return -EFAULT if we failed to find folio */ if (ret == -ENOENT) @@ -769,9 +783,16 @@ static __always_inline ssize_t mfill_atomic(struct userfaultfd_ctx *ctx, return mfill_atomic_hugetlb(ctx, dst_vma, dst_start, src_start, len, flags); - if (!vma_is_anonymous(dst_vma) && !vma_is_shmem(dst_vma)) + if (!vma_is_anonymous(dst_vma) && !vma_is_shmem(dst_vma) +#ifdef CONFIG_KVM_PRIVATE_MEM + && !kvm_gmem_vma_is_gmem(dst_vma) +#endif + ) goto out_unlock; if (!vma_is_shmem(dst_vma) && +#ifdef CONFIG_KVM_PRIVATE_MEM + !kvm_gmem_vma_is_gmem(dst_vma) && +#endif uffd_flags_mode_is(flags, MFILL_ATOMIC_CONTINUE)) goto out_unlock; From patchwork Mon Mar 3 13:30:11 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nikita Kalyazin X-Patchwork-Id: 13998854 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 3F11EC282D1 for ; Mon, 3 Mar 2025 13:31:49 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id CC7786B007B; Mon, 3 Mar 2025 08:31:48 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id C78946B009B; Mon, 3 Mar 2025 08:31:48 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id B3FA96B009C; Mon, 3 Mar 2025 08:31:48 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id 402A36B009B for ; Mon, 3 Mar 2025 08:31:48 -0500 (EST) Received: from smtpin13.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id D9A6F1A09B2 for ; Mon, 3 Mar 2025 13:31:46 +0000 (UTC) X-FDA: 83180327412.13.A4B45A2 Received: from smtp-fw-2101.amazon.com (smtp-fw-2101.amazon.com [72.21.196.25]) by imf08.hostedemail.com (Postfix) with ESMTP id 5872216000D for ; Mon, 3 Mar 2025 13:31:41 +0000 (UTC) Authentication-Results: imf08.hostedemail.com; dkim=pass header.d=amazon.com header.s=amazon201209 header.b=NWsY9fXc; dmarc=pass (policy=quarantine) header.from=amazon.com; spf=pass (imf08.hostedemail.com: domain of "prvs=150a0b0d2=kalyazin@amazon.co.uk" designates 72.21.196.25 as permitted sender) smtp.mailfrom="prvs=150a0b0d2=kalyazin@amazon.co.uk" ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1741008701; a=rsa-sha256; cv=none; b=fHGL8YkUXeoG07vvjScjRqi3riF8RTasXN7bFhZR2C0PZ9l+qi8b2KgxROoknYCV2owQCs FoOU86QwXrMgwtkSu9S9WLmT4ua37061q02FKrwopuZORrA12EWb9Y5ejxE/JBRii1PCXI sbWBMJgm5BipFTbJLme6j2tCT1aCF9M= ARC-Authentication-Results: i=1; imf08.hostedemail.com; dkim=pass header.d=amazon.com header.s=amazon201209 header.b=NWsY9fXc; dmarc=pass (policy=quarantine) header.from=amazon.com; spf=pass (imf08.hostedemail.com: domain of "prvs=150a0b0d2=kalyazin@amazon.co.uk" designates 72.21.196.25 as permitted sender) smtp.mailfrom="prvs=150a0b0d2=kalyazin@amazon.co.uk" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1741008701; 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-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=Q0UMU0w4P1V9x66iYOqq2hXEUmMMf6XfFEDXRgYhyWI=; b=fHoOQ//lyuBUii/qPu7CZg+TLDa7mJ2w7Vhsub18+l3OV8HRt+wBxFkl2hwFKaAPSk/Hmr DMIAC+NxMHMsdHTRaCIUyYaNcwR4CPSIfwUIzfGhDBr0l3SVt0Rp04P/6VxXrUVCnMporM 5R/0Gflw39478NUgZ/Xf1+mqm1z01Kc= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amazon.com; i=@amazon.com; q=dns/txt; s=amazon201209; t=1741008702; x=1772544702; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=Q0UMU0w4P1V9x66iYOqq2hXEUmMMf6XfFEDXRgYhyWI=; b=NWsY9fXc8VV3NtzairQ/1WCfJY9h+CasXUQ14nnp6bU0QVm2kOkK5uop gsNlWGgJ9herXLcNhZxEfEE+UkkOviUqchIkXQ0Tu9ZC7SM2nDGxJU4rv XyOgYzmKu8fMRNmqWkQWpdekP/GGQwWnwh5B++uDBDzjwiP99SpyYwLTe I=; X-IronPort-AV: E=Sophos;i="6.13,329,1732579200"; d="scan'208";a="471520831" Received: from iad12-co-svc-p1-lb1-vlan3.amazon.com (HELO smtpout.prod.us-west-2.prod.farcaster.email.amazon.dev) ([10.43.8.6]) by smtp-border-fw-2101.iad2.amazon.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 03 Mar 2025 13:31:23 +0000 Received: from EX19MTAUWC002.ant.amazon.com [10.0.7.35:52084] by smtpin.naws.us-west-2.prod.farcaster.email.amazon.dev [10.0.52.238:2525] with esmtp (Farcaster) id 138b0d45-31f1-425a-a923-c15034519930; Mon, 3 Mar 2025 13:31:22 +0000 (UTC) X-Farcaster-Flow-ID: 138b0d45-31f1-425a-a923-c15034519930 Received: from EX19D020UWC004.ant.amazon.com (10.13.138.149) by EX19MTAUWC002.ant.amazon.com (10.250.64.143) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA) id 15.2.1544.14; Mon, 3 Mar 2025 13:31:22 +0000 Received: from EX19MTAUWA001.ant.amazon.com (10.250.64.204) by EX19D020UWC004.ant.amazon.com (10.13.138.149) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA) id 15.2.1544.14; Mon, 3 Mar 2025 13:31:21 +0000 Received: from email-imr-corp-prod-pdx-1box-2b-ecca39fb.us-west-2.amazon.com (10.25.36.214) by mail-relay.amazon.com (10.250.64.204) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA) id 15.2.1544.14 via Frontend Transport; Mon, 3 Mar 2025 13:31:21 +0000 Received: from dev-dsk-kalyazin-1a-a12e27e2.eu-west-1.amazon.com (dev-dsk-kalyazin-1a-a12e27e2.eu-west-1.amazon.com [172.19.103.116]) by email-imr-corp-prod-pdx-1box-2b-ecca39fb.us-west-2.amazon.com (Postfix) with ESMTPS id EF588803CC; Mon, 3 Mar 2025 13:31:18 +0000 (UTC) From: Nikita Kalyazin To: , , CC: , , , , , , , , , , , , , , , , Subject: [RFC PATCH 5/5] KVM: selftests: add uffd missing test for guest_memfd Date: Mon, 3 Mar 2025 13:30:11 +0000 Message-ID: <20250303133011.44095-6-kalyazin@amazon.com> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250303133011.44095-1-kalyazin@amazon.com> References: <20250303133011.44095-1-kalyazin@amazon.com> MIME-Version: 1.0 X-Rspamd-Server: rspam08 X-Rspamd-Queue-Id: 5872216000D X-Stat-Signature: wm16ug43nh66a4qt81t9a1ufe8k3777q X-Rspam-User: X-HE-Tag: 1741008701-977496 X-HE-Meta: U2FsdGVkX1+HcqxLrPEbFV2PREd8AraaibZe8NUpkK2z7JvgaP5TcqPxJvDBAWUVqQnYRc6rW6Emin64Qc5EEV7xAF1uPiQYYF98dL266ganCoknUIlyJAwh/DlVuUSNJH4Qg8BnbJeXfl1AMs+/HFfJH2O0JfLQtJWFe4LCMvs7oi+PW+MhdXqaYMeCYbjlIbKStGxg0pZhYZbj+rtj7sgpGMfbMGsyIBZLK/NiHD8aMShkuRCdKSmAdkWXZVqartOSfqoZvm6AkuWtA1S8Ncb7n5KteAhp7ZXpHQqx8ehmIECaaJhksJYrlHbA7O+YVAHko4m5qvTyaZdby8p6ywXCowUB1oTXlyP770JB2bqCPo+dJvYIuB9C9L2CCJUH2iH+Nz+gOSj80hULcxgduCm5i2rZJ9JDFZmELjC3UZwPizBvhHPOuixX+01vE1hyf0UPuInVRTg8MLItfkowOR/aghH3edl7/e+g6mZ+0PXWUwo61k+05/Pznq8uDiVpIVwAFONXOdSXLYSJV2z/2tlNyiq4Vr9YBC0VkM7+QIXP/k44XkH19ut19OsUqNZWzKebu1x1ZnQxTIY6/UX/oeczeoxPfU0xqmu3EZDjN37z7Ij7XIlD8V2DNbRd8/yneAJcS/JJAVSaE3ZKF9Lp/yXnd2xbA27+8MvR69jccgIo4TtpezZmCXFAkoK6SEsWIfWCQpOjL31Y+2lfmwMPt8QNwhC56upWyF3FcaQSh2rtDm/sJbCU5PUMYF1RYMyYbmk2z65EPjSYS0XUlY0PcXBHRX/MryRLv7SlXjKIuoHIz/rXbArULyG4xD69GJItNI2bUHwFXBiSg5xgfJx6iqK+2yinJEUT7GKHjb3LEVXlnY8ca3d8SUIBZ27T5dZvdaEEXpdyW47lVImUKQHSXehqVPdygcxdJqVGRRLZsQM/4wR1+Hv4EzMj6iMaAUnqxCwfA/BOdPF1BONzSzE Wd0Q4avm 5TxybYUu82q+Av7iplSIY4Z5tmNOKzbreG5DChRiR7EaHlF432JFOLv13cA0kIjsny1FOse/XGaANKcDIPxX+qHco2CF0pNOctHCN99JcbUA2uWzDca6tf+TA1234df+7tcHSqN+aBqbHp19rxwr7oewLAoHzG7uQCPdmaml8RhNKPkHHvP/ItOGXsg95EelWObHJSUSrAcVulvWQx98o8l62eOgwUfmXcG+XFeVZSxZbgKM/WqSW4lQwd+TSL/vt312H5fxLqYMWU64rLYNG6fjsSeYJh/VGOGRthLpXAsTco90SPFXhdJiXtfASnfAu0h52Vi1ad7AaEI5m72/oj0LXdXch4gcigMbP+cljarMhkrs= 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: The test demonstrates how a page missing event can be resolved via write syscall followed by UFFDIO_CONTINUE ioctl. Signed-off-by: Nikita Kalyazin --- .../testing/selftests/kvm/guest_memfd_test.c | 88 +++++++++++++++++++ 1 file changed, 88 insertions(+) diff --git a/tools/testing/selftests/kvm/guest_memfd_test.c b/tools/testing/selftests/kvm/guest_memfd_test.c index b07221aa54c9..aea0e8627981 100644 --- a/tools/testing/selftests/kvm/guest_memfd_test.c +++ b/tools/testing/selftests/kvm/guest_memfd_test.c @@ -10,12 +10,16 @@ #include #include #include +#include #include #include +#include #include #include #include +#include +#include #include "kvm_util.h" #include "test_util.h" @@ -278,6 +282,88 @@ static void test_create_guest_memfd_multiple(struct kvm_vm *vm) close(fd1); } +struct fault_args { + char *addr; + volatile char value; +}; + +static void *fault_thread_fn(void *arg) +{ + struct fault_args *args = arg; + + /* Trigger page fault */ + args->value = *args->addr; + return NULL; +} + +static void test_uffd_missing(int fd, size_t page_size, size_t total_size) +{ + struct uffdio_register uffd_reg; + struct uffdio_continue uffd_cont; + struct uffd_msg msg; + struct fault_args args; + pthread_t fault_thread; + void *mem, *buf = NULL; + int uffd, ret; + off_t offset = page_size; + void *fault_addr; + + ret = posix_memalign(&buf, page_size, total_size); + TEST_ASSERT_EQ(ret, 0); + + uffd = syscall(__NR_userfaultfd, O_CLOEXEC); + TEST_ASSERT(uffd != -1, "userfaultfd creation should succeed"); + + struct uffdio_api uffdio_api = { + .api = UFFD_API, + .features = UFFD_FEATURE_MISSING_SHMEM, + }; + ret = ioctl(uffd, UFFDIO_API, &uffdio_api); + TEST_ASSERT(ret != -1, "ioctl(UFFDIO_API) should succeed"); + + mem = mmap(NULL, total_size, PROT_READ | PROT_WRITE, MAP_SHARED, fd, 0); + TEST_ASSERT(mem != MAP_FAILED, "mmap should succeed"); + + uffd_reg.range.start = (unsigned long)mem; + uffd_reg.range.len = total_size; + uffd_reg.mode = UFFDIO_REGISTER_MODE_MISSING; + ret = ioctl(uffd, UFFDIO_REGISTER, &uffd_reg); + TEST_ASSERT(ret != -1, "ioctl(UFFDIO_REGISTER) should succeed"); + + ret = fallocate(fd, FALLOC_FL_KEEP_SIZE | FALLOC_FL_PUNCH_HOLE, + offset, page_size); + TEST_ASSERT(!ret, "fallocate(PUNCH_HOLE) should succeed"); + + fault_addr = mem + offset; + args.addr = fault_addr; + + ret = pthread_create(&fault_thread, NULL, fault_thread_fn, &args); + TEST_ASSERT(ret == 0, "pthread_create should succeed"); + + ret = read(uffd, &msg, sizeof(msg)); + TEST_ASSERT(ret != -1, "read from userfaultfd should succeed"); + TEST_ASSERT(msg.event == UFFD_EVENT_PAGEFAULT, "event type should be pagefault"); + TEST_ASSERT((void *)(msg.arg.pagefault.address & ~(page_size - 1)) == fault_addr, + "pagefault should occur at expected address"); + + ret = pwrite(fd, buf + offset, page_size, offset); + TEST_ASSERT(ret == page_size, "write should succeed"); + + uffd_cont.range.start = (unsigned long)fault_addr; + uffd_cont.range.len = page_size; + uffd_cont.mode = 0; + ret = ioctl(uffd, UFFDIO_CONTINUE, &uffd_cont); + TEST_ASSERT(ret != -1, "ioctl(UFFDIO_CONTINUE) should succeed"); + + ret = pthread_join(fault_thread, NULL); + TEST_ASSERT(ret == 0, "pthread_join should succeed"); + + ret = munmap(mem, total_size); + TEST_ASSERT(!ret, "munmap should succeed"); + free(buf); + close(uffd); +} + unsigned long get_shared_type(void) { #ifdef __x86_64__ @@ -316,6 +402,8 @@ void test_vm_type(unsigned long type, bool is_shared) test_file_size(fd, page_size, total_size); test_fallocate(fd, page_size, total_size); test_invalid_punch_hole(fd, page_size, total_size); + if (is_shared) + test_uffd_missing(fd, page_size, total_size); close(fd); kvm_vm_release(vm);