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 244FFEE4993 for ; Wed, 23 Aug 2023 15:26:50 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 93AA8280082; Wed, 23 Aug 2023 11:26:49 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 8EAA4280080; Wed, 23 Aug 2023 11:26:49 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 78C7C280082; Wed, 23 Aug 2023 11:26:49 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id 6A8FE280080 for ; Wed, 23 Aug 2023 11:26:49 -0400 (EDT) Received: from smtpin16.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id 2DCE1160154 for ; Wed, 23 Aug 2023 15:26:49 +0000 (UTC) X-FDA: 81155746938.16.F159271 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf19.hostedemail.com (Postfix) with ESMTP id E4A1C1A0006 for ; Wed, 23 Aug 2023 15:26:46 +0000 (UTC) Authentication-Results: imf19.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=fn6MIlTe; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf19.hostedemail.com: domain of david@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=david@redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1692804407; 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=4UI7Ho540jlH4rUXPCi14mhF5Zm1AtUOA4NGPCV7qRs=; b=Vmt4xxucFF/paBxYA1lOfN2wKkR8EZjNd06crJJhVBD5Gft3H+RyuYqhOGejqpl+cqyWtv XmEArv769mf2x10JQLrLQICXIKZjNyayZavLRI8mp6NaQPwdZ0RPwv2f/3L6U5C8Zvd5t5 o/rrtWe6Pe2t9MpnQWyn0nK6rgRJ46o= ARC-Authentication-Results: i=1; imf19.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=fn6MIlTe; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf19.hostedemail.com: domain of david@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=david@redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1692804407; a=rsa-sha256; cv=none; b=eA/kBdF4Mb14SSDEEI2dI0hm/anGkEpub6i+sdB9e0oK7udWqBRimqAfVa37Szp7ENFCYq g7s5fxYsv9Izu9/QR3914v0OEATAWgDDTDjGCQDVO4IE3xcrVxvrgf+RVahVJcfAap5gur Jh2BvRJBRoaeh3IS3wROkWo3iM2LTXo= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1692804406; 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; bh=4UI7Ho540jlH4rUXPCi14mhF5Zm1AtUOA4NGPCV7qRs=; b=fn6MIlTexxlZbVG0fg/lR9rM/ybsHlQb/pyzfhaoXqH8MgjkHnvClYhUvg/m5/ktatoPzV wjHGkiAAs9qkFHDueKwLhMAj9b5c41JJbNb0l6V5Bskdo3XDhiSX9++gCge4WFP/7or/5L i3ii5JydNAJzT9g/jZgQFPf4jDtHP/w= Received: from mail-wm1-f69.google.com (mail-wm1-f69.google.com [209.85.128.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-684-rVOnyBnsPBeECsuET3Rk6Q-1; Wed, 23 Aug 2023 11:26:44 -0400 X-MC-Unique: rVOnyBnsPBeECsuET3Rk6Q-1 Received: by mail-wm1-f69.google.com with SMTP id 5b1f17b1804b1-3fe4cca36b7so39334285e9.3 for ; Wed, 23 Aug 2023 08:26:44 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1692804403; x=1693409203; h=content-transfer-encoding:in-reply-to:organization:from:references :cc:to:content-language:subject:user-agent:mime-version:date :message-id:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=4UI7Ho540jlH4rUXPCi14mhF5Zm1AtUOA4NGPCV7qRs=; b=baWcQq2OHbWlHkeUzCPhb/HIe3zWI0LAYgwFncSi7YV021HPR9dlSsyI4Uqm8sWd/W yj/AbnNCO+mR74IwpDT0JeGy4R3Cr3ahfexNyxue+/GkbelQfNPVFhP3xXpXMrsDv1Ec Asw/Hc46cEeoqfFqyYeCtPGsrwiZiTF39kXUfSP7OKxNa/Q0WXUz30QKBU0kH9gfgWoh 6AOmxacbnRIHtV8XqVjRQ2pUMTBqH06jEAoHouB2NRR+7nbKgwaOm4IN28AUTo+qq3VT sf+D56Je/cF4ixr/AncRv42F9ESrK6WN2cybJ3muBChMWxLfysqAqCEzOuokRstPhfsN fB1Q== X-Gm-Message-State: AOJu0Yw8CvgaTaSl+CnGMQIyggbpFJB8gS+Zq9amQ4Wh9LlqhJKNfaM4 6Pxk8+fMNtsf96jKXEeeFzoCFMyyq5AchFlep6nQH1lINUwuHSG6I8+zHe1uy3elFUEbwgJw7kK C7QSIccgWUv8= X-Received: by 2002:a05:6000:9:b0:319:8d94:c245 with SMTP id h9-20020a056000000900b003198d94c245mr10178791wrx.69.1692804403201; Wed, 23 Aug 2023 08:26:43 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFCOvETovhlYYrILujcJE2Q9Ex1e0QwKZySp+1RFtrq2eD3vfEzX6s4PxKdnt5D2cAAlx+gpQ== X-Received: by 2002:a05:6000:9:b0:319:8d94:c245 with SMTP id h9-20020a056000000900b003198d94c245mr10178776wrx.69.1692804402720; Wed, 23 Aug 2023 08:26:42 -0700 (PDT) Received: from ?IPV6:2003:cb:c70c:e700:4d5c:81e2:253e:e397? (p200300cbc70ce7004d5c81e2253ee397.dip0.t-ipconnect.de. [2003:cb:c70c:e700:4d5c:81e2:253e:e397]) by smtp.gmail.com with ESMTPSA id m7-20020a5d6247000000b00317f29ad113sm19470345wrv.32.2023.08.23.08.26.41 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 23 Aug 2023 08:26:42 -0700 (PDT) Message-ID: Date: Wed, 23 Aug 2023 17:26:41 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.13.0 Subject: Re: [PATCH mm-unstable v1 1/4] mm/swap: stop using page->private on tail pages for THP_SWAP To: Yosry Ahmed Cc: linux-kernel@vger.kernel.org, linux-mm@kvack.org, linux-arm-kernel@lists.infradead.org, Andrew Morton , Matthew Wilcox , Peter Xu , Catalin Marinas , Will Deacon , Hugh Dickins , Seth Jennings , Dan Streetman , Vitaly Wool References: <20230821160849.531668-1-david@redhat.com> <20230821160849.531668-2-david@redhat.com> From: David Hildenbrand 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-Rspamd-Queue-Id: E4A1C1A0006 X-Rspam-User: X-Rspamd-Server: rspam02 X-Stat-Signature: 4o4a9ezqqy7ofkp4y6usqqosbyqzdtfz X-HE-Tag: 1692804406-335099 X-HE-Meta: U2FsdGVkX1/zgRDIyod7wpxWvfuo3fxPfRNtZ3xAExdrt0AvD3JS9jEmaCCowL497BbJ39TJr6x2INzpIxz/D0GsW+QC1+ovlT+JPf6Jc9CLRDXGVV1zdNbkMAPK2ks/jQeZs9WCq+o24tsykU5W1tqtgyT64KSu/XSpT5UDQgLPQk1K++KLqd5VxQqDz+riG+TbZYOHbQFV9rR9Z06+GVz1PYeIydNNgZ+9PLlerudu0U7OIp1N9bLAZuImp8meuCdh0RGjrbX4kSzczjzDqzljMD5FzyaB9HfQBCI8/4ltckemufiLR944wAsjsFtxixGcA3VhqoWFsTW9kD9GvImf4bQ8lrS13ih6mTgaCahUwub4+GIYsmKQ5rwEYIchu5scNgELcYrwgM/0qf6mHybcycBeOzCIapJGQrKZOww4pBXR/2qsQjM+aIMnD2lcQKR66GardotFDnaj/USM/jKUJzqzgquVI5L5OcIIFfYObSe4RSmQeEAaeBZ8FfWV89AGeebcyql8xZhCrD+r1XSgbT7l20vHrfujDMBgUbLt0Df4TmMG/2SsYUZZbctHdMzxYGUnNi+xEEqrD81azv+B/HVUVM/5EmIaPzCdov/vCrQAsoxUjgUwXnVMaxuw6sJCg0Z7/BJWxj5U3Rfs5/nNwSl7XLoPl14HwlF8J5HW1sQSlZDp5pQJTJiznY7obun+CbzqTjx62KvxHl0X4YtIgzhaDEg/OarNaGtueror6PkLs35pe/emPtgVS61l6jA53ByNe3UGo3wYAUhSnK9invQYhqbi/d1qp8HNLi3Omc8sQGwZH9lUwSaUuIE0GPyrl/aTc0o3Y/p33ZvFHR/0B4bsYi5qnAF8eF2RI8znxtg8vUXo9AHLxFjHwWVZxujPhA2oj/CL3NJtYpZNMeGPoHv8T8Skz09ZrW3598opnLwtPLWwVdi9Ss5d+PjjmyNkV+/90syU9DwQZXR ZNNG6fUR KWG/B1sq2mrEdhm1Frb4qc8swlkuIVXFNyRTHDyfoy8p1Nh98bHKRob2d0MVzu9SqUMAgKbWojSAHSzt4G+7UrH3GK7fQoVFeJqciMNDsd2in2cwYEhqDaSLIcfzpbVlTElSYN74xuS2xeNVGOv2xF9SIzgNvUsX2TFTkpJ8Ao0e9S/WZn0WYcC3NDKo72k18h+nd/+4yBDYObHU/oazJFppmvKi0ipyUSflI0Kk8GuV6T4qlwmAZFmidTS2WxdVAT9zY70ba7mBgSxv7t6sy0rMowMSypBEcesys24Lxu+vEdBfTn+txsiyYSRje3U3tCO3bg1sn/gkQET7NsZ3UhKvfRYLW6MFlBpDFQAaTNB9zt5khybW3B1lKy6R2zcWGeGxA 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: On 23.08.23 17:21, Yosry Ahmed wrote: > On Wed, Aug 23, 2023 at 8:17 AM David Hildenbrand wrote: >> >> On 23.08.23 17:12, Yosry Ahmed wrote: >>> On Mon, Aug 21, 2023 at 9:09 AM David Hildenbrand wrote: >>>> >>>> Let's stop using page->private on tail pages, making it possible to >>>> just unconditionally reuse that field in the tail pages of large folios. >>>> >>>> The remaining usage of the private field for THP_SWAP is in the THP >>>> splitting code (mm/huge_memory.c), that we'll handle separately later. >>>> >>>> Update the THP_SWAP documentation and sanity checks in mm_types.h and >>>> __split_huge_page_tail(). >>>> >>>> Signed-off-by: David Hildenbrand >>> >>> The mm part looks good to me (with the added fixup): >>> >>> Reviewed-by: Yosry Ahmed >> >> Thanks! >> >>>> /** >>>> diff --git a/include/linux/swap.h b/include/linux/swap.h >>>> index bb5adc604144..84fe0e94f5cd 100644 >>>> --- a/include/linux/swap.h >>>> +++ b/include/linux/swap.h >>>> @@ -339,6 +339,15 @@ static inline swp_entry_t folio_swap_entry(struct folio *folio) >>>> return entry; >>>> } >>>> >>>> +static inline swp_entry_t page_swap_entry(struct page *page) >>>> +{ >>>> + struct folio *folio = page_folio(page); >>>> + swp_entry_t entry = folio_swap_entry(folio); >>>> + >>>> + entry.val += page - &folio->page; >>>> + return entry; >>>> +} >>>> + >>>> static inline void folio_set_swap_entry(struct folio *folio, swp_entry_t entry) >>>> { >>>> folio->private = (void *)entry.val; >>>> diff --git a/mm/huge_memory.c b/mm/huge_memory.c >>>> index cc2f65f8cc62..c04702ae71d2 100644 >>>> --- a/mm/huge_memory.c >>>> +++ b/mm/huge_memory.c >>>> @@ -2446,18 +2446,15 @@ static void __split_huge_page_tail(struct page *head, int tail, >>>> page_tail->index = head->index + tail; >>>> >>>> /* >>>> - * page->private should not be set in tail pages with the exception >>>> - * of swap cache pages that store the swp_entry_t in tail pages. >>>> - * Fix up and warn once if private is unexpectedly set. >>>> - * >>>> - * What of 32-bit systems, on which folio->_pincount overlays >>>> - * head[1].private? No problem: THP_SWAP is not enabled on 32-bit, and >>>> - * pincount must be 0 for folio_ref_freeze() to have succeeded. >>>> + * page->private should not be set in tail pages. Fix up and warn once >>>> + * if private is unexpectedly set. >>>> */ >>>> - if (!folio_test_swapcache(page_folio(head))) { >>>> - VM_WARN_ON_ONCE_PAGE(page_tail->private != 0, page_tail); >>>> + if (unlikely(page_tail->private)) { >>>> + VM_WARN_ON_ONCE_PAGE(true, page_tail); >>>> page_tail->private = 0; >>>> } >>> >>> Could probably save a couple of lines here: >>> >>> if (VM_WARN_ON_ONCE_PAGE(page_tail->private != 0, page_tail)) >>> >>> page_tail->private = 0; >>> >> >> That would mean that we eventually compile out the runtime check >> >> #define VM_WARN_ON_ONCE_PAGE(cond, page) BUILD_BUG_ON_INVALID(cond) > > I thought the warning would be compiled out but not the check, my bad. I even remembered that VM_WARN_ON_ONCE and friends could/should not be used in conditionals. But we do seem to have two users now: $ git grep "if (VM_WARN_ON" mm/mmap.c: if (VM_WARN_ON_ONCE_MM(vma->vm_end != vmi_end, mm)) mm/mmap.c: if (VM_WARN_ON_ONCE_MM(vma->vm_start != vmi_start, mm)) But they only do warning-related action, to dump the stack, the vma, ... So if the warnings get compiled out, also all the other stuff gets compiled out as well, which makes sense here. -- Cheers, David / dhildenb