From patchwork Thu Jul 21 02:05:52 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alistair Popple X-Patchwork-Id: 12924669 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 2F5A6C43334 for ; Thu, 21 Jul 2022 02:06:04 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id B8AEE6B0073; Wed, 20 Jul 2022 22:06:03 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id B15606B0074; Wed, 20 Jul 2022 22:06:03 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 965946B0075; Wed, 20 Jul 2022 22:06:03 -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 813456B0073 for ; Wed, 20 Jul 2022 22:06:03 -0400 (EDT) Received: from smtpin15.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id 5B40240828 for ; Thu, 21 Jul 2022 02:06:03 +0000 (UTC) X-FDA: 79709466606.15.0E276C3 Received: from NAM04-MW2-obe.outbound.protection.outlook.com (mail-mw2nam04on2076.outbound.protection.outlook.com [40.107.101.76]) by imf14.hostedemail.com (Postfix) with ESMTP id E925C10007B for ; Thu, 21 Jul 2022 02:06:02 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=PT37RF38uRBCVhQ0IDLXpl8/+7Y1thWFeb4P4GP+Wrcw81+d+U/XQw9VQcfvkUEi0pfSfJrNrrGRyTA0zec+NLSUW2uQaXQGuUkxc+AeT9O6bUs/W9spvfnpKHYtneaVwiLJ+dYkk8XkvAjqQyDNsgAe94tQsuXKrloAufED6wjgFDTlHK766lNlpwopnGLg8PA9asca3xSztX6t3aHYNThvC/77cMQJtYfQjpzVJgoAAHO/RjQom/ynaP/7C4KIyFmoJJZX4TV1a4oSe8WQEoPFeLdFNgfJLN/aov3o2OS8hH6XCc1VaegybFCnnF9lD2yEx9dk84QYSgf/jM5+cA== 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=aYz83FVK4RS0WmDrQO7yBE9ROV4P2MNMAmPLjozOw64=; b=mvcv0mk2u5UxSmODmNezPhBLz01Ab1bdCgvipeKPNU/mlS2J3T0NaAAgp0kI7LWbqcl3fUPUm4v2tK0BXEmPFiegFnLonxgwPhEWaQz12WM81fD96SNIGnBU3/iLw77CJJSWv+XjFyUJnd6F0qQWl0GcSPdgiHyaYJnZFHgVSTwCTyTq2k25I4sGvC2ZJsg6B2j2S/7lAEIqFAURdorQLU5NxKy/fVxiF+F5lKEjQfumesoQ5p7f8QXWu3zWJiyesI0/yXddLxLvRKu+8dcdn2QWE+2Su6PCDSuuIhnZO5qHero9W+zrXZgewUvi2d4yAQS4mOFtJpCy6fcD0QjxBw== 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=aYz83FVK4RS0WmDrQO7yBE9ROV4P2MNMAmPLjozOw64=; b=J9sVYuzqY1xa1yP4k1lQm0MNggDihnFvJLKuWpqsU08aHbT/ij11X/PFjWns1alst90n+3VlW/hu41ery7FksXemZDJyCcKF9och3q7znrusfz7Oi6g0vortuFLh/U+dmPiwDmhKePoOsMZgkk3QnvOBoAeq/+Lav3IC0iHYO9kMHJRumMuJ2cQi/IHo1mfDXLePGZ34MM3fdszgiZnsQDEFUA1tJvZjxJTJbMoxv+tjXPWUquaOm+L+tuknhp/njYLOlsPszGj8tnnVXJ0A+b734HE2EJdT0mKx/rIKZ+pTttl+hzbng1echow3aZuTXjhOzHVS37Jtvkezk6HGxg== Received: from BYAPR12MB3176.namprd12.prod.outlook.com (2603:10b6:a03:134::26) by MN2PR12MB4317.namprd12.prod.outlook.com (2603:10b6:208:1d0::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5458.18; Thu, 21 Jul 2022 02:06:00 +0000 Received: from BYAPR12MB3176.namprd12.prod.outlook.com ([fe80::eca6:a4a7:e2b2:27e7]) by BYAPR12MB3176.namprd12.prod.outlook.com ([fe80::eca6:a4a7:e2b2:27e7%5]) with mapi id 15.20.5438.023; Thu, 21 Jul 2022 02:06:00 +0000 From: Alistair Popple To: akpm@linux-foundation.org Cc: david@redhat.com, alex.sierra@amd.com, Felix.Kuehling@amd.com, linux-mm@kvack.org, amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, Alistair Popple Subject: [PATCH] mm/gup.c: Fix formating in check_and_migrate_movable_page() Date: Thu, 21 Jul 2022 12:05:52 +1000 Message-Id: <20220721020552.1397598-2-apopple@nvidia.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220721020552.1397598-1-apopple@nvidia.com> References: <20220721020552.1397598-1-apopple@nvidia.com> X-ClientProxiedBy: SJ0PR03CA0033.namprd03.prod.outlook.com (2603:10b6:a03:33e::8) To BYAPR12MB3176.namprd12.prod.outlook.com (2603:10b6:a03:134::26) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 01997833-3089-4b14-7d38-08da6abd8eb3 X-MS-TrafficTypeDiagnostic: MN2PR12MB4317:EE_ X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 9oeL9b38MZU3jiQTmlqlQJaddb97LG+2leIRhTG6Piz0sCwieQTp4tyKf43s8QrxE1l4YDGbugutkN/bTQQoyoUrn9jkWTiHD2cTaLSqRpH2M0t+SFzdizX0jqTz0bq4iPD8/SMBiCCqCN6h7dtcelKeuR9OiNNr/AGnzWudhe97OW/F6hpb7+vGSs8G8eNMZaD/Sg/xKJ7/JCd2QGCrx0jigq8JmBHeKIETycrsBnva2kwGk1e9JirCcC+ZHv5Jo6ObQKPanTBwRd/eMMpzS/OnDrgmENo18+1pR7SPFScIkrhH9zyvJtDO2N3QdEuN61BlHRJAMAkeFQgyyoBC0RCSngIBEYCkDDc1PqnRz/9l00XDvOfuBwZn3NWjW8kHNGKMHd5tjMkRBkCq/CiHXWJvXnJHimNhVAe6TkouKipmcz0Ioh5VsI+C6sGhnbK1bLWxprth+NKAf0z+NwAJdfJRcHINhPHw8ToIjtnz/YW4f/s1DJ76yNqOk9B5zrQhL+QiTKViJ28V3EGVXA2JmpKBKbIVCq089icOJO8SDJJ1jRBIOGq+ovLSnf40qun8FCxWoICj9sqINNSJRdKad5VCAltYwhUs0CoQ0EQuz47x0j67nhnuD9XO1Er6r4CcrloSa2qnuYKqaFzq/FmD4TwsPTYS5zUGWIJT9+gYGe/fX+6oxOYfux8kJfMUrzsbQkVHKD6kCkH7EGR5YR3zyQmBEL1UxKo1oOF9GkMPajpDwW+hpDpZhF5/rqiQ725Y X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:BYAPR12MB3176.namprd12.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230016)(4636009)(376002)(136003)(39860400002)(396003)(346002)(366004)(83380400001)(186003)(107886003)(2616005)(36756003)(1076003)(38100700002)(66556008)(8676002)(6486002)(4326008)(26005)(6512007)(6506007)(66476007)(66946007)(478600001)(41300700001)(316002)(5660300002)(2906002)(6916009)(86362001)(8936002)(6666004)(4744005);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: zt+55peuzLkbv0cJTQypCCOt9YWfwVcJRB1/V/tgCjfuxcMPHjHWTIzwkNra2nR7lVMAa5ABZd/prpjHaPHl4rrpYsJ0za+W6i9+/4CzZ03W7tOuDrWb/NNtTJlrGdfTvueLsuPqwci8437odCfDOhlPQNuWnYYf/qjN5MIZdqrWBEsly6McDINU7jMBpmQyjEaeYnMkfuf3XyTWkl58fCpVa3JV0uj/Hnh4WdOznS+UEhmv+TuXCqiz2egstn9r3opz49oIvzV9TqTGDfiH1x6hpg/sBBsB3BL5oNDgvFn72eapuU326wpd2jVSp+pqV+EBBDRGJOOsmFXZYG8O0Bd8lyXhyw9anUr1m1AFi/OucIiSErkrCSA5KqTaTUDnZOh37jLNfCYL+GRA90cYFdr3YdFJMmZ54w72UyKjzjcSAuTrUoaZYyDHQ6N2Ut7Q7F4xZFONPsWhKiJMH2aZtp+qHKP2LeI9qfS6buYIVh6LSeWGZI29isdYeXQSbvHFAyS1gwoOH32WHVZmVTQ86dFHx/KQwn+GdPpHxEdUKfh2m6kqkz7kYBFdNuBvAeoc6xCuEbeylEh/UJ3k/WqM47WO5WAsSOfXzHgsfJLRlWHjeuUcVoalR45aP2f17Wr1xFW47+RMrz/CvAwvxFwTFxFzLT99/ttyXPg8XUSuOZfZ0ijhmOgwZMI0VVItL00mFD35KLlYOJaYVv5OkE+t7A4+PV0wgz7GYxQgaQ4/iMiCat0//KHUOClDdqwloWe+T3Kni8MRooAk1f3nyY58Xz+NAPZFl2rr+jkmLWbGXMqtgRcs8dbMLJ6b0mb/yzkaiWElai59PsD2r7VKDsAw725BYmqRgy/iaxAaiH/Romcpiov9od48sgWtRQxfDnbNpfZJ6lsP0ghzJ3I83wedU57UB3mfMv8QT0yfb1nhrpAu8reNjqC9CdlTMkAPG4k+eKfGsCuWVNVp2oyJwxA6u3an2G6zcfQ3gSRy/UKFqVwDpp9xGpPIzGKyAB/jYJAba2aCPrDJCKP3p7Ys36Jsw9AGUHYQAjrfmLrctiF6vuxP8nCvFEk8YWR7xs9FXSPaLjMCHrG8sax0VMTrkkyou80F7OYdmgsrFvmXLZ7atZwIaiCIGCI0kClNCH+nY0C8/Ovmx2zH+yDd2bFONLcHpsnzNl2/9turjb2rP8ykQxB8sxCAWYJz7odQek+U32rS2anC2DCGu7xbCjWdF8SSqQRBOgNDK78C6dtPRhDJObiQYQZh7h22sUwboiXwyba4WfEYZkhxoeu2PUwyMBADA7xKxujE1jB6ONqE4UQOkYZdGpIUGaGsNyNbF2vrTDqsN0o2laN0lh1iClEFhHklN816SFaNePL02YZ5DvBdB0dMVtYs2IdOQkGx1a3obqAgV34o/F8neWjUAXKvYI+QEFK76ZAOz5lFHpJqNikVIUO952sUQ05Ug7ZplNmZuKtuIW/XxxqLJQynfdISJkLpZaMcYiEU6aWNDTSFdmQxqNrq5QqJGsGR745rzi2UHOHb7lA1C9HULrpQMesInCePVdj3+RpTzv4figtCGaJNfh3IBNcP8305b3rCopteAVSn X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-Network-Message-Id: 01997833-3089-4b14-7d38-08da6abd8eb3 X-MS-Exchange-CrossTenant-AuthSource: BYAPR12MB3176.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Jul 2022 02:06:00.4180 (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: NxGYAhz6yP57xVuIZ60qps3KfscXpkU0Df2WX2U/eDCKAYShyKwrVm+GOSa9t57ADh1r+5B//wcX8eGwrKLJJQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR12MB4317 ARC-Authentication-Results: i=2; imf14.hostedemail.com; dkim=pass header.d=Nvidia.com header.s=selector2 header.b=J9sVYuzq; arc=pass ("microsoft.com:s=arcselector9901:i=1"); dmarc=pass (policy=reject) header.from=nvidia.com; spf=none (imf14.hostedemail.com: domain of apopple@nvidia.com has no SPF policy when checking 40.107.101.76) smtp.mailfrom=apopple@nvidia.com ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1658369163; 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=aYz83FVK4RS0WmDrQO7yBE9ROV4P2MNMAmPLjozOw64=; b=fN65D1ME5vqVacOYGkY0JLQe0CoacmXl4tqzPJaj5TZiZnIIFcP+mDIKrRLkuwqH9jXORz +Bx+77tmrLozp1n8yd4aCNAVfu66jjmqVbOHXGcu2D+bKIzb1FokHYuEwIkhnMsBBBO8jY vNgdMaZHt9xefOOkdGAvv7mZH/5RWLw= ARC-Seal: i=2; s=arc-20220608; d=hostedemail.com; t=1658369163; a=rsa-sha256; cv=pass; b=1TN6Yy0pSKz/Vs6bxZPZNWFA0XTnIwfIYSzq1hh/XRodBP3wl9uZevNIo93cYsu11jnINp iUEZ9x+tvrKgSZ9PsVUZiGjaAORipnnVDQzPRyXnEagYuMpUsvx2nXcUUO0XePaU7EnMOL b4PQI1YdD27qpVomt28e0IVOXQ1DVIo= X-Rspamd-Queue-Id: E925C10007B Authentication-Results: imf14.hostedemail.com; dkim=pass header.d=Nvidia.com header.s=selector2 header.b=J9sVYuzq; arc=pass ("microsoft.com:s=arcselector9901:i=1"); dmarc=pass (policy=reject) header.from=nvidia.com; spf=none (imf14.hostedemail.com: domain of apopple@nvidia.com has no SPF policy when checking 40.107.101.76) smtp.mailfrom=apopple@nvidia.com X-Rspam-User: X-Rspamd-Server: rspam03 X-Stat-Signature: n76izb1ptu3jxh36xpchccwoyx4f8jrj X-HE-Tag: 1658369162-782349 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: Commit b05a79d4377f ("mm/gup: migrate device coherent pages when pinning instead of failing") added a badly formatted if statement. Fix it. Signed-off-by: Alistair Popple Reported-by: David Hildenbrand --- Apologies Andrew for missing this. Hopefully this fixes things. mm/gup.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mm/gup.c b/mm/gup.c index 364b274a10c2..c6d060dee9e0 100644 --- a/mm/gup.c +++ b/mm/gup.c @@ -1980,8 +1980,8 @@ static long check_and_migrate_movable_pages(unsigned long nr_pages, folio_nr_pages(folio)); } - if (!list_empty(&movable_page_list) || isolation_error_count - || coherent_pages) + if (!list_empty(&movable_page_list) || isolation_error_count || + coherent_pages) goto unpin_pages; /*