From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B1CAB2116F5 for ; Fri, 30 May 2025 20:55:48 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.129.124 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1748638550; cv=none; b=uqXgkVJQzv48TPfJIuyDrmrECJM+R99NWgMt8in/Wc6EnOgrni+x5bEhNdTHXohvE2F9N4vHe9nIxjp4pmhiQfZznLysKZeIUdcscs3FEmessEQem5FZyc8e6o6IgDo4pJkeQBx90ugbwafHYoF/n2JFBHjEppyL4QCNXe7fsdQ= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1748638550; c=relaxed/simple; bh=ca326f95SJj1IubOU0UVbJ7ZcG6ddXSM67x8beCh92U=; h=Message-ID:Date:MIME-Version:Subject:To:Cc:References:From: In-Reply-To:Content-Type; b=eS3Hce85jCPYyjmm5beeyk/OYdVF6H4e2GMMQHBV8Ot4A38KFxOpBFHfTy1OF7XVa500AwA9p5CYtnMV2Sz/OhVlolhxK/28OF1tl6CpwPzPsxxKDWkfz6ZsFtAUIhEDQbwrG4P1fn1fKkEAOkmUPrRZtMmWH7C1khyWYexEpi4= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=TP6D2O1W; arc=none smtp.client-ip=170.10.129.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="TP6D2O1W" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1748638547; 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=8hvacZp6eSMYRK889NcFVta8nnw6kyl64xsEOzYlr7s=; b=TP6D2O1WT/l3hGsAACR6Jp2ttBbLgQYZnvbRqHfniN7zO1svCljtPrQWRwjj3iu0MG+9pG ucn4c+C+4IkrmFQRM2K+jShayEi46VVmQYehynOBdzEuigIeza2sm8tcDpsq4ev/y66QUV 1jdbeRRyZfYU0HDB0kt7fiWv+1ANLZc= 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-581-ZK3kTQPqMzGY6yeU0mjAQA-1; Fri, 30 May 2025 16:55:46 -0400 X-MC-Unique: ZK3kTQPqMzGY6yeU0mjAQA-1 X-Mimecast-MFC-AGG-ID: ZK3kTQPqMzGY6yeU0mjAQA_1748638545 Received: by mail-wr1-f70.google.com with SMTP id ffacd0b85a97d-3a34f19c977so1224828f8f.0 for ; Fri, 30 May 2025 13:55:45 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1748638545; x=1749243345; 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=8hvacZp6eSMYRK889NcFVta8nnw6kyl64xsEOzYlr7s=; b=Kore/d8X3mZzQC6nwZvic/g+8fUVLpGnjQU+Yb9eTz0SYWT48c//duXWa3WEhxVSeW +2ChpzGYVZsevLzOIHYwBD8jS0b0oSEANEJbKdzC7vc6O5wlDsmwldsZ+XC3grFUi80W 9p9Jne/fILMSnjOB2+yph9zN6UcRaXuhsr4Y/s0z7BJesYcEG3pqZhKrZz/t31WeUMZ9 gCGhqks2QYADsKieEoupkZZjBA6/co26+B9VdwA5Sutog75WUcCDmkchc2rlFVfkh6ds GsHRZZI/vC0GVpYiOJW5ZEmTfKPRNYZQTV8R5bdUH7Pkl554DBfAFy4oyXsjbEJhEKGD drpg== X-Forwarded-Encrypted: i=1; AJvYcCXZuDYtfNAN3zp251arYnyjDAlAoS944JpG3C7YyPi5AA7nieNLV4AaFoT3F/YKoB/lz/1dYz9LQNQXRCU=@vger.kernel.org X-Gm-Message-State: AOJu0Ywa9YoZRIJ1i520aIqsrzquWVYFOquewzqOmqMw+phDIT3pT5Oo wFwvgbXSXUgbC2uPS2X1CTR4G0dEpYfL66XTQmmQJuo96yn+GecBRL9UAO3WFyemxiMmQUVWseM nKDi+JOgACTZ51iGGDXhDJi/ZuR/2KMDWY0TVa+gcq2oGsM0WljeyGwryl8yC8S6NcQ== X-Gm-Gg: ASbGncsSZDDomYDctUB15HLa+PPaHZqjyUQRzvrJcDrIv9Sc/X3BrlCnHDsdzo7iRRr 8U0C269N/eOcLknqZbkCkNFQzF0SSYOg0yieWkxdEfBnXoejD6BoJwLWHv8YeofMgmhBFVrJkab JqcluBmL8Xq5TZ7ofKyvA1+1HcmEaNVuiV0dJZkHFRaEOl8h/E+5rq5cGr8EU81oiA+3c7WejR+ 9vh98G4cRgZzQ6bZ4IZcYSeY5RHuv/lJsQf+yRvqvrNsdgHuteR/d8CZr2S8Vb1zQ/9/l47rJIs d5dPX8Q5gBaLZ9aTaBDqNVkwy34aIamxCe/3upkSekmC+GHRYFtS/nNVH7DHVxrUuOqo8hLdT5V RDeyev/mkoTJah3TzySUc80HQhIRJJkuaQMlnn8o= X-Received: by 2002:a05:6000:18ab:b0:3a4:eee4:f73a with SMTP id ffacd0b85a97d-3a4f79da823mr4480210f8f.22.1748638544781; Fri, 30 May 2025 13:55:44 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFpFBZOQqFCSOH+TZMMjNiekzE6wkWQmqzZXhEKhAAmG+yDvh2h1KZwFf2x1EW9Go9M2jSkFw== X-Received: by 2002:a05:6000:18ab:b0:3a4:eee4:f73a with SMTP id ffacd0b85a97d-3a4f79da823mr4480191f8f.22.1748638544362; Fri, 30 May 2025 13:55:44 -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 ffacd0b85a97d-3a4f00971efsm5875545f8f.62.2025.05.30.13.55.43 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 30 May 2025 13:55:43 -0700 (PDT) Message-ID: Date: Fri, 30 May 2025 22:55:43 +0200 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: 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 Cc: Johannes Weiner , Vlastimil Babka , linux-mm@kvack.org, 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> <8C1EFB3C-0F1C-46DE-878A-3546A86A141F@nvidia.com> <50da1626-5894-42ef-b3fd-935a331f14c4@redhat.com> From: David Hildenbrand Content-Language: en-US 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: Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit On 30.05.25 22:46, Zi Yan wrote: > On 30 May 2025, at 16:08, David Hildenbrand wrote: > >> On 30.05.25 21:58, Zi Yan wrote: >>> On 30 May 2025, at 15:56, David Hildenbrand wrote: >>> >>>> 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. >>> >>> I have a fixup to change acr_flags_t to acr_mode. >>> >>>> >>>>> + >>>>> /* 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 :) >>> >>> Sure. Take your time. >> >> Could we abstract both settings and use a single one? Then, we could simply reject if MEM_OFFLINE is passed into alloc_contig_range(). >> >> alloc_contig_pages and page isolation, hmmmm, MEM_OFFLINE is kind-of an allocation. CMA is an allocation. >> >> Just an idea, not sure ... > > I think so. > > This is the fixup of removing acr_flags_t. It is on top of the original > patch. Take your time. I guess I will send V7 with all fixups next week. Only wondering if we should rename "pb_isolate_mode" to something more abstract, that covers both use cases clearer. Hmmm. > > The one strange part is that in virtio_mem_fake_offline, > PB_ISOLATE_MODE_OTHER is used instead of PB_ISOLATE_MODE_MEM_OFFLINE. > I guess you do not want to report failures there. That's the right thing to do. It's not ordinary memory offlining code. Thanks and enjoy the weekend! -- Cheers, David / dhildenb