From patchwork Thu Dec 16 08:38:37 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dan Carpenter X-Patchwork-Id: 12680163 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 4D824C433EF for ; Thu, 16 Dec 2021 08:39:36 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id AD7CC6B0071; Thu, 16 Dec 2021 03:39:25 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id A875B6B0073; Thu, 16 Dec 2021 03:39:25 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 927E96B0074; Thu, 16 Dec 2021 03:39:25 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (relay033.a.hostedemail.com [64.99.140.33]) by kanga.kvack.org (Postfix) with ESMTP id 8317E6B0071 for ; Thu, 16 Dec 2021 03:39:25 -0500 (EST) Received: from smtpin05.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id 47ADBB07 for ; Thu, 16 Dec 2021 08:39:15 +0000 (UTC) X-FDA: 78923007870.05.52BC60A Received: from mx0a-00069f02.pphosted.com (mx0a-00069f02.pphosted.com [205.220.165.32]) by imf23.hostedemail.com (Postfix) with ESMTP id 41D04140002 for ; Thu, 16 Dec 2021 08:39:10 +0000 (UTC) Received: from pps.filterd (m0246617.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.16.1.2/8.16.1.2) with SMTP id 1BG7hsRf006670; Thu, 16 Dec 2021 08:38:58 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=date : from : to : cc : subject : message-id : content-type : mime-version; s=corp-2021-07-09; bh=5MiTAGcoCSsdCa4ZmXMAT7j7giG7FqXWiUiG1zDFtCY=; b=FLBG7r5bcikLPuhMjieRIORQ0nBHi+2CHe75G16S1egPRvjtjg97+cmFu1ZWCNQYWUvx DdO2BU/K5GKfodpmedvgMsuY6ZEOZabZIzjzKnZkkFQ5eVAZ3e6218o6oF/BfrOOoSyi NyLwBTuYuVV9gqslWbvONdKfMBdZjhq+XAsOUJ+3cyGTQm3SmuNjCDVIDi1TlSFV9X7J 3pDNARfqraPcVD1QVcldh3CWUuSGvIH441MVIiD5wCberLB+GyV57d34StMwdqpoENZK 2mygmCFWCO3c0D4J/S2tqNLX9UpYYYQtKZQbG0EvytGCteDmxwx6H2Yjl6Vb+kRdNBeV Ag== Received: from aserp3030.oracle.com (aserp3030.oracle.com [141.146.126.71]) by mx0b-00069f02.pphosted.com with ESMTP id 3cykm5a5f1-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 16 Dec 2021 08:38:58 +0000 Received: from pps.filterd (aserp3030.oracle.com [127.0.0.1]) by aserp3030.oracle.com (8.16.1.2/8.16.1.2) with SMTP id 1BG8aAa4160279; Thu, 16 Dec 2021 08:38:57 GMT Received: from nam12-mw2-obe.outbound.protection.outlook.com (mail-mw2nam12lp2044.outbound.protection.outlook.com [104.47.66.44]) by aserp3030.oracle.com with ESMTP id 3cyju9k2np-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 16 Dec 2021 08:38:56 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=SD7PA3iwh+L318l9O6revq+21VLi4QhXyy2k7H9Lol4y1caKgD6/CJFEbMvfWebxTmulylyjOQ8uGJGYAbMDUvw4iTofuNSeIYfuiDrhoIp06Yfgluy1vWHFEVUiLdkR+wxeFy40A+YYRiJHdcI2Qz8+Yvr1vb9Kjd/AGr+88MKTuzGKqbcZWV+jV7MFeMNqvSSPs5WDaY7xp5cHwqGcv4tu2CZZkxwrnCjeuxH/LNvWgHjW6ZxJnRNjygbL7t53da+jxCvgu4GH8H5XthOn3mjwgUvWLbCEeJgdP9I49FRJgnDj1FXlLqpIWRoGuQLM0yzrKNLDKzdDch+pvcgF5w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; 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=5MiTAGcoCSsdCa4ZmXMAT7j7giG7FqXWiUiG1zDFtCY=; b=PH6l6brKQt7Z43kLIYBF68Nzf45kbNtR5o6150yqGA8rhM+l7yB8zVkN84HiDEnwo4HVHv/W/2fmUDCEYIi9m0h6ZiVKGiCz4rdwKU/CMfCtwr6awYtyPnAKtI94Q4J8tkqDd9Py98jmYVYEjdBIwxngMQ5LudgmkWwfmiJFmnrcg0Uy/EDTGAu2vgENDC6u1uephEt1XFxaDTmG/hlOPQpuxsTchc+b8MdDYcNwHnlL+BZ7eLQ5aJcFpCIazg2NfV3WYSCrvOo/k7ymw1PWPPCkPkQ8bcXQ1kraU+GYHzfG4f3HiI8kcieyhdcHnCKjU5nMx1EpH3VopaO0xITkWw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oracle.com; dmarc=pass action=none header.from=oracle.com; dkim=pass header.d=oracle.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.onmicrosoft.com; s=selector2-oracle-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=5MiTAGcoCSsdCa4ZmXMAT7j7giG7FqXWiUiG1zDFtCY=; b=nvR+gni8QR8FgrTlrFH3mnNeToCnX7ueWIcdZ89cJG8iMteXBSUb4tNnAdE/1JRe3NR9B5Maj2BRjTcuLeBDZKHBKcYv4uaKhpMd/RCh7JZ75b8wJjmh7VOCnePKwvhWA/6AV01qmqYxJxuXMd/+8kMpZuTx2jstGYQFdvWqitM= Received: from MWHPR1001MB2365.namprd10.prod.outlook.com (2603:10b6:301:2d::28) by CO6PR10MB5650.namprd10.prod.outlook.com (2603:10b6:303:14f::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4801.14; Thu, 16 Dec 2021 08:38:54 +0000 Received: from MWHPR1001MB2365.namprd10.prod.outlook.com ([fe80::7194:c377:36cc:d9f0]) by MWHPR1001MB2365.namprd10.prod.outlook.com ([fe80::7194:c377:36cc:d9f0%6]) with mapi id 15.20.4801.014; Thu, 16 Dec 2021 08:38:54 +0000 Date: Thu, 16 Dec 2021 11:38:37 +0300 From: Dan Carpenter To: Mark Brown Cc: linux-mm@kvack.org, Matthew Wilcox Subject: [PATCH] mm/migrate: fix pmd_migration_entry_wait() (merge issue in linux-next) Message-ID: <20211216083837.GA9094@kili> Content-Disposition: inline X-Mailer: git-send-email haha only kidding User-Agent: Mutt/1.10.1 (2018-07-13) X-ClientProxiedBy: ZR0P278CA0113.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:20::10) To MWHPR1001MB2365.namprd10.prod.outlook.com (2603:10b6:301:2d::28) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 84f066ed-e8c8-4189-9ad9-08d9c06f7e3d X-MS-TrafficTypeDiagnostic: CO6PR10MB5650:EE_ X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:5516; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: /n/7vmQjMpHqGGeJ7PfT/suNoZ9521D4Z5KY/9wcAtuJVfVX2CjfWQXFBytsTTB7m2APBrlKrhNXQbAyr3EPvQJFiM+K0RB2r2mg7vBITd8Cj2x04gayPSJCLLTJes+HwOmrIIGB4BkvB/bkG7RaMz3UpmjlkM33PtcNddelWdz86uazBKluhII3fjhO2vQLlmP/224lt+fhayxBG47hquVmhkSx6u7lZehSg6KMNbmdD+9+1SJoh+gbiVuC4UUm4cgZXFzRwnDzCOiVJCbfqPXWsO91i9OnLFA3cOEs0RW4doUngtX5/ovq9XnqIB2LOi+Sct2qCibuBQzU8Z8+zdIzC/a0oKZnknX3IIaeDL9xenCcpStH5W6kDqTEAYCFic9ul6Zz4mjGZPWN4Nt9bJIDyXLOMSVcmCPNHoKeCu2II148AWhPC6qFrbVDRI5c2amzxGUo7Y+uHvB4kLUQX3EHICg93QQv0QrYUWkkhYdhY2RD+yPH5/gOm/YcT0S7ULpiLZWsq02i0bBSAtCoSQ0uxQrImEb/dcrtq5Vs2o2cfLCBX6MqUSK4KWxttSVDuwzTjcVRqNVwiuGMoNEiQiZzlAEWZkdYhwKwIXiMjK1cvirt7w+SyRPJOz/CS7KeatJ8eLoK2Nk7+JEbk9M9aDBlwuek4VYZvtt4FkI9jt1LOm1WYDdjpdv9ElN77Cml+i+Ally9wCz/gnCYKLPiqA== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:MWHPR1001MB2365.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(7916004)(366004)(66556008)(86362001)(6512007)(33716001)(9686003)(186003)(6916009)(83380400001)(52116002)(66946007)(66476007)(508600001)(316002)(8936002)(26005)(4744005)(5660300002)(33656002)(1076003)(44832011)(6666004)(4326008)(6486002)(38100700002)(6506007)(8676002)(38350700002)(2906002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 3mVn6+m8H7/6G3GQN+W/pHBaKPRDEFHt3jvy+b8DUDyt7Yu06LJndMfvYVPb7rhjAY+HrGYbOAuEKkLcEcH817iKcLTaC4sd5QcbWfeWx75c0t5ldjUgXdw626jN+Ohp2lL8lY79f0UH2MnqjeDhkuixqSfsyeXUg7hUWxydqUzPGGcZ3OkvdLpDNunp6XjmiXjQl8VSRENfo19KvhaDyZqj8p0UcwRJh9XL7SD3Z4tpSh3I7Ass9d1jysRmLm7VKzhOsl7XxvQ7gH9wdSLcmoy3bcZQBswqtAnlM0aSrhCJczVLfjx2AUhHKPbpzMfiDnXUjH2xGQoD7Iu9y6KwBP6+FAALTE4wge7brBGhz1DRKIq180etyxSRW9feUsD6l7pP/Sd925p7pilCwJOxBR9Wg+T4GP1cEZw/FODgvz5AiL+E7zrh+IKcrIfvnO5IsTL+MKVlRpW9dRoNz51HUyQQA9l4j0QBhi0VcIe36ZTgxpa8oGugiWLq9oaUzc3ouQ1AbTzdr0O96T52+QsZYlK6qlUk+wfmbYTQ9AfKDESWAgdydKusqVc3vkzaCJZFLFKql+2xodjTCDdRl8RRRwTUaYT5JLrTqVAdfOR37M9pjhQEtMNmrW2P1Fxx956wXYKp9I9wC3/iFgfg2QcRNSL+iNoL4n/ryoNgo2AAks3yuuJK2m8utlRDSLoW4kPowwLSgURkUvwPdWucVlHmG1Q62hj8M+uJ6u2gf7HEVG8Mwx8QQa8tlKgr/7AGJja+puNoU9nW/k7h9j7+RnYbMHGr+jIBpM7RvvOJ6tGl8CenKVJpLzk7gOWox5L+kAazkQSRc94qk0JrZM5Hr2m65FsAd3pcKwVsY3GpxGf3QLlKEvYy5khfW7Psuj7eUlQH+246H3gt8Gvxfyt5m2jrZeoplQSXkPkWCQ0Lebs2dW/+Gcnbd3evvzVuNwpdHO7BFmWpYtABDLvzVBfHUBEdC3Z7A2tuhXVIiwrWaDnczD4hAx1j1UUe2J+FGRW2ahz1houaB0LhudHR+fMA/4eaadp3n/5YmQbQ+gRvNQp6MrCArbf7MKLXYCheVJXOyMDTQ869AXlXvN10PeTjV64yrsXeOUV8Vhv01ldS+oZqcyXWDW01DJwFqHwAeHsHTMY9iA+Z7BgeLjm/V+F9Z27u9kBay55EkqygHXgpXNPY19W8yKl6N4jdvk7SrL9g2yV6Y/Zalj9S0+m4yaokUTcCIKgtN0ziI+sVQGmYxLY8vwle/uhyODx08d3qQLwcyWY4JgRvfFCzl/OJC6d56PMJvnLb9j6rXfc/tpgN1d/YTUb64dC2w4qLBLPgoPbXzx/hyqpXZNcQBF9Afmvpi+n08sP05j3xyntVy67NPwrzWpOJ2w7Z2Nm9Iy1X0Ea4N1IbAcNoxRnDiEBFVCilbAhNjXScqOevcAx4nF1n3+vs4NHSEOwhM4RILJYTIZa2cK7HgfEoTBzGgPgxXOCk3JclGC9hudUJlc2FTK/9bubnpAG90JD2JJ4k5j8mjFS3xMn20YiN+43s7DPW6rH3oPyMHMD3LM3S3OOE80fiiBE1cKsjKsrFSiAXHTF7NDJSQXjnu5fhncI8ebtjMbid4p8iL1wml//sYlUW//3V3i13JscOVWfwPxeCBQL+hUQhMcz5xDK4MyGwU/5/Kz0vc5A3ZJK4XZ6b1HsvLEIJKN6vkXs= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 84f066ed-e8c8-4189-9ad9-08d9c06f7e3d X-MS-Exchange-CrossTenant-AuthSource: MWHPR1001MB2365.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 Dec 2021 08:38:54.2634 (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: Cu20GErfCLmsQUSofgWd8pLI8i8teN55gTv4i6XbJA0N2GMls0lE2CpdrYNKpBk07WXA7WEZNSVrNko/zDVGCoGKdRWGbnkr+YKa0ixYRHU= X-MS-Exchange-Transport-CrossTenantHeadersStamped: CO6PR10MB5650 X-Proofpoint-Virus-Version: vendor=nai engine=6300 definitions=10199 signatures=668683 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxlogscore=999 phishscore=0 spamscore=0 mlxscore=0 adultscore=0 bulkscore=0 suspectscore=0 malwarescore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2110150000 definitions=main-2112160048 X-Proofpoint-GUID: XnJvgqop-SI4cJfI3gOxncQEj4wHnAy- X-Proofpoint-ORIG-GUID: XnJvgqop-SI4cJfI3gOxncQEj4wHnAy- X-Rspamd-Queue-Id: 41D04140002 X-Stat-Signature: h6364isjr784mw11qd6etewu6unnijao Authentication-Results: imf23.hostedemail.com; dkim=pass header.d=oracle.com header.s=corp-2021-07-09 header.b=FLBG7r5b; dkim=pass header.d=oracle.onmicrosoft.com header.s=selector2-oracle-onmicrosoft-com header.b=nvR+gni8; spf=none (imf23.hostedemail.com: domain of dan.carpenter@oracle.com has no SPF policy when checking 205.220.165.32) smtp.mailfrom=dan.carpenter@oracle.com; dmarc=pass (policy=none) header.from=oracle.com X-Rspamd-Server: rspam10 X-HE-Tag: 1639643950-846020 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 "ptl = pmd_lock(mm, pmd);" line was accidentally deleted in the linux-next merge for next-20211214. Fixes: fd93c9fe58cc ("Merge branch 'akpm-current/current'") Signed-off-by: Dan Carpenter --- mm/migrate.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/mm/migrate.c b/mm/migrate.c index 8d93dfb0b9e1..c9296d63878d 100644 --- a/mm/migrate.c +++ b/mm/migrate.c @@ -339,6 +339,8 @@ void pmd_migration_entry_wait(struct mm_struct *mm, pmd_t *pmd) { spinlock_t *ptl; struct folio *folio; + + ptl = pmd_lock(mm, pmd); if (!is_pmd_migration_entry(*pmd)) goto unlock; folio = page_folio(pfn_swap_entry_to_page(pmd_to_swp_entry(*pmd)));