From patchwork Fri Oct 18 01:17:11 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Hubbard X-Patchwork-Id: 13840950 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 97EADD3C53E for ; Fri, 18 Oct 2024 01:17:36 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 348F16B0085; Thu, 17 Oct 2024 21:17:36 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 2D2426B0088; Thu, 17 Oct 2024 21:17:36 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 124C96B0089; Thu, 17 Oct 2024 21:17:36 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id E89706B0085 for ; Thu, 17 Oct 2024 21:17:35 -0400 (EDT) Received: from smtpin15.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id 75D0C14043D for ; Fri, 18 Oct 2024 01:17:23 +0000 (UTC) X-FDA: 82684960218.15.9904030 Received: from NAM12-DM6-obe.outbound.protection.outlook.com (mail-dm6nam12on2057.outbound.protection.outlook.com [40.107.243.57]) by imf03.hostedemail.com (Postfix) with ESMTP id 8337520008 for ; Fri, 18 Oct 2024 01:17:27 +0000 (UTC) Authentication-Results: imf03.hostedemail.com; dkim=pass header.d=Nvidia.com header.s=selector2 header.b=Q1rSnmyV; dmarc=pass (policy=reject) header.from=nvidia.com; arc=pass ("microsoft.com:s=arcselector10001:i=1"); spf=pass (imf03.hostedemail.com: domain of jhubbard@nvidia.com designates 40.107.243.57 as permitted sender) smtp.mailfrom=jhubbard@nvidia.com ARC-Seal: i=2; s=arc-20220608; d=hostedemail.com; t=1729214145; a=rsa-sha256; cv=pass; b=ZoNnd02271D/ZvlQmn9M57dohUY/s9gFPACIIoydMcgk5rqN9Uk1+fVFKAwvCIZduF61pS 5rLldBxjLgLbI5Cv1VkL2T+ZV1+2gRX/h/252OwO51YrmBeFMGCMW3WCWStSf7SFa8MWrO p+Pb6AsCUQHF2mSW45v9Zg4uz0SSHyE= ARC-Authentication-Results: i=2; imf03.hostedemail.com; dkim=pass header.d=Nvidia.com header.s=selector2 header.b=Q1rSnmyV; dmarc=pass (policy=reject) header.from=nvidia.com; arc=pass ("microsoft.com:s=arcselector10001:i=1"); spf=pass (imf03.hostedemail.com: domain of jhubbard@nvidia.com designates 40.107.243.57 as permitted sender) smtp.mailfrom=jhubbard@nvidia.com ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1729214145; 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:in-reply-to:references:references:dkim-signature; bh=Md1MjpdHuilWPTTJzdr6SW7W/BrD9InA2SMVrB7H2Hw=; b=MO7otKdymsHr7N8FhNcUChiyFUZEoN2wX5oTL4Ad3LoiQ03U7Bd4Y/DMU9zu9iluQEKq6g z8zrbqf44nP1btkc72etSGR895DtELNObuyP7EZgAJSRYfEuqUG6vEGzoW474R2F+LjKQM KabKnWsmT+Wnyj+EPxYzwTigGV+GfWE= ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=drWu645H172MaJUNq/CikRaRJF/MCvBF8S/MwV2AUoK2vgaW3PywTInEO0BjgncHWFt/h2ZDYwwjJNHlDQbw5WUiVV3nShznGcN/Jmv1EB1dx9WW3vq81s2dNFD5ORfuyIiQwYFzfNB9TgTMSuSDiSdAb3+hE4CeJ44oJgkaYt72EjXBOYGl/5oORKT9BOiEUdZOPDHFUhZnwDv2/w2NzKw4aM+lr5kif3ZCJPCKJ/3UfaMdyR1J6N0IVISE4vz1wyvf69uIFuJDorGModjTdfN4NFLVmSVzP56RB+K+63kwvcXsYvqJrIyQIDXUybCfAwUHhmkB+zrMfjhjTDMMnQ== 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=Md1MjpdHuilWPTTJzdr6SW7W/BrD9InA2SMVrB7H2Hw=; b=nyuj3jsPRWTH1iBsserpUGOn/Hfam2FDTMu8KxWEKAwLudN8RZ3TvLzavmbNAcau888C5oqciJW+twxiioh/lALf+IUpHexmjR+JTRcU/iterACrSuBQVS5z/VLzcf2oFOz2P98ZuFyOl58qcbJWsEnX/PMLScTkPx9WHgsG1h/dtgZR316VYEXNf14fnRljg7MMDf3zglq3clVQ6WZ0givjCcCGGn2ZMcSjAw8nsZ9yvk7WnKy+Rw+y7cF3OWd001BVXc6VCl398ZbybVRpYya0X4ETfSaLAFM7z0YzR0hOoCOKjTICieUZofE3QtF/MltP5KCUauhiHsB5OZB0Bw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=nvidia.com; dmarc=pass action=none header.from=nvidia.com; dkim=pass header.d=nvidia.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=Md1MjpdHuilWPTTJzdr6SW7W/BrD9InA2SMVrB7H2Hw=; b=Q1rSnmyVPk4jIRnjeeBzwxpAadgT3gBg4nNn8veCg6CiBl1bANhExvbHQQu+CaLXMwaGhBTf12OORM6Fzfexpy2WqnvcC5+UrIlC9wCRZPT+aa8sEEkhK2zDA2XhNDOs0RYowgg1GkaOuZBa+Q2G+LCR7K9APKW4v5aX3OXHpa2TGgYwPBORkHMdpytStSNpbuMa06egs8aOiSmkgoIKEm7iuUocDmUpJuIZLsyP2LFM3juiBZBdpVjYUBCSk2TC6RwTNaJ3XNU4caVYdyYMJSn4DjzyrSd3eHY5lgAkge11TEcUBZ5mbpMnAj6q/uC5uWiJTepeZWWeZ3UafeGDUQ== Received: from SJ0PR12MB5469.namprd12.prod.outlook.com (2603:10b6:a03:37f::16) by DM4PR12MB5913.namprd12.prod.outlook.com (2603:10b6:8:66::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8069.19; Fri, 18 Oct 2024 01:17:14 +0000 Received: from SJ0PR12MB5469.namprd12.prod.outlook.com ([fe80::ff21:d180:55f2:d0c0]) by SJ0PR12MB5469.namprd12.prod.outlook.com ([fe80::ff21:d180:55f2:d0c0%6]) with mapi id 15.20.8069.019; Fri, 18 Oct 2024 01:17:14 +0000 From: John Hubbard To: Andrew Morton Cc: LKML , linux-mm@kvack.org, John Hubbard , David Hildenbrand , Alistair Popple , Vivek Kasireddy , Jason Gunthorpe , Christoph Hellwig , Dave Airlie , Gerd Hoffmann , "Matthew Wilcox (Oracle)" , Daniel Vetter , Hugh Dickins , Peter Xu , Dongwon Kim , Junxiao Chang , Arnd Bergmann , Christoph Hellwig , Mike Kravetz , Oscar Salvador Subject: [PATCH v2 2/2] mm/gup: memfd: stop leaking pinned pages in low memory conditions Date: Thu, 17 Oct 2024 18:17:11 -0700 Message-ID: <20241018011711.183642-3-jhubbard@nvidia.com> X-Mailer: git-send-email 2.47.0 In-Reply-To: <20241018011711.183642-1-jhubbard@nvidia.com> References: <20241018011711.183642-1-jhubbard@nvidia.com> X-NVConfidentiality: public X-ClientProxiedBy: SJ0PR13CA0044.namprd13.prod.outlook.com (2603:10b6:a03:2c2::19) To SJ0PR12MB5469.namprd12.prod.outlook.com (2603:10b6:a03:37f::16) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ0PR12MB5469:EE_|DM4PR12MB5913:EE_ X-MS-Office365-Filtering-Correlation-Id: 9b67244d-bbee-471b-ac17-08dcef129963 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|376014|7416014|366016; X-Microsoft-Antispam-Message-Info: u+xgi/RPVQrRtaIYaIrdsoyHkUKIF8OlSoZ703MVWIIyhQ7Po0mORhreDwOLxNwpyIKdbsg2PmmEN+Rx+odB9Fj0b5pt/xrpW/jcOvKvoaPHEbbC4oB73XoBtPt9QcRFiH2H6A0ElxXlKsIfVbKL9UiGRSJtZUNUMZeDZ9CbWQhTFRQvxsT8Ii4XLChs38vVdvscJpVU2IYtTEmQ2w1XJ2PbND/fdqKMG7UaGLxIbfWyvBqwiSYle4VnmvI6FrTfv9dDyEPJrurBLprrgl8Vj7HbJZuZrjC4v+CyWlDgu6Xfoaad4t/qfzUtwSL/j9f/r52is/staT1vDAaTLNVeO8zUIdWV8n22L2fhowrIwOJ0I+q7UTR7vjuWKejYdSmCyILuzaOZi+WqzKXZQWGuJOptRxZ8+DP4YZuDJkeEDYq95ceIFAz5i9mSUHV4aDf+5jimJ6zIjh8Du4u5WVNOdFfAEQqj7nr0MJiJnCqLd5Ond7ESGRk+k4CKgOVO74Wa+GuJ3HlgtF6VlTPneyXlyuG/5/71ORaHUXxiiQW1V5EkZ2+QEeAUFVUK1EgsEgZ9lsEs9qljHIhtWm6VTBBeUOUIzNYBpp1sNq85j4dGg222rFNe1HP8jP2DWbBY+EtlS9wltr9I3Zc2h2JvBYUHc85X6R82Wu7YxxxmptxIJtUUdDgF0In0zyW+LfaNGOpBXQhRY0jVyrAHy3L1Mdyg+uyFYkUm2NRqP27oCsXlzahCM/hWGmDKOK8+2X2xbO/3Hh1AFoLPWYIqFAp0cYVaD/MZMXpdQbOAQI/cQy7lM0uAfsyen5u4GbSMlFqaQ2XUUzthhFKIxgdex8akmL9ocW0wpgBxgy191NRdUClQMy2KSThPIcVjJKQ2LEfSPwneO0gYDHAIm2Wm70WG3n/E8pO4gEFttJMeb25M5QQfTQKNJKTmYZKjOCleo3B9xwwDhqTxWfztFjjJhKk+jHd3x1R8NFzTmRTWWPe+abvyLEH9/s8fqHuoqovtI8gW+lp9nn7/9Lf/pPBujOfN0lGlrZ1zLu4diDbYBgS+d2cVjKWsktNAGoasdOK1xbbfM4yyKHJ7NG6n5IVNmRMsoNtLW+poYJifHLkblxSSuo0v2tNADAlssZhhr195PvDQf2I6CIVb9wo5AOmWi0CRLLfrjLnbFUEAWUrLfBggbJ/bYUgnyeKNX1Lvg1d3tgSReHkPqvIgGqFUEW1d24lxDgBV1YQhZETlidvtZ4ZcOUGjWw0z6wAehLJe/FmPcODOHtk/xMScpFYPNiXkBUJBr0K8hRViQXJH9CYz6hl0t5ECdZpLDKtxwIUnbm+CdEgu686l X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:SJ0PR12MB5469.namprd12.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(1800799024)(376014)(7416014)(366016);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: QBqpOBTS+8Iw2ubqb9DxjwjU8/g0iXBwNaHwAc8J5i3uY+HQvZyNrbiTCFg6NFVLDfqnBQ81bNy7s5qyKIptGfzp90B//DxXlLTHlnOYvcsPMhWyp4ZscF6LLuy7AykWeL81Kcwn7bpupHwULvl3C/hQYxsApA/pz2Vm2myeqtiXKch1XjNSlVUXnZkjNwcemhEEyi5je0w+y2sqRXDUB12/e0zlL96lFgGgZPrfVLztaGIlEp7R99Un+cNwLmxuR2vJqBsq/N37LUfCkCFob33yo3i0hcnzXqkDDjRrMzEceGkwqlemujbaLu3L/pqans8JkP2g7YWdfp+nGHjtT+W6MJ3pSYvvaoAGRMKWArxSvwXFm2Wulbt5FyVlO8nrLKhwPvhONNjNoHcRvaegLyVjOPHov8LeVqJlUCHY9ZRc5BbOR4vXezt3kkh5GipvoClNw0uKHpLYqG9CddjYI2iibc0Bl103FyaC5fFLaKdawlPmPC4VqwBLd4HNzFv13NDOltLeGTn9Y1Fp0wm2OLvi0M1NnGkqHfUqFxLwTI1Jj3QFdS/W7dsxe/Oxf7FfprUS0ASgvuV1TcmP6cFOceBUq4t/JLqIjXAWIOrpRmu0TFTfW2DTisc41etqAxXh8Weumawla1TFbYpP0WeoPP3dj3sRPQps4YVYPgaZeGteiwc+Md+8U2d7CAOqI6J0oIWkVgifFuIusJQAY6INIgLxn7+D2ZpqvL3wEMb1PNE0RyfIDxVd/UYXHrRh5n9LUBBT7bzdNDPEgkl8/8sU/RpeylpfuiO+BrhGHgNVYbZFNK2lZ5qfjNyInCoQaPqbaBjWIZuM4AYOPdpT+g2o6pPFbR7avXCWfJP/4qbtmoOKkdHovpddji0f51I7QP0s3xWtwIOYx4onfRW6NRRObycaFjGb+OHaMONTdCAUMvhNgxE/9MXBQ05KuIDyTQdga7InEvNGPFJyffU65/vdjKyHSV1KoKZlBW4EDFK8O5huvr57FzAweGJrZXZ8hr8IXOGNITYrF3VKndmMdhUlKDoLISAQk60tVq3ev9Jz0eJPwNpUDAfOfx3Wt8NHPrcqnu8FuRycnLGOy5NbJPC38d0/KSnkBl1pbhQFLgWPRv5zAcTISKsre6GSF0LcCXsNBRG052vKfZ1HAV1PcDA2gkKh1c3qQYP0rnEC2sru/xdissq5S9/5DzftOoapfcLYybvjQjTmq/5JoWVFunerqQzNPl4OkkLC6SVXFAyUyAcpVXWAOUN917A7YNRgcZp3LpfjQZZ8OKZLRtj0D1VruoqJj9PJcbbOD0p2lqUuxVjmrBfxISQNFXRIWDX7fKYYKgjuo/9qYP8tEmg0RBWBT8CE41cOM15wrwGv36/sfCuu3t6KmQKLatdkm3Qa7yYlJAo3IKsPvXPMAiMmpHtMH7N6M2I3PS03WKbmOpatLbYxuA0KJkTV+1TDNMGFbVqbbuRIVv8K8fm8j9SsIXA+ZokbzNMOg/uL1fHwEMRaqqNQkaop7SgRQjZsHyFyh+vDOKIbCbIF8mJOzIuApROe6Kijf3E5yrxMd5nvISyhYkiRBXPC3xaKIqoScMQpVJOw X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-Network-Message-Id: 9b67244d-bbee-471b-ac17-08dcef129963 X-MS-Exchange-CrossTenant-AuthSource: SJ0PR12MB5469.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Oct 2024 01:17:14.2502 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: 5yqFJFAWNIz6A5S5htlIkGZ5NSI3BAed7Utd+y1nVtlniNqXCMAlHpVp9SKA2qgCzgtAtj7aON94A8M1f9t+hA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM4PR12MB5913 X-Rspamd-Queue-Id: 8337520008 X-Rspam-User: X-Rspamd-Server: rspam05 X-Stat-Signature: 3fte88epdoseogt9rskywdqd4r9tktj4 X-HE-Tag: 1729214247-246738 X-HE-Meta: U2FsdGVkX19BC2wb7lucfthYRudmzfY6An9inPa2XJKoZVd8wnbssImEcJirUgvLtIBVbK1FhL979MXFe6MsneRUqanXf9N8HR3yNxYMzbr5/yVsRcnN4TiBWx7gQWULKJAuOivqVmXx1X0pA1LWDnVuCMX1LfvtdNl7qjHvbAM7w1rfyNDc24ctXykUoyd3dQEY2qdu4zrj56lZVUQmnH/eQuEVg+dhh5NhMOwVeSVtJvPnFy3dgzkadKavdL/L2GIFFqgHwkyzike5h8H8bmV+XN+925+qYgBvmVbG2Jmlm+IfVLP3XCOFYywQsuBtd1UdFQnu+V9ruDJis/uHcCh3udfEPR3oLyOxBO+8G4yJqx4TleC+jrdRmO4e8DUnXoEiGtEgykFm6UbYDtv2h4U3D5hQtI9SOlL1l2K1EoZnEbisoaPUGhJQFH2bOwGjbIg829GDEnxhBUyFuAWDInUiaOsIxA3/hzYRcEtmU7fAkAg3PDSN5UPEAeruupdmkf3RIBdnzJHepJQ+UgIJDlj9Yj3KVnezOrrYijjcxCgRtezx/2ro0pjyqqCt2o1/ym4feoE7XNdpDVEi87A+Kyl6yKLYIyr557ZMqy7lHnZTMQm+YWDXlOXuAwi0vfAqwLJuhLSO4+cAWFzlmsHgW4+wd0S38Sxg8bDCt70PCe0GJ+088NdYLTBvQTatjBZGooIVW/gWMGrVFWB/aCayzfeIHe9rblhx5eEybg/nsh8scQM3bs3nf8L3zgdMo6u5oPwiLZ1JnYFBpbbolEzJydHeHL9OPkRcgZkzkhPnCow/W+vzDSeq/1TDky6HNQWiB5eowPbrB8UGZD8gTOn+IaLHVNXfKkdXaXE1fYLCZ2l4RkGcjPXULJZrXDeO1q8vr3sofn2PPcO6TlDe6cBRPEHHXJ0H5sqS1jI0+7WrUWZyhAFJv39pY1f7jWK7LSjMcPu8GXdPgZUv4R5IHK7 IcNrh7R7 FNcd5c4jgZPyQwiluktxp7RzMw0daZrjYLQ0NFPfO3SMUYR9Mr2i3iD+4cU4SkTZ+36pJVVQBbP1ndRlF5YaKm3l2Of901gCqdGCx1Ph4QQaimyoLygvhbobHZlO6KjsMWvzgz7g2z422+x6Q4YJzqxjdnh5klzdnZKceUFb27G+sYPeTHr9faQ6XjIBLXa03GUnat/h5ysPreuwUFhh0avFpaGg2F/wfQRz/dFt4HJQqSd+bD3bqVPikdc2nQ4+cKEmSwv+7P0qcUrudjJql/0ZR3udLLRWJec0UfbS6ZMVwY9uX5Fs7B7ifnEC0AXnEk8BvDjBCDA3Kr+p9FJwoQdL6yk3AlndgJivpnPTyHmV6GMvNwFlGtMdaTxR/ilBm/ZkTEsP/8PTOdiRKVfGUAGkBko7i/BOguhhrt6091whiSQ94ccPx8EOGXJ83QEDOjLjg 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: If check_and_migrate_movable_pages() fails, typically with -ENOMEM, then memfd_pin_folios() will leave pages pinned. Those are leaked forever, and are visible to user space as a memory leak. Fix this by unpinning the folios that try_grab_folio(FOLL_PIN) has pinned, in such error cases. Fixes: 89c1905d9c14 ("mm/gup: introduce memfd_pin_folios() for pinning memfd folios") Suggested-by: David Hildenbrand Cc: Alistair Popple Cc: Vivek Kasireddy Cc: Jason Gunthorpe Cc: Christoph Hellwig Cc: Dave Airlie Cc: Gerd Hoffmann Cc: Matthew Wilcox (Oracle) Cc: Daniel Vetter Cc: Hugh Dickins Cc: Peter Xu Cc: Dongwon Kim Cc: Junxiao Chang Cc: Arnd Bergmann Cc: Christoph Hellwig Cc: Mike Kravetz Cc: Oscar Salvador Signed-off-by: John Hubbard --- mm/gup.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/mm/gup.c b/mm/gup.c index 233c284e8e66..dc4906243b97 100644 --- a/mm/gup.c +++ b/mm/gup.c @@ -3719,12 +3719,10 @@ long memfd_pin_folios(struct file *memfd, loff_t start, loff_t end, ret = check_and_migrate_movable_folios(nr_folios, folios); } while (ret == -EAGAIN); - memalloc_pin_restore(flags); - return ret ? ret : nr_folios; err: memalloc_pin_restore(flags); - unpin_folios(folios, nr_folios); - - return ret; + if (ret) + unpin_folios(folios, nr_folios); + return ret ? ret : nr_folios; } EXPORT_SYMBOL_GPL(memfd_pin_folios);