From patchwork Wed Mar 12 22:15:21 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yang Shi X-Patchwork-Id: 14013972 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 B2E2BC28B28 for ; Wed, 12 Mar 2025 22:15:46 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 94FAE280002; Wed, 12 Mar 2025 18:15:44 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 900BC280001; Wed, 12 Mar 2025 18:15:44 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 7789C280002; Wed, 12 Mar 2025 18:15:44 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id 59659280001 for ; Wed, 12 Mar 2025 18:15:44 -0400 (EDT) Received: from smtpin10.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id 4E18D12170F for ; Wed, 12 Mar 2025 22:15:45 +0000 (UTC) X-FDA: 83214307050.10.E3BEAE1 Received: from SJ2PR03CU002.outbound.protection.outlook.com (mail-westusazon11023103.outbound.protection.outlook.com [52.101.44.103]) by imf14.hostedemail.com (Postfix) with ESMTP id 619CE10000B for ; Wed, 12 Mar 2025 22:15:42 +0000 (UTC) Authentication-Results: imf14.hostedemail.com; dkim=pass header.d=os.amperecomputing.com header.s=selector2 header.b=PyQsFusJ; spf=pass (imf14.hostedemail.com: domain of yang@os.amperecomputing.com designates 52.101.44.103 as permitted sender) smtp.mailfrom=yang@os.amperecomputing.com; arc=pass ("microsoft.com:s=arcselector10001:i=1"); dmarc=pass (policy=quarantine) header.from=amperecomputing.com ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1741817742; 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-type: content-transfer-encoding:content-transfer-encoding:in-reply-to: references:dkim-signature; bh=0n4Taklm3c4QYrIruFt44QWnbmlRZ3RcfI3hTY43K1c=; b=0bfVKQwiNmKDw45WFyd6h8jN45qhlb9En+nwfhc/WnulaWAHJ+K/EarAiI4zSxPKpfeAit jYVbthBUB7+JZZRzoW7F50PptsRSX6Iew3s/zHIG1Wg2787T2L7PY63KkhNfLAHZW6of/b HJV9FMbL+NH3g+FhIdu0qkoPQ8rVieE= ARC-Authentication-Results: i=2; imf14.hostedemail.com; dkim=pass header.d=os.amperecomputing.com header.s=selector2 header.b=PyQsFusJ; spf=pass (imf14.hostedemail.com: domain of yang@os.amperecomputing.com designates 52.101.44.103 as permitted sender) smtp.mailfrom=yang@os.amperecomputing.com; arc=pass ("microsoft.com:s=arcselector10001:i=1"); dmarc=pass (policy=quarantine) header.from=amperecomputing.com ARC-Seal: i=2; s=arc-20220608; d=hostedemail.com; t=1741817742; a=rsa-sha256; cv=pass; b=SlYZRcVBeNSaJR4L7w1UQ34Rd4ViAEXOPBnyBoHV6vMNY4aVWDC9PTb5m2rbfx0x6tqDrO m1hsX5gObGpNn5DdEhgWHPy5cWGGqlGAPQi+TDUKcWUX4IeWomNtPbxnN7S9um5sFXen/u Cpa9fhj7G/QRb6nP7BAwKP+BlyEFPx4= ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=Mlc1754dX++c4HB1DMVg/qydXCOR6ccH8ykKXcrOg7NIProLXZe8hV1hm2cmXS13zJuwZLBpUNsuaUFxGnnhHyk+6mpdMYIUNMnWddg+RFze0DOFOkmafIRHIt5VgiM/YQm4oQ7FtEzkS7WxayToUa9gyw0f+9q7OMefU8ALxgeIvEp02ajERyn8kIWPeGdQ8l/BC8lWE/IGlor4/999C43NY+S6C8DCGMYWxoHXX+DLHDhzGDT4/hqVXcqp4bkQtLVq1UVeLgzDdT+IkkanA/iOPgyr+rw1hYS3l6nB1V/OmOeE80EebmPs+ESeFSimm2iKLHRPY8vKUoLj4t7zoQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=0n4Taklm3c4QYrIruFt44QWnbmlRZ3RcfI3hTY43K1c=; b=Zip1oNN9ydT3kANj83ee/J5vZZvCLmFZMUwsQdiqeGrIZYRFHa4eNaEvJw39ClhXDDtoumXqgYuAWHi/tX09+iLb20HDxspSyntb1erh6ScTcBP+710Li2VBJMxhloSDSiT8DobmONRwrpfG4iWe2GWYCr5962biiTSTcvtsLSWqzYTzLoU9M6m44+AAozUFvSfKQmrVnWzOFF4XHmUzYCBCEHOzfSs6AkdvYg3Oo5pkGyi31tFE8pp0/dZ4Vv9mVK7yhloA5TIP8UzWy5c3L0ENOa66NNglCKSGZexqAo78kZnn5xx3kkdG9EgvTYQI7usQwd8o43jUkfdxNIRU1w== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=os.amperecomputing.com; dmarc=pass action=none header.from=os.amperecomputing.com; dkim=pass header.d=os.amperecomputing.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=os.amperecomputing.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=0n4Taklm3c4QYrIruFt44QWnbmlRZ3RcfI3hTY43K1c=; b=PyQsFusJE2hPpupAFQYENFyMjtdGFD50nsEIlIWIbgDYdREDEpJmZTyYJZncEdx7j7gTTYehfpwZ8kZm6NLWKNYhdhbtdlajXBNcPMz4kxi1ohjQ/SFvFH/TboX7TMX7reDddg+/8wzeo7Q7HIZhyiG9l2wA3SuRWMqQJGPGxo4= Received: from CH0PR01MB6873.prod.exchangelabs.com (2603:10b6:610:112::22) by CO1PR01MB7353.prod.exchangelabs.com (2603:10b6:303:158::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8511.28; Wed, 12 Mar 2025 22:15:38 +0000 Received: from CH0PR01MB6873.prod.exchangelabs.com ([fe80::3850:9112:f3bf:6460]) by CH0PR01MB6873.prod.exchangelabs.com ([fe80::3850:9112:f3bf:6460%4]) with mapi id 15.20.8511.026; Wed, 12 Mar 2025 22:15:38 +0000 From: Yang Shi To: Liam.Howlett@oracle.com, lorenzo.stoakes@oracle.com, vbabka@suse.cz, jannh@google.com, oliver.sang@intel.com, akpm@linux-foundation.org Cc: yang@os.amperecomputing.com, linux-mm@kvack.org, linux-kernel@vger.kernel.org Subject: [v2 PATCH] mm: vma: skip anonymous vma when inserting vma to file rmap tree Date: Wed, 12 Mar 2025 15:15:21 -0700 Message-ID: <20250312221521.1255690-1-yang@os.amperecomputing.com> X-Mailer: git-send-email 2.48.1 X-ClientProxiedBy: CY8PR22CA0015.namprd22.prod.outlook.com (2603:10b6:930:45::14) To CH0PR01MB6873.prod.exchangelabs.com (2603:10b6:610:112::22) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CH0PR01MB6873:EE_|CO1PR01MB7353:EE_ X-MS-Office365-Filtering-Correlation-Id: 758cd20d-8dfa-4597-4fed-08dd61b36b17 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|366016|52116014|376014|38350700014; X-Microsoft-Antispam-Message-Info: qvM0q5f7WqjRNiFXlBD4sdEo91xR5dDBcv0znpMFhJAAXxfgXbh6jElNka7CHwcK/rkJxpkQT21PPh2YuNOU7M8Ufquf21wmVDUCb8RvXxaoKSDVy8TBh6UzAMbB5QzZ0vwQthXMsYFRgzQBGEH2GIKq+1gYHei+a8e3xoVKe2MeN/1Xp9e6l4DWAV+UhZkFNEyDk3W9mEF6cJCMqBOTHjD2Pg68HmT8ZAhnvO3ehOR4XhxHGGFKKx5n7hQX848t06IK/GU3tlLQavrPEK2HW3Ub9+T9BlUgyRmtU4wWF5lK+giNZl0tBg5iML1Db3HfwtaXwKwdh5Ulo7DidFonye2x5JVAEuzKOA2qkhpH+vDtDF4aDT2hzaGWQBEIah/jnQI1WOyzDtweIk3B7km0wwY/StLsfno4gHOJrE5GkNtGlNQ9z2gFWMS16sjhRKumqr6cgQ3Ju18/pialFxsjTSMBWwnUFxZ6ZPfr303R3dPzLObBFZnukTkljAPiZjIajzc6w+14XLE+2+fnLoEJ8SZIR1b9EvhMyTMwsj6ZO6kwzU8FM07hhApn/tudDfvBiABF4P5nvV/gqXt/3aaAUFM0MbFZFjplI7xILAd1PtwbbWs5i21MMFHI41wRSOvj4HIMS0NhY0JoW1EyWCKigmJlyh4JRKme6Biob9AIh1witlNw26gfZaOmt4UkEerqQ9YY5jY9F4NRC5W7kcgnuSWmq9+VXR1jlcQdEdq/Lc0F/0ohN8BYPZS9kqUcmKeGAxRyuYYW1YJw9PgPYV9lRggLeTa0rLyrNJDQj8JzQWrMuCt6q3HJ/UuMgaWHfSHAK3JCVI3frlgwzNJnMSa3sHbbTcDXqaedxAZlmZanbT9m9Wk1ZgQY2laGFC0HgxV5fZZJNAFm8jpsXZ+dqxEWIwaDFycbZ+kPm+aiI82SrICViZvvxXU5rFuh+qTxhav30tJrOoBtir9m8gBjG9Gte27b2Od+X56qYDpBJEfVe8gyGcZVZ7vM9gCq/zYpaqUOnJeojFF5Gj21EM9WfG8de11SLe/jSEQKan30znEKAFGPJtAfp5AJza72cFwAVNDC08rnKnuMVqfuSFU+/3oeBlmnw/1MpxveZtL7VXep27j/+uQ6o2YDBLINS+4/Z4i/8FJtXpkwuQ+G0aJgOjBgnUTvuTOQzS7Qlz8DMSAoH4yFqn5gkt2ruAvITded6UxFSBK8ssCASrzEdZ9XLAy3Tp39SQkxbMOW/jYlSXLMXAqjhgZyeVHHINxL9Md0uvlrl7HCownq8HI1eckILikO7GEcsGdUwJJaoSk1VoNSLt827d3zwDNHFrmHtzpI+djn/Hu4OY5sU+3Q0GnMkgw05tp3dFfhBOMI4Lujr6ofyNsfD6F/Ginj7OLKl/GIgBF0zTXHkiPHRhz5vQP8CR4rTYlXMo8CRI2lcdx8S4sllQ9dw+2J10nzyxjkE/lJERbq X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:CH0PR01MB6873.prod.exchangelabs.com;PTR:;CAT:NONE;SFS:(13230040)(1800799024)(366016)(52116014)(376014)(38350700014);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 9ZUnjW/k5QNBzIcW8cIRJEAjR9qlImoE1z9S9aJlBAtR/iOXc2OP2cAu9F4qWbyJBqtUDrsx2unoCUQs5zq8cfCHZ/kBdFaT8nctkhmT/GjqRYrKy9mISZtn+V4JuwfUZv6dMZg0918Ga2WmjbhLgDoQHjeZaV5rLmSQsa8x083MgFN1OwZsPtQ/M29n2Sai4dJklq0u2KGRxTRpFR34OW17c8MIuO1lEBMiqsuh8Fz6PToWMG9Gr0sw27u5HtlqWlbcNHDLSox/gw6Xzih4+eJpfwYpm/j/WmptXz7rq47pGI7pR20w71h/7nFZeFdumDADnoVQR7Mlw8cO/pJgjPEBTbohOaJwxgEQTYNdwmFH5y/iAIzVhCu7vww821S6aaxaxoxTtq8lZrV+HyoSbYf5qiGcbVyI+QwGJ3NCOt5wvfQEheQuZyZ7VYUsL7J1yzDMirRJW+f2FzZkyI80nzxXkhqyxSd+Shd7Pv35V/asrSjt060oO72idlc8hv74nRbxwOF0qrIY4mWwfq181/HEVyHmo1RYyrpTak226ZyYuWJwckNU7rMAoJgnaYiyvPWdlDb3OTvvvBddtzz9C43vfvQ8N5DMhm8FD85Yeyh6OAmAy5QyuI/kcehCMgOvNdWVyX0oEs/jzvl+eew63MNuao6TM287haG+gYXd98nmg025ee58W8H2yJNZwM/PxhqEk1oarP7zeftEDNsgmmGy3DfKSS8NCedSta1e/RHlHf8B2wHlADCYjiuv+cb9nfYDYLghuhEGOdldDQt1WTAzZg2FTtcs9Ia2UlBOQxi1xi+QQY4O/TfbRgLsEANM/k7p6sembsn0hQyGjitxZdIm50XjmgPlokgNgp0utdXiP4wH6ieFjUAb7L5iPMDcEvkUeiH75n2G2aAzCIq7xe7FoUKKA+u5Y3AZ/pPG1rxL0ioHF5g4cgAqinnf3O9DS2cnQlmfTL7oZx6zPlwwLTkCOv3k9D1Ax0hhW04rOu1PHu4dAwujGYDO9YiD23tsmKxxZxwrdNLZCZajenJXJE4J0XqcT0j2ELWqgvifY7w6Ujr+BQZJG2kUe8rsABh3qqTrOS6e2DAz0OeSFspniKi9G1oVodKD1RUY1rcQWkiNFDAD2HJR+EHxRq6DevPuD14V1+UIF91gIwS8lkP3APR4MFZ5ieG4dNKOFO9wEnFKjfKv5zTFYhmEeJFCgctYRS1gUycgiY5igg8E/desOCP6VI24N13sRhhFNJPlOjDvc/npk/rPCYFhK4O7D8mtYe69U3TWvyOoSkKBF4FLEUasLKEvjL7nR+F+Ou38VUwtAt/1rglKskT3HBuKuzGfDm/ELxCPiTTH70eu5TTHqKyU4qvTtDKepV25Vmt8UuYdiU1rMqGiFDxRH+b6Ae5fHm60AJKv8FSj18GD6Ul4yrcN+UL3pjza4TBf+LZIR+SIWqE0Bor+QIYH+dKftse2AUtoxVEOvXmYR40JK+yJgTDVIcCCvN/00qt+zEewgGT4OSIkRgJEELd6OUDyqhxncMt/udmfFeB2fohIeTiXMwtDx8IHL+HLzLG/ziaBUFifYxiVLlzmTmBDgAxpAEDGHSo+MwENa8xWGuKN6FHLloJvgUq+s8P4d9vHvmNdhZo= X-OriginatorOrg: os.amperecomputing.com X-MS-Exchange-CrossTenant-Network-Message-Id: 758cd20d-8dfa-4597-4fed-08dd61b36b17 X-MS-Exchange-CrossTenant-AuthSource: CH0PR01MB6873.prod.exchangelabs.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Mar 2025 22:15:38.1763 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 3bc2b170-fd94-476d-b0ce-4229bdc904a7 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: e5HAngUA8I2ReWqvanJ1duk7aaTa2I4WkidHvYSG9eySDGTg+8by3rTM+a5EsIV+FwFK7lc7mJ030y+CCt3fiv0UnDqf4MRQSuyy3uARrKE= X-MS-Exchange-Transport-CrossTenantHeadersStamped: CO1PR01MB7353 X-Rspam-User: X-Rspamd-Queue-Id: 619CE10000B X-Rspamd-Server: rspam08 X-Stat-Signature: r7mme98dbbcx8hdirs5h1usgobaz1a4g X-HE-Tag: 1741817742-162399 X-HE-Meta: U2FsdGVkX18fCuRDHaemuWO81py47pfVXlbaF+sFdWHfchk5+s/AH6ZI9JZG1AFyRDQNV1sSRDmFUgTPA+EAh/iVbyc4UgUEyJMkP3Tvc2rpm+i9dE9xHOCBHMCyekaA5+eewimV/fHcRHJBt3IMTaT9KjrLonvdgjgbZabrDi1j44ojINW1pqps23hsCxFrmJk9Ss6KsxlyqmJ66TvbJFc0tGJJ4Umul6ZOBEVIeBpbp+dOvPmELO1Sz1b47s00/6/jkDsSd5txlQKY3n+6cx6ImTiV1/s3kA3YZospShhR7YsmKhYGAr1Ak5BFaWYSvrc4AG55I3BKWFapVCxlnhZAgQZ1xKtb/VfLzwEd3rC3CdfH17KMaYHOkkWCa2QnFqrPyO/4OrTaiLNKRyF0DRNX6nz9HspHGHR/Oz3YCsVtrtSqFiSudgSPkOqCXbKs8safBSNAvKZI9ISjHLNwa8AxVjILpD8jpPxiQGDQwJ4h7Xx+sQCyRSJXG7oadYO632JZldAF/8Lm1nLUzJ3G8f4jRFj7qzxUSq5WhvaM7ix0hVPAAVuYvCN3gEGnoZGr3R8tKySyKbSlGhn2CVuPMXJw+9zo4VpvqoLwZhuWAYoOI2NFO5uwrFIphbqs3vyix66nM7e28KNrGXjbjLSo4KbChFFdc3+iEbk+BJsfn95tK6GT9Ga3OIbMgOP9D0ELrny7/sjwpqna7xOrKnS7ZWUYAEg8OeQsFEVquO2U1LJPw/jKj0NzK1AyyprvqWhqDheNXybdZUemnfSni4FW6OQbz6qhkyWIzYKcnEoU3zJ3RTnD1r3m3C7TAmziwLsgfe912r2egc6zL6xctfKu1bpsa8GLX6F/qxkWSrgk88mAhYQPVIAU86q4IfPcSZKxuK9EIzQWPBSthwsrtvNAeQUJ/+sKfMNbQDt22BKzIP1Q7369Ph+WZMhSuQu61vYHBrlx7yFQhgPpT2qgwr9 hTSjX57U 7UCEhmzBB9uhahnKOvXz5qlIgVSHBOQoxeLztbrzcRbt8PuaMxrzF01InaPM6CseELvCZDAYMvmwPvoqH0Mywsb/R2umBawo5LCktoC5q94SxsiwIhl935F16T5R7GvqrUVAOOBeU+6JNPklDYUs/yXTLRwQSF3KuCnPFqQwHiPPno7TAPbfLOR9mnt937h8Gr+oqJ7wPE6jkYsrMgwawb+IzcYAiYwAQc5PyVdz1pktF/0IK1LLuK0ZRfgNSiEfBhZbvq+i3dy4Gkh1uwiACzQApvx6TXGVZgRb/GQn/kbXtA3VqLCVoXSkRibQGn7apZtqHAfs/hFTN4FVBjuis4gcrtNpeO+CARXOpSxtzUstQ1IufWq+Nynhqgmr5dHZS5Fk7n/Wzw6c22p3NMkJb8eF3gJo/EMZcgVSrXRy3TVHwMEjEz8+yJxWt2XtLZTfNvIqa7hSNsT4TV/vUyk0K6EPOYAvybpAQeA37GNhN7tfGkAxoEv8zkkUoceBKUrnCp17Xy1hTh4YQtdYi7JcMFbOZUhXqmK/APVwl5qRSaDXBKv8zOa/O2Qc+SxfqbGCk0Y+6 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: List-Subscribe: List-Unsubscribe: LKP reported 800% performance improvement for small-allocs benchmark from vm-scalability [1] with patch ("/dev/zero: make private mapping full anonymous mapping") [2], but the patch was nack'ed since it changes the output of smaps somewhat. The profiling shows one of the major sources of the performance improvement is the less contention to i_mmap_rwsem. The small-allocs benchmark creates a lot of 40K size memory maps by mmap'ing private /dev/zero then triggers page fault on the mappings. When creating private mapping for /dev/zero, the anonymous VMA is created, but it has valid vm_file. Kernel basically assumes anonymous VMAs should have NULL vm_file, for example, mmap inserts VMA to the file rmap tree if vm_file is not NULL. So the private /dev/zero mapping will be inserted to the file rmap tree, this resulted in the contention to i_mmap_rwsem. But it is actually anonymous VMA, so it is pointless to insert it to file rmap tree. Skip anonymous VMA for this case. Over 400% performance improvement was reported [3]. It is not on par with the 800% improvement from the original patch. It is because page fault handler needs to access some members of struct file if vm_file is not NULL, for example, f_mode and f_mapping. They are in the same cacheline with file refcount. When mmap'ing a file the file refcount is inc'ed and dec'ed, this caused bad cache false sharing problem. The further debug showed checking whether the VMA is anonymous or not can alleviate the problem. But I'm not sure whether it is the best way to handle it, maybe we should consider shuffle the layout of struct file. However it sounds rare that real life applications would create that many maps with mmap'ing private /dev/zero and share the same struct file, so the cache false sharing problem may be not that bad. But i_mmap_rwsem contention problem seems more real since all /dev/zero private mappings even from different applications share the same struct address_space so the same i_mmap_rwsem. Inserting anonymous VMA into file rmap tree is also a broken behavior. It is worth fixing from this perspective too. [1] https://lore.kernel.org/linux-mm/202501281038.617c6b60-lkp@intel.com/ [2] https://lore.kernel.org/linux-mm/20250113223033.4054534-1-yang@os.amperecomputing.com/ [3] https://lore.kernel.org/linux-mm/Z6RshwXCWhAGoMOK@xsang-OptiPlex-9020/#t Reported-by: kernel test robot Reviewed-by: Lorenzo Stoakes Signed-off-by: Yang Shi --- v2: * Added the comments in code suggested by Lorenzo * Collected R-b from Lorenze mm/vma.c | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/mm/vma.c b/mm/vma.c index c7abef5177cc..2fe99d181cfd 100644 --- a/mm/vma.c +++ b/mm/vma.c @@ -1648,6 +1648,10 @@ static void unlink_file_vma_batch_process(struct unlink_vma_file_batch *vb) void unlink_file_vma_batch_add(struct unlink_vma_file_batch *vb, struct vm_area_struct *vma) { + /* Rare, but e.g. /dev/zero sets vma->vm_file on an anon VMA */ + if (vma_is_anonymous(vma)) + return; + if (vma->vm_file == NULL) return; @@ -1671,8 +1675,13 @@ void unlink_file_vma_batch_final(struct unlink_vma_file_batch *vb) */ void unlink_file_vma(struct vm_area_struct *vma) { - struct file *file = vma->vm_file; + struct file *file; + + /* Rare, but e.g. /dev/zero sets vma->vm_file on an anon VMA */ + if (vma_is_anonymous(vma)) + return; + file = vma->vm_file; if (file) { struct address_space *mapping = file->f_mapping; @@ -1684,9 +1693,14 @@ void unlink_file_vma(struct vm_area_struct *vma) void vma_link_file(struct vm_area_struct *vma) { - struct file *file = vma->vm_file; + struct file *file; struct address_space *mapping; + /* Rare, but e.g. /dev/zero sets vma->vm_file on an anon VMA */ + if (vma_is_anonymous(vma)) + return; + + file = vma->vm_file; if (file) { mapping = file->f_mapping; i_mmap_lock_write(mapping);