Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
From:   Liam Howlett <liam.howlett@oracle.com>
To:     "maple-tree@lists.infradead.org" <maple-tree@lists.infradead.org>,
        "linux-mm@kvack.org" <linux-mm@kvack.org>,
        "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
        Andrew Morton <akpm@linux-foundation.org>
Subject: [PATCH v5 70/70] mm/mmap.c: Pass in mapping to __vma_link_file()
Thread-Topic: [PATCH v5 70/70] mm/mmap.c: Pass in mapping to __vma_link_file()
Thread-Index: AQHYF96ESrS5WLVzMU6LcrDXrVDyVg==
Date:   Wed, 2 Feb 2022 02:42:28 +0000
Message-ID: <20220202024137.2516438-71-Liam.Howlett@oracle.com>
References: <20220202024137.2516438-1-Liam.Howlett@oracle.com>
In-Reply-To: <20220202024137.2516438-1-Liam.Howlett@oracle.com>
Accept-Language: en-US
Content-Language: en-US
x-ms-exchange-antispam-messagedata-chunkcount: 1
x-ms-exchange-antispam-messagedata-0: =?iso-8859-1?Q?lNC5QItyiQ0ws4zh+SMskqyd32ismPrJyPRPfQmdwG0Y1FyOojK0XEOBeD?=
 =?iso-8859-1?Q?5wHNp0Dqn4Z1KXeH1dzE/NOjrmsXb2E35tRRJF1iWwpWGfEiPylVlroJV2?=
 =?iso-8859-1?Q?wxeuxF0udWAhezbLNing242cOOJF/jt2pT+9uxKndBUAws2GEC4sVCNsE7?=
 =?iso-8859-1?Q?XhqTkpIkugdOyvXBUq4tqWvM24zLmYsbYm9TJQqJq2PxQHS3R2omEbUiWw?=
 =?iso-8859-1?Q?9fbkvGATRH3Pekuzymhcctn5YjRce8AvmoBcQdYjFG9EJJWDR3UrnIet1s?=
 =?iso-8859-1?Q?KMjK/lNUNhNLvJFEY8n1QvozRES9pW+Y0/+ASgDDHC0BZ89rsecQOyN7pL?=
 =?iso-8859-1?Q?zasO0zqOfnL7vwNu1LDfaMswt0HUzkoHipBjzuy1P4eW7REIypNIOfmUoY?=
 =?iso-8859-1?Q?gju4SZZm8bPMOWfv9iXDYzdHVKxN7GmDPaRRANhcJ0Xz9CjCW5kr7lOKcQ?=
 =?iso-8859-1?Q?hSBK3Uj/GJwqHMRNcTnvWDLL83zbQDcz38BwoZq8/ZizbuD9kpmWAVfElg?=
 =?iso-8859-1?Q?N/CcGBNTJTycy1dhpficeZWSCqA98hQlqRs9t37nkA37xO0MNTCmeC/qLL?=
 =?iso-8859-1?Q?ukKICjRviS0bhEuN93xTgZrlp+KSQZX8TCm8ab326AKhvXl4UYb2WhzdbI?=
 =?iso-8859-1?Q?GxIiaupkJpv4XLFx1mCV3CIQTZE+YmYQcg5jMJH921jkzmWIbEWCX2plkd?=
 =?iso-8859-1?Q?W0vyZhT1IYuZ7BAwLqmIWHIoPZj/Z/Z58wQvAEW1JN5XF7kkaaLJ0/gmr2?=
 =?iso-8859-1?Q?3PO02q49PpLCfzywSIOqXw9HA9+Bj6OwjmNxXQ5+kYxqlV9HhbHlVitI8m?=
 =?iso-8859-1?Q?s3LZwNChNochn+WKeqbS9uMhBcb6S4MKxuUz+fdGE2Rc+XKfYWSWU4Vic7?=
 =?iso-8859-1?Q?G1/5mZnxCfaAUseiK1TnmByPIU0mxRMPv7DLchU49ae/nf2eDE7m6a9qB2?=
 =?iso-8859-1?Q?3ePMi1TgKMwMyPXmsbcM3TIvWlUWQ7EVzs4xCYS8lE/0He8zbHPQB7Cj5e?=
 =?iso-8859-1?Q?xoSNIb8rjZrSQvmKmn3w3JwpvrQ8eGWV0T+qpZtWndeoHaQXfzV8z4SD64?=
 =?iso-8859-1?Q?Ns9AbNqSElYpcmCOJtkl5E19I2n/qq0ge7RdEKXLUxJwhS7w/7leKRCFc8?=
 =?iso-8859-1?Q?mA25ZShG73SDIBybTlJiLgOAumjlT78ACRU201J1Ag0UdxDJDM5V9cVV/Y?=
 =?iso-8859-1?Q?wDyxIFfMftGpwaEgZ80X3ig0UDx4gaOk7fEmPd/vroFOG2vhTqaElQMNBS?=
 =?iso-8859-1?Q?jal98l+Z/nd98PcK6S4/GEZ3k6pS1z6F8hT7C/ocl2ajXwe/rBwJ2KC6Ko?=
 =?iso-8859-1?Q?ucW1gZYSHy+DjJwf/ovNylnmyH1+FIbpC/HywIaQx426iFbH08YWDRkkIe?=
 =?iso-8859-1?Q?T63l3rUvQ4IT/vB/1j9iezNyx3+OEiQ8c29dXER0QF0m3U5Gp4QsDF3Nqh?=
 =?iso-8859-1?Q?+8mEcyw/a5rzaaimVVc4PhT1iqNgTEEziOMVh10b2aCIPoRcXB2tFv7oZc?=
 =?iso-8859-1?Q?OqegXtdDhBga5RRUaOZ/Tt34azwADGsK5yu7SqUzT/BYfhYl41OzyyHBRc?=
 =?iso-8859-1?Q?IWfI014wu8lKil9TL6B8Q5vCB5dmOtDYCwRjTU14zr8ndKg1uxuxBie9Rd?=
 =?iso-8859-1?Q?IwDTLWEc+oC+KcYIpTp+9XfJ1iNTdG8uLY3Hv7nYYpQsxrzlJ2SPyWYDzd?=
 =?iso-8859-1?Q?VvT2iKSp2UhUcozSRMA=3D?=
Content-Type: text/plain; charset="iso-8859-1"
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-AuthSource: SN6PR10MB3022.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-Network-Message-Id: ed4b5890-2c58-4b86-0999-08d9e5f5ccf4
X-MS-Exchange-CrossTenant-originalarrivaltime: 02 Feb 2022 02:42:28.6409
 (UTC)
X-MS-Exchange-CrossTenant-fromentityheader: Hosted
X-MS-Exchange-CrossTenant-id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b
X-MS-Exchange-CrossTenant-mailboxtype: HOSTED
X-MS-Exchange-CrossTenant-userprincipalname: enQFwPdJVlub2VN2rlQbXTPTQ0ilYiTfJM9vxAvzxpg3QKPrX23Mfv+OvzXrp/4sZdKciW59Rj5aZuKk3AECsg==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: CO1PR10MB4801
X-Proofpoint-Virus-Version: vendor=nai engine=6300 definitions=10245 signatures=673430
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 spamscore=0 mlxlogscore=999
 adultscore=0 malwarescore=0 bulkscore=0 suspectscore=0 mlxscore=0
 phishscore=0 classifier=spam adjust=0 reason=mlx scancount=1
 engine=8.12.0-2201110000 definitions=main-2202020010
X-Proofpoint-GUID: yaW09pZZKT9dZcz2CDRy7vqaGX5NUNuR
X-Proofpoint-ORIG-GUID: yaW09pZZKT9dZcz2CDRy7vqaGX5NUNuR
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

__vma_link_file() resolves the mapping from the file, if there is one.
Pass through the mapping and check the vm_file externally since most
places already have the required information and check of vm_file.

Signed-off-by: Liam R. Howlett <Liam.Howlett@oracle.com>
---
 mm/mmap.c | 42 ++++++++++++++++++++----------------------
 1 file changed, 20 insertions(+), 22 deletions(-)

diff --git a/mm/mmap.c b/mm/mmap.c
index 8fdef5b83b74..160a2a77c243 100644
--- a/mm/mmap.c
+++ b/mm/mmap.c
@@ -457,21 +457,15 @@ static unsigned long count_vma_pages_range(struct mm_=
struct *mm,
 	return nr_pages;
 }
=20
-static void __vma_link_file(struct vm_area_struct *vma)
+static void __vma_link_file(struct vm_area_struct *vma,
+			    struct address_space *mapping)
 {
-	struct file *file;
-
-	file =3D vma->vm_file;
-	if (file) {
-		struct address_space *mapping =3D file->f_mapping;
-
-		if (vma->vm_flags & VM_SHARED)
-			mapping_allow_writable(mapping);
+	if (vma->vm_flags & VM_SHARED)
+		mapping_allow_writable(mapping);
=20
-		flush_dcache_mmap_lock(mapping);
-		vma_interval_tree_insert(vma, &mapping->i_mmap);
-		flush_dcache_mmap_unlock(mapping);
-	}
+	flush_dcache_mmap_lock(mapping);
+	vma_interval_tree_insert(vma, &mapping->i_mmap);
+	flush_dcache_mmap_unlock(mapping);
 }
=20
 /*
@@ -514,10 +508,11 @@ static void vma_link(struct mm_struct *mm, struct vm_=
area_struct *vma)
 	}
=20
 	vma_store(mm, vma);
-	__vma_link_file(vma);
=20
-	if (mapping)
+	if (mapping) {
+		__vma_link_file(vma, mapping);
 		i_mmap_unlock_write(mapping);
+	}
=20
 	mm->map_count++;
 	validate_mm(mm);
@@ -750,14 +745,14 @@ int __vma_adjust(struct vm_area_struct *vma, unsigned=
 long start,
 			uprobe_munmap(next, next->vm_start, next->vm_end);
=20
 		i_mmap_lock_write(mapping);
-		if (insert) {
+		if (insert && insert->vm_file) {
 			/*
 			 * Put into interval tree now, so instantiated pages
 			 * are visible to arm/parisc __flush_dcache_page
 			 * throughout; but we cannot insert into address
 			 * space until vma start or end is updated.
 			 */
-			__vma_link_file(insert);
+			__vma_link_file(insert, vma->vm_file->f_mapping);
 		}
 	}
=20
@@ -2952,6 +2947,7 @@ static int do_brk_munmap(struct ma_state *mas, struct=
 vm_area_struct *vma,
 static int do_brk_flags(struct ma_state *mas, struct vm_area_struct *vma,
 		unsigned long addr, unsigned long len, unsigned long flags)
 {
+	struct address_space *mapping =3D NULL;
 	struct mm_struct *mm =3D current->mm;
 	validate_mm_mt(mm);
=20
@@ -3009,13 +3005,15 @@ static int do_brk_flags(struct ma_state *mas, struc=
t vm_area_struct *vma,
 	vma->vm_pgoff =3D addr >> PAGE_SHIFT;
 	vma->vm_flags =3D flags;
 	vma->vm_page_prot =3D vm_get_page_prot(flags);
-	if (vma->vm_file)
-		i_mmap_lock_write(vma->vm_file->f_mapping);
+	if (vma->vm_file) {
+		mapping =3D vma->vm_file->f_mapping;
+		i_mmap_lock_write(mapping);
+	}
 	vma_mas_store(vma, mas);
 	mm->map_count++;
-	if (vma->vm_file) {
-		__vma_link_file(vma);
-		i_mmap_unlock_write(vma->vm_file->f_mapping);
+	if (mapping) {
+		__vma_link_file(vma, mapping);
+		i_mmap_unlock_write(mapping);
 	}
=20
 out:
--=20
2.34.1