From patchwork Fri Mar 21 05:31:47 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gavin Shan X-Patchwork-Id: 14024872 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 04ED1C35FF3 for ; Fri, 21 Mar 2025 05:32:22 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id F0998280003; Fri, 21 Mar 2025 01:32:20 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id EB7CF280001; Fri, 21 Mar 2025 01:32:20 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id D809A280003; Fri, 21 Mar 2025 01:32:20 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id B8EF2280001 for ; Fri, 21 Mar 2025 01:32:20 -0400 (EDT) Received: from smtpin25.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id 0261D141BA6 for ; Fri, 21 Mar 2025 05:32:21 +0000 (UTC) X-FDA: 83244437724.25.915D44F Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf07.hostedemail.com (Postfix) with ESMTP id 30E114000D for ; Fri, 21 Mar 2025 05:32:20 +0000 (UTC) Authentication-Results: imf07.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=Ay5P4zTU; dmarc=pass (policy=quarantine) header.from=redhat.com; spf=pass (imf07.hostedemail.com: domain of gshan@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=gshan@redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1742535140; a=rsa-sha256; cv=none; b=xZ9QRsveSzn3sU7javT14aHiG0Rb5IZ28H/FA1I/zjryJYsWRHH0jx3YDWNxZ1O1kTdY5u PvavPxBbhQ+vBYj7PRgWb37gWfkUC2ULBx32risLR+JOlRuidH1S+6SlERIBHKdfjDweJJ LRKLHuCNUHR1B8e+GBOnvVTt913fpxU= ARC-Authentication-Results: i=1; imf07.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=Ay5P4zTU; dmarc=pass (policy=quarantine) header.from=redhat.com; spf=pass (imf07.hostedemail.com: domain of gshan@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=gshan@redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1742535140; 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=KLmz+StgN3LKOwHPa2A88i6gxamoiRfdCYwKVYk+MWA=; b=NI0EY5Cv4xWcWZfNzHK6RxbSsjp9Hi5jV1mBugKhAiIpZZgRhwaI/zpC0mGQBpsIwSoqa+ P6OT+dzMIM5lrbeiCyKHZ0Wd+M+Ip4AL8O5GUfAXCamFC4FjO5ci5AeLys3nFuM7UL6U42 lqq9Z1Zv9TaIezQnpLzrBBOFV38ywqU= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1742535139; 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=KLmz+StgN3LKOwHPa2A88i6gxamoiRfdCYwKVYk+MWA=; b=Ay5P4zTUjyYixHBsAHSLGTKskjDVwf3cL7OqP9/WvPXGdT7SO9OZWfCRvCJqNhEUZF4AsT +PiJnosIXgV3RyHCmw3zB5Leg3+TVfCZhvHB9GnxhMzb6SIBpUnq4Zq34uWbveUOyLbFPq PtxYT8Y3ogK6Czl3R3lIIY+S6dDc61c= Received: from mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-540-SvgeW2gIMd-HhZRu14cONg-1; Fri, 21 Mar 2025 01:32:15 -0400 X-MC-Unique: SvgeW2gIMd-HhZRu14cONg-1 X-Mimecast-MFC-AGG-ID: SvgeW2gIMd-HhZRu14cONg_1742535134 Received: from mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.12]) (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 mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id C888B196D2D0; Fri, 21 Mar 2025 05:32:12 +0000 (UTC) Received: from gshan-thinkpadx1nanogen2.remote.csb (unknown [10.64.136.79]) by mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id EBD5C19373C4; Fri, 21 Mar 2025 05:32:06 +0000 (UTC) From: Gavin Shan To: linux-mm@kvack.org Cc: linux-kernel@vger.kernel.org, akpm@linux-foundation.org, willy@infradead.org, david@redhat.com, vbabka@suse.cz, osalvador@suse.de, gehao@kylinos.cn, shan.gavin@gmail.com Subject: [PATCH 1/2] mm: Fix parameter passed to page_mapcount_is_type() Date: Fri, 21 Mar 2025 15:31:47 +1000 Message-ID: <20250321053148.1434076-2-gshan@redhat.com> In-Reply-To: <20250321053148.1434076-1-gshan@redhat.com> References: <20250321053148.1434076-1-gshan@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.12 X-Rspamd-Queue-Id: 30E114000D X-Stat-Signature: ku9ker3o5kadr5fzmnsbqozxxgopk9cg X-Rspam-User: X-Rspamd-Server: rspam06 X-HE-Tag: 1742535140-854690 X-HE-Meta: U2FsdGVkX1/ermrpbbc1/TsLsZlzotm5vlG7K/W4x96HblX6bLhr+4F8XdosjJ1H/8x8b+/KFulnZ22aNM/AcJ+eLYutZDcARs+OaqF6Qi9GEmfFiiAoo4W7S2wnAwRHhsj+ks8lXa8aporVYV4SaSqTPYKzANiSaSUnyr6spzT1z05yiv7rxc/SRIWZ39EFLGhwtfDj2bT9o3BD4pH5LrlEKMO2RVmiTX+hVvIG1hZfuE/+OW7NeqqSLoHvZLHSr9wz5qOg+mXWb+OB3gAY22pOS/3K89taaXJu+w8UMe2TKi2Q55DMsZsTJa7Nhnc6HAvQNN3aVxFg3hSr7TJYEjsgE+/LQ+X07z98FNN0XL2pxZm0BfMnYK69R3i0My9Ban6trUEGnSuKG1Fnplmns66MggIYp7WSuhC26JpNWDU2+dAGj6FUyt5Iok5Q0n9NqfhIrOChw0uNnnSnDgwd4a9ZTfRF1S9yxflU3bWrKfiEFBtWRg+Zos8p49f16oGbTbsnKSPNH7FpzjITjjKEQykzdzIIMICPuBSqXDooqDJnsyfeJ2E+9oPFLb+qlB5b8MuvVHLsPfbKfoDhnaHX3DSx7XshnxqYHt+01pHdT92NCGWuQvA69mMe3dVPznaeYdFFAB7zwNliHwxlKcd2GQ8B/VJSWSyke4T+eYD3KbkwtabEOOxIY+NpzY7/S9qTEgXzwvoXsK1X8DymH+0YAHGP7eeyFByqmqw19LoA7T0MBLLgcTUKtBE34BI9wvzjctZZuaw0N9vhs6vGtdbkpZHOk8tbnG41iyClp2WYFt3IQqZCu+709QEFZSZInPP8wUpYW8HwLXLFB+JzpvTjEqCUhksV+76Fmw0La4ZT2HkVyreSb6VFs4DnO6y4y72D1vlwqtWF2tb3IJxz7PIykSuqS9kw2AV8Sxo0yJIxYrOSh4gVwxa7ABLH9edP0d2Hg2zMCXaE/CFbtqkgYgJ 4TEDeP4K j7Pf3W5Bzozqo8FA0xUGwzC2wspYdZQmjjHUrfuuDH5jzi732K03x3J7xQZSHuruMg6URXZWsjn07vWb6xNlypO9ou0GeFUhFY8iTeQ00p/thLZ86qXZJdwqvBWQ2E5WeHMI8v+ryv8b72F2WS/20z/bNOl526CB4rAZd9ShshHg31m2ZftdlvmMdCMqYKEA2bM2fVuxRiP9vR6rEIMdDGrP1+09QH28mZPelSd9qACGfwfOrvhlmwUgTIv10sBk+FUlLhtJwi3k1lOMxDcdEdq7yWQ64Ks57OTYJCCDIrqkTH7DIfPh8y5IdnzVAxA+WMcqGVjzdMURnsWE+hzz+PFf2tC3Lxv7OMvRwfo4So6eIiheT63pfx4ghZeSwrPRgH+jXkpwgMvzEn+Kreps9SNAA+bfvCg5N8XP3nq/bfpksKGkMtpzuAsy4cjJBqmr+sGHZHKxuAK+BbeGTEIRxYChPFZznB7OLYewd 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: As the comments of page_mapcount_is_type() indicate, the parameter passed to the function should be one more than page->__mapcount. However, page->__mapcount (equivalent to page->page_type) is passed to the function by commit 4ffca5a96678 ("mm: support only one page_type per page") where page_type_has_type() is replaced by page_mapcount_is_type(), but the parameter isn't adjusted. Fix the parameter passed to page_mapcount_is_type() to be (page->__mapcount + 1). Fixes: 4ffca5a96678 ("mm: support only one page_type per page") Cc: stable@vger.kernel.org # v6.12+ Signed-off-by: Gavin Shan Acked-by: David Hildenbrand --- include/linux/page-flags.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/linux/page-flags.h b/include/linux/page-flags.h index 36d283552f80..ad87b4cf1f9a 100644 --- a/include/linux/page-flags.h +++ b/include/linux/page-flags.h @@ -950,7 +950,7 @@ static inline bool page_mapcount_is_type(unsigned int mapcount) static inline bool page_has_type(const struct page *page) { - return page_mapcount_is_type(data_race(page->page_type)); + return page_mapcount_is_type(data_race(page->page_type) + 1); } #define FOLIO_TYPE_OPS(lname, fname) \