From patchwork Tue Apr 9 15:54:07 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Sumanth Korikkar X-Patchwork-Id: 13622907 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 57B94CD1296 for ; Tue, 9 Apr 2024 15:54:34 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id B2AF86B007B; Tue, 9 Apr 2024 11:54:33 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id ADAF66B008C; Tue, 9 Apr 2024 11:54:33 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 97BBE6B0093; Tue, 9 Apr 2024 11:54:33 -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 73FBA6B007B for ; Tue, 9 Apr 2024 11:54:33 -0400 (EDT) Received: from smtpin04.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id CC8491A0453 for ; Tue, 9 Apr 2024 15:54:32 +0000 (UTC) X-FDA: 81990440784.04.D2D8E66 Received: from mx0b-001b2d01.pphosted.com (mx0b-001b2d01.pphosted.com [148.163.158.5]) by imf14.hostedemail.com (Postfix) with ESMTP id 9C185100011 for ; Tue, 9 Apr 2024 15:54:29 +0000 (UTC) Authentication-Results: imf14.hostedemail.com; dkim=pass header.d=ibm.com header.s=pp1 header.b=koBP5gFl; spf=pass (imf14.hostedemail.com: domain of sumanthk@linux.ibm.com designates 148.163.158.5 as permitted sender) smtp.mailfrom=sumanthk@linux.ibm.com; dmarc=pass (policy=none) header.from=ibm.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1712678069; 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: references:dkim-signature; bh=hltvEKuUiuAjdE9Nr1WEt7/LBEqngI0qozmlnXjnpxQ=; b=GbVzAS7LlTuKRYoJwKWzGqTjBvX9vDcluFVEDFRiTKxP8WlOKCjptroZxUi8X67TfmGcZk vNykcon81iOgXEOjQRAAkqMp1VIFPnsJc+jsVwWVSnv/9bL4Xnx2y0ElL2TQYzioAiEnhw +vN1bYLQfr9jMBakmcLHr2fpLpRxspE= ARC-Authentication-Results: i=1; imf14.hostedemail.com; dkim=pass header.d=ibm.com header.s=pp1 header.b=koBP5gFl; spf=pass (imf14.hostedemail.com: domain of sumanthk@linux.ibm.com designates 148.163.158.5 as permitted sender) smtp.mailfrom=sumanthk@linux.ibm.com; dmarc=pass (policy=none) header.from=ibm.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1712678069; a=rsa-sha256; cv=none; b=Tka7v9pWt63ZLTBPDhfewzmTjimC9DaFxpQQqu9july9z+ifjnB8dVihi1VVE1T+zHykuS 6BB3ELN+lIqAF74oqweG6BE1CyyHAlljYkxOteOjusQiznQKMZv2IoWT85tjoGx9l96qXJ s5CYtxNMiK7uaDNML6ugSimp7oR+xyw= Received: from pps.filterd (m0356516.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 439FR6dd010322; Tue, 9 Apr 2024 15:54:28 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=from : to : cc : subject : date : message-id : mime-version : content-type : content-transfer-encoding; s=pp1; bh=hltvEKuUiuAjdE9Nr1WEt7/LBEqngI0qozmlnXjnpxQ=; b=koBP5gFlerfgpNI8OIJu7AleYBawOadeGKFYBwnGA8Pk4vhUcPSTi1kbZQwhy6oGdE4t BXOZKClyN1Nni+3DzSdl+etqj0+SaDETd8LGqT8rx9/MK/qB5Hq2gI8nDyhlZx+DhwXq LwZWoL/gVB69eC8xcTsMEUwl0mIl28tDM/y/z6Ql7R84suftLYFhHbdoqAJduQOh3arO rXFoxTYOZM9tl5/wT4s4xwbXoy0nIXqLnI88eGASrrvNF+aS+/aO99AdLHVyKZi43zqv xU2STpY58crxyuJOhob0SqDqUq/t0CBnBTgbjkugVbymPopoVw1AlLIDNwtjI6YeZYsj RA== Received: from pps.reinject (localhost [127.0.0.1]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 3xd7rq05gc-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 09 Apr 2024 15:54:26 +0000 Received: from m0356516.ppops.net (m0356516.ppops.net [127.0.0.1]) by pps.reinject (8.17.1.5/8.17.1.5) with ESMTP id 439FsNm6022291; Tue, 9 Apr 2024 15:54:23 GMT Received: from ppma13.dal12v.mail.ibm.com (dd.9e.1632.ip4.static.sl-reverse.com [50.22.158.221]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 3xd7rq05g8-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 09 Apr 2024 15:54:23 +0000 Received: from pps.filterd (ppma13.dal12v.mail.ibm.com [127.0.0.1]) by ppma13.dal12v.mail.ibm.com (8.17.1.19/8.17.1.19) with ESMTP id 439Flq8D021485; Tue, 9 Apr 2024 15:54:22 GMT Received: from smtprelay01.fra02v.mail.ibm.com ([9.218.2.227]) by ppma13.dal12v.mail.ibm.com (PPS) with ESMTPS id 3xbjxkpvrd-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 09 Apr 2024 15:54:22 +0000 Received: from smtpav02.fra02v.mail.ibm.com (smtpav02.fra02v.mail.ibm.com [10.20.54.101]) by smtprelay01.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 439FsHGU29491696 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 9 Apr 2024 15:54:19 GMT Received: from smtpav02.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 507B82004B; Tue, 9 Apr 2024 15:54:17 +0000 (GMT) Received: from smtpav02.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 232FB20040; Tue, 9 Apr 2024 15:54:17 +0000 (GMT) Received: from tuxmaker.boeblingen.de.ibm.com (unknown [9.152.85.9]) by smtpav02.fra02v.mail.ibm.com (Postfix) with ESMTP; Tue, 9 Apr 2024 15:54:17 +0000 (GMT) From: Sumanth Korikkar To: akpm@linux-foundation.org, linux-mm@kvack.org Cc: hughd@google.com, hca@linux.ibm.com, gor@linux.ibm.com, agordeev@linux.ibm.com, iii@linux.ibm.com, linux-s390@vger.kernel.org, linux-kernel@vger.kernel.org, Sumanth Korikkar Subject: [PATCH] mm/shmem: Inline shmem_is_huge() for disabled transparent hugepages Date: Tue, 9 Apr 2024 17:54:07 +0200 Message-Id: <20240409155407.2322714-1-sumanthk@linux.ibm.com> X-Mailer: git-send-email 2.40.1 MIME-Version: 1.0 X-TM-AS-GCONF: 00 X-Proofpoint-GUID: Yh2qOqAwEPz1FAUnTgCuXIpzv-cWRku- X-Proofpoint-ORIG-GUID: O04OGiBclUlW1kPL5W7uXFQepVAMoGO2 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.272,Aquarius:18.0.1011,Hydra:6.0.619,FMLib:17.11.176.26 definitions=2024-04-09_11,2024-04-09_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 impostorscore=0 lowpriorityscore=0 malwarescore=0 mlxscore=0 mlxlogscore=569 suspectscore=0 priorityscore=1501 clxscore=1011 phishscore=0 adultscore=0 spamscore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2404010000 definitions=main-2404090104 X-Rspamd-Queue-Id: 9C185100011 X-Rspam-User: X-Stat-Signature: npyxtwywci8qcn1fc7pf3owx11jxfnxu X-Rspamd-Server: rspam01 X-HE-Tag: 1712678069-656990 X-HE-Meta: U2FsdGVkX1/3ppUtdfkyFnJpyMRokBbdCxKAk5xTvf7ogFtjAk3bHnbEzy3/g2EE9TcXPxJrPXW+CLwx2jbTk5CCk5keJ6TU9F93bmlyZcwyvhFOnP5t+3brDeDvU4OS5aRKp+HTNNT8ah8LzNNnoK+ojVvU8FQ1A9p8Zu8pO7mtu2irPYIiCUyx9ulrSMwI2cBaS89aBiyT9OSvefBxZpgGMIHLlfINgXKO8o4KyutRXvWOMMT8sEundWhSZbwbtsA7/VHw0F0owjHxPaFPMbht5gjmcoWFrrZ7fvdtwOQv+Wr+GqZ0E78Nc6BjjMVj94hR5c1cUkvH1BN9izUIn6VystLJ3rZmiG3MZkNYi6DmKmHpNpPmu9a6S6GeE8XxL2y/PL9C0alK2obOmC8aZrMDx17ooEuKsVM4EeWZmFzVO//1Ejy/sSS0uXqAE55X6GGsPA0f3DyQBPAt+yXl8tTxo5ajNRunMFD777J3ncwCtVk6Up5ovrtCSLW1lh9ch8c6N5gj7mNIyQF1Q+N8J2f0ZsbOCdUSwoLx1+a/sB8BG+ikPJjrQqYRmT3yqdEdnoxRlRgDIgBJ4DYDu0eIMorxwpeV2R5ZXU5oZGO9GeM6LDZWJz4JdpJQvRwpEtb/kw87CtJeSwP+5/JR+xfMZUJrjiHR+KticbKZ2GkCnLEBR+vSSRk1ibE7tX2upN8agbUKIK3Umklk9gdZBP4QPS552kUd1wcWsKD5YEfeMl5pY6B+EfuL8aS0q3xfNo/Nj2cgWE3KPnlw7AcV2J3IBTsr5P7NFAiqcMWWOU69rdXT5f+n56Hct+GbB/OuWNvLOZloARQ/6Bfti1K8dWg6nZieCykgq/cVfNmIcpgSuf2xux/N+9C7BMQPYPdt7/kuh/NqowqTPDiHKQ/rCSsrxk6DpzhTAH7+MqlprL3sKhqaj9K9YYvZfpJl9Gs32YwUxmkp6CGVtE7vQzcg+XF cxaKNWzm C13PJ3Q1GOzBAjWssefNmMQTPbhPiz3LfnYOTZT6MA2ODhJ5wAQbpnKhvGKPj0uFnhPhKnbftiqQjsMAkACPb0LqyhgqFlA9pA7/sBbp7Bnl/3JSULTnMt8USRL0JoJ40xa4E4yfklZ5dF1zIE+re1ippcQRey/Xi3N5WRy4CjEoHi5fXlwNlzpFTXkt4C4Fytsp8TCAizHzgP0GYnqiu/1pHnNfGoU3yVYVuwgAp5kSvuncoF6zFxATRF2NlqjLvLtscXViW6rWNDYl4BTm/IlwUtyNkBZMQR5pCBkXwM/AxP7KmRcNjytDBqFhtL8YJgSfh 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: In order to minimize code size (CONFIG_CC_OPTIMIZE_FOR_SIZE=y), compiler might choose to make a regular function call (out-of-line) for shmem_is_huge() instead of inlining it. When transparent hugepages are disabled (CONFIG_TRANSPARENT_HUGEPAGE=n), it can cause compilation error. mm/shmem.c: In function ‘shmem_getattr’: ./include/linux/huge_mm.h:383:27: note: in expansion of macro ‘BUILD_BUG’ 383 | #define HPAGE_PMD_SIZE ({ BUILD_BUG(); 0; }) | ^~~~~~~~~ mm/shmem.c:1148:33: note: in expansion of macro ‘HPAGE_PMD_SIZE’ 1148 | stat->blksize = HPAGE_PMD_SIZE; To prevent the possible error, always inline shmem_is_huge() when transparent hugepages are disabled. Signed-off-by: Sumanth Korikkar Acked-by: David Hildenbrand --- include/linux/shmem_fs.h | 9 +++++++++ mm/shmem.c | 6 ------ 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/include/linux/shmem_fs.h b/include/linux/shmem_fs.h index a4c15db2f5e5..3fb18f7eb73e 100644 --- a/include/linux/shmem_fs.h +++ b/include/linux/shmem_fs.h @@ -110,8 +110,17 @@ extern struct page *shmem_read_mapping_page_gfp(struct address_space *mapping, extern void shmem_truncate_range(struct inode *inode, loff_t start, loff_t end); int shmem_unuse(unsigned int type); +#ifdef CONFIG_TRANSPARENT_HUGEPAGE extern bool shmem_is_huge(struct inode *inode, pgoff_t index, bool shmem_huge_force, struct mm_struct *mm, unsigned long vm_flags); +#else +static __always_inline bool shmem_is_huge(struct inode *inode, pgoff_t index, bool shmem_huge_force, + struct mm_struct *mm, unsigned long vm_flags) +{ + return false; +} +#endif + #ifdef CONFIG_SHMEM extern unsigned long shmem_swap_usage(struct vm_area_struct *vma); #else diff --git a/mm/shmem.c b/mm/shmem.c index 0aad0d9a621b..94ab99b6b574 100644 --- a/mm/shmem.c +++ b/mm/shmem.c @@ -748,12 +748,6 @@ static long shmem_unused_huge_count(struct super_block *sb, #define shmem_huge SHMEM_HUGE_DENY -bool shmem_is_huge(struct inode *inode, pgoff_t index, bool shmem_huge_force, - struct mm_struct *mm, unsigned long vm_flags) -{ - return false; -} - static unsigned long shmem_unused_huge_shrink(struct shmem_sb_info *sbinfo, struct shrink_control *sc, unsigned long nr_to_split) {