From patchwork Mon May 27 14:14:54 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Hildenbrand X-Patchwork-Id: 13675413 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 D2EA2C25B74 for ; Mon, 27 May 2024 14:15:28 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 232EA6B00A0; Mon, 27 May 2024 10:15:23 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 1E41D6B00A2; Mon, 27 May 2024 10:15:23 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 011766B00A3; Mon, 27 May 2024 10:15:22 -0400 (EDT) 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 CAA606B00A0 for ; Mon, 27 May 2024 10:15:22 -0400 (EDT) Received: from smtpin15.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id 845F31C28B7 for ; Mon, 27 May 2024 14:15:22 +0000 (UTC) X-FDA: 82164373284.15.16AACCA Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf01.hostedemail.com (Postfix) with ESMTP id C913340015 for ; Mon, 27 May 2024 14:15:20 +0000 (UTC) Authentication-Results: imf01.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=Ys32Q7n+; spf=pass (imf01.hostedemail.com: domain of david@redhat.com designates 170.10.133.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=1716819320; 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-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=mvfl7fozsgrYXK/cOQK4fr4wIb0TzpdI/FqNXmQZaNc=; b=kbQCpHYf7hGTqnivPG7ExkwIRK3O9LEPR+voYkhPAxza0X1N8Nx5coOM5BAPhlR9BwBNQu 7FUyaw28SD/JebFSH0Zcy0+Vr73jCt5XovRXTHQg30FKyGkI0msbAoVg0Tr4nx2QBLiT2c K9OYT0jMCjutFTvkdxr7I0P/RX2KoRY= ARC-Authentication-Results: i=1; imf01.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=Ys32Q7n+; spf=pass (imf01.hostedemail.com: domain of david@redhat.com designates 170.10.133.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=1716819320; a=rsa-sha256; cv=none; b=y0Wia6iamRUCNlueHqmYU9CF5TqF3XX7uFK+OgsnQ4tIGFVvEXImeS/jWCiKWkDxUw5qlN T4drP/161Gda2kYbvb0APITHq7fOADZdCq8f1tlV2SlS+rTVC1uPLS4Gn90x5lZ2cRuXfn eLpMEnHxf54NXZw2kdvlaISe0diFWA0= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1716819320; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=mvfl7fozsgrYXK/cOQK4fr4wIb0TzpdI/FqNXmQZaNc=; b=Ys32Q7n+O1EZoy2KSFo4DaXLBfWAzcLYnFtNtQOq7RyMrJGywkT5AZusLGz1BonMjnJRB5 m2ExDlVP+ByBdch6iNJjY1vSHX4BLF8DYmcL2ot7moF/uAgTefrKfWtUhtBEgNFA9ap3Ck IYoRIq6Tp5JigfCdjQOrZWZua4YN+P8= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-626-fSndykL4PXGFfJJtu-ZbSQ-1; Mon, 27 May 2024 10:15:14 -0400 X-MC-Unique: fSndykL4PXGFfJJtu-ZbSQ-1 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 4E79A8058D1; Mon, 27 May 2024 14:15:14 +0000 (UTC) Received: from t490s.redhat.com (unknown [10.39.192.209]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 9A1631C00047; Mon, 27 May 2024 14:15:11 +0000 (UTC) From: David Hildenbrand To: linux-kernel@vger.kernel.org Cc: linux-mm@kvack.org, David Hildenbrand , Andrew Morton , "Matthew Wilcox (Oracle)" , Mike Rapoport , Minchan Kim , Sergey Senozhatsky , Hyeonggon Yoo <42.hyeyoo@gmail.com> Subject: [PATCH v1 6/6] mm/mm_init: initialize page->_mapcount directly in __init_single_page() Date: Mon, 27 May 2024 16:14:54 +0200 Message-ID: <20240527141454.113132-7-david@redhat.com> In-Reply-To: <20240527141454.113132-1-david@redhat.com> References: <20240527141454.113132-1-david@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.7 X-Stat-Signature: rddd33hirwrwyzq8gdmggc1choxguf7d X-Rspamd-Queue-Id: C913340015 X-Rspam-User: X-Rspamd-Server: rspam10 X-HE-Tag: 1716819320-520053 X-HE-Meta: U2FsdGVkX18biSkkGy8unglf42Il+M23dbEHmRRecl4Lemtq3f9GTKlpZEAd64M6PMqcjSTfICxJoyWycMRa9OWvlUF5W/y7Qs01JaIJWuuQ4uX50/xt4PD+21Zj4slRWO4vArcodlsLvVWI9jWv7A689ca2s/eYdPcNbVU8oUyXn+brhA3L73KxkRorI77nhnntQGzQrxeD4gRofjPHeFxt91sAeQD03KaZaa2AVrq7uSKJ/DgY+V9/nOEaONIOlinYH1Y57qqRH8g3NEHceZgE5kzj9XqFkvHi7GPWavk0nOKVZrM01U5G9o/5JSMWRU74IhCNcrs8BeDhsvUvppAA0fSGD1tkKrmT6biyv7N0k8As2deEJlkf6j2KQFGtDikkT/Iu0MUou0RWTLYa4G3uExvtSSLh3UB7uixGGXjJobBRZljscDMq9Vs6cGRVJ/dB6tWVlCflVVO96h7ULTV/CGT9rcicV3BZuMh7BQsxms2yKzWGGB7rYYkm89iW7dlcXcNIDkatGINSwNsgrBvxiaBOe1ry+mbTSqNzZJBHRVjjUEWuAirfsmvATDijnBk2qQ6cyI06DFq7qRwB5HDcC676D9hVJhBDCWkNkoKLsBX3SsGJthBjUS11RSxdXmFgLNBopxUH1QVdtnj6tfuiqPvmvbpD2WsufO3VluXrxhV/5h2iYq3Eg5lFRP/+V5yZCZUWhm7aUWe+MxloPfWAhNmj+D7fRz8rsahh0inTE6EZKTg9wtNx5tT8ifgLGIlplykVJL+HMlcfYyd5PCGpNkMlxupqoOGXpxtZ/lrrqG1ZlIwSdocNLR4jS8y3JbYFUoKVZHB7kKw2VTKpVQkQzNH4GsotYq33nHwrPjY9KCvuHWjIvqAvx40f2TJ5+7fWuMxhR6eZym+qzyf4AAimd4Fj4s7B1Q1ZRB4mEy6nJZamkN/3gNQPf8dnAeHLwzn1s8Z2pDvP9wyfQM9 LuHeoSH5 brjpvoLfNbAiKUGEeoLeG8HasadT94RUzixxWgUOjwNrWK0TGAsSgD26//H7Fn9t149rv8eL6pl+bXR2dgIzTm8iVxIMd9kfkXVYjCQyNBPJlmOp3pWELufpUwnJyRF7dthigz3s+Y5rupt8SZGK/4XGRz+q7YwqBLnYk+lonxFT73ibOX3PjTEz1EXCYMJsJrCu3vBlJs4mEltSRacgTQTQEPN+i7/RdPJGBDoaOuLt/GqaklGLK4g9sXCihPDMWvUEkGuEwydlUoTyqOvYI+Vm3dbN9/+wD68ef 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: Let's simply reinitialize the page->_mapcount directly. We can now get rid of page_mapcount_reset(). Signed-off-by: David Hildenbrand --- include/linux/mm.h | 5 ----- mm/mm_init.c | 2 +- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/include/linux/mm.h b/include/linux/mm.h index 018e7c0265ca..3e1d3b0d545e 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -1206,11 +1206,6 @@ static inline int folio_entire_mapcount(const struct folio *folio) return atomic_read(&folio->_entire_mapcount) + 1; } -static inline void page_mapcount_reset(struct page *page) -{ - atomic_set(&(page)->_mapcount, -1); -} - /** * page_mapcount() - Number of times this precise page is mapped. * @page: The page. diff --git a/mm/mm_init.c b/mm/mm_init.c index f72b852bd5b8..b4916751edce 100644 --- a/mm/mm_init.c +++ b/mm/mm_init.c @@ -568,7 +568,7 @@ void __meminit __init_single_page(struct page *page, unsigned long pfn, mm_zero_struct_page(page); set_page_links(page, zone, nid, pfn); init_page_count(page); - page_mapcount_reset(page); + atomic_set(&page->_mapcount, -1); page_cpupid_reset_last(page); page_kasan_tag_reset(page);