From patchwork Sun Mar 12 23:40:13 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lorenzo Stoakes X-Patchwork-Id: 13171902 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 F2656C6FD1F for ; Sun, 12 Mar 2023 23:42:36 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 1298A6B0072; Sun, 12 Mar 2023 19:42:36 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 0B3906B0074; Sun, 12 Mar 2023 19:42:36 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id E6F288E0001; Sun, 12 Mar 2023 19:42:35 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id D66D06B0072 for ; Sun, 12 Mar 2023 19:42:35 -0400 (EDT) Received: from smtpin27.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id 8E44440627 for ; Sun, 12 Mar 2023 23:42:35 +0000 (UTC) X-FDA: 80561873070.27.FE41F42 Received: from mail-wm1-f47.google.com (mail-wm1-f47.google.com [209.85.128.47]) by imf19.hostedemail.com (Postfix) with ESMTP id ACDDF1A000C for ; Sun, 12 Mar 2023 23:42:32 +0000 (UTC) Authentication-Results: imf19.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=L1Evxvsp; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf19.hostedemail.com: domain of lstoakes@gmail.com designates 209.85.128.47 as permitted sender) smtp.mailfrom=lstoakes@gmail.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1678664552; 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=Q+mP9OxDgYsiVDAz5z+bfOZyYeqjlm5fObrSUjf3HHE=; b=3sm9hkTujhGTqzcil/yf9D21vyd1YclYGG21+rkbd/Cj+0EaqoR35wO2fBIfOClc2hLt2L VPhLVuRcHhRVkBLqd7ks9n3liNip80fk9f4aImQVteyMekSCs7upSnhygGOeQC6Gm+3aId M/srBzP/Zhqk4OmgpH5NJsx+jq95P1Y= ARC-Authentication-Results: i=1; imf19.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=L1Evxvsp; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf19.hostedemail.com: domain of lstoakes@gmail.com designates 209.85.128.47 as permitted sender) smtp.mailfrom=lstoakes@gmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1678664552; a=rsa-sha256; cv=none; b=3hki0KX/4/A9q5C7aCrGgUzbyE3nSSQnoTuTr/oebtOcDR7Kll5S9rPEmpvxOUf75tgYae HTZJTvkRsbdrEnq22bA3mFKtb6wxkhCsVbPyXnv08qjnCq/G6vADSqDQrROE7rCRjO2gMh hmRXcDal8h/+9aQEV//qATTL+JZ6kq8= Received: by mail-wm1-f47.google.com with SMTP id j19-20020a05600c1c1300b003e9b564fae9so9757469wms.2 for ; Sun, 12 Mar 2023 16:42:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1678664551; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Q+mP9OxDgYsiVDAz5z+bfOZyYeqjlm5fObrSUjf3HHE=; b=L1EvxvspnWq8VbJ/cBPuwim/GfX7GyDcQh25eB8GiiGs7xV6czGIVCDJwylbb/WhpH jDFWtcEGZEkI905j9O6EBHcKvsGVqjZK04JkCGnQY528FTc/xGSKUQoJ1yY0pPvKCbzb IBNvOTkgsqZyZycwsx8m2Sth1E7Aozlkfg5MUoZCKaaMJPw/6tRWZDo07r5CQODqxUMT 1IeCaq70mfPubXlyZAz0EF4+uo1ZBp0Z928tN4A3fNLcS0TV/nntMus6BBh64bjYsk9h tNxjHKAtpE6j09aXXplCYPYqgmxOLm6RPMn+1oaBSQ4+kPQxO6ASvcd39FdgX1bjTARn 4pFw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678664551; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Q+mP9OxDgYsiVDAz5z+bfOZyYeqjlm5fObrSUjf3HHE=; b=Duei8+Ttt4g530WMi7IFih6D9gBEyxoO7b+mgJjK8HDknPi5QtIxEofZaLKexNHoka yl+TXhAsHFnAjBrcnDRvdY2Zs5zgiLN4E/O1Si7kUFpdJ8Ytohk8l51b09WvXQG9v56T tW32AooB1N1gvyKzA1GjifdY5e+v8rS9o7iijEu7tIDdH4KuFvzDvJ1BpcQkIxhL4kEz BvcALLF9LNwHeu+znJc2EtpGmgLrzEMNVixMkp9jn7I0BW4A/hHOLjchETznoG7tZQXo 6MDgbGN54UCJrt7hc/1kck7F6zZU86BfovS6DOtCuyEY2Fj3Usb1f/s7aAyzbxNmQQaS 0MEA== X-Gm-Message-State: AO0yUKVXzxsCB1IIlIkNGllqT8jnEWI41n0usm1kIK6r1ajzX/Qqt2am a7R6SD7HIkZ8hUeDSOFIGhVmCrAkbis= X-Google-Smtp-Source: AK7set+tGc+DGYJtdNRAq9fRAAuOfnBu6NAnqmDjDmjxC2dzIZIZWRmGTBsrN67MRDZeVRNHzuZI8g== X-Received: by 2002:a05:600c:350c:b0:3eb:3692:6450 with SMTP id h12-20020a05600c350c00b003eb36926450mr10229727wmq.18.1678664550942; Sun, 12 Mar 2023 16:42:30 -0700 (PDT) Received: from lucifer.home (host86-146-209-214.range86-146.btcentralplus.com. [86.146.209.214]) by smtp.googlemail.com with ESMTPSA id iz20-20020a05600c555400b003ed201ddef2sm3698376wmb.2.2023.03.12.16.42.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 12 Mar 2023 16:42:30 -0700 (PDT) From: Lorenzo Stoakes To: linux-mm@kvack.org, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, Andrew Morton Cc: Thomas Hellstrom , Christian Konig , Matthew Wilcox , Michal Hocko , "Kirill A . Shutemov" , Dan Williams , Jason Gunthorpe , Lorenzo Stoakes Subject: [PATCH 1/3] mm: remove unused vmf_insert_mixed_prot() Date: Sun, 12 Mar 2023 23:40:13 +0000 Message-Id: X-Mailer: git-send-email 2.39.2 In-Reply-To: References: MIME-Version: 1.0 X-Rspamd-Queue-Id: ACDDF1A000C X-Rspamd-Server: rspam09 X-Rspam-User: X-Stat-Signature: p5s48awkimhsotnj9ds17bgw5bfxmsex X-HE-Tag: 1678664552-565545 X-HE-Meta: U2FsdGVkX1+bi3kJNwZKj+ji2jBy/dBNi004F8BbARLLpux0M333ECeLU/Z93JoVpgAuIdVvR6i5enMTdOga2G4CFizexRaOkOv5D8a+dA/JsjKpNw050r/eSPKN7Q/FnlhCNdBbPYyzNHsIWmI8uL0sxi+tDV3t0A4wqMwt7ViWPit22HNd8sKqSwOPapxNm40OHMwcw4G+tJQF+1Cv357RTQKTNl75PA58rig8/GvvhQ2K+uIYfUzVkCGirHm7iPdJx2m5AZKilS7Q7NVLagPxGxB3T2O05vFQu4uahlLO9NJRYvchNJJXVww2ac3FZmKdf0xwNYRBTI5og6uKl0HqatqKDjcPkKkQNisLnAqZVI12334rTec24ZN9q/dOlEtMeN99mbK0204ACOim1B48HQIc0zMN7b6AMXQVEZaxS8xjTqoxhp9WXbogC9XbgKO9/K+L7NhLPNqiLbSvjR8v9cq94eOHCjhv1Uvnb+r38u5K02KFZKUbA3HRDjqLwzoagOHIBkAzY5TXEAgQjI+xX0yHmNxnf2fSdhCgUL8Enkyqw3XRiQOU/Xjd5IUw7QNjJIST1WIYGKTqAGBk9ILFAs7Js2zDZ2KlhEIt/4Zv2DO6+8O1CQeVJ77kwq09juFxAtw6EG7dhofcBWa5vxYic8i4O0ZEE6L0VeaiPbMUg7z+yHeN+ndSiro9Sjl690JlDbhbSs44m/j+ek+wD6U5YnaaPbSmgFq8f9nK4V2hTleb+KzFrz9SAPxp/Dzi3M3+KGo6Yz3lR9dI4Yr1gY9TRicLzhiP8Ik28c+AmkUZvbLXr00FNObJ7m8EZ7tGc8R1vFbZAeDskbLXSU3srCuw3KnK/Hw3y/6ErUWWYjuslfMzZPw7h4WyO1PShx0YAXY8vczhTOJivoSH5Ukui+FIoxDC7O8n3TXgAAv6rXO1G8yGdmnZGo71zAcLkxBhZ4obP53k3pGjrk9G9+C ryLwBR5J ZDtJEnUP8a1NU6PecsTRt/O+MOsucJnTeHtXobZwDut95RsCmIx4YTDCQgtZVtkwaEdI8/wEjDktozWl+Ko4hkvKMMBZ5lzNJ952kslmMkB+9hk19s5xLzOo9RZVVfYSAdy4wGkyWsOog9w6yK/kjfMOJ6i5VNnbRHh65AS9+Y2w0z711+0SKI2wr3Z+x0/W3kJ7FWx78zxOqRj6AYC/FXG1JjW2Boav8WDZbCVS4uXmI+dEAKPSYNCeWHFKzIAnL772PYfNxnD7N0V7KIwTG9ZSgoN4XpQ3dhSPrFEh27mQM1sTWTxwGtLgzHpPCEnDTBTax4/CLmmR1bRFTXW64zJHBdExvYDbHgX9/MscqoOK6WWby60JViRg6FdpoA5FgsCpWX7w9zYpruvEAGDvysOnJpG6LXQx9nhnuVokCUH00kF1Oyf9pwm+uF2oNfjKOjU5hes1esZolC3I2Yklq55+k5irJ/tmu8PyAyMEufGGHIdDKbntkL9xSBk44Vp4ncLss 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: The sole user of vmf_insert_mixed_prot(), the drm ttm module, stopped using this in commit f91142c62161 ("drm/ttm: nuke VM_MIXEDMAP on BO mappings v3") citing use of VM_MIXEDMAP in this case being terribly broken. Remove this now-dead code and references to it, but retain the useful description of the prot != vma->vm_page_prot case, moving it to vmf_insert_pfn_prot() instead. Signed-off-by: Lorenzo Stoakes --- include/linux/mm.h | 2 -- include/linux/mm_types.h | 7 +---- mm/memory.c | 57 +++++++++++++--------------------------- 3 files changed, 19 insertions(+), 47 deletions(-) diff --git a/include/linux/mm.h b/include/linux/mm.h index ce1590933995..ee755bb4e1c1 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -3330,8 +3330,6 @@ vm_fault_t vmf_insert_pfn_prot(struct vm_area_struct *vma, unsigned long addr, unsigned long pfn, pgprot_t pgprot); vm_fault_t vmf_insert_mixed(struct vm_area_struct *vma, unsigned long addr, pfn_t pfn); -vm_fault_t vmf_insert_mixed_prot(struct vm_area_struct *vma, unsigned long addr, - pfn_t pfn, pgprot_t pgprot); vm_fault_t vmf_insert_mixed_mkwrite(struct vm_area_struct *vma, unsigned long addr, pfn_t pfn); int vm_iomap_memory(struct vm_area_struct *vma, phys_addr_t start, unsigned long len); diff --git a/include/linux/mm_types.h b/include/linux/mm_types.h index 3a028db80ffb..5ef0d0da328a 100644 --- a/include/linux/mm_types.h +++ b/include/linux/mm_types.h @@ -502,12 +502,7 @@ struct vm_area_struct { }; struct mm_struct *vm_mm; /* The address space we belong to. */ - - /* - * Access permissions of this VMA. - * See vmf_insert_mixed_prot() for discussion. - */ - pgprot_t vm_page_prot; + pgprot_t vm_page_prot; /* Access permissions of this VMA. */ /* * Flags, see mm.h. diff --git a/mm/memory.c b/mm/memory.c index 7ca7951adcf5..ee6bcd747867 100644 --- a/mm/memory.c +++ b/mm/memory.c @@ -2147,8 +2147,20 @@ static vm_fault_t insert_pfn(struct vm_area_struct *vma, unsigned long addr, * vmf_insert_pfn_prot should only be used if using multiple VMAs is * impractical. * - * See vmf_insert_mixed_prot() for a discussion of the implication of using - * a value of @pgprot different from that of @vma->vm_page_prot. + * pgprot typically only differs from @vma->vm_page_prot when drivers set + * caching- and encryption bits different than those of @vma->vm_page_prot, + * because the caching- or encryption mode may not be known at mmap() time. + * + * This is ok as long as @vma->vm_page_prot is not used by the core vm + * to set caching and encryption bits for those vmas (except for COW pages). + * This is ensured by core vm only modifying these page table entries using + * functions that don't touch caching- or encryption bits, using pte_modify() + * if needed. (See for example mprotect()). + * + * Also when new page-table entries are created, this is only done using the + * fault() callback, and never using the value of vma->vm_page_prot, + * except for page-table entries that point to anonymous pages as the result + * of COW. * * Context: Process context. May allocate using %GFP_KERNEL. * Return: vm_fault_t value. @@ -2223,9 +2235,9 @@ static bool vm_mixed_ok(struct vm_area_struct *vma, pfn_t pfn) } static vm_fault_t __vm_insert_mixed(struct vm_area_struct *vma, - unsigned long addr, pfn_t pfn, pgprot_t pgprot, - bool mkwrite) + unsigned long addr, pfn_t pfn, bool mkwrite) { + pgprot_t pgprot = vma->vm_page_prot; int err; BUG_ON(!vm_mixed_ok(vma, pfn)); @@ -2268,43 +2280,10 @@ static vm_fault_t __vm_insert_mixed(struct vm_area_struct *vma, return VM_FAULT_NOPAGE; } -/** - * vmf_insert_mixed_prot - insert single pfn into user vma with specified pgprot - * @vma: user vma to map to - * @addr: target user address of this page - * @pfn: source kernel pfn - * @pgprot: pgprot flags for the inserted page - * - * This is exactly like vmf_insert_mixed(), except that it allows drivers - * to override pgprot on a per-page basis. - * - * Typically this function should be used by drivers to set caching- and - * encryption bits different than those of @vma->vm_page_prot, because - * the caching- or encryption mode may not be known at mmap() time. - * This is ok as long as @vma->vm_page_prot is not used by the core vm - * to set caching and encryption bits for those vmas (except for COW pages). - * This is ensured by core vm only modifying these page table entries using - * functions that don't touch caching- or encryption bits, using pte_modify() - * if needed. (See for example mprotect()). - * Also when new page-table entries are created, this is only done using the - * fault() callback, and never using the value of vma->vm_page_prot, - * except for page-table entries that point to anonymous pages as the result - * of COW. - * - * Context: Process context. May allocate using %GFP_KERNEL. - * Return: vm_fault_t value. - */ -vm_fault_t vmf_insert_mixed_prot(struct vm_area_struct *vma, unsigned long addr, - pfn_t pfn, pgprot_t pgprot) -{ - return __vm_insert_mixed(vma, addr, pfn, pgprot, false); -} -EXPORT_SYMBOL(vmf_insert_mixed_prot); - vm_fault_t vmf_insert_mixed(struct vm_area_struct *vma, unsigned long addr, pfn_t pfn) { - return __vm_insert_mixed(vma, addr, pfn, vma->vm_page_prot, false); + return __vm_insert_mixed(vma, addr, pfn, false); } EXPORT_SYMBOL(vmf_insert_mixed); @@ -2316,7 +2295,7 @@ EXPORT_SYMBOL(vmf_insert_mixed); vm_fault_t vmf_insert_mixed_mkwrite(struct vm_area_struct *vma, unsigned long addr, pfn_t pfn) { - return __vm_insert_mixed(vma, addr, pfn, vma->vm_page_prot, true); + return __vm_insert_mixed(vma, addr, pfn, true); } EXPORT_SYMBOL(vmf_insert_mixed_mkwrite); From patchwork Sun Mar 12 23:40:14 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lorenzo Stoakes X-Patchwork-Id: 13171903 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 DC72AC6FD19 for ; Sun, 12 Mar 2023 23:42:37 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 7E0ED6B0074; Sun, 12 Mar 2023 19:42:37 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 76AC96B0075; Sun, 12 Mar 2023 19:42:37 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 4AB9F8E0001; Sun, 12 Mar 2023 19:42:37 -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 3786E6B0074 for ; Sun, 12 Mar 2023 19:42:37 -0400 (EDT) Received: from smtpin24.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id 0EF521A07DF for ; Sun, 12 Mar 2023 23:42:37 +0000 (UTC) X-FDA: 80561873154.24.63D0179 Received: from mail-wm1-f42.google.com (mail-wm1-f42.google.com [209.85.128.42]) by imf19.hostedemail.com (Postfix) with ESMTP id 37EE71A0003 for ; Sun, 12 Mar 2023 23:42:33 +0000 (UTC) Authentication-Results: imf19.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=maz9e2QT; spf=pass (imf19.hostedemail.com: domain of lstoakes@gmail.com designates 209.85.128.42 as permitted sender) smtp.mailfrom=lstoakes@gmail.com; dmarc=pass (policy=none) header.from=gmail.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1678664554; 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=l5BwzPdb3pP6HQP4bpfNX6Ih3sOxfK6TuzT4vYnYmzI=; b=WSSuuGbSViNSiJOOpvJAXNlPkjhkPMmdrutdIOUQWHlptMi0Jcam0dVXVEA9t8IS0WCFtL I5JHZKsD5e7zqiZ4iSHpTpaIY+VW/nV8iBLgGya6EuQr+0QvAm6D0g69eTDlp/bNv4lJIE FHN5GEMlzh+S+UpLxTR1VG69uTbPrD4= ARC-Authentication-Results: i=1; imf19.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=maz9e2QT; spf=pass (imf19.hostedemail.com: domain of lstoakes@gmail.com designates 209.85.128.42 as permitted sender) smtp.mailfrom=lstoakes@gmail.com; dmarc=pass (policy=none) header.from=gmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1678664554; a=rsa-sha256; cv=none; b=UnvR8IGtCkV7o8qwku2xxOHD0b1Ma5UdW1ayf0L5CeOY+B8r1w/j3L3hlFf6N5Bz43dLmC gIUG0bo+bPmbPv6yNIcLpxGURDBCZvAj5mheF/ihnnFC11kSActqOSJuYzxJZMd4HoskpP wuL8wAawFslPte//cA2C4lTEr6HV4+M= Received: by mail-wm1-f42.google.com with SMTP id k25-20020a7bc419000000b003ed23114fa7so1054600wmi.4 for ; Sun, 12 Mar 2023 16:42:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1678664552; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=l5BwzPdb3pP6HQP4bpfNX6Ih3sOxfK6TuzT4vYnYmzI=; b=maz9e2QTegb5aGWaMrUn0W1T4Yb7pAPV4qShHMkAP0jmTAZnGYuceUYaHypxk3ZK3n ZDBqAaSh4+ktG95WP3CVzvvsS2QYlwldP0jD7mTJmW1UGRN168RC1lxMVOZZ1PQh6TOP +y2rQ91YejaLYBVYdHPFlUg3gA+SBPTgCXZkunTCQq/KKrnRLP5bUKBFIC/AQiIgFbRE 9s1UuvtwQdsPaN9SJ22GP58vW9sS051TMmx+qiNlQayml8SjCelQJT8pch0Nw/dG8/SL tYw6OY+zWYtLnjRJ7LUlFPQgbzFk8ileybTIoNKp4/+CPVyIglWvzyNCWtisu9Kn/kcB nHrw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678664552; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=l5BwzPdb3pP6HQP4bpfNX6Ih3sOxfK6TuzT4vYnYmzI=; b=CDiqCcRTktgILTesbopaeQcMudwjZULjkbYFhmkfkhiKBRKAQk+AK1fNub8rj12qYd l5mOY5aRfXHw28+GSyIawDxNo8NvwNm+cGoxA3XcqiXJlZoAPorYzG6deKX0RK+FL94x hutnHQIQ3xYGhGsugwalr/QGLOZCX8B8sSZjTpEI8rSiyhXcXbzpn3HAbbSlkXzYdyBM 3cabntZLRauKa9KhdQ4vzQmAne59COZNVS+8Wfz4FF/83t14TJkjnlisTvU+sjJAwmnX bNqsbotaoil0oXVuhr7oHN4DcOsAadX2lZt/0r8+h7Q6UnPESMkTF+g3Ze+ePnZGS2H/ z0iQ== X-Gm-Message-State: AO0yUKVaj9jPA2pYSJ749mCTdbnja27LHuuaVhvXU1DqJBKdhzWuddxn quHrmqDv8w/EJImFTXjrT1qprOgFGSk= X-Google-Smtp-Source: AK7set88QQ6jrd1M0hrmNofJDYtEfX1glIjDn7W2t6EdL0uThkNjlqD3H5zcW/MHqEOtS/rhvVi/CQ== X-Received: by 2002:a05:600c:1d29:b0:3eb:3945:d3f4 with SMTP id l41-20020a05600c1d2900b003eb3945d3f4mr10055016wms.2.1678664552343; Sun, 12 Mar 2023 16:42:32 -0700 (PDT) Received: from lucifer.home (host86-146-209-214.range86-146.btcentralplus.com. [86.146.209.214]) by smtp.googlemail.com with ESMTPSA id iz20-20020a05600c555400b003ed201ddef2sm3698376wmb.2.2023.03.12.16.42.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 12 Mar 2023 16:42:31 -0700 (PDT) From: Lorenzo Stoakes To: linux-mm@kvack.org, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, Andrew Morton Cc: Thomas Hellstrom , Christian Konig , Matthew Wilcox , Michal Hocko , "Kirill A . Shutemov" , Dan Williams , Jason Gunthorpe , Lorenzo Stoakes Subject: [PATCH 2/3] mm: Remove vmf_insert_pfn_xxx_prot() for huge page-table entries Date: Sun, 12 Mar 2023 23:40:14 +0000 Message-Id: <604c2ad79659d4b8a6e3e1611c6219d5d3233988.1678661628.git.lstoakes@gmail.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: References: MIME-Version: 1.0 X-Rspam-User: X-Rspamd-Server: rspam03 X-Stat-Signature: ziatbwycmg784zy6iynry5ms14w6c8b4 X-Rspamd-Queue-Id: 37EE71A0003 X-HE-Tag: 1678664553-292380 X-HE-Meta: U2FsdGVkX19maPTUIsSqTWCDSxvqgbFw+6RPfjensyCckUQmKys36ZzW9RwfIwo/7r/kkOaHFP/4I1sVtNG63obI9f5ocaj8FXt36DF8uD+Ih9gdaiXiQSmP80gRP6wc7ZUZT/HS621HGGiw+hADjB0nBJ7atAU27JtuwX7Unvog/CuvA35NqHEI3zEiNcfnMZCFcu6XESTiPPH3a7t65USgU7adqnRemU+mm+XC72DruaEWNSsCfOiVxEGhNx65rbwXW2SN6EqnzX0ksaV4izP88R7d1VLp6WbD7SW7wRhT20u1P4A9P7ZpK2QbQBUHiAtWwomZNFUqzEPtGUQMwYMG8EVaJsgHtk21gQ3IXfvUqdvSsNcywxyVJHzGn2SVeeS2O5QFufll5PYYvrKE3M8L2A8yV6Cndj7OXtyYWTsuScNXGo0Cmq8+xnh9dzn+ssjuKX4Nbi6nQzuy7MvmC0l1oOlKfkNAySh73Q45kQnm/9ZM54wNWncuizJrla+uVqyrL4x8cuVkjPc8qlgLLZdZZw4c5KScgUzAVHW1S/wgH/8k09DeekZgvKuwfl3qS7SxjAEugtmoB7J0L0YXABi6U17+Q4j7u3BTjW6ouQeQdLoosjh+/aGv5UtHcZGTlbDDc3Bd4F+RiVROMZgwr0QIg+nON7QOtYoIg9BwTQFQsBN1eODTtEYJy+m0Fz26lWJEEZUnGCDytqHFoC20RO8yJjr7a6xJkHAI1QVAF5nbiYw02TvMqMRfz3yHtxHzTBrtaeHH5ywXEswZzQmvaXDPqoIxTcOU2ZJESH+GJLFyAsh3IzZw/aH9xVRFLdJUPpRsHPVZUQETm7mJZQhFaCElgB/sDeO6Qrv7ms4nAlAI+9deC9e/axvtC7mSnUuwH4WzBdROs0mFBcHBfadYpDaB0JUbB0ophJ7L5ibN2DjBIYywPS5weTsmL2cGRhPU/yBbo37hMYXGEb78Cn3 EO2L0S8h HbIhWkgiSU1fOvD9y3VCTw5QBDPRiiymX4nGWFcOxc/zoM+yvNVCCQbCGAkFxkVY5b4GmdT3ziviu2rSB0omtKEUSxd7i0GyxGQBdzsbRoAfZXsWJpOBScFBjxw7DCnZFpYwmkyZVz4bhed8oy37CRkgzAlYYFoDN74kDZp2cazoORm9WvNZnsQUcPnknEx9hZ/8pmFcnuROo4GgRDXKvTrDk3IJr4tQT8nu56nmtfkCoFXwScScTywV6FqIzFWG89SJjJz2hhHZjtoNNKFABoiZrKu/07IRl1kOwI6QgOrK5UciSZrRa034jLSDoeCdrev10Oi9/oQU/7f9n+vkkX/RCvde1P3hfQg2TDhTWThyUDcsfZssdbweafOmR0cK8KOJy7oo1T3YSrXNlikrLQVGQus7SZWGM1U1fN9Wf3KHRD4mAw3XMFjHzlfsnIe0j83n83rCyqg7T7p8lVa8GzeOli/WzCuCzy3/uVBTJWDW2/WCfgoiuD1FAyrv2IG703CHf 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: This functionality's sole user, the drm ttm module, removed support for it in commit 0d979509539e ("drm/ttm: remove ttm_bo_vm_insert_huge()") as the whole approach is currently unworkable without a PMD/PUD special bit and updates to GUP. Signed-off-by: Lorenzo Stoakes --- include/linux/huge_mm.h | 39 ++------------------------------------- mm/huge_memory.c | 31 +++++++++++++------------------ 2 files changed, 15 insertions(+), 55 deletions(-) diff --git a/include/linux/huge_mm.h b/include/linux/huge_mm.h index 70bd867eba94..3c52fc9d85dc 100644 --- a/include/linux/huge_mm.h +++ b/include/linux/huge_mm.h @@ -39,44 +39,9 @@ bool move_huge_pmd(struct vm_area_struct *vma, unsigned long old_addr, int change_huge_pmd(struct mmu_gather *tlb, struct vm_area_struct *vma, pmd_t *pmd, unsigned long addr, pgprot_t newprot, unsigned long cp_flags); -vm_fault_t vmf_insert_pfn_pmd_prot(struct vm_fault *vmf, pfn_t pfn, - pgprot_t pgprot, bool write); -/** - * vmf_insert_pfn_pmd - insert a pmd size pfn - * @vmf: Structure describing the fault - * @pfn: pfn to insert - * @pgprot: page protection to use - * @write: whether it's a write fault - * - * Insert a pmd size pfn. See vmf_insert_pfn() for additional info. - * - * Return: vm_fault_t value. - */ -static inline vm_fault_t vmf_insert_pfn_pmd(struct vm_fault *vmf, pfn_t pfn, - bool write) -{ - return vmf_insert_pfn_pmd_prot(vmf, pfn, vmf->vma->vm_page_prot, write); -} -vm_fault_t vmf_insert_pfn_pud_prot(struct vm_fault *vmf, pfn_t pfn, - pgprot_t pgprot, bool write); - -/** - * vmf_insert_pfn_pud - insert a pud size pfn - * @vmf: Structure describing the fault - * @pfn: pfn to insert - * @pgprot: page protection to use - * @write: whether it's a write fault - * - * Insert a pud size pfn. See vmf_insert_pfn() for additional info. - * - * Return: vm_fault_t value. - */ -static inline vm_fault_t vmf_insert_pfn_pud(struct vm_fault *vmf, pfn_t pfn, - bool write) -{ - return vmf_insert_pfn_pud_prot(vmf, pfn, vmf->vma->vm_page_prot, write); -} +vm_fault_t vmf_insert_pfn_pmd(struct vm_fault *vmf, pfn_t pfn, bool write); +vm_fault_t vmf_insert_pfn_pud(struct vm_fault *vmf, pfn_t pfn, bool write); enum transparent_hugepage_flag { TRANSPARENT_HUGEPAGE_NEVER_DAX, diff --git a/mm/huge_memory.c b/mm/huge_memory.c index b0ab247939e0..5a0e5e84ab13 100644 --- a/mm/huge_memory.c +++ b/mm/huge_memory.c @@ -889,23 +889,20 @@ static void insert_pfn_pmd(struct vm_area_struct *vma, unsigned long addr, } /** - * vmf_insert_pfn_pmd_prot - insert a pmd size pfn + * vmf_insert_pfn_pmd - insert a pmd size pfn * @vmf: Structure describing the fault * @pfn: pfn to insert - * @pgprot: page protection to use * @write: whether it's a write fault * - * Insert a pmd size pfn. See vmf_insert_pfn() for additional info and - * also consult the vmf_insert_mixed_prot() documentation when - * @pgprot != @vmf->vma->vm_page_prot. + * Insert a pmd size pfn. See vmf_insert_pfn() for additional info. * * Return: vm_fault_t value. */ -vm_fault_t vmf_insert_pfn_pmd_prot(struct vm_fault *vmf, pfn_t pfn, - pgprot_t pgprot, bool write) +vm_fault_t vmf_insert_pfn_pmd(struct vm_fault *vmf, pfn_t pfn, bool write) { unsigned long addr = vmf->address & PMD_MASK; struct vm_area_struct *vma = vmf->vma; + pgprot_t pgprot = vma->vm_page_prot; pgtable_t pgtable = NULL; /* @@ -933,7 +930,7 @@ vm_fault_t vmf_insert_pfn_pmd_prot(struct vm_fault *vmf, pfn_t pfn, insert_pfn_pmd(vma, addr, vmf->pmd, pfn, pgprot, write, pgtable); return VM_FAULT_NOPAGE; } -EXPORT_SYMBOL_GPL(vmf_insert_pfn_pmd_prot); +EXPORT_SYMBOL_GPL(vmf_insert_pfn_pmd); #ifdef CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE_PUD static pud_t maybe_pud_mkwrite(pud_t pud, struct vm_area_struct *vma) @@ -944,9 +941,10 @@ static pud_t maybe_pud_mkwrite(pud_t pud, struct vm_area_struct *vma) } static void insert_pfn_pud(struct vm_area_struct *vma, unsigned long addr, - pud_t *pud, pfn_t pfn, pgprot_t prot, bool write) + pud_t *pud, pfn_t pfn, bool write) { struct mm_struct *mm = vma->vm_mm; + pgprot_t prot = vma->vm_page_prot; pud_t entry; spinlock_t *ptl; @@ -980,23 +978,20 @@ static void insert_pfn_pud(struct vm_area_struct *vma, unsigned long addr, } /** - * vmf_insert_pfn_pud_prot - insert a pud size pfn + * vmf_insert_pfn_pud - insert a pud size pfn * @vmf: Structure describing the fault * @pfn: pfn to insert - * @pgprot: page protection to use * @write: whether it's a write fault * - * Insert a pud size pfn. See vmf_insert_pfn() for additional info and - * also consult the vmf_insert_mixed_prot() documentation when - * @pgprot != @vmf->vma->vm_page_prot. + * Insert a pud size pfn. See vmf_insert_pfn() for additional info. * * Return: vm_fault_t value. */ -vm_fault_t vmf_insert_pfn_pud_prot(struct vm_fault *vmf, pfn_t pfn, - pgprot_t pgprot, bool write) +vm_fault_t vmf_insert_pfn_pud(struct vm_fault *vmf, pfn_t pfn, bool write) { unsigned long addr = vmf->address & PUD_MASK; struct vm_area_struct *vma = vmf->vma; + pgprot_t pgprot = vma->vm_page_prot; /* * If we had pud_special, we could avoid all these restrictions, @@ -1014,10 +1009,10 @@ vm_fault_t vmf_insert_pfn_pud_prot(struct vm_fault *vmf, pfn_t pfn, track_pfn_insert(vma, &pgprot, pfn); - insert_pfn_pud(vma, addr, vmf->pud, pfn, pgprot, write); + insert_pfn_pud(vma, addr, vmf->pud, pfn, write); return VM_FAULT_NOPAGE; } -EXPORT_SYMBOL_GPL(vmf_insert_pfn_pud_prot); +EXPORT_SYMBOL_GPL(vmf_insert_pfn_pud); #endif /* CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE_PUD */ static void touch_pmd(struct vm_area_struct *vma, unsigned long addr, From patchwork Sun Mar 12 23:40:15 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Lorenzo Stoakes X-Patchwork-Id: 13171904 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 6F7F9C74A4B for ; Sun, 12 Mar 2023 23:42:39 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id D88146B0075; Sun, 12 Mar 2023 19:42:37 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id D10A86B0078; Sun, 12 Mar 2023 19:42:37 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id AC5708E0001; Sun, 12 Mar 2023 19:42:37 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id 9A2906B0075 for ; Sun, 12 Mar 2023 19:42:37 -0400 (EDT) Received: from smtpin19.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id 3D72E1C5BCA for ; Sun, 12 Mar 2023 23:42:37 +0000 (UTC) X-FDA: 80561873154.19.E4AD8BE Received: from mail-wm1-f43.google.com (mail-wm1-f43.google.com [209.85.128.43]) by imf14.hostedemail.com (Postfix) with ESMTP id 6738410000D for ; Sun, 12 Mar 2023 23:42:35 +0000 (UTC) Authentication-Results: imf14.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=aLZj8JfH; spf=pass (imf14.hostedemail.com: domain of lstoakes@gmail.com designates 209.85.128.43 as permitted sender) smtp.mailfrom=lstoakes@gmail.com; dmarc=pass (policy=none) header.from=gmail.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1678664555; 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=la0p/jvvcd1pW9pC/kzK82qIi7c6KvzFPifjBlwZbrc=; b=h0/lkLjVUSVeQ1i2lHvUD384eI8ZcwB/z3c3NQjOD+xboaqf0sfzJK9D3TEjl+FZ75uHSP XX5uvTf4yWPRXAkvBGKVqebCi9gsThAtOa00I3fn+ptQDyFkODdpGZdiWIQka3lNd2GeLc zDe+BS5NBgPZ85fNBsruOTndduVuL+A= ARC-Authentication-Results: i=1; imf14.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=aLZj8JfH; spf=pass (imf14.hostedemail.com: domain of lstoakes@gmail.com designates 209.85.128.43 as permitted sender) smtp.mailfrom=lstoakes@gmail.com; dmarc=pass (policy=none) header.from=gmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1678664555; a=rsa-sha256; cv=none; b=ArLDSUkfUXGSAiCO9rLURJtktR4lfqMDJ63+KnY5gkqKgBRhR0NqVyrEnP8y0f3ZuWWGIj IWyDPmAy2r5fIJ9J1h6QtLg/iVhJjffqz/J/FBf1js/bNtCaAevubAQimkKxCAql4rdC50 n02SAM+TnGxJ4lNYzRhcqrqsudAWNe0= Received: by mail-wm1-f43.google.com with SMTP id bg16-20020a05600c3c9000b003eb34e21bdfso9787543wmb.0 for ; Sun, 12 Mar 2023 16:42:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1678664553; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=la0p/jvvcd1pW9pC/kzK82qIi7c6KvzFPifjBlwZbrc=; b=aLZj8JfH0eQ7HFdZx/+iprS/tlBFopYdB1aCKQXTt5WK8FgM8bcDbsa+wSY1iKQJxE Sq7nlwxxzv+OkfrXORItUJ0aliFlsx2GYC4bVIbkqOdoz3XJ/8X+6UsBq/gt7H0EZtMt nuAc/KhC3rf0zvdcWc/OLcAHwR9ZY+peyrzGWB24fyZW1aAv3sBtA5JYpdpHACiwUM4C Zn2OTxsvJxQeZs50umFz+7v+OiiQaf/ZCNb2VEVVGtNQsaBRYYbpPPVuAQjUJokXjnKZ skXJHxntFAccCGCVcChxVjMizrL+8AfSuhDiDuW1ANf8qzQ5/J6eKWecB6/XPCdmkVUt dJcg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678664553; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=la0p/jvvcd1pW9pC/kzK82qIi7c6KvzFPifjBlwZbrc=; b=6SIMiiD81rCCN8jYvVZ9YzmXcaTBZB9M+UvSWxx1WY6TMAKVhjGcDfcjBN3/qayqVv cp6GtrKJaWEGFLQjJAvPfMYbJAsFXyGh47PS7LTNcvVwrEZX8/1sxENnHaPMsmWtWR71 kL4P7L0fwcU2V+CmcvW3z2JMAVyhV8vlz33lH/NRip6Q78w4snuiuctKgPuc06EYNt3I xSanO/2wk2oYVjMd+81NhdQy32BzTLMs9QNoNdTrCoWEN3kzcfE/KcU+7n7Qbw46X+wl G9KubipspJhOJajDUbDaeHrfP+K59fUf0CwQP+n2zQh81PQik/7oKYlEn49uZ/zPWbik 2Naw== X-Gm-Message-State: AO0yUKXGdXrx5mVqJpXHKvKcbip7weyQLDdxIzys1LWr8MqGWr0joCRl HowLmpYwgOnoDnsyCn9B0g0lP34dYWM= X-Google-Smtp-Source: AK7set91yp0phYi1oU83T07w5p/4LtduuFcFeFbpdusqdMZ60+SpKowFcXg2lljxmC60wI0iAyj0hw== X-Received: by 2002:a05:600c:4e87:b0:3eb:38a2:2bcd with SMTP id f7-20020a05600c4e8700b003eb38a22bcdmr9079693wmq.28.1678664553621; Sun, 12 Mar 2023 16:42:33 -0700 (PDT) Received: from lucifer.home (host86-146-209-214.range86-146.btcentralplus.com. [86.146.209.214]) by smtp.googlemail.com with ESMTPSA id iz20-20020a05600c555400b003ed201ddef2sm3698376wmb.2.2023.03.12.16.42.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 12 Mar 2023 16:42:32 -0700 (PDT) From: Lorenzo Stoakes To: linux-mm@kvack.org, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, Andrew Morton Cc: Thomas Hellstrom , Christian Konig , Matthew Wilcox , Michal Hocko , "Kirill A . Shutemov" , Dan Williams , Jason Gunthorpe , Lorenzo Stoakes Subject: [PATCH 3/3] drm/ttm: Remove comment referencing now-removed vmf_insert_mixed_prot() Date: Sun, 12 Mar 2023 23:40:15 +0000 Message-Id: X-Mailer: git-send-email 2.39.2 In-Reply-To: References: MIME-Version: 1.0 X-Stat-Signature: 4acxe18sj4zeqnex13z5zyrgrgepahs5 X-Rspam-User: X-Rspamd-Queue-Id: 6738410000D X-Rspamd-Server: rspam06 X-HE-Tag: 1678664555-549709 X-HE-Meta: U2FsdGVkX1/a4NIYdFGxKYFd8GcdSshiT0WCSbXJpPTsJBvnGVv5GeMShjH9onuFxC8/3gHdNi8bIF61pA/dQdATOwVhw0g3sO8HPyojN6sLTtOYbzrh8fW/tijcRPc4eHlrmuoR1EHLq2O4SCoOnsQ3c8A/7NpToeXIKanodG9RyQNW5iLZS/35Ng8URQ1NuwQKFP57Z5V90ojrkYqSFnieAgAvZgwWxWJGtSdw8V/D8TZaal6wWBP8TAuhgiowIWclWTM/BEiNmsEBT/fcQxBpHPCqrzSathC3FPd48Ga9oY7w8k6Nbk4/gy+klG/WkU0e5E7/cSIUc1P5XnTAVeDD8Z9crxmRTM5tXCqVNjflL/OFWV2/oMxXqs+POX83kr8ivzIk7NNDAOlg4ZYPFFzd9hINTVqn85Ov5i8pwV5l9l6EkOFJ3Ud2qa5tiDdVgrvKyjCxpYL0Qc5yY/elkMXxGxIJL8ocdU+QpYzcIB7BsPVIrBzxV1aLeIzQaJQAifgM5CNCqVnfJosCn7Ow+LBHZk+YR4Ih1DN9QmcuCC9bG1l9H8eDobnRgfkuu0aR7O1fMETDlF/HVGZDVG+aU/qr8hyqXuSilktLqaKXykXDrfHSeFRHTrTgC/QXz5HY48lV2xra6PMu/fZl3yEA2HHQfDVktyhINSU2xiaB1W9K9n7rrIeZzTkPUU4BQThLp1O8AnCZNXI4UHFwWM3mDOKbHk4Fln+AVOzswc6v+2dCRFQCfU4MbaBvE/BKHGPImAijPzKSzV1CRNxyT+PXUy8zlpDEj/E8JiaCwRUJpbrb6/AEUCvFLo/5RW28JrbPTT6+ziQPoz04dNZuzqKxdHoTNXdwusIEifA39FTLdHdm6YuxqPUtzmY7KD1/2dz6HOuLjL8LTyjeIEXR8GKFiMYsVyI/jPII6mtoSJAgDpzvPBk481Is7NxRxpmsRCEXJCfH+FpaYYL4xIwJCWG Sr0Q5xI/ efEkxNVJF4+2V59J7RHNcimKv+qm8zjv05X7RjyjctL4mH/qB7fFsdaUxOQNgFAyC+snMXuTkjNTYO/xzejfFetsbpirCE3bG8YmROFQFbez1d6uLQeIdVRdH6aMBbXWs6qPU+Q/bNSPhBtS5D/daClGVxnDWxODrQ5auGDT2NVxnYN14gEuiXsiE32TAY0Rk5G5nwKPD2gmXM8aiwzhFn01cY+vK8DX/8whqaYJ0YM6fcPRzMxHbY8XgFAFbEVBqS2naVw6qQmdmDvmjLnOZmfpKdm7VDjcxIfOKTn+kSoOUsIdDhkW/BLAsM2N6gnnNTYLMtPyU+gIa1+0seN8jkqFmFSUnD3ibomPo9RgUdc39pYZgpl9Mrgwov9eN3nNid5jPGcRXXEyc+z4qauu2zkAIMAIkEXKHis4umCrkPFi+S8cuni/a7gE8g/tIWUaC9ToYflt6jdiUw58aZsOdTJSKsXf22Yt6L4053jlCv0oHi/jbkd7sS+EoruSpdEj7utUp 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: This function no longer exists, however the prot != vma->vm_page_prot case discussion has been retained and moved to vmf_insert_pfn_prot() so refer to this instead. Signed-off-by: Lorenzo Stoakes Reviewed-by: Christian König --- drivers/gpu/drm/ttm/ttm_bo_vm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/ttm/ttm_bo_vm.c b/drivers/gpu/drm/ttm/ttm_bo_vm.c index ca7744b852f5..5df3edadb808 100644 --- a/drivers/gpu/drm/ttm/ttm_bo_vm.c +++ b/drivers/gpu/drm/ttm/ttm_bo_vm.c @@ -254,7 +254,7 @@ vm_fault_t ttm_bo_vm_fault_reserved(struct vm_fault *vmf, * encryption bits. This is because the exact location of the * data may not be known at mmap() time and may also change * at arbitrary times while the data is mmap'ed. - * See vmf_insert_mixed_prot() for a discussion. + * See vmf_insert_pfn_prot() for a discussion. */ ret = vmf_insert_pfn_prot(vma, address, pfn, prot);