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>
CC:     Liam Howlett <liam.howlett@oracle.com>,
        Liam Howlett <liam.howlett@oracle.com>
Subject: [PATCH v13 70/70] mm/mmap.c: pass in mapping to __vma_link_file()
Thread-Topic: [PATCH v13 70/70] mm/mmap.c: pass in mapping to
 __vma_link_file()
Thread-Index: AQHYtjjE86QeqUMRBUGxCsJkeA0J7A==
Date:   Mon, 22 Aug 2022 15:06:34 +0000
Message-ID: <20220822150128.1562046-71-Liam.Howlett@oracle.com>
References: <20220822150128.1562046-1-Liam.Howlett@oracle.com>
In-Reply-To: <20220822150128.1562046-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?28hVgYnPL49jJEPazxAcn326i/XDJMz/FcAGTMwDPiRu95wNU0mdbwqbWH?=
 =?iso-8859-1?Q?Avpbjiaps4PfmCArUE+Eqvmi4uERjwmKaveT0ZOJm/5cHOne9b5qIIzCQ6?=
 =?iso-8859-1?Q?KWkOfA8gIvAoa6wc2SfHFyomI/ldrL3ICItCrA2cBC0fvYeasC9RfHxATy?=
 =?iso-8859-1?Q?o8JPikfCY0zmI5vfEt3trGJVo1LeHXD3/Icz0PYIxaba122biLydbyCubM?=
 =?iso-8859-1?Q?YxA+5HBId7wjUFo9yfvXsI0CF7j7s2rgG9oX8foSpcoilE+z0JWRit32SI?=
 =?iso-8859-1?Q?RFu4A1O9NbfPssPMd8O4iwY6x9cc7X4KnRwv/AIaepwpw8ebhaXnfQ1jFc?=
 =?iso-8859-1?Q?z6+1vImJHhnX8rKTsuXwLawU/UKtN2h+K5UC7a8DIYX9akcSqjNm4iSAZr?=
 =?iso-8859-1?Q?Pk3vhkLr9y12l3qD+WDK7uEoYqxOuMbpMa12g1YLhMMg/aSU5sTIrDTM+R?=
 =?iso-8859-1?Q?yj/egL93gJK12YmYrsFPqdvgm5jm+x8r29rK7VPUoiUYMioktE3pRl1IMq?=
 =?iso-8859-1?Q?ARW5Y1J9suV/Fqe04i6bHs1Ww+7Z/JY1uphdjlyjSAnX8Chq5lWuMdNjOF?=
 =?iso-8859-1?Q?R+9w3hkhNAno+EnSMe9poeeYwUDFpbz+p8NgRc2ocgS+Nkqy6VOe0NOHdD?=
 =?iso-8859-1?Q?2mfgix1xRA3H/9FzV6pJW+k37avcXGIx1QEk415SOhMOyCEVErUunFBXhE?=
 =?iso-8859-1?Q?TyTJetLjCQbBZ/PxlsgGCFEHvZxEmO0+Ncj8fS8g422LNFYMIBGnabGlOA?=
 =?iso-8859-1?Q?feAKteXJWe794LCs4/35zqEWowGGoxYb161hXiFTvntgZTxNbDXu5kxO7M?=
 =?iso-8859-1?Q?YnVtLzzbiv2kB4OOgSisSQZu/t0CAHN+cnwzrKfs26V+CzdiSsgHnOEKQ8?=
 =?iso-8859-1?Q?c1SFG2UiSgks/6DVLCTlA2q9R3wCgvU5g97vHSeOu/F4XFNVtJMguIHsb8?=
 =?iso-8859-1?Q?KwZnofuUnUpOGZ0Gd9S04DthzXV0007aIeVpdT3AfR5SrrGsLwYzoRdGVr?=
 =?iso-8859-1?Q?bOc7NE1MpIXul6jcnGzBwW3guJcujSgvHez7NzbkA3XBvtx3Q1bevS9D2Z?=
 =?iso-8859-1?Q?fx2cnSOOxuZdnzVsOzK7Y/53Ep37eICxv3bDTMSzEJe8n7sbCqp4XiAWqt?=
 =?iso-8859-1?Q?1gkHTA5+kYFo/GdGsYzpwofLFACKTl/9o3vVLEckHA1E7bLG56afPF83RS?=
 =?iso-8859-1?Q?89oEtdrRrgX/P5J5IiZ8Z+GvyXu4DLM+cRPQHJt7gTKCKeyHBaVI7YPQ0G?=
 =?iso-8859-1?Q?zBxGN1srjpjMYWWP8KP/VpYFOicttTLMALk4AkiYnBHmHysbfttdP8OmIG?=
 =?iso-8859-1?Q?QklV0BP3vaQIZ0ZnJKB30lc8t+Ibi6FCISQlfFkFIjCPEz4SwnH7otPtN2?=
 =?iso-8859-1?Q?kaZF0P/BojFr9iU5WA2Mhh0v8SOYpvmRpNwnaaclt4xdExnjNUo4HgtKAw?=
 =?iso-8859-1?Q?3y+behYlLCuZxvdjB0/Q7xHNYvWahzFxOtEaAlVkDfdOckzqGD5PbBly2D?=
 =?iso-8859-1?Q?k5cUvKnNh7Y4uhtQQQ2RBFDCWzFEK4iEAYJa9JNT9PJIE9eLUeUklWE7sO?=
 =?iso-8859-1?Q?qSaImZb4GQgatZ67Tl2VA2QzW/LBjND043SqW+Df3WCtDgJOdICP03pDGE?=
 =?iso-8859-1?Q?iY+2b/5jyqcJqtLSk6uu6+4y7IZ0c+DdHSe5pDAsgynXCLRRKa9Z4JMA?=
 =?iso-8859-1?Q?=3D=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: eac7b861-592c-4978-eca0-08da844ffd28
X-MS-Exchange-CrossTenant-originalarrivaltime: 22 Aug 2022 15:06:34.4251
 (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: i5krG9PtyA4bIRqFi34XGiBbCTwQGR/wQIKaSDBc4ehm2wgZ0yeNZ9bnpPDScbWQaqKokeGk0wIDuHxboMmanw==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: SJ0PR10MB4512
X-Proofpoint-Virus-Version: vendor=baseguard
 engine=ICAP:2.0.205,Aquarius:18.0.895,Hydra:6.0.517,FMLib:17.11.122.1
 definitions=2022-08-22_09,2022-08-22_02,2022-06-22_01
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 bulkscore=0 mlxlogscore=999
 phishscore=0 mlxscore=0 adultscore=0 spamscore=0 suspectscore=0
 malwarescore=0 classifier=spam adjust=0 reason=mlx scancount=1
 engine=8.12.0-2207270000 definitions=main-2208220065
X-Proofpoint-ORIG-GUID: Azst037EvyVQODeGYJaeBdUS6iYwePix
X-Proofpoint-GUID: Azst037EvyVQODeGYJaeBdUS6iYwePix
X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_LOW,
        RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_NONE,T_SCC_BODY_TEXT_LINE
        autolearn=ham autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

From: "Liam R. Howlett" <Liam.Howlett@Oracle.com>

__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 | 29 ++++++++++++-----------------
 1 file changed, 12 insertions(+), 17 deletions(-)

diff --git a/mm/mmap.c b/mm/mmap.c
index 5070af64b99d..fbe8b52a90a3 100644
--- a/mm/mmap.c
+++ b/mm/mmap.c
@@ -407,21 +407,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
 /*
@@ -488,10 +482,11 @@ static int vma_link(struct mm_struct *mm, struct vm_a=
rea_struct *vma)
 	}
=20
 	vma_mas_store(vma, &mas);
-	__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);
@@ -730,14 +725,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, insert->vm_file->f_mapping);
 		}
 	}
=20
--=20
2.35.1