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 1BF64C282CD for ; Mon, 3 Mar 2025 13:46:15 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 864316B0085; Mon, 3 Mar 2025 08:46:14 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 7ED1B6B0088; Mon, 3 Mar 2025 08:46:14 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 63F916B0089; Mon, 3 Mar 2025 08:46:14 -0500 (EST) 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 4366B6B0085 for ; Mon, 3 Mar 2025 08:46:14 -0500 (EST) Received: from smtpin30.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id 63B93A40EF for ; Mon, 3 Mar 2025 13:46:12 +0000 (UTC) X-FDA: 83180363784.30.D6D3F56 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by imf09.hostedemail.com (Postfix) with ESMTP id 584F0140013 for ; Mon, 3 Mar 2025 13:46:07 +0000 (UTC) Authentication-Results: imf09.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=LV+Hoh9C; spf=pass (imf09.hostedemail.com: domain of david@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=david@redhat.com; dmarc=pass (policy=none) header.from=redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1741009567; 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=9x+L4BP+jfFn2R8nkb2ErwiCf7vFBCRLJltX2walJOA=; b=2AU5kswgZYRGPmrsN4pIFgAwh8Y0ZSgLnJKbKPXDEylgX0sdqbooIOyL09OQ5WP1TZBs30 Cp2LbSThMj/wAUdSso1x2XtYV4CJCItDONhu4bGAKRCjPFBjJOCRqiI0KTNqwoUJu7hGpb Y8aYD//WtfvNfvJuDXvdlwc0IUkZ3UU= ARC-Authentication-Results: i=1; imf09.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=LV+Hoh9C; spf=pass (imf09.hostedemail.com: domain of david@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=david@redhat.com; dmarc=pass (policy=none) header.from=redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1741009567; a=rsa-sha256; cv=none; b=j8irTP1eDaTlWHvfwI6UoRXpTrv6VN60OZPiJPNeURR0SOp30o5ZtiIHG+IKQ7ipSjqWRx j1Ow0qrsBzrTbX8cJ2ZoiI2/f/1TxRFLb4T96CccbUPg1mXU3kkXrcuFLZ8uLEqMVpR3Ge 4fpimryahbNtjCmp8RkZa0upmOR3D6c= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1741009566; 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=9x+L4BP+jfFn2R8nkb2ErwiCf7vFBCRLJltX2walJOA=; b=LV+Hoh9CUQDwera3FIASPbTAxSvUWM4+5BIlo3F+9ssInSWnOUX203CItrecB5Sz1uzR2Z XO9LoI3DHC173GASJc2uCdrHPEWTLXStkmF7ubgnbXz+ifekX/dZVVmXD/kodYHm2H/UuE UUk59qj7/UCIZ2l3HuI8Sekuye4L3NE= Received: from mail-wr1-f69.google.com (mail-wr1-f69.google.com [209.85.221.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-397-pY_VHz98MHCCW1qzm29D5A-1; Mon, 03 Mar 2025 08:46:00 -0500 X-MC-Unique: pY_VHz98MHCCW1qzm29D5A-1 X-Mimecast-MFC-AGG-ID: pY_VHz98MHCCW1qzm29D5A_1741009559 Received: by mail-wr1-f69.google.com with SMTP id ffacd0b85a97d-3910cd78330so323060f8f.1 for ; Mon, 03 Mar 2025 05:46:00 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741009559; x=1741614359; 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=9x+L4BP+jfFn2R8nkb2ErwiCf7vFBCRLJltX2walJOA=; b=OAcKxdT85NXJWnH+k7ITPHTsrNViWH9b2aFpWtICfv9Cx8rh8teNN6ocHRhdJLgohe FB7Rrz9WN33iq4OYp+o0I3EvkW2Awh/7LJOPgXyNt23OtyV7e3yHNP71w9uufZ31Ym7j PDTKFG3xjPn3HZJMTzNRfIM73dcV175c49Q1jydUGUu8AYHXc00tklghooEMMAbS4pLh jH7iezd1pyKreNqt6DdEHRvcQEVtFOOhh0hWbl9FIaPRT2oC5nFgc6CsuG8QjLymSrLw FRJjEmf9lsvLe67zfu8D1OSYLRM1Ckg9RjKGLDGcyNeIiWexQ6obUGI7GncOD99eadL8 7+Bw== X-Gm-Message-State: AOJu0Ywzazb4FGh1rf/0h8rztm9CHuPFSdKCNxrMLCiEXAiQmOrOBx6Y Gg0lSdYa3aDzbbS1JS5208IGeZIVBqSEpbOitiZxukvniE9TzkWL3X/C15WBGf8NwKjiUycJCvd w3MM51DYG/U1DdzL5afM9w1ar4zSeRzRdsvMoDgK5w24apxqV X-Gm-Gg: ASbGncudW08FuP6inA4g0rNHbydFDclkIP9FImEPv4UTEDVjldyIZ+UFz5oa6GzGye+ GUp4Pv0ImDmTNeqEVL8CiFqsWr9SIv46i7XF5cwYYvcQ8bjbhIzX2c/n9Nb81rXnqBIb0oOAwKb Ah6eq2MF+UgBG24uoAxKewG29hqi5DCnaxqq8BWlbuBZdMd2ujKXm4XEoPPwR0tdIwgdkinKhEM O9nzMrGSN/tMZNcHAjEr4QoIshSY1CQ+X9n1Cxu7ip0xhYBrdiOy0QiAWfIMtEmQE3bUcNmVXY6 w0ENUWwHCy18D8u2z1E4BoS9l1Vkq6dqjx7V6Nj79ng4iTZ99FKI6Pe4p2J4SjhaMtVHmdH6iOo yvJsAwLCYVccEE2lQnOyHLKij1jTMnZIXP9wV3PMrakw= X-Received: by 2002:a5d:584b:0:b0:390:d954:5e7c with SMTP id ffacd0b85a97d-390eca34e23mr13466461f8f.38.1741009559141; Mon, 03 Mar 2025 05:45:59 -0800 (PST) X-Google-Smtp-Source: AGHT+IHsa1O3XXXhGVnWJc95KvVf3377Ija/fkmB/Ota+HP4/zpxnmUvMTteYSPXf3uwGtm26AdR6g== X-Received: by 2002:a5d:584b:0:b0:390:d954:5e7c with SMTP id ffacd0b85a97d-390eca34e23mr13466442f8f.38.1741009558807; Mon, 03 Mar 2025 05:45:58 -0800 (PST) Received: from ?IPV6:2003:cb:c734:9600:af27:4326:a216:2bfb? (p200300cbc7349600af274326a2162bfb.dip0.t-ipconnect.de. [2003:cb:c734:9600:af27:4326:a216:2bfb]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-390e4847e62sm14703678f8f.67.2025.03.03.05.45.58 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 03 Mar 2025 05:45:58 -0800 (PST) Message-ID: <7e3e8f34-cb61-4702-87c2-486803c5957e@redhat.com> Date: Mon, 3 Mar 2025 14:45:52 +0100 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH] mm/hugetlb: fix surplus pages in dissolve_free_huge_page() To: Jinjiang Tu , akpm@linux-foundation.org, muchun.song@linux.dev, osalvador@suse.de Cc: linux-mm@kvack.org, wangkefeng.wang@huawei.com, sunnanyong@huawei.com References: <20250303060920.2886263-1-tujinjiang@huawei.com> From: David Hildenbrand Autocrypt: addr=david@redhat.com; keydata= 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 WNyWQQ== Organization: Red Hat In-Reply-To: <20250303060920.2886263-1-tujinjiang@huawei.com> X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: angqztano7rFoOis1q8lCRC7_bl0NXpM0OT5Irs684I_1741009559 X-Mimecast-Originator: redhat.com Content-Language: en-US Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Rspam-User: X-Stat-Signature: 1e9nxh56c5533ud4nfp36ydds73zb5js X-Rspamd-Queue-Id: 584F0140013 X-Rspamd-Server: rspam07 X-HE-Tag: 1741009567-350216 X-HE-Meta: U2FsdGVkX18cAS36dBDaBlcEZsihMuUScwG5CXm757viCsUp4XXoMDn2HEYgj00/mYeuMeRDKzoT4KFqJBT5YL0RA686YheHIPOuLOXqwjQ+zGs47uidGNK5YpPgb64lMu0JNZY74cnNadNModKHvUwXbxFINYY5K17ToDyKBrvBXoX1uUFTADXB+ie8RZlvhyANYDie1I3OAABu6DjaaM0KAg7qXNUHBB6mh6OuGGJm04ViA1D/BhckXxAwvuC1Rk3D6B8ZTwr1ExXYx4XPtCr0HH299CzJhR1IBljoYMAWKZGfm5Do9xNYSflTna8VVuoHU5IG5fPg5SSfkjFQV7AhmXCZeb/YXTFgRxYjfQIe6njGJQyMU/4pn1xbopyzdH8U+Z5OPmJOAPx1M2KHO80Aj2Eb/4wCFhRnsaomx4rrxdb5Y3dtGtwr+PNuUo0Oq1q/6ctmWTjfYAvORW1+lyNyFFDBvpUNqp1f4H/BmAOFo3m9WevfyXV3RMaJ70CHFo1mfLR8RnPtiCICBU7hTDoG3dGJX+cjX64/ulzj0a4wIpR09MRtcK3LTokUs+svcvFJGr7aJZGdStGMQ2xuDN16MQ2nFY1Vz3Jn10ektCN5MANihnJAOXzSdB/yayoxM+lX+ZyWOTXGxwSU9oGTYREUqwKKfwsXcxjPERLPxohvMSdXIppr+D4NHvxaVS/zPyRnzbSHabcxS+kAA3XnhyVoPrU69Jgo6r88qvIvlIf4jjVt+22gQTyPDDu02RT7fP/WMFkO5ixTjeQAvFc6lZLGjTtY/5DLGW/tIN3buLo59ujyeCz9LG9ECn06f44ZJhHlY4LacHL8WiO4dT8ot0zzHhSIpUcgBn8rxUU7tvNkBIown9A+7H85JhMyHNCli6vPfREVL+5uSWUJF284K6aTkq3b5nxP94r2uVNc/jsQzpyEMhhvPho367rtfQu6jY2gplVlAquhgg2fRa+ DTnRcow4 iKw1JtCIqZP9vxXD06V0v5Dj18aytevcpISQExzR0aiwjDMQTF7VZ8FgsiLtJvc1MGhfoaTsBmmQC9MISwRTjAPvo8EfYpwkpgQAlMY01Dx3X4uZsq0tBvmE62Qfy3/v6OLSTsfCC5FC7491+kLd7eiOIi4nbxT2u4W4NIoA52ivW6kKeTHgmsWt0IFwOvyVzQaBXHyAxakjwhMMtwdVnqZvO5vLtKXZiGRHko7D7C41EwDliUp3zpCgbC/1IYqiudGkYK6KdPPrJzF2auTKX4EmsFsdL9h212/GUcITLPZw97PnyWlaEwT0MMGNoyYWYbvQCUz7gB5rE221kH3Gl8RXbpHw5V4xAnz5xxbs1KRTnBvAJaf9daii1BNRuWrmUFbepVLUZoTqMRxZYL8oKJfMwSjb5OB9if8NXpxdeDsIUY/vJ60SNo1XN59xv5z6C4GYv 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: > --- a/mm/hugetlb.c > +++ b/mm/hugetlb.c > @@ -2135,6 +2135,8 @@ int dissolve_free_hugetlb_folio(struct folio *folio) > > if (!folio_ref_count(folio)) { > struct hstate *h = folio_hstate(folio); > + bool adjust_surplus = false; > + > if (!available_huge_pages(h)) > goto out; > > @@ -2157,7 +2159,9 @@ int dissolve_free_hugetlb_folio(struct folio *folio) > goto retry; > } > > - remove_hugetlb_folio(h, folio, false); > + if (h->surplus_huge_pages_node[folio_nid(folio)]) > + adjust_surplus = true; This change looks good to me > + remove_hugetlb_folio(h, folio, adjust_surplus); > h->max_huge_pages--; > spin_unlock_irq(&hugetlb_lock); > > @@ -2177,7 +2181,7 @@ int dissolve_free_hugetlb_folio(struct folio *folio) > rc = hugetlb_vmemmap_restore_folio(h, folio); > if (rc) { > spin_lock_irq(&hugetlb_lock); > - add_hugetlb_folio(h, folio, false); > + add_hugetlb_folio(h, folio, adjust_surplus); I'm not quite sure here, though. We dropped the hugetlb_lock, can't some weird concurrent action result in us not having to adjust surplus page anymore? -- Cheers, David / dhildenb