From nobody Tue Jan 24 08:53:55 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4P1LNz5Dztz30wk4; Tue, 24 Jan 2023 08:53:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4P1LNz3FWvz3QRc; Tue, 24 Jan 2023 08:53:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674550435; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nwRNGY4bgO5oivqPLUEHJLlmglO8ZfqW7dDL+SDkiyM=; b=Dst5FWO+ZjH0xLhifu7tjpYkNYIOf5XhcJgbGv4S6wQyxD5MRsg4KjA+mdp9q2SjcTD2iC 9gRDOaTxRIdcsWe0ALVuE2iMkqVbPqjLZqRLdv3J7q2Vl8FiqI0ia1N1iH2MT0R8z1hzU8 ru0qyRCgZJ0Auiw+xuICBOysfVVq3fX/DigFaSehkcXAEh/JhpdOMlYkrCYU3K/Kss5xCC Vsp8Sy/NT8oZbuIbP1sya6jr5eK8uEzI/59Qhjo/EQ7YYXgmHk71n3EUpbITi1Kzr66LSK qpG6aYRwCGPfSUCuGsKN416q4J1eMq9PRknbMZlXYI+DpY/zsKJHOwoqc4qcXQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674550435; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nwRNGY4bgO5oivqPLUEHJLlmglO8ZfqW7dDL+SDkiyM=; b=f0r/2hOWlN8K4G9mRQBaAgRBVFaCaVXmf/cV+lhLx2sUkYTs+Ig61uKu0iAoO/zTnTzhRa rY0Xh3cTofLlwWY9xzCrthaCD3fE4tKrgUXavFg9HPv7VH52Cz26L4VzvPQ9lAQBYb/lPC YT0PyDX0UGM2qBZId+27hpIjvTMALCV3kAjPqh68spf73pdPxvHqhBnDfkx7AwTWBaZMYN L5Ndha9ggOkfd94m0F2314xisRkOhvlqJY3XnOz0IbCAqZAoUxiIFIscuJrT0sGqICBnIE fIaIjye5QUKERK9FQ2tvTtfJ/HjYH+iPQQHllKwlHrKIuv1Otkv+3KXTuJX7qA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1674550435; a=rsa-sha256; cv=none; b=EGKgUG5bFOQyXZGlI+VilY78VeZIhOjceTlhNfRG9jvdmBj4GlINkdqL4PB5dkDSvnsZoR 4OzX1wLKT06mNY0rIU3cMw6mc7wgJ7yP4j9oIfuD1cwrDIihXRaXgPKgzYIYA0H6VCtNDF fG5/35F4f0u5bnD27gqZEG9PxYt28Aw/zUYRolU2aTZjBAPL1q9ah0PlhS4yD33wUNBbet w8AfggxVZIYWu3/pwzw8cLHdhgyQpaaNj7t8V2QeSHBHHqC9lioXBoloz88Z1tsPPIZPgY ohI3TQeX2j/rRe255M7xfdxehSjSUZiNxhJsYJpp2lTqwTWXcThWm1a0yLYICQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4P1LNz2Blmz13Qc; Tue, 24 Jan 2023 08:53:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 30O8rtSI035660; Tue, 24 Jan 2023 08:53:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30O8rtbg035659; Tue, 24 Jan 2023 08:53:55 GMT (envelope-from git) Date: Tue, 24 Jan 2023 08:53:55 GMT Message-Id: <202301240853.30O8rtbg035659@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Emmanuel Vadot Subject: git: 6024bee614f2 - stable/13 - linuxkpi: Introduce `vma_set_file()` List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: manu X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 6024bee614f2e90442666ebb0829f3424f975830 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=6024bee614f2e90442666ebb0829f3424f975830 commit 6024bee614f2e90442666ebb0829f3424f975830 Author: Jean-Sébastien Pédron AuthorDate: 2022-11-11 17:36:00 +0000 Commit: Emmanuel Vadot CommitDate: 2023-01-24 09:08:00 +0000 linuxkpi: Introduce `vma_set_file()` This code was moved from the i915 driver in Linux 5.11. Reviewed by: manu Approved by: manu Differential Revision: https://reviews.freebsd.org/D36957 (cherry picked from commit c72dd0aabe25dd4ea82e5b83d36f706d8bd2e783) --- sys/compat/linuxkpi/common/include/linux/mm.h | 2 ++ sys/compat/linuxkpi/common/src/linux_compat.c | 12 ++++++++++++ 2 files changed, 14 insertions(+) diff --git a/sys/compat/linuxkpi/common/include/linux/mm.h b/sys/compat/linuxkpi/common/include/linux/mm.h index dd0fb6e2d8f8..4afc1a953f8e 100644 --- a/sys/compat/linuxkpi/common/include/linux/mm.h +++ b/sys/compat/linuxkpi/common/include/linux/mm.h @@ -311,4 +311,6 @@ void lkpi_unmap_mapping_range(void *obj, loff_t const holebegin __unused, #define PAGE_ALIGNED(p) __is_aligned(p, PAGE_SIZE) +void vma_set_file(struct vm_area_struct *vma, struct linux_file *file); + #endif /* _LINUXKPI_LINUX_MM_H_ */ diff --git a/sys/compat/linuxkpi/common/src/linux_compat.c b/sys/compat/linuxkpi/common/src/linux_compat.c index 33da7dd1c8e1..082219721de1 100644 --- a/sys/compat/linuxkpi/common/src/linux_compat.c +++ b/sys/compat/linuxkpi/common/src/linux_compat.c @@ -834,6 +834,18 @@ zap_vma_ptes(struct vm_area_struct *vma, unsigned long address, return (0); } +void +vma_set_file(struct vm_area_struct *vma, struct linux_file *file) +{ + struct linux_file *tmp; + + /* Changing an anonymous vma with this is illegal */ + get_file(file); + tmp = vma->vm_file; + vma->vm_file = file; + fput(tmp); +} + static struct file_operations dummy_ldev_ops = { /* XXXKIB */ };