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 X-Spam-Level: X-Spam-Status: No, score=-23.3 required=3.0 tests=BAYES_00,DKIMWL_WL_MED, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, USER_IN_DEF_DKIM_WL autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2FE43C432BE for ; Fri, 30 Jul 2021 07:51:08 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 0C39C60C51 for ; Fri, 30 Jul 2021 07:51:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237943AbhG3HvL (ORCPT ); Fri, 30 Jul 2021 03:51:11 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53588 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230240AbhG3HvJ (ORCPT ); Fri, 30 Jul 2021 03:51:09 -0400 Received: from mail-qk1-x730.google.com (mail-qk1-x730.google.com [IPv6:2607:f8b0:4864:20::730]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 89C43C061765 for ; Fri, 30 Jul 2021 00:51:04 -0700 (PDT) Received: by mail-qk1-x730.google.com with SMTP id f22so8618213qke.10 for ; Fri, 30 Jul 2021 00:51:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:from:to:cc:subject:in-reply-to:message-id:references :mime-version; bh=ZYvXgAMhZX01NKmlvH33RhZ44JsHMLRjdU/+X4oPAP0=; b=M++CnQDxvFEiHc9PulkSLAh6kL9L0Mf02pYSg26QbAHd0RupUQVcTbQ6JejGvxhBWa uDCs7A2+Blzlyec01AEwB3KYzygoRhepQ6cM7zkuC26SuVwQAgqYyDMYGvAb+p6tuWVt uAti9yDs3Y0FMyKX/H1+I893Cjxm2AstBrNhJ5/Yj6dO2Njiiu0h7F7BLrpjKHQf7Ag3 iOEagjkCO1QRJk1OwPPNUwpwm6/wsrkuI72zheG31DfrIoFPKjDcKUJykTvL4iMsvS+h dkQMCsTsIQBzcYeQAaiSJFwaYWNXTllFQVFbKi2YeGxu3YbeQ8/w4dCKKQF9WC7QqTrC hx9A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:in-reply-to:message-id :references:mime-version; bh=ZYvXgAMhZX01NKmlvH33RhZ44JsHMLRjdU/+X4oPAP0=; b=bCE71UceOm3+4uBCDAZiOczgo6gqmIypFd37ZUuwIeQAKVMtiiecn3l7skJDZ68cCE z3h6Awl3owhIJu92i4ZvwbaLKfTYeQFhDCKQIGhsc0ZvsXMBfDLxbCb5OsBVXjKR9jsj S+zxsuhWDtoZZb5Sdc5tV4VOBoqdR0JsO0X9lji9ygTJqOUZ6Vrt7bBuxUvrUIWMQgMV jCsWOIBFUvdxu8G06lS29rr666MB5arjE62as722jO6hssC1NYcmwrK3V8EZFreh0M6Z ibXvt4YkkzwWmey/li7yktlkAruQVHajKS+qXqtMr3euLQIWfuuJL9utOJjih2Sa+kDv 83FA== X-Gm-Message-State: AOAM53013THSM9StMXAXQHWebb9bEiR+8RIPB1/dP+gBrrT4vWVK+nLR 8LIJd0u7lA9F8nthvzLvYVl6QQ== X-Google-Smtp-Source: ABdhPJyPBn/olLKduBhhHdPeEPWykg5rqcweE1bgQNc9dr4GS3RCw9sWt+ENRQNyeOq3zhFv/hgaog== X-Received: by 2002:a05:620a:1242:: with SMTP id a2mr1063374qkl.443.1627631463539; Fri, 30 Jul 2021 00:51:03 -0700 (PDT) Received: from ripple.attlocal.net (172-10-233-147.lightspeed.sntcca.sbcglobal.net. [172.10.233.147]) by smtp.gmail.com with ESMTPSA id x7sm507569qki.102.2021.07.30.00.51.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 30 Jul 2021 00:51:02 -0700 (PDT) Date: Fri, 30 Jul 2021 00:51:00 -0700 (PDT) From: Hugh Dickins X-X-Sender: hugh@ripple.anvils To: Andrew Morton cc: Hugh Dickins , Shakeel Butt , "Kirill A. Shutemov" , Yang Shi , Miaohe Lin , Mike Kravetz , Michal Hocko , Rik van Riel , Christoph Hellwig , Matthew Wilcox , "Eric W. Biederman" , Alexey Gladkov , Chris Wilson , Matthew Auld , linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, linux-api@vger.kernel.org, linux-mm@kvack.org Subject: [PATCH 09/16] huge tmpfs: decide stat.st_blksize by shmem_is_huge() In-Reply-To: <2862852d-badd-7486-3a8e-c5ea9666d6fb@google.com> Message-ID: References: <2862852d-badd-7486-3a8e-c5ea9666d6fb@google.com> MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 4.18 commit 89fdcd262fd4 ("mm: shmem: make stat.st_blksize return huge page size if THP is on") added is_huge_enabled() to decide st_blksize: now that hugeness can be defined per file, that too needs to be replaced by shmem_is_huge(). Unless they have been fcntl'ed F_HUGEPAGE, this does give a different answer (No) for small files on a "huge=within_size" mount: but that can be considered a minor bugfix. And a different answer (No) for unfcntl'ed files on a "huge=advise" mount: I'm reluctant to complicate it, just to reproduce the same debatable answer as before. Signed-off-by: Hugh Dickins --- mm/shmem.c | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/mm/shmem.c b/mm/shmem.c index 67a4b7a4849b..f50f2ede71da 100644 --- a/mm/shmem.c +++ b/mm/shmem.c @@ -712,15 +712,6 @@ static unsigned long shmem_unused_huge_shrink(struct shmem_sb_info *sbinfo, } #endif /* CONFIG_TRANSPARENT_HUGEPAGE */ -static inline bool is_huge_enabled(struct shmem_sb_info *sbinfo) -{ - if (IS_ENABLED(CONFIG_TRANSPARENT_HUGEPAGE) && - (shmem_huge == SHMEM_HUGE_FORCE || sbinfo->huge) && - shmem_huge != SHMEM_HUGE_DENY) - return true; - return false; -} - /* * Like add_to_page_cache_locked, but error if expected item has gone. */ @@ -1101,7 +1092,6 @@ static int shmem_getattr(struct user_namespace *mnt_userns, { struct inode *inode = path->dentry->d_inode; struct shmem_inode_info *info = SHMEM_I(inode); - struct shmem_sb_info *sb_info = SHMEM_SB(inode->i_sb); if (info->alloced - info->swapped != inode->i_mapping->nrpages) { spin_lock_irq(&info->lock); @@ -1110,7 +1100,7 @@ static int shmem_getattr(struct user_namespace *mnt_userns, } generic_fillattr(&init_user_ns, inode, stat); - if (is_huge_enabled(sb_info)) + if (shmem_is_huge(NULL, inode, 0)) stat->blksize = HPAGE_PMD_SIZE; return 0; -- 2.26.2 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 X-Spam-Level: X-Spam-Status: No, score=-23.3 required=3.0 tests=BAYES_00,DKIMWL_WL_MED, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, USER_IN_DEF_DKIM_WL autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2AFE3C4338F for ; Fri, 30 Jul 2021 07:51:06 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id B884160C51 for ; Fri, 30 Jul 2021 07:51:05 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org B884160C51 Authentication-Results: mail.kernel.org; dmarc=fail (p=reject dis=none) header.from=google.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=kvack.org Received: by kanga.kvack.org (Postfix) id 50D3A8D0002; Fri, 30 Jul 2021 03:51:05 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 4950F8D0001; Fri, 30 Jul 2021 03:51:05 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 335B08D0002; Fri, 30 Jul 2021 03:51:05 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0217.hostedemail.com [216.40.44.217]) by kanga.kvack.org (Postfix) with ESMTP id 134B88D0001 for ; Fri, 30 Jul 2021 03:51:05 -0400 (EDT) Received: from smtpin14.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay05.hostedemail.com (Postfix) with ESMTP id AAD5B183DC7D3 for ; Fri, 30 Jul 2021 07:51:04 +0000 (UTC) X-FDA: 78418483248.14.EBB3198 Received: from mail-qk1-f178.google.com (mail-qk1-f178.google.com [209.85.222.178]) by imf16.hostedemail.com (Postfix) with ESMTP id 66CE4F003753 for ; Fri, 30 Jul 2021 07:51:04 +0000 (UTC) Received: by mail-qk1-f178.google.com with SMTP id t66so8679527qkb.0 for ; Fri, 30 Jul 2021 00:51:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:from:to:cc:subject:in-reply-to:message-id:references :mime-version; bh=ZYvXgAMhZX01NKmlvH33RhZ44JsHMLRjdU/+X4oPAP0=; b=M++CnQDxvFEiHc9PulkSLAh6kL9L0Mf02pYSg26QbAHd0RupUQVcTbQ6JejGvxhBWa uDCs7A2+Blzlyec01AEwB3KYzygoRhepQ6cM7zkuC26SuVwQAgqYyDMYGvAb+p6tuWVt uAti9yDs3Y0FMyKX/H1+I893Cjxm2AstBrNhJ5/Yj6dO2Njiiu0h7F7BLrpjKHQf7Ag3 iOEagjkCO1QRJk1OwPPNUwpwm6/wsrkuI72zheG31DfrIoFPKjDcKUJykTvL4iMsvS+h dkQMCsTsIQBzcYeQAaiSJFwaYWNXTllFQVFbKi2YeGxu3YbeQ8/w4dCKKQF9WC7QqTrC hx9A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:in-reply-to:message-id :references:mime-version; bh=ZYvXgAMhZX01NKmlvH33RhZ44JsHMLRjdU/+X4oPAP0=; b=PhX/F7L2HtI3WHROE6YGN5n6F5EKsrcJURVJLXb6pTUcmlP9w4OFA5hv+nEAjmhD+3 XXDEZ6Y2AWWqKg1eL6h7GrlsX8uFYi5lh2q0fq95OH8TOUX/IfuPx8ZvMjtJAhHTt7gZ RyJ7A3vp0vVDyG1pxMw/AJtUgx+qZ25lfzXU/WfdoZ0WAYwTUrZ2L+ASzbU6/HnR+1Bn b0v7eoSxJhwbJUVj5Z55E17upSy7wfZwxFiv/PjsLlw71JESf26r4sk4vSeBUiAPbqrs CGKPFzR5+LnxD1vJ5L5Lq6FY+JzOwJ4gsKwgRq+tZnPGFZFnPnEcGhbLCSvBHsdpk/nR SoVg== X-Gm-Message-State: AOAM533rsg20hkaW81Jg8hEq0xWB5aiRWLm6uHoCJbQNYazQA6YPApcg KFTSWXiOJ3vP7aGikOrzWGlYNA== X-Google-Smtp-Source: ABdhPJyPBn/olLKduBhhHdPeEPWykg5rqcweE1bgQNc9dr4GS3RCw9sWt+ENRQNyeOq3zhFv/hgaog== X-Received: by 2002:a05:620a:1242:: with SMTP id a2mr1063374qkl.443.1627631463539; Fri, 30 Jul 2021 00:51:03 -0700 (PDT) Received: from ripple.attlocal.net (172-10-233-147.lightspeed.sntcca.sbcglobal.net. [172.10.233.147]) by smtp.gmail.com with ESMTPSA id x7sm507569qki.102.2021.07.30.00.51.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 30 Jul 2021 00:51:02 -0700 (PDT) Date: Fri, 30 Jul 2021 00:51:00 -0700 (PDT) From: Hugh Dickins X-X-Sender: hugh@ripple.anvils To: Andrew Morton cc: Hugh Dickins , Shakeel Butt , "Kirill A. Shutemov" , Yang Shi , Miaohe Lin , Mike Kravetz , Michal Hocko , Rik van Riel , Christoph Hellwig , Matthew Wilcox , "Eric W. Biederman" , Alexey Gladkov , Chris Wilson , Matthew Auld , linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, linux-api@vger.kernel.org, linux-mm@kvack.org Subject: [PATCH 09/16] huge tmpfs: decide stat.st_blksize by shmem_is_huge() In-Reply-To: <2862852d-badd-7486-3a8e-c5ea9666d6fb@google.com> Message-ID: References: <2862852d-badd-7486-3a8e-c5ea9666d6fb@google.com> MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Authentication-Results: imf16.hostedemail.com; dkim=pass header.d=google.com header.s=20161025 header.b=M++CnQDx; spf=pass (imf16.hostedemail.com: domain of hughd@google.com designates 209.85.222.178 as permitted sender) smtp.mailfrom=hughd@google.com; dmarc=pass (policy=reject) header.from=google.com X-Rspamd-Server: rspam02 X-Stat-Signature: a5sk7fn3wgu8e3o8qjhcjeke6sfqt6os X-Rspamd-Queue-Id: 66CE4F003753 X-HE-Tag: 1627631464-2426 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: 4.18 commit 89fdcd262fd4 ("mm: shmem: make stat.st_blksize return huge page size if THP is on") added is_huge_enabled() to decide st_blksize: now that hugeness can be defined per file, that too needs to be replaced by shmem_is_huge(). Unless they have been fcntl'ed F_HUGEPAGE, this does give a different answer (No) for small files on a "huge=within_size" mount: but that can be considered a minor bugfix. And a different answer (No) for unfcntl'ed files on a "huge=advise" mount: I'm reluctant to complicate it, just to reproduce the same debatable answer as before. Signed-off-by: Hugh Dickins --- mm/shmem.c | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/mm/shmem.c b/mm/shmem.c index 67a4b7a4849b..f50f2ede71da 100644 --- a/mm/shmem.c +++ b/mm/shmem.c @@ -712,15 +712,6 @@ static unsigned long shmem_unused_huge_shrink(struct shmem_sb_info *sbinfo, } #endif /* CONFIG_TRANSPARENT_HUGEPAGE */ -static inline bool is_huge_enabled(struct shmem_sb_info *sbinfo) -{ - if (IS_ENABLED(CONFIG_TRANSPARENT_HUGEPAGE) && - (shmem_huge == SHMEM_HUGE_FORCE || sbinfo->huge) && - shmem_huge != SHMEM_HUGE_DENY) - return true; - return false; -} - /* * Like add_to_page_cache_locked, but error if expected item has gone. */ @@ -1101,7 +1092,6 @@ static int shmem_getattr(struct user_namespace *mnt_userns, { struct inode *inode = path->dentry->d_inode; struct shmem_inode_info *info = SHMEM_I(inode); - struct shmem_sb_info *sb_info = SHMEM_SB(inode->i_sb); if (info->alloced - info->swapped != inode->i_mapping->nrpages) { spin_lock_irq(&info->lock); @@ -1110,7 +1100,7 @@ static int shmem_getattr(struct user_namespace *mnt_userns, } generic_fillattr(&init_user_ns, inode, stat); - if (is_huge_enabled(sb_info)) + if (shmem_is_huge(NULL, inode, 0)) stat->blksize = HPAGE_PMD_SIZE; return 0; -- 2.26.2