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 4804BC3DA42 for ; Wed, 10 Jul 2024 21:40:25 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id C1B636B0095; Wed, 10 Jul 2024 17:40:24 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id BCA9A6B009C; Wed, 10 Jul 2024 17:40:24 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id A6B6C6B009D; Wed, 10 Jul 2024 17:40:24 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id 8A9FA6B0095 for ; Wed, 10 Jul 2024 17:40:24 -0400 (EDT) Received: from smtpin13.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id 3A80B1202A7 for ; Wed, 10 Jul 2024 21:40:24 +0000 (UTC) X-FDA: 82325161968.13.78AF11E Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by imf24.hostedemail.com (Postfix) with ESMTP id 0203518002F for ; Wed, 10 Jul 2024 21:40:21 +0000 (UTC) Authentication-Results: imf24.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=jLeiKRrG; spf=pass (imf24.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=1720647606; 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=ZgJZ0T6r3P+qXMQykm3Ll9hYnB+GPHH+i4htPza+heI=; b=UH3ak4kgaCKZbmVnQakg4kYyCR8KvItbNPAKvQaj35dzbRqT84sYS9bfAaMd/jY3UMml5N vYRkmZTH8YjrUDLI9yd+4x0OZJ/ycTu+PgQXitxQ8WzOEmP5ZHY3hV1cOatl1a0k3sfLc2 nsEckEkx91PA4FqeJN/IHa7SYEBltSg= ARC-Authentication-Results: i=1; imf24.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=jLeiKRrG; spf=pass (imf24.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=1720647606; a=rsa-sha256; cv=none; b=GAnulGMOlwjHrCH+Sc/4b1/z8GR6rT1tyriWsz4bX5a6k+L6hM4GgfJfAEidmvZ64vfMNK 3h2ok7EFzp5qs46jLALb/CFCLhcxGaz6S4MYjM7dZruGOLBxEXAIy4q2h6JpyLYjyic/9K SB12eBvVhhoVp6xb7McQJVK53yLM0aM= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1720647621; 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=ZgJZ0T6r3P+qXMQykm3Ll9hYnB+GPHH+i4htPza+heI=; b=jLeiKRrGJIZjXsHKCvOTDCkJ8Cf77rtfjUuUCMB/FVQsJxf8EkYmd/0lTctRxIsx70XFld PLrZN65A6QgjFmqLAF1RIyVx4RYRtJ9FgZfMr9YxYCN2SbZ9m++yOhGrKtKO7dlhYkRSLv Hhl09YsYvXLNO0o42MKo/rW5I7wFX9A= Received: from mail-pf1-f199.google.com (mail-pf1-f199.google.com [209.85.210.199]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-381-XMDx74u4MYObNxkMuarAyQ-1; Wed, 10 Jul 2024 17:40:19 -0400 X-MC-Unique: XMDx74u4MYObNxkMuarAyQ-1 Received: by mail-pf1-f199.google.com with SMTP id d2e1a72fcca58-70af0dff5c5so202762b3a.3 for ; Wed, 10 Jul 2024 14:40:19 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1720647618; x=1721252418; 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=ZgJZ0T6r3P+qXMQykm3Ll9hYnB+GPHH+i4htPza+heI=; b=ASzokTJwrOwkCTKpPOBCUS3N8ddLEzzFoGLNo8Yc3vD/Nkcc44DZrxPgeHR1Yv02qt Kl7jDrYi2yIOYANUwFQwMuYcgzRSS9MDp0yF30qXhupx8BtjUabGFQEGUrbEBmvVmlIB fRoM2HTG4RC2GTg5LAVkp0bmsRHllTrlV5uf1QWRzE4UKSK1mz8Y66VvNQJi78WQ0Cj7 a2Q0GUa98/cYy/YqDZ1PZi0gnQ5OOIHq+Vrr3GnYSanFfASGNmipGKxUCzlgwC/C1/7u uOLNDfvi4U5nXvzP0feM1zXHv2pOX88aXZX0CMJKNmJ1OK9t3NWZMKjIFkWLRffu0QQi YyXA== X-Forwarded-Encrypted: i=1; AJvYcCUR/ib4XpfFUpe8enFRvMl9+XClkS+vHALeyYRhZmVfkwV7xFCzRB11HWPbXThpFfPz3JQ2vST93nZJSxxGwZRjO9w= X-Gm-Message-State: AOJu0Yyh4ZhtlVn9EKFa4Ox37bxGYWjeiEcC9I9M4V1BUSFMKl3mk03S L0bz3SzoJ96y8zaRmpMnmz1JJh/nAa8WNa/mvpvD4sggmUEn20Nx4Wo1feAJ30kL2YORb5bWnAH K9ctJ1/adu4OfrizKy4YIgTrPi0SiDWDmr7Z3evkbgzP9Ui6W X-Received: by 2002:a05:6a00:1955:b0:70a:f5c5:135d with SMTP id d2e1a72fcca58-70b43667750mr8053504b3a.32.1720647618548; Wed, 10 Jul 2024 14:40:18 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEPTuTQRQE30zFBM0t8+WCUxb2VC4RLEEJeQ4IxECNg0RAHwUr/Q/CjeWUsChjiQaCkqSL2Pg== X-Received: by 2002:a05:6a00:1955:b0:70a:f5c5:135d with SMTP id d2e1a72fcca58-70b43667750mr8053487b3a.32.1720647618108; Wed, 10 Jul 2024 14:40:18 -0700 (PDT) Received: from [10.35.209.243] ([208.115.86.68]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-70b439afda9sm4242396b3a.169.2024.07.10.14.40.17 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 10 Jul 2024 14:40:17 -0700 (PDT) Message-ID: <25a87009-5318-457b-926b-69185767b274@redhat.com> Date: Wed, 10 Jul 2024 23:40:16 +0200 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH v1] mm/rmap: cleanup partially-mapped handling in __folio_remove_rmap() To: Yosry Ahmed Cc: linux-kernel@vger.kernel.org, linux-mm@kvack.org References: <20240618151026.521019-1-david@redhat.com> From: David Hildenbrand Autocrypt: addr=david@redhat.com; keydata= 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 WNyWQQ== Organization: Red Hat In-Reply-To: X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Language: en-US Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit X-Rspam-User: X-Rspamd-Server: rspam01 X-Rspamd-Queue-Id: 0203518002F X-Stat-Signature: 4ykhifqchuczi5o9ptr7drpjed8xo8wr X-HE-Tag: 1720647621-421578 X-HE-Meta: U2FsdGVkX19wTXTQ+6hX+fVWzksTmsJA321OErGYRs3hyH/Yg/4VHWSUoyxUt0dxNCxKNoK6j4aLgULs/m+Wmk2AlPYw1rqyZ0tjrgChQlwGzJRZWu5lmWnr8We5ijn3vsQA0ssoL0fcBA7SYeTWsHOLtNZlI7f3l9U9tmwmA7AmUVMpd81dQcXalHUxEM0AbBiWaQ8rFxHRKmg89M6TUqZXbHPaZz2WA0ul3yGbrKFsbdcm2CmOp2DOA/f9HStC3iuGi8tPqNazOnabuErXGh2MYjmfYR/2nVk0OEAfarqh0xT7KYcyGvyAxRghFsvGxZcdZ2XMmIqFzW87W1wLgdG28VgAPnv/BxXFl1TAW7+qDlLTJMeUJUa6Vo+H9Z8X31lYl3/SWHec9JwQU3cTRJGymOlsbnlTF+spf1rOFg/4o2gkB1bgkUpMeQIuvEZcjJ3O6ttwIvZWc9ssTpCKBXwWuQ6ZZYxm6xfdEqOlWzlZlfMaVwe128VP9lAxfbNuYylEzSUtiDOZtm0mRFIi0L0zlps27zmfSd2i7yCzsw1qrWOyTQv5N3MoB35rrUwUGh/aJRiVMfBZHhzbJLLqg9vTsbRvNytxKXAnMJmnJ/57AMuoGHAunt8FsffdBAierDxJZWcKWHjKaXzOyzZli6znQ/gOEc6rnpNzNfq+dxUMTui8wcRqJg+aWrSVGEB8xCUbHBDzD9IFikPIuheSIqwaw+AdgM542jyRcPoY7gwSOhAGrV+DHXGV5alH7qJURq4Pj8XMvH8K2xSoDP8scPTzrwNBHQa52S3xWjUeUA7AVEvv8fRjAkarkHlWij+474RznWZ+5JfyOcO1L1bZ3TyE7ETCdAPSAyGk2YW6csL0SISsqpBMTPwmvi7vr903wPnn+JjR2bPo1kGv4KyQg2YQ8KwIpNgjk+Nv53GsmngWKDGWffkp9LpxgamZBlekPfCSoIVNCJBC6ljkl1K 0uRAnuDS NnZQLn0TLhCUy5EROChPBm5tIIph2NuYkM7fj+C/o1E9cB6KviGioLB0u3I0/osSLDYpBCCq3roG71io6bOv3BK47PmSZtV7GMRvNjy6By3OFOIdVga1XtS/RSeLfyLylpl2FYiaDPKeP0UZ40FV02NIe6mQoK3zTH1C8D6dQGkJ4AydsALNXq3ac8WhY1yTqktjvvMGFLZSfer/TFeprkEYN3RC6jYQDj4qp0JnXFDha7OkP+L4mKR4LwLHrHIaPEARpMCl6IMEBrHHM04XD513E/qRTO60VZK2cMb8W4ivlAiu+xz7DluZYRshAiiGhd3bcrDYGwT4gkmqqKvBnEclNR91jlv/L5m5lRVBzEBIJrwN242qwT1wOhkxZ76u46GMMQKKDan/vru36l/QO6sDyDZpGNbySnJnPcbRV/xic2+KPOHjOtGAxK6vDdMM+1kNumF+4vRqpbfQPa4KnQ8XEEXPNjGBDtHwajvO/keE4/HV65LlBRpx9ySbi8ryqHFFDqn1qBn9Vrb0= 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 24.06.24 13:48, Yosry Ahmed wrote: > On Tue, Jun 18, 2024 at 8:10 AM David Hildenbrand wrote: >> >> Let's simplify and reduce code indentation. In the RMAP_LEVEL_PTE case, we >> already check for nr when computing partially_mapped. >> >> For RMAP_LEVEL_PMD, it's a bit more confusing. Likely, we don't need the >> "nr" check, but we could have "nr < nr_pmdmapped" also if we stumbled >> into the "/* Raced ahead of another remove and an add? */" case. So >> let's simply move the nr check in there. >> >> Note that partially_mapped is always false for small folios. >> >> No functional change intended. >> >> Cc: Yosry Ahmed >> Signed-off-by: David Hildenbrand > > Makes sense to me. FWIW: > > Reviewed-by: Yosry Ahmed > >> --- >> mm/rmap.c | 10 ++++------ >> 1 file changed, 4 insertions(+), 6 deletions(-) >> >> diff --git a/mm/rmap.c b/mm/rmap.c >> index afec4b6800caf..aa900e46cdf82 100644 >> --- a/mm/rmap.c >> +++ b/mm/rmap.c >> @@ -1551,11 +1551,12 @@ static __always_inline void __folio_remove_rmap(struct folio *folio, >> } >> } >> >> - partially_mapped = nr < nr_pmdmapped; >> + partially_mapped = nr && nr < nr_pmdmapped; >> break; >> } >> >> - if (nr) { >> + if (partially_mapped && folio_test_anon(folio) && >> + list_empty(&folio->_deferred_list)) >> /* >> * Queue anon large folio for deferred split if at least one >> * page of the folio is unmapped and at least one page >> @@ -1563,10 +1564,7 @@ static __always_inline void __folio_remove_rmap(struct folio *folio, >> * >> * Check partially_mapped first to ensure it is a large folio. >> */ >> - if (folio_test_anon(folio) && partially_mapped && >> - list_empty(&folio->_deferred_list)) >> - deferred_split_folio(folio); >> - } >> + deferred_split_folio(folio); > > FWIW, I prefer moving the comment out of the one-line if block as you > originally suggested in [1]. > > [1]https://lore.kernel.org/lkml/1a408ed1-7e81-457e-a205-db274b4d6b78@redhat.com/ Sorry for the late reply, crazy times here. Let me do that and resend, thanks! -- Cheers, David / dhildenb