From mboxrd@z Thu Jan 1 00:00:00 1970 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 73129C5AD49 for ; Fri, 30 May 2025 19:56:42 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 0FB666B018B; Fri, 30 May 2025 15:56:42 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 0AC4E6B018E; Fri, 30 May 2025 15:56:42 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id EB6C76B01AB; Fri, 30 May 2025 15:56:41 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id CA9A76B018B for ; Fri, 30 May 2025 15:56:41 -0400 (EDT) Received: from smtpin10.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id 7FE6081457 for ; Fri, 30 May 2025 19:56:41 +0000 (UTC) X-FDA: 83500631802.10.D4DB07B Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf27.hostedemail.com (Postfix) with ESMTP id 0FE184000A for ; Fri, 30 May 2025 19:56:38 +0000 (UTC) Authentication-Results: imf27.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=cOPpP8LT; spf=pass (imf27.hostedemail.com: domain of david@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=david@redhat.com; dmarc=pass (policy=quarantine) header.from=redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1748634999; 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=tvBAAzFRZWgKvdMYS4slyoiYTjJP1YViGuKwx+ViZSc=; b=NcYU6wkQJdjgZh2XU5Xtl7lFLYaMUvaq8IAmE3RIA+FcdyIwg50fK4ySuDx2E6eUN0T1Tv AAATSD8nb13MRfudM2WYjVh6k0CbGJOGpgKcJ4kHYR36MJT/JJQyecH/S2dcCJeHHpuxuJ zWqycTZ8N4A0nG2Sa5pnw1LLu7RBUaE= ARC-Authentication-Results: i=1; imf27.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=cOPpP8LT; spf=pass (imf27.hostedemail.com: domain of david@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=david@redhat.com; dmarc=pass (policy=quarantine) header.from=redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1748634999; a=rsa-sha256; cv=none; b=PMNcg23GaiIIw/XeXFPvSRVNuLe7xhGtqd1CCpEN6p8q4GftHtRGkBDTvhIFiwdlCLu/ME 0hGSBC1QTBFk2Cq3xVBW/fQv9+vtAspdWTZJDFlsWvahWg3AK0Ys6JxU/w+/OlTfjMMRNA oS8hD4qwgORthNLbp8dVofezu7M62AQ= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1748634998; h=from:from: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:autocrypt:autocrypt; bh=tvBAAzFRZWgKvdMYS4slyoiYTjJP1YViGuKwx+ViZSc=; b=cOPpP8LT7birTeJdInHASktEvi6HP51iqy0axvGRBexpkkqHolz4wgp0tm1V71WvpwxPLl iysrGNCBFmSll545JFB6d+u11kK2DPiR7jwfu8Voxq7CWjWTg+EPA5oae8nWpCg7pbi7mA WWWHXXxUAXAoguB5pLGdOqnQJXxXtqw= Received: from mail-wr1-f70.google.com (mail-wr1-f70.google.com [209.85.221.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-686-Rg0c6-mZNOe1rnrfNyCeGg-1; Fri, 30 May 2025 15:56:37 -0400 X-MC-Unique: Rg0c6-mZNOe1rnrfNyCeGg-1 X-Mimecast-MFC-AGG-ID: Rg0c6-mZNOe1rnrfNyCeGg_1748634996 Received: by mail-wr1-f70.google.com with SMTP id ffacd0b85a97d-3a4e713e05bso1085274f8f.3 for ; Fri, 30 May 2025 12:56:37 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1748634996; x=1749239796; h=content-transfer-encoding:in-reply-to:organization:autocrypt :content-language:from:references:cc:to:subject:user-agent :mime-version:date:message-id:x-gm-message-state:from:to:cc:subject :date:message-id:reply-to; bh=tvBAAzFRZWgKvdMYS4slyoiYTjJP1YViGuKwx+ViZSc=; b=LNi/BJOwxOseTNFVkXa0CaNByYDmS65k2anrEH3g/BrRSwMNLvKe6ZIolHhYVTW1wS oqzU6hyXdedDovy8BuVngrQTm/mtt941FsQqL1aVi+CHE/m35vX2FoHsRyhHBRwsYZPz E2LkQdReYd9AVV/12tlyUTfZigjMxlN8HvY+UvYhsTq9wFjoXPNgT2a9I8zXek6DNQ/r 69RtXZ/1hoRoqp5M9NA2Uk4v8fHa6Tfxw1T/pJFXbH7t6+rDMPQgYkz1TSTo9MHiIB3w VmETutWaIJe78ccnMw+An134S7MTe5xcuaciqOQjRQ125N1tWJNvFLZzs5z8mgzq5mKF KT2w== X-Forwarded-Encrypted: i=1; AJvYcCWU+R/j7LszLm1nTcOFFksk7wsY0gP3os50jGxGApaS8Y/hAW8h6c/Z9C/udIOsKrfd5yrzjDm6/Q==@kvack.org X-Gm-Message-State: AOJu0YxJmU/eRPV4bCL/CWi0zD0w0q9XdIOTH3xnHTCLslzHpmKasHk8 SPiZxoKWPeDLavg7st5Z0ZiWE8BRbZSJ/cMbgej2JisL4yCH0R5Q6/mV7usSTDTsCqXEEcsi1jA Vxd4uymuc+GJNLAyPUeP1jkZDhH2Dwy1PKJOiLQYNnhfbrX7coxvQ X-Gm-Gg: ASbGnctWOQtp7/j3w11gtwOCQxtUCCoKjgIPFmqW2Gr9xAW6KwVRp81HJ1uebzQVvy+ aNQSwti2kder4pvDd+NcCCfPmGk44pFP1yVS41G8vLBfWD7mUMgTbGyd0RB3mdURb8nnS5y34BY pGRDFSGOvLwUQ+rn6HtamSlbRT1Sdo/bhZ+ePI7NzN2gX58EKKwbHEc+xYSnZIqBEdb2DsVnSaS kt0PVVenskWjS5dH/08lfExaOy6jDff7JwvH0+HlYjswk5c5y3C6CnPEBa0IELrn8oxjwySpfsh dNZmdzhROEryqfgQaIRqRpQinducX/zTqv+EuTMnKZuPFkDu/A1DB/ReqjVUynzVGC2i/Xqqevl zXR2WAcQM1WlkFMBwroeaoL7krg4ltWt0yZZHNDM= X-Received: by 2002:a05:6000:4287:b0:3a4:f744:e00c with SMTP id ffacd0b85a97d-3a4f7a62cb1mr3556922f8f.29.1748634996055; Fri, 30 May 2025 12:56:36 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFKeZZvuxpuWqtWJGoS16vB7pQEX6oxIZg7W/ztBDXBVVhVshEgct8dsWN2g5FuF1qJEUE0WQ== X-Received: by 2002:a05:6000:4287:b0:3a4:f744:e00c with SMTP id ffacd0b85a97d-3a4f7a62cb1mr3556903f8f.29.1748634995597; Fri, 30 May 2025 12:56:35 -0700 (PDT) Received: from ?IPV6:2003:d8:2f03:5b00:f549:a879:b2d3:73ee? (p200300d82f035b00f549a879b2d373ee.dip0.t-ipconnect.de. [2003:d8:2f03:5b00:f549:a879:b2d3:73ee]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-450d7fb86d2sm26237585e9.30.2025.05.30.12.56.32 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 30 May 2025 12:56:34 -0700 (PDT) Message-ID: Date: Fri, 30 May 2025 21:56:32 +0200 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH v6 6/6] mm/page_isolation: remove migratetype parameter from more functions. To: Zi Yan , Johannes Weiner , Vlastimil Babka , linux-mm@kvack.org Cc: Andrew Morton , Oscar Salvador , Baolin Wang , "Kirill A . Shutemov" , Mel Gorman , Suren Baghdasaryan , Michal Hocko , Brendan Jackman , Richard Chang , linux-kernel@vger.kernel.org References: <20250530162227.715551-1-ziy@nvidia.com> <20250530162227.715551-7-ziy@nvidia.com> From: David Hildenbrand Autocrypt: addr=david@redhat.com; keydata= xsFNBFXLn5EBEAC+zYvAFJxCBY9Tr1xZgcESmxVNI/0ffzE/ZQOiHJl6mGkmA1R7/uUpiCjJ dBrn+lhhOYjjNefFQou6478faXE6o2AhmebqT4KiQoUQFV4R7y1KMEKoSyy8hQaK1umALTdL QZLQMzNE74ap+GDK0wnacPQFpcG1AE9RMq3aeErY5tujekBS32jfC/7AnH7I0v1v1TbbK3Gp XNeiN4QroO+5qaSr0ID2sz5jtBLRb15RMre27E1ImpaIv2Jw8NJgW0k/D1RyKCwaTsgRdwuK Kx/Y91XuSBdz0uOyU/S8kM1+ag0wvsGlpBVxRR/xw/E8M7TEwuCZQArqqTCmkG6HGcXFT0V9 PXFNNgV5jXMQRwU0O/ztJIQqsE5LsUomE//bLwzj9IVsaQpKDqW6TAPjcdBDPLHvriq7kGjt WhVhdl0qEYB8lkBEU7V2Yb+SYhmhpDrti9Fq1EsmhiHSkxJcGREoMK/63r9WLZYI3+4W2rAc UucZa4OT27U5ZISjNg3Ev0rxU5UH2/pT4wJCfxwocmqaRr6UYmrtZmND89X0KigoFD/XSeVv jwBRNjPAubK9/k5NoRrYqztM9W6sJqrH8+UWZ1Idd/DdmogJh0gNC0+N42Za9yBRURfIdKSb B3JfpUqcWwE7vUaYrHG1nw54pLUoPG6sAA7Mehl3nd4pZUALHwARAQABzSREYXZpZCBIaWxk ZW5icmFuZCA8ZGF2aWRAcmVkaGF0LmNvbT7CwZgEEwEIAEICGwMGCwkIBwMCBhUIAgkKCwQW AgMBAh4BAheAAhkBFiEEG9nKrXNcTDpGDfzKTd4Q9wD/g1oFAl8Ox4kFCRKpKXgACgkQTd4Q 9wD/g1oHcA//a6Tj7SBNjFNM1iNhWUo1lxAja0lpSodSnB2g4FCZ4R61SBR4l/psBL73xktp rDHrx4aSpwkRP6Epu6mLvhlfjmkRG4OynJ5HG1gfv7RJJfnUdUM1z5kdS8JBrOhMJS2c/gPf wv1TGRq2XdMPnfY2o0CxRqpcLkx4vBODvJGl2mQyJF/gPepdDfcT8/PY9BJ7FL6Hrq1gnAo4 3Iv9qV0JiT2wmZciNyYQhmA1V6dyTRiQ4YAc31zOo2IM+xisPzeSHgw3ONY/XhYvfZ9r7W1l pNQdc2G+o4Di9NPFHQQhDw3YTRR1opJaTlRDzxYxzU6ZnUUBghxt9cwUWTpfCktkMZiPSDGd KgQBjnweV2jw9UOTxjb4LXqDjmSNkjDdQUOU69jGMUXgihvo4zhYcMX8F5gWdRtMR7DzW/YE BgVcyxNkMIXoY1aYj6npHYiNQesQlqjU6azjbH70/SXKM5tNRplgW8TNprMDuntdvV9wNkFs 9TyM02V5aWxFfI42+aivc4KEw69SE9KXwC7FSf5wXzuTot97N9Phj/Z3+jx443jo2NR34XgF 89cct7wJMjOF7bBefo0fPPZQuIma0Zym71cP61OP/i11ahNye6HGKfxGCOcs5wW9kRQEk8P9 M/k2wt3mt/fCQnuP/mWutNPt95w9wSsUyATLmtNrwccz63XOwU0EVcufkQEQAOfX3n0g0fZz Bgm/S2zF/kxQKCEKP8ID+Vz8sy2GpDvveBq4H2Y34XWsT1zLJdvqPI4af4ZSMxuerWjXbVWb T6d4odQIG0fKx4F8NccDqbgHeZRNajXeeJ3R7gAzvWvQNLz4piHrO/B4tf8svmRBL0ZB5P5A 2uhdwLU3NZuK22zpNn4is87BPWF8HhY0L5fafgDMOqnf4guJVJPYNPhUFzXUbPqOKOkL8ojk CXxkOFHAbjstSK5Ca3fKquY3rdX3DNo+EL7FvAiw1mUtS+5GeYE+RMnDCsVFm/C7kY8c2d0G NWkB9pJM5+mnIoFNxy7YBcldYATVeOHoY4LyaUWNnAvFYWp08dHWfZo9WCiJMuTfgtH9tc75 7QanMVdPt6fDK8UUXIBLQ2TWr/sQKE9xtFuEmoQGlE1l6bGaDnnMLcYu+Asp3kDT0w4zYGsx 5r6XQVRH4+5N6eHZiaeYtFOujp5n+pjBaQK7wUUjDilPQ5QMzIuCL4YjVoylWiBNknvQWBXS lQCWmavOT9sttGQXdPCC5ynI+1ymZC1ORZKANLnRAb0NH/UCzcsstw2TAkFnMEbo9Zu9w7Kv AxBQXWeXhJI9XQssfrf4Gusdqx8nPEpfOqCtbbwJMATbHyqLt7/oz/5deGuwxgb65pWIzufa N7eop7uh+6bezi+rugUI+w6DABEBAAHCwXwEGAEIACYCGwwWIQQb2cqtc1xMOkYN/MpN3hD3 AP+DWgUCXw7HsgUJEqkpoQAKCRBN3hD3AP+DWrrpD/4qS3dyVRxDcDHIlmguXjC1Q5tZTwNB boaBTPHSy/Nksu0eY7x6HfQJ3xajVH32Ms6t1trDQmPx2iP5+7iDsb7OKAb5eOS8h+BEBDeq 3ecsQDv0fFJOA9ag5O3LLNk+3x3q7e0uo06XMaY7UHS341ozXUUI7wC7iKfoUTv03iO9El5f XpNMx/YrIMduZ2+nd9Di7o5+KIwlb2mAB9sTNHdMrXesX8eBL6T9b+MZJk+mZuPxKNVfEQMQ a5SxUEADIPQTPNvBewdeI80yeOCrN+Zzwy/Mrx9EPeu59Y5vSJOx/z6OUImD/GhX7Xvkt3kq Er5KTrJz3++B6SH9pum9PuoE/k+nntJkNMmQpR4MCBaV/J9gIOPGodDKnjdng+mXliF3Ptu6 3oxc2RCyGzTlxyMwuc2U5Q7KtUNTdDe8T0uE+9b8BLMVQDDfJjqY0VVqSUwImzTDLX9S4g/8 kC4HRcclk8hpyhY2jKGluZO0awwTIMgVEzmTyBphDg/Gx7dZU1Xf8HFuE+UZ5UDHDTnwgv7E th6RC9+WrhDNspZ9fJjKWRbveQgUFCpe1sa77LAw+XFrKmBHXp9ZVIe90RMe2tRL06BGiRZr jPrnvUsUUsjRoRNJjKKA/REq+sAnhkNPPZ/NNMjaZ5b8Tovi8C0tmxiCHaQYqj7G2rgnT0kt WNyWQQ== Organization: Red Hat In-Reply-To: <20250530162227.715551-7-ziy@nvidia.com> X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: kvMnm_uCy-d9WkY7BaTTzqERCvMW7SxbEYQDiVR6RoM_1748634996 X-Mimecast-Originator: redhat.com Content-Language: en-US Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Rspamd-Queue-Id: 0FE184000A X-Stat-Signature: mc7kb7qgwkr8jfmqfjsmz1u7prsbgm4i X-Rspam-User: X-Rspamd-Server: rspam04 X-HE-Tag: 1748634998-302382 X-HE-Meta: U2FsdGVkX18f1raIL3Gav7o2Ow2jCQir648gv4Uw4xq3Qv72nKFUp4/3NF9qZq8bgy3B2yTGDJbiD0yIFxk0m0bgb8pPA3Io9i1kbUUcrVWSIow6SoXFuoCfMdeYSsQHQyNLhTHOo9eW+vexBSnMwUsSsqDFvPDCypub5chZ/ztYdRAeBPPI0ZMACscO4pacRXHJkdB6GYU7MY3/2dL5Ymsys3lliFrxGVLvDVXsBV8uqoXfra8QsuFCuL0QVzHMuYSYWZcsGtldvlIyAQsZUFzw4/QQVFqigNvQL52IwDfWh09bZw+7b+fwnOVoO1F8Y50wBjhAuX7qLG34LNIZdx+Ckwmm3hqWCMp+TUjI84zi9kIJM3LpmLlyGvaMjsYrGerSajm+lWBUJuvBsidO+brz4hPpbPrpQnAk+JmZHT9v1K2rm3mUnfxznPrBzFHrOFykx2IECHi0tURWpd+cjbSbu8Ht3mzSOD/EucAK4TqJzmH3vR1MobMvn2vulor61/yht6nfGND5Zn4LRdtYJCZi+5Om1Hps5Ha+SaudoOwbL7fLzp3XBLkumi995x59aTYln8yzbrXq6839Yqb1XzDu1x/rnJ2z9bEw1OJVo7R5CNxk7M78F/0B8wt/46EPXuIMoX0LuFH/MBnA8rICmuRmdGNON3CgXPDrMO0VDZcWA94t0z18iStGju21/RvfihbNiAruARDvhgNVx15UlvoXTTZd/pLG1ualijPofM4GINWHaM1keojYhZNr2Xf6MBCDWWrmUCpaW1bY/ZCka8YGmd5ysqe33DRF2ba/cwfpIi21gJzUdIk/bQJ/RZNEth55bECBJ+p04qI1bMYyh8hGct7/1s02mHwAmopj4bqm9+P/BaSz8ZzC9UIpxs1UOPzTSE1yRPbYX72a43ijfxkCEgCXBUAGKLj8Nppw0hHlR2NXMHjJjIjZPzJ1uQ5BVSwXsUFkystH3CIzoYx 93PHVNTz VjrRIrY1balZuk77b30dlvu1QVoQISC3Jg4DSfbfoQzGNQHNtpoyy5QDlldFLKsSyOQAq6ficvq3SGzDkhTjHJf4X8H2GcpeY8g7j+KJjUjTli9tpIduZV68Aip6oSrOX1yxVoqhi0Ctwp8HanrRLUB6BmklhXMO6UJoh/xE4TPVv+C4lXzQPoweXIQLojtObFcQqZq7TBPV0wRGivV2BrvTD4fcJ4Z3UAkm/NqF2CZZFHTtaKntC9vG/aFwfvToQNaYQ7zgC23PIO7sUQKYH6UV1T2NsUakaZnZDS5pF8Yc/PaJ3UC4hecMGd4bqxTvpmKCfjdsMMk9aiGgCbO6QpTmhfFexBenxofnSwsFrtdADjcjcipw6iO2Fd0V/A68GCFMJnNGu03ddFrTsYUSCrtfIo1iETzSget4Rdy63GFycnx3oOSJY/GNNSq6rpsP4NCpHvyM0Zicj4PAiwtyGL4GFPajQjP/smHeg 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: On 30.05.25 18:22, Zi Yan wrote: > migratetype is no longer overwritten during pageblock isolation, > start_isolate_page_range(), has_unmovable_pages(), and > set_migratetype_isolate() no longer need which migratetype to restore > during isolation failure. > > For has_unmoable_pages(), it needs to know if the isolation is for CMA > allocation, so adding CMA_ALLOCATION to provide the information. At the > same time change isolation flags to enum pb_isolate_mode > (PB_ISOLATE_MODE_MEM_OFFLINE, PB_ISOLATE_MODE_CMA_ALLOC, > PB_ISOLATE_MODE_OTHER). Remove REPORT_FAILURE and check > MEMORY_OFFLINE instead, since only PB_ISOLATE_MODE_MEM_OFFLINE reports > isolation failures. > > alloc_contig_range() no longer needs migratetype. Replace it with > enum acr_flags_t to tell if an allocation is for CMA. So does > __alloc_contig_migrate_range(). > > Signed-off-by: Zi Yan > --- > drivers/virtio/virtio_mem.c | 2 +- > include/linux/gfp.h | 9 ++++- > include/linux/page-isolation.h | 20 ++++++++-- > include/trace/events/kmem.h | 14 ++++--- > mm/cma.c | 2 +- > mm/memory_hotplug.c | 6 +-- > mm/page_alloc.c | 27 ++++++------- > mm/page_isolation.c | 70 +++++++++++++++------------------- > 8 files changed, 82 insertions(+), 68 deletions(-) > > diff --git a/drivers/virtio/virtio_mem.c b/drivers/virtio/virtio_mem.c > index 56d0dbe62163..6bce70b139b2 100644 > --- a/drivers/virtio/virtio_mem.c > +++ b/drivers/virtio/virtio_mem.c > @@ -1243,7 +1243,7 @@ static int virtio_mem_fake_offline(struct virtio_mem *vm, unsigned long pfn, > if (atomic_read(&vm->config_changed)) > return -EAGAIN; > > - rc = alloc_contig_range(pfn, pfn + nr_pages, MIGRATE_MOVABLE, > + rc = alloc_contig_range(pfn, pfn + nr_pages, ACR_OTHER, > GFP_KERNEL); > if (rc == -ENOMEM) > /* whoops, out of memory */ > diff --git a/include/linux/gfp.h b/include/linux/gfp.h > index be160e8d8bcb..51990d571e3e 100644 > --- a/include/linux/gfp.h > +++ b/include/linux/gfp.h > @@ -423,9 +423,16 @@ static inline bool gfp_compaction_allowed(gfp_t gfp_mask) > extern gfp_t vma_thp_gfp_mask(struct vm_area_struct *vma); > > #ifdef CONFIG_CONTIG_ALLOC > + > +enum acr_flags_t { > + ACR_CMA, // CMA allocation > + ACR_OTHER, // other allocation > +}; Hm, enum != flags. If you want to use flags, then just have ACR_CMA. ACR_OTHER is implied if not set. And ACR_CMA would then have to be "1" etc. > + > /* The below functions must be run on a range from a single zone. */ > extern int alloc_contig_range_noprof(unsigned long start, unsigned long end, > - unsigned migratetype, gfp_t gfp_mask); > + enum acr_flags_t alloc_flags, > + gfp_t gfp_mask); > #define alloc_contig_range(...) alloc_hooks(alloc_contig_range_noprof(__VA_ARGS__)) > > extern struct page *alloc_contig_pages_noprof(unsigned long nr_pages, gfp_t gfp_mask, > diff --git a/include/linux/page-isolation.h b/include/linux/page-isolation.h > index 7a681a49e73c..3e2f960e166c 100644 > --- a/include/linux/page-isolation.h > +++ b/include/linux/page-isolation.h > @@ -38,8 +38,20 @@ static inline void set_pageblock_isolate(struct page *page) > } > #endif > > -#define MEMORY_OFFLINE 0x1 > -#define REPORT_FAILURE 0x2 > +/* > + * Pageblock isolation modes: > + * PB_ISOLATE_MODE_MEM_OFFLINE - isolate to offline (!allocate) memory > + * e.g., skip over PageHWPoison() pages and > + * PageOffline() pages. Unmovable pages will be > + * reported in this mode. > + * PB_ISOLATE_MODE_CMA_ALLOC - isolate for CMA allocations > + * PB_ISOLATE_MODE_OTHER - isolate for other purposes > + */ > +enum pb_isolate_mode { > + PB_ISOLATE_MODE_MEM_OFFLINE, > + PB_ISOLATE_MODE_CMA_ALLOC, > + PB_ISOLATE_MODE_OTHER, > +}; It's late on friady, but it looks like we are duplicating things here. Let me think about that once my brain is recharged :) -- Cheers, David / dhildenb