From mboxrd@z Thu Jan 1 00:00:00 1970 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 2A85FC36013 for ; Fri, 28 Mar 2025 15:31:49 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id C3F89280148; Fri, 28 Mar 2025 11:31:44 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id BEB50280151; Fri, 28 Mar 2025 11:31:44 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id A69E9280148; Fri, 28 Mar 2025 11:31:44 -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 730BB280151 for ; Fri, 28 Mar 2025 11:31:44 -0400 (EDT) Received: from smtpin14.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id 234AD80433 for ; Fri, 28 Mar 2025 15:31:45 +0000 (UTC) X-FDA: 83271349770.14.9C42556 Received: from mail-wr1-f73.google.com (mail-wr1-f73.google.com [209.85.221.73]) by imf21.hostedemail.com (Postfix) with ESMTP id CACCF1C0009 for ; Fri, 28 Mar 2025 15:31:40 +0000 (UTC) Authentication-Results: imf21.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=2lmW9JzH; spf=pass (imf21.hostedemail.com: domain of 32sDmZwUKCD0sZaaZfnnfkd.bnlkhmtw-lljuZbj.nqf@flex--tabba.bounces.google.com designates 209.85.221.73 as permitted sender) smtp.mailfrom=32sDmZwUKCD0sZaaZfnnfkd.bnlkhmtw-lljuZbj.nqf@flex--tabba.bounces.google.com; dmarc=pass (policy=reject) header.from=google.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1743175900; 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: in-reply-to:in-reply-to:references:references:dkim-signature; bh=zBwVWT3bMzuxYkVzph9Re975E4ZOgPSLG5vu5hERwkU=; b=0Jvd94Bf3TDC1rT1ip+1tZXmBWDSKFQyjwCdKsac9oPKp89PwlSpFtxEl6VyU+ZUNpmtCJ AfMfNJzZjq7ZLa7S5VUoi7B0Fc5I0y4dnhGRox0jgjyqenBxatHxZn+p4ce6cDDDM0VTGu 3T8/MGk5vzbrTcC1S/A6aeDWqecEIIU= ARC-Authentication-Results: i=1; imf21.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=2lmW9JzH; spf=pass (imf21.hostedemail.com: domain of 32sDmZwUKCD0sZaaZfnnfkd.bnlkhmtw-lljuZbj.nqf@flex--tabba.bounces.google.com designates 209.85.221.73 as permitted sender) smtp.mailfrom=32sDmZwUKCD0sZaaZfnnfkd.bnlkhmtw-lljuZbj.nqf@flex--tabba.bounces.google.com; dmarc=pass (policy=reject) header.from=google.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1743175900; a=rsa-sha256; cv=none; b=RI+aeSeOKaB0RiNvB740q2Pn0TwEhIZjcp6zsrSkDiifpJTt7yRkNgKeBrdLpe9lCie9DV cWVgGRFomS4yPtwW8MHDz0NoHHyuC8S96Cta0WGB+OzSzFtTtrehQR/u1fNL+dWKnGNW3v 19i0sJfpLgMqCPNPztHQcPuPk5kyui0= Received: by mail-wr1-f73.google.com with SMTP id ffacd0b85a97d-3912d5f6689so1371511f8f.1 for ; Fri, 28 Mar 2025 08:31:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1743175899; x=1743780699; darn=kvack.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=zBwVWT3bMzuxYkVzph9Re975E4ZOgPSLG5vu5hERwkU=; b=2lmW9JzHUREB/1h5wkA0yb9eNPYhD83Fblt5kjrpfZv4J77ZvAsQ9txrqcptiNC4mF uC6z7h8SsKIfe61zhEIAHsa3nyrTkTD2gNSvo+zo9Fk2mkMmsUfMgBrHbu+MaZ0cWMw5 hzRvYn6oQusd92DT6VnqrMgz4iBve7/Je+oKgfkSq+ZVU/E7AD7omV3HUGjGaNSwd3JA ihuMDnsGAtbbYIW8NMZiD3DL7btrXMzVdtxA9gDGmcP7WH1Y9WHpcCBUzEIFOQfI01H1 VxLqpngbqA5RSUY8CK3EWBtQpc4+NjQ0IzBjAxfxmnTXcnsHHxuYiLxhFiYHBAwsF7ZP 5DrQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1743175899; x=1743780699; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=zBwVWT3bMzuxYkVzph9Re975E4ZOgPSLG5vu5hERwkU=; b=XhFItF1XicV2q7b4GYDsKdm6VifBvO8Vhga+DjYNRv2Sbc703T79vs//NtsoNm1GDY va/ipeQIlyunhdKi4wQcIDvmsjYpXTt3aq4MEPUc5jpeUWa8T9onGJ9bc1UERC7+R5p+ UlRinSeKFP5cc9wMlR+F4H+G/lWTrzXOnEHk2SuQuiLKAoO15ZNPRI2rd/MdE6fUOBgD 4XKb6wn9FUoRx7B4oE8OSSIHTU8kY5/j96NL76kj16T3xt5/XKPtTlXdC8ahzWaeSG1J kibyR90mXfhue8x0WuW4uPG457wZ64B0NvNHKj6GTU+P1dch7HjquscUVTbv5SfCAbSK J8xA== X-Forwarded-Encrypted: i=1; AJvYcCV1xkuGQyAdXXAOZNCWatGPJSjhIaEAogwtPfyciLNVC1fIpv0fUiVdhYdMLSx2W94mkxFSXxgnIQ==@kvack.org X-Gm-Message-State: AOJu0YxZCV9km+EuKjpYrAGNixSTVQXyai7acc5ybhuxJ3OwOkhK8KS7 TI2ykpzGUt0NvOLLPFq1Gom5TVoIJIadoQg9EEjQfW4M+JwJR8XOKCMWOXPnpEp6krstHotX5A= = X-Google-Smtp-Source: AGHT+IFjfxf6/c4YGYpRR8ebQgMC7nETbgoP7o3HpJ1E0q7VHYEiUY/Sncl1PhAsgk21ab/L2t0C6VGu3g== X-Received: from wrps2.prod.google.com ([2002:adf:f802:0:b0:399:7a0a:493f]) (user=tabba job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6000:18a8:b0:391:4559:876a with SMTP id ffacd0b85a97d-39ad1794cd7mr8199077f8f.46.1743175898942; Fri, 28 Mar 2025 08:31:38 -0700 (PDT) Date: Fri, 28 Mar 2025 15:31:28 +0000 In-Reply-To: <20250328153133.3504118-1-tabba@google.com> Mime-Version: 1.0 References: <20250328153133.3504118-1-tabba@google.com> X-Mailer: git-send-email 2.49.0.472.ge94155a9ec-goog Message-ID: <20250328153133.3504118-3-tabba@google.com> Subject: [PATCH v7 2/7] KVM: guest_memfd: Introduce kvm_gmem_get_pfn_locked(), which retains the folio lock From: Fuad Tabba To: kvm@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-mm@kvack.org Cc: pbonzini@redhat.com, chenhuacai@kernel.org, mpe@ellerman.id.au, anup@brainfault.org, paul.walmsley@sifive.com, palmer@dabbelt.com, aou@eecs.berkeley.edu, seanjc@google.com, viro@zeniv.linux.org.uk, brauner@kernel.org, willy@infradead.org, akpm@linux-foundation.org, xiaoyao.li@intel.com, yilun.xu@intel.com, chao.p.peng@linux.intel.com, jarkko@kernel.org, amoorthy@google.com, dmatlack@google.com, isaku.yamahata@intel.com, mic@digikod.net, vbabka@suse.cz, vannapurve@google.com, ackerleytng@google.com, mail@maciej.szmigiero.name, david@redhat.com, michael.roth@amd.com, wei.w.wang@intel.com, liam.merwick@oracle.com, isaku.yamahata@gmail.com, kirill.shutemov@linux.intel.com, suzuki.poulose@arm.com, steven.price@arm.com, quic_eberman@quicinc.com, quic_mnalajal@quicinc.com, quic_tsoni@quicinc.com, quic_svaddagi@quicinc.com, quic_cvanscha@quicinc.com, quic_pderrin@quicinc.com, quic_pheragu@quicinc.com, catalin.marinas@arm.com, james.morse@arm.com, yuzenghui@huawei.com, oliver.upton@linux.dev, maz@kernel.org, will@kernel.org, qperret@google.com, keirf@google.com, roypat@amazon.co.uk, shuah@kernel.org, hch@infradead.org, jgg@nvidia.com, rientjes@google.com, jhubbard@nvidia.com, fvdl@google.com, hughd@google.com, jthoughton@google.com, peterx@redhat.com, pankaj.gupta@amd.com, tabba@google.com Content-Type: text/plain; charset="UTF-8" X-Rspam-User: X-Rspamd-Server: rspam09 X-Rspamd-Queue-Id: CACCF1C0009 X-Stat-Signature: k16fa95hb5wrzg8dnx6roxdspy5ubrc4 X-HE-Tag: 1743175900-119387 X-HE-Meta: U2FsdGVkX1+rRwbmiWIj8NCDnuvdVtYk2DW/fonUrzIuymahGqALVc5MKMPUrF1+6QJtpA61MGK4oTC+20xNHxgS0yL4elwDGQYPwKZjoC/yttfSZKof+nWeXsMRZqMPXZ/Yjniopg6QuycpAttSSQu2K9PV1X/mC6hkf6CGO+upTXDHRT2ywTuM6MWtp5eukDkGp01j/Wm0/Djh4K5jOi+MDtyyxHsA3fM2pXCMi5NznX/dSSaBgsALsIyBg4rzUEwJLHG1YaXI/g41riP4Q62itoLgEb0rWYVwcmViYC81uSuHDbRRNohi4Zo5qBLB3nR2AHhlSXja4K03zVfsB+u8X5hH3orhhfgIdjgGS8DyFYTmTty4a1jTFvjWlNmdD3KWo2ZEKOAtgR3nfdUBj1RAtHiqZ+r7p4OQhlb9NvhvWrmKbQk1vWYigNKeUllnLhIMOn69P/nVUsLHaTnTICPE2akcNDNlWSXtXA6PCIevNNZDlg6uYH3LwThDGhkbql82KRlgPLnOPw6sBXMZp2ivJtnVtRtqgZxdO9wlKrc5Ir6wANsd79zeBFrNBsIYo0t7E9LoTsCefbzOuTmpE1qUJkiiHP1VYEUxQBDcu494wieJp0rmx6NMP8lD9J2gKNElN1Q3EcFM6+DRNmtcpMIAgdp+2CkFtdNYoYZyU3kqxcgyPie8rPrYGf0FQO/TqTpIj8VcTQYZKrmad/V7W5Z/4MdsiSASUM6tY+dlgHs6wChyohypfQa+xhNSDxSLg0t0P5BHMRO7G+B8pFqlKYyKLNR9N6yiLxiZzVRp9cewb2U/mhaFmTQY8yzHy7ecqH6eZm84ieiV2I4XBAVF9cv7oRlIModHxzWehjhVW4X05q6BY0GNZocPEQ/feLatKc5TqM7OXW3GpIdFBtbY8Ye3NehlWkZ5vP/cpqditoRq8UgNXsiFTneKw7WiB2sn2o5x9UCsz/swk10vFdq ny6D4dve kPKdNmXmKV/53uLzuza3wJmbZt/JD+R3JeUCuGju21DVcTIfTmdpEJyTrd2CqvldZcYdqvFnOXRhEr7gek0/bTCkxF0X++oeUK0C+Ot51D663A3S2GFswUANhuAW19ASS5oRZVogXLrcCpbpyRbMI52aiD94pwVAEM0YqZrLZCTT5zbpVGloVxRTgqe2UZoJNto+WegnCvSh3I0B3maesFwomgWfyahx1Gzl0PPN+x9jlt5vAeKbSJ0TIGCUaSxULbRkFQw6Izl8K1XRnQlEySzoTYBV/bVrtIfzzBea2Gh86MYfSfXR0azawzwv40BJsoDMfXNYAVd4Mpg+Z20XeqeKMgEK0QpokLFUa5x2F10+PcIMWZP88rwNDO91zddYNh99jVhR8kxUUiU8rJCKR+K0Etl541kLawad+upTiHb12TnzlMHwCYley+PocDlr4x6g5dp8shyLAe2d9ffKJXK7ii4ogC7xTSD9L5j+jdJLuXrEgY6T6RsaecFw+91fMjMG06Mb0vWj29VWQSorhxczy+dI4/21vPbNpKzFexx8bd5zPWB1hNaEaAfv5czREEpJ7V+3AjV8ihoVdii65UtsW/xkXQhDm+MWUmtpmp9cVm+kBcI9JteJrY+Tol4aCL+nTl81Y4eq7nqVyKNRgHv4zTA== 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: Create a new variant of kvm_gmem_get_pfn(), which retains the folio lock if it returns successfully. This is needed in subsequent patches to protect against races when checking whether a folio can be shared with the host. Signed-off-by: Fuad Tabba --- include/linux/kvm_host.h | 11 +++++++++++ virt/kvm/guest_memfd.c | 27 ++++++++++++++++++++------- 2 files changed, 31 insertions(+), 7 deletions(-) diff --git a/include/linux/kvm_host.h b/include/linux/kvm_host.h index ec3bedc18eab..bc73d7426363 100644 --- a/include/linux/kvm_host.h +++ b/include/linux/kvm_host.h @@ -2535,6 +2535,9 @@ static inline bool kvm_mem_is_private(struct kvm *kvm, gfn_t gfn) int kvm_gmem_get_pfn(struct kvm *kvm, struct kvm_memory_slot *slot, gfn_t gfn, kvm_pfn_t *pfn, struct page **page, int *max_order); +int kvm_gmem_get_pfn_locked(struct kvm *kvm, struct kvm_memory_slot *slot, + gfn_t gfn, kvm_pfn_t *pfn, struct page **page, + int *max_order); #else static inline int kvm_gmem_get_pfn(struct kvm *kvm, struct kvm_memory_slot *slot, gfn_t gfn, @@ -2544,6 +2547,14 @@ static inline int kvm_gmem_get_pfn(struct kvm *kvm, KVM_BUG_ON(1, kvm); return -EIO; } +static inline int kvm_gmem_get_pfn_locked(struct kvm *kvm, + struct kvm_memory_slot *slot, + gfn_t gfn, kvm_pfn_t *pfn, + struct page **page, int *max_order) +{ + KVM_BUG_ON(1, kvm); + return -EIO; +} #endif /* CONFIG_KVM_PRIVATE_MEM */ #ifdef CONFIG_HAVE_KVM_ARCH_GMEM_PREPARE diff --git a/virt/kvm/guest_memfd.c b/virt/kvm/guest_memfd.c index 844e70c82558..ac6b8853699d 100644 --- a/virt/kvm/guest_memfd.c +++ b/virt/kvm/guest_memfd.c @@ -802,9 +802,9 @@ static struct folio *__kvm_gmem_get_pfn(struct file *file, return folio; } -int kvm_gmem_get_pfn(struct kvm *kvm, struct kvm_memory_slot *slot, - gfn_t gfn, kvm_pfn_t *pfn, struct page **page, - int *max_order) +int kvm_gmem_get_pfn_locked(struct kvm *kvm, struct kvm_memory_slot *slot, + gfn_t gfn, kvm_pfn_t *pfn, struct page **page, + int *max_order) { pgoff_t index = kvm_gmem_get_index(slot, gfn); struct file *file = kvm_gmem_get_file(slot); @@ -824,17 +824,30 @@ int kvm_gmem_get_pfn(struct kvm *kvm, struct kvm_memory_slot *slot, if (!is_prepared) r = kvm_gmem_prepare_folio(kvm, slot, gfn, folio); - folio_unlock(folio); - - if (!r) + if (!r) { *page = folio_file_page(folio, index); - else + } else { + folio_unlock(folio); folio_put(folio); + } out: fput(file); return r; } +EXPORT_SYMBOL_GPL(kvm_gmem_get_pfn_locked); + +int kvm_gmem_get_pfn(struct kvm *kvm, struct kvm_memory_slot *slot, + gfn_t gfn, kvm_pfn_t *pfn, struct page **page, + int *max_order) +{ + int r = kvm_gmem_get_pfn_locked(kvm, slot, gfn, pfn, page, max_order); + + if (!r) + unlock_page(*page); + + return r; +} EXPORT_SYMBOL_GPL(kvm_gmem_get_pfn); #ifdef CONFIG_KVM_GENERIC_PRIVATE_MEM -- 2.49.0.472.ge94155a9ec-goog