From patchwork Fri Dec 14 21:53:02 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Waiman Long X-Patchwork-Id: 10731705 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 89DB6746 for ; Fri, 14 Dec 2018 21:53:24 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3CC992D7EE for ; Fri, 14 Dec 2018 21:53:24 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 30E382D7F8; Fri, 14 Dec 2018 21:53:24 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C59D42D7E2 for ; Fri, 14 Dec 2018 21:53:23 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 3DD1F8E0212; Fri, 14 Dec 2018 16:53:22 -0500 (EST) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 3B1E98E01DC; Fri, 14 Dec 2018 16:53:22 -0500 (EST) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 2A2888E0212; Fri, 14 Dec 2018 16:53:22 -0500 (EST) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-qt1-f200.google.com (mail-qt1-f200.google.com [209.85.160.200]) by kanga.kvack.org (Postfix) with ESMTP id F1B7E8E01DC for ; Fri, 14 Dec 2018 16:53:21 -0500 (EST) Received: by mail-qt1-f200.google.com with SMTP id z6so6891510qtj.21 for ; Fri, 14 Dec 2018 13:53:21 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-original-authentication-results:x-gm-message-state:from:to:cc :subject:date:message-id:in-reply-to:references; bh=mlGwKIY/E9SCB+00js2v/xNWhVvGerrcKO1O55Kntjc=; b=rdzZPh/Sb4naT9pK2swt04gzcVILonN9Vk6/PN6zIIeSixLqIIxDjAPEX8NTm4XcJj +Re+ZGbJHMK0LFsctLZDoWnWNEflUPSL1X6By9mj3r5S/v8rgyfS+Gg8tpl/xLnsHXbH 2IETs6zt//PxRDBW5k8FVEFeRbmJ9iA30/JMOlgi31yMSmAewRM65OtnorYpRNXfXBED Fo0wEVtmSzwDIazP5SqTHj/iO/HYzy9j/RbuLZYyXd5LlOuDeXl0bSWpGAjJN8cCs4Fv 5upP7Ok5obyWkIFE7qzBdZTYWI2xkMwRedzjWWYrE6kbybE2kGlp/48oJ6JpxU8wd+Uk Gk+w== X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of longman@redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=longman@redhat.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com X-Gm-Message-State: AA+aEWbTE/utZCk35I3Yimpwbpm4xpZLmzpdM/WV+HFZVkDoQ//ODPT4 CQ2gXwb0RlyJ7uItz1nCaE25qfjDoLb1XmADDdKkNRLTsBMzARwD3V19VRzy466OA/tzhn2FtZa LtTpy8V1qihpl8Ee8qVFirMZyq7estvjIT5a7/9YoLVlqlHvjqpCiYubH3Ghevh5yTA== X-Received: by 2002:ac8:4a8e:: with SMTP id l14mr4577697qtq.135.1544824401746; Fri, 14 Dec 2018 13:53:21 -0800 (PST) X-Google-Smtp-Source: AFSGD/XwlwFyjXXd9ESto+YXt20wHxGyd2eb4tNUsl83w84hYBcyVOJ7LFrcTHJu/wvH3KgjOPKT X-Received: by 2002:ac8:4a8e:: with SMTP id l14mr4577686qtq.135.1544824401226; Fri, 14 Dec 2018 13:53:21 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1544824401; cv=none; d=google.com; s=arc-20160816; b=NWeDEGerg94tJEYOS6g7qoeHME2nRkt8KHmEEugQkfPDNIbq0G1eXMFJkPInaJi7h2 +1EHQWGSdFe447ZRHXQXPodzo3kXNNdupfskTZnKNSBh528DNpo2OhVTKdIVU98neixm LIus3ReFxEZWq3FHIMFNsGPbjnXIMh6qT/SNJUoQXmpmGWhLpPGqdQt9UrWjHKgiKbzm Fwtkrpqkg/Cene03FT5Y0CLO/akB8crf9JegFSgVKqTwiJwcM+CoKUWYnZU930c9sqZQ dhpkvEzBrGRVf2/N2uq3CvjFZtkryYgjGGPXu1GqJ3X0qX1XsRTtQQHd6w48EP1LXAOU OhtQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:message-id:date:subject:cc:to:from; bh=mlGwKIY/E9SCB+00js2v/xNWhVvGerrcKO1O55Kntjc=; b=CtJ+DC42B2N2Rh78UKCkUOIj5qyvwmB9axdb6isNvFVoceHNyg2a50PPcQ1+R0m0BK VCKKihYEid6hH1/GdglO7HlVcS6Yh/IiDUyPifBgbshFMvBJXB5jD5fZ/FhAU6vW12E+ 5RUqpOH+KNHfnJmiMmGpHIccQsvSP65jkeunai3MjgToDVaGrwADFXPeiCeWi8aNNYxM sNOt+T7JGexqWKj/o6BUW5tLhmCc5goobTVYqdcx/OUJ0q+Ux31i86iTIisp2pZ6UJDt 3sH2mc+6N6eaqoaL4ZtaT219MrigvvgNfHjK+HYj+yU2JlcqctvMo+ub2AU5q+GmUccO EIFw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of longman@redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=longman@redhat.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from mx1.redhat.com (mx1.redhat.com. [209.132.183.28]) by mx.google.com with ESMTPS id t64si3253694qkf.154.2018.12.14.13.53.21 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 14 Dec 2018 13:53:21 -0800 (PST) Received-SPF: pass (google.com: domain of longman@redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; Authentication-Results: mx.google.com; spf=pass (google.com: domain of longman@redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=longman@redhat.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 098A67FD63; Fri, 14 Dec 2018 21:53:20 +0000 (UTC) Received: from llong.com (dhcp-17-223.bos.redhat.com [10.18.17.223]) by smtp.corp.redhat.com (Postfix) with ESMTP id F27DD18111; Fri, 14 Dec 2018 21:53:17 +0000 (UTC) From: Waiman Long To: Alexander Viro , Jonathan Corbet , Andrew Morton Cc: linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-mm@kvack.org, linux-doc@vger.kernel.org, "Luis R. Rodriguez" , Kees Cook , Linus Torvalds , Jan Kara , "Paul E. McKenney" , Ingo Molnar , Miklos Szeredi , Matthew Wilcox , Larry Woodman , James Bottomley , "Wangkai (Kevin C)" , Michal Hocko , Waiman Long , stable@vger.kernel.org Subject: [RESEND PATCH v4 1/3] fs/dcache: Fix incorrect nr_dentry_unused accounting in shrink_dcache_sb() Date: Fri, 14 Dec 2018 16:53:02 -0500 Message-Id: <1544824384-17668-2-git-send-email-longman@redhat.com> In-Reply-To: <1544824384-17668-1-git-send-email-longman@redhat.com> References: <1544824384-17668-1-git-send-email-longman@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.27]); Fri, 14 Dec 2018 21:53:20 +0000 (UTC) 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: X-Virus-Scanned: ClamAV using ClamSMTP The nr_dentry_unused per-cpu counter tracks dentries in both the LRU lists and the shrink lists where the DCACHE_LRU_LIST bit is set. The shrink_dcache_sb() function moves dentries from the LRU list to a shrink list and subtracts the dentry count from nr_dentry_unused. This is incorrect as the nr_dentry_unused count Will also be decremented in shrink_dentry_list() via d_shrink_del(). To fix this double decrement, the decrement in the shrink_dcache_sb() function is taken out. Fixes: 4e717f5c1083 ("list_lru: remove special case function list_lru_dispose_all." Cc: stable@vger.kernel.org Signed-off-by: Waiman Long Reviewed-by: Dave Chinner --- fs/dcache.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/fs/dcache.c b/fs/dcache.c index 2593153..44e5652 100644 --- a/fs/dcache.c +++ b/fs/dcache.c @@ -1188,15 +1188,11 @@ static enum lru_status dentry_lru_isolate_shrink(struct list_head *item, */ void shrink_dcache_sb(struct super_block *sb) { - long freed; - do { LIST_HEAD(dispose); - freed = list_lru_walk(&sb->s_dentry_lru, + list_lru_walk(&sb->s_dentry_lru, dentry_lru_isolate_shrink, &dispose, 1024); - - this_cpu_sub(nr_dentry_unused, freed); shrink_dentry_list(&dispose); } while (list_lru_count(&sb->s_dentry_lru) > 0); }