Received: by 2002:a6b:fb09:0:0:0:0:0 with SMTP id h9csp4862856iog; Wed, 22 Jun 2022 07:15:57 -0700 (PDT) X-Google-Smtp-Source: AGRyM1tDopPr3fyHIk3sdDEYMYKNVGAKfA+uYW8wO/ZWXYcKF0pnL3cOM17agjs+zA3xm3mxiEdJ X-Received: by 2002:a17:906:5350:b0:711:f866:ed8 with SMTP id j16-20020a170906535000b00711f8660ed8mr3185995ejo.441.1655907357169; Wed, 22 Jun 2022 07:15:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1655907357; cv=none; d=google.com; s=arc-20160816; b=fuKN0LN2sxc34GnMvgJqPt6jd61/VOXqzJFuB2KrVQurfBrwKMHU5VMTSxHO7YT0yx MambFUwN1jhGb0j6P3RKdA4mabUGoiTqJetMXAPHqRQ7A7/m99am6a8INaBU1J7gpVax mGrUj6n/Awamd3CqqKOPFtaSzMEHSyepNx1kr1NCbZoiYQW7lJRccIJ7jC4UzGjM7eHe QSSKeQKxT6n+oL8VCATf/Mahn2/WosgN9KeGT7YdJJKEk9owTHB2iJAHuDX7QTIphAZD JA/eoGyok7N5Ge32T6WUz924coPt29ZaeE9hSAJlkl0rhZMpU+chxhCmTf3uDjhRcS/o /JeQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:cc:to:from :subject; bh=cAad3gRbPLFFD8iFKTkl/wV0WMB7VNw/JGYZCtsabD0=; b=u/K8GqJBWMHoX64VWNSKE/xRm5XYILLnZpxA12VKp27VomJS4MatB3ZyEd93prS0id Awv+uXXtHBHNeztMOPId1m/zAXO73GtIvwW6R4BmffpWmFIKiiOuyh+aLhWCqbKHbOn5 4o0uHmmtO5BjeEWccDjzz92tO/q7tH2Empo7wLAvWBxaN+QBpFc5B7qeb2oouCh2tgZq wLS5tcSQt9K7iJOX3QMVJsCHoZ/5jtTBsbylA/fBlFvHJn5kJDoquPC1TxFOs2WTFRGi 96Vnme3Pxmp+OuMTrEGTrdZetmNaSWK51wt3ES4cyiqKTfa8AuVcV2039Buw++5LIM2N XeFg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-nfs-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-nfs-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=oracle.com Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id sc18-20020a1709078a1200b00711f55a31casi22136303ejc.775.2022.06.22.07.15.31; Wed, 22 Jun 2022 07:15:57 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-nfs-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-nfs-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-nfs-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=oracle.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1357965AbiFVOOe (ORCPT + 99 others); Wed, 22 Jun 2022 10:14:34 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36840 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1358363AbiFVOOb (ORCPT ); Wed, 22 Jun 2022 10:14:31 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 474FE393C9; Wed, 22 Jun 2022 07:14:15 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 474CCB81F56; Wed, 22 Jun 2022 14:14:14 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id BCCD4C341C0; Wed, 22 Jun 2022 14:14:12 +0000 (UTC) Subject: [PATCH RFC 13/30] NFSD: WARN when freeing an item still linked via nf_lru From: Chuck Lever To: linux-nfs@vger.kernel.org, netdev@vger.kernel.org Cc: david@fromorbit.com, tgraf@suug.ch, jlayton@redhat.com Date: Wed, 22 Jun 2022 10:14:11 -0400 Message-ID: <165590725183.75778.17085853710070897709.stgit@manet.1015granger.net> In-Reply-To: <165590626293.75778.9843437418112335153.stgit@manet.1015granger.net> References: <165590626293.75778.9843437418112335153.stgit@manet.1015granger.net> User-Agent: StGit/1.5.dev2+g9ce680a5 MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit X-Spam-Status: No, score=-6.7 required=5.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,RCVD_IN_DNSWL_HI,SPF_HELO_NONE,SPF_PASS, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org Add a guardrail to prevent freeing memory that is still on a list. This includes either a dispose list or the LRU list. This is the sign of a bug, but this class of bugs can be detected so that they don't endanger system stability, especially while debugging. Signed-off-by: Chuck Lever --- fs/nfsd/filecache.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/fs/nfsd/filecache.c b/fs/nfsd/filecache.c index 0cf2e44e874f..6bb37d3abbaa 100644 --- a/fs/nfsd/filecache.c +++ b/fs/nfsd/filecache.c @@ -221,6 +221,14 @@ nfsd_file_free(struct nfsd_file *nf) fput(nf->nf_file); flush = true; } + + /* + * If this item is still linked via nf_lru, that's a bug. + * WARN and leak it to preserve system stability. + */ + if (WARN_ON_ONCE(!list_empty(&nf->nf_lru))) + return flush; + call_rcu(&nf->nf_rcu, nfsd_file_slab_free); return flush; } @@ -350,7 +358,7 @@ nfsd_file_dispose_list(struct list_head *dispose) while(!list_empty(dispose)) { nf = list_first_entry(dispose, struct nfsd_file, nf_lru); - list_del(&nf->nf_lru); + list_del_init(&nf->nf_lru); nfsd_file_flush(nf); nfsd_file_put_noref(nf); } @@ -364,7 +372,7 @@ nfsd_file_dispose_list_sync(struct list_head *dispose) while(!list_empty(dispose)) { nf = list_first_entry(dispose, struct nfsd_file, nf_lru); - list_del(&nf->nf_lru); + list_del_init(&nf->nf_lru); nfsd_file_flush(nf); if (!refcount_dec_and_test(&nf->nf_ref)) continue;