From patchwork Fri Apr 29 20:22:06 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mina Almasry X-Patchwork-Id: 12832731 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 819E3C433F5 for ; Fri, 29 Apr 2022 20:22:26 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 0DA126B0071; Fri, 29 Apr 2022 16:22:26 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 08A9F6B0072; Fri, 29 Apr 2022 16:22:26 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id E6CD26B0073; Fri, 29 Apr 2022 16:22:25 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (relay.a.hostedemail.com [64.99.140.24]) by kanga.kvack.org (Postfix) with ESMTP id D2B4D6B0071 for ; Fri, 29 Apr 2022 16:22:25 -0400 (EDT) Received: from smtpin04.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id 8261D20ADA for ; Fri, 29 Apr 2022 20:22:23 +0000 (UTC) X-FDA: 79411038966.04.F072A97 Received: from mail-yw1-f201.google.com (mail-yw1-f201.google.com [209.85.128.201]) by imf30.hostedemail.com (Postfix) with ESMTP id A0C0A8006D for ; Fri, 29 Apr 2022 20:22:13 +0000 (UTC) Received: by mail-yw1-f201.google.com with SMTP id 00721157ae682-2f7dbceab08so83636537b3.10 for ; Fri, 29 Apr 2022 13:22:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=date:message-id:mime-version:subject:from:to:cc; bh=mLZo4rWRmYeOPsqZc8LV+VyHA05NOry17ZGo2E64vgY=; b=UbXY0tidHP24IsTejBXuf1oTmpnczNzA42umqngD3FKepeMY53OUU1A4dF3GHPGslE uNyeYu04aJ9a9HAFbtJ0VK8fu01Uj5yxPrnJf82S1ebP7y/wjsyUPMPiaqF8vzy5oQKY 5/zVFP6BESRwuoM/kHNtbeCqx8bTzrN/5PD01E5L8+Hspn/yDaTjzffMXnD1x2kRB6VE TkKHj7nGeNO9UBdJ+uuo5vb6ee0jDHgiNncHsTGzqevmxstujYiW2B6R3ZKwVfAcXRV1 pFgSf3S/P2cJpL3d7+bmfwHbNVl3/RsiLfVTtm3FoMt7vF99R2AtbkQh3SIrjvaZ4p/1 oPzQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:message-id:mime-version:subject:from:to:cc; bh=mLZo4rWRmYeOPsqZc8LV+VyHA05NOry17ZGo2E64vgY=; b=uXyEpUDKPTvmt7NxwDS7eIdWHFqLPDxE+nHC4u6HzBwccmcmP1tuTfJhfNkb9DnEcf HZ+4XIRXRpf1xZ0dWHPabWBNpPg3rF2q/jPgsTcU9i3PviHjgpY8N+dKC9leszSvAX2a 9Knz2f+dGBzxL9j000Aw/HWBbxcPLiMF2OPjvCMdMBnpd5NGviMsKDLlflr+fMuKIHDW QQgUNNwQbnP7QNWrdf/H5Bx4uRwjNcTNKEloj59f7gSIMVKgWPaGC83SB6njibJz9KPT 920VliE0HvdxzpUu2zD9f6cTOCoYb5YLOyHT3Bubtm5ZH/Zil4CNHuGH/w8tkZoEj041 CVqg== X-Gm-Message-State: AOAM530Xap8FUWZ7xJtOt3oR9lvzfPvAZCSDNmY0KCf8qbLwE5PCg1QZ 6mG29zg3CtrgWwTZan4u9AZkjPlo6tTJlNcYLw== X-Google-Smtp-Source: ABdhPJwzU+/Sy4engQgcYH8rZhziuNRgIvjPjCG18m1I8hY/SqEHVmaTb3QNRHltsoMtIljV85bXyLsJd5CgOE9jVw== X-Received: from almasrymina.svl.corp.google.com ([2620:15c:2cd:202:99d8:b58f:87d2:80f3]) (user=almasrymina job=sendgmr) by 2002:a25:938d:0:b0:648:c0cd:3339 with SMTP id a13-20020a25938d000000b00648c0cd3339mr1220850ybm.336.1651263741916; Fri, 29 Apr 2022 13:22:21 -0700 (PDT) Date: Fri, 29 Apr 2022 13:22:06 -0700 Message-Id: <20220429202207.3045-1-almasrymina@google.com> Mime-Version: 1.0 X-Mailer: git-send-email 2.36.0.464.gb9c8b46e94-goog Subject: [PATCH v1] hugetlbfs: fix hugetlbfs_statfs() locking From: Mina Almasry To: Mike Kravetz , Oscar Salvador , Andrew Morton , Muchun Song , Michal Hocko Cc: Mina Almasry , linux-mm@kvack.org, linux-kernel@vger.kernel.org X-Rspamd-Queue-Id: A0C0A8006D X-Stat-Signature: e8c1qxmeirrm43trp5jg5dj4owdqti7y Authentication-Results: imf30.hostedemail.com; dkim=pass header.d=google.com header.s=20210112 header.b=UbXY0tid; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf30.hostedemail.com: domain of 3_UhsYgsKCFo2DE2KJQEAF28GG8D6.4GEDAFMP-EECN24C.GJ8@flex--almasrymina.bounces.google.com designates 209.85.128.201 as permitted sender) smtp.mailfrom=3_UhsYgsKCFo2DE2KJQEAF28GG8D6.4GEDAFMP-EECN24C.GJ8@flex--almasrymina.bounces.google.com X-Rspam-User: X-Rspamd-Server: rspam08 X-HE-Tag: 1651263733-393191 X-Bogosity: Ham, tests=bogofilter, spamicity=0.000020, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: After commit db71ef79b59b ("hugetlb: make free_huge_page irq safe"), the subpool lock should be locked with spin_lock_irq() and all call sites was modified as such, except for the ones in hugetlbfs_statfs(). Fixes: db71ef79b59b ("hugetlb: make free_huge_page irq safe") Signed-Off-By: Mina Almasry Reviewed-by: Mike Kravetz --- fs/hugetlbfs/inode.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- 2.36.0.464.gb9c8b46e94-goog diff --git a/fs/hugetlbfs/inode.c b/fs/hugetlbfs/inode.c index dd3a088db11d..591599829e2a 100644 --- a/fs/hugetlbfs/inode.c +++ b/fs/hugetlbfs/inode.c @@ -1048,12 +1048,12 @@ static int hugetlbfs_statfs(struct dentry *dentry, struct kstatfs *buf) if (sbinfo->spool) { long free_pages; - spin_lock(&sbinfo->spool->lock); + spin_lock_irq(&sbinfo->spool->lock); buf->f_blocks = sbinfo->spool->max_hpages; free_pages = sbinfo->spool->max_hpages - sbinfo->spool->used_hpages; buf->f_bavail = buf->f_bfree = free_pages; - spin_unlock(&sbinfo->spool->lock); + spin_unlock_irq(&sbinfo->spool->lock); buf->f_files = sbinfo->max_inodes; buf->f_ffree = sbinfo->free_inodes; }