From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=100.103.45.18 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1793912823; b=jMv8kKB3PXmjjQsL9LUMau+HiU8s7dBVwep38j2L1eU+mgfyD2VFoYgezl6H4T8Ontd4 UWFfZQCl3qcaYKBJH87chKFY6G0o0u/fGpqarL6GMN/nvrWQzqLV9caBLkQ8ubQ+M2aGD xp2J7znabbX96tMwQd7zHX0EwFFdlZwwp3+BOgcwtpszBKzdv7vuH6ofb6R49jjzkuWa6 JSwomOMmdfqlbixMUupQYzLTj4IOcQB75oLAiFKWGdcJqF8kRtGcht406yVpRySGXlEny Gw7o3i241L422tLnjpTxYv7r6EFEd8ja4azkpYaGW1fDFFLQ4aR3lXjnbo2wqeOIy4A== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1793912823; h=Received:DKIM-Signature:From:Date:Subject:MIME-Version:Content-Type: Content-Transfer-Encoding:Message-Id:References:In-Reply-To:To:Cc: X-Mailer:X-Developer-Signature:X-Developer-Key; bh=bqfQWE9INck3Aoq42ZNpSathvk4p8fmQAVJsjbZAm0g=; b=FXwSHCZ1yMOYntGU1/xrsqlvdXwtwszTNC0w4WU3WiDxUvzftXkHUYNx49PJ65W35jn5 PzFkCRss5diarwe7qtij1dzdvpiPhRDPqad2ajYOu1hiP4X95CO6H+vPmNWnxr9cvATfj lozlcFO/wipF8rJa5IQJiU6fID1hDh3L7LIIswLSfCrcetoqiBw3RdlQu/w/GHQpDYY3K 93iqUZfCiJs5tmGE04u2v6FpL2HK4Sf5ldT4KdQ7GyJ6/qmCTZBhFU7aCaNlTDO5Sc/EQ jy3huorqAmuY3xt0lxtZsFNra7ix7Mh9AP6oucS40twJLdc5akS+ssHaHxrKupKxqHg== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256 header.s=k20260515 header.b=GWekXUJt; arc=none smtp.remote-ip=100.103.45.18 Received: from smtp.kernel.org (quasi.space.kernel.org [100.103.45.18]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id F30BB606D818; Thu, 5 Nov 2026 21:07:02 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key, unprotected) header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256 header.s=k20260515 header.b=GWekXUJt Received: by smtp.kernel.org (Postfix) with ESMTPSA id 073691F008A6; Thu, 5 Nov 2026 21:06:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1793912822; bh=bqfQWE9INck3Aoq42ZNpSathvk4p8fmQAVJsjbZAm0g=; h=From:Date:Subject:References:In-Reply-To:To:Cc; b=GWekXUJtTW/bmKiTy4QB6lwJ7qbgw7vFuwUU+DOaOfg/TRAzLeM32R3kLak4qQeQ3 Qv4vJ9ieuL7oXsySpCaty+GruAFXFHyboa49jWYOSQ5CvYOGpKEnZ4EVlYgXyECMBV SAYyovNMBS/4DJV9jvSExBs04MC2Ny8P8JjIrR64zZOycDnouZr851hmFFOt4+wNVA fPiv0XZG2hDHC8h3Gwkazyekp82IqzHvmXnmVgCZg0iO26M0dmBWKapLrfZusp9wwT zzsZcWlKHFiQMAFkueAeuPV0PQFvmCrLb3vSKAp9PJu0JxbVW/FD9XwOTh2SLxX8iP /o3UyJrfNU3sg== From: "Lorenzo Stoakes (ARM)" Date: Thu, 05 Nov 2026 21:05:36 +0000 Subject: [PATCH 05/14] x86/sgx: convert vepc mmap hook to mmap_prepare X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20261105-late-2026-mmap_prepare-v1-5-c56aadfbab8a@kernel.org> References: <20261105-late-2026-mmap_prepare-v1-0-c56aadfbab8a@kernel.org> In-Reply-To: <20261105-late-2026-mmap_prepare-v1-0-c56aadfbab8a@kernel.org> To: Juergen Gross , Stefano Stabellini , Oleksandr Tyshchenko , Madhavan Srinivasan , Nicholas Piggin , Michael Ellerman , "Christophe Leroy (CS GROUP)" , "Ritesh Harjani (IBM)" , Shrikanth Hegde , Haiyang Zhang , Wei Liu , Dexuan Cui , "Michael S. Tsirkin" , Jason Wang , =?utf-8?q?Eugenio_P=C3=A9rez?= , Xuan Zhuo , Jarkko Sakkinen , Dave Hansen , Thomas Gleixner , Ingo Molnar , Borislav Petkov , x86@kernel.org, "H. Peter Anvin" , Jan Kara , Paul Moore , Stephen Smalley , =?utf-8?q?Ondrej_Mosn=C3=A1=C4=8Dek?= , Joel Stanley , Andrew Jeffery , Ryan Chen , Billy Tsai , Bjorn Andersson , Konrad Dybcio , Abel Vesa , Jens Wiklander , Sumit Garg , Scott Branden , Broadcom internal kernel review list , Arnd Bergmann , Greg Kroah-Hartman , Richard Cochran , David Woodhouse , Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni Cc: ljs@kernel.org, xen-devel@lists.xenproject.org, linux-kernel@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, kvm@vger.kernel.org, linux-hyperv@vger.kernel.org, virtualization@lists.linux.dev, linux-sgx@vger.kernel.org, selinux@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-aspeed@lists.ozlabs.org, linux-arm-msm@vger.kernel.org, op-tee@lists.trustedfirmware.org, netdev@vger.kernel.org X-Mailer: b4 0.14.3 X-Developer-Signature: v=1; a=openpgp-sha256; l=1666; i=ljs@kernel.org; h=from:subject:message-id; bh=8M6KXM/gidl407BgZsE6l9e639j02CBQooR3iZ5mU4M=; b=owGbwMvMwCV2fu7ZrsZH9SKMp9WSGLLevF/NfkpnyQUdw7u/LIOuqb1l2agTvF3TyPxd3+spl 1Y3rn9v1lHKwiDGxSArpsjy/Iv4/iCRsHmdF/zdYOawMoEMYeDiFICJyAcx/NONOFpeGCnRO6e7 +3T/k1zGsxF7YoO6TcO7Xjvq/jC+sIuRocFi0+uncd+Ew6Qit/5Nqt5kFnHQtvGp8hbW+Lk53Av lmAA= X-Developer-Key: i=ljs@kernel.org; a=openpgp; fpr=E7F417BF5214569E89D04F46CF9DCD8A81E27F14 Move from the deprecated mmap hook to the new mmap_prepare hook. The hook only checks that the mapping is shared and sets VMA flags, operations and private data. Signed-off-by: Lorenzo Stoakes (ARM) --- arch/x86/kernel/cpu/sgx/virt.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/arch/x86/kernel/cpu/sgx/virt.c b/arch/x86/kernel/cpu/sgx/virt.c index 6a1933ddc6fc..850990519ca5 100644 --- a/arch/x86/kernel/cpu/sgx/virt.c +++ b/arch/x86/kernel/cpu/sgx/virt.c @@ -98,17 +98,18 @@ static const struct vm_operations_struct sgx_vepc_vm_ops = { .fault = sgx_vepc_fault, }; -static int sgx_vepc_mmap(struct file *file, struct vm_area_struct *vma) +static int sgx_vepc_mmap_prepare(struct vm_area_desc *desc) { - struct sgx_vepc *vepc = file->private_data; + struct sgx_vepc *vepc = desc->file->private_data; - if (!(vma->vm_flags & VM_SHARED)) + if (!vma_desc_test(desc, VMA_SHARED_BIT)) return -EINVAL; - vma->vm_ops = &sgx_vepc_vm_ops; + desc->vm_ops = &sgx_vepc_vm_ops; /* Don't copy VMA in fork() */ - vm_flags_set(vma, VM_PFNMAP | VM_IO | VM_DONTDUMP | VM_DONTCOPY); - vma->vm_private_data = vepc; + vma_desc_set_flags(desc, VMA_PFNMAP_BIT, VMA_IO_BIT, VMA_DONTDUMP_BIT, + VMA_DONTCOPY_BIT); + desc->private_data = vepc; return 0; } @@ -315,7 +316,7 @@ static const struct file_operations sgx_vepc_fops = { .unlocked_ioctl = sgx_vepc_ioctl, .compat_ioctl = sgx_vepc_ioctl, .release = sgx_vepc_release, - .mmap = sgx_vepc_mmap, + .mmap_prepare = sgx_vepc_mmap_prepare, }; static struct miscdevice sgx_vepc_dev = { -- 2.56.0