From patchwork Tue Oct 20 17:33:35 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeff Layton X-Patchwork-Id: 7449231 Return-Path: X-Original-To: patchwork-linux-nfs@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 583049F1C3 for ; Tue, 20 Oct 2015 17:34:18 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 770852083C for ; Tue, 20 Oct 2015 17:34:17 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 95BF62083B for ; Tue, 20 Oct 2015 17:34:16 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753032AbbJTReF (ORCPT ); Tue, 20 Oct 2015 13:34:05 -0400 Received: from mail-qg0-f42.google.com ([209.85.192.42]:33274 "EHLO mail-qg0-f42.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752821AbbJTReA (ORCPT ); Tue, 20 Oct 2015 13:34:00 -0400 Received: by qgeo38 with SMTP id o38so21852991qge.0 for ; Tue, 20 Oct 2015 10:33:59 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=NMBRgq6RRHXtGPlu7FUdJFyfY3f0aZGLWOSAYCucGhk=; b=koPzpkZyN+yH+lts5WDfjcnSJhMCp6WV4GFXuGbtKbAeAgF3gOUQI7uByMKGCz6rCW mDtAg4dABKj3A2NSdTNCuNUdPXbA1m0ynySFoc7ws2N0k75NODjAsdiEMZmcYw0C7Cj4 /u3Oik0WXZuyWZAS8AK5dPCWh7fA/9JEaMPNk+JFyp89tY0b3uFDMnphNapMudy3SywT fInqZ7Sknqmp+6wFEaqwXHsfQ778bqprxWZA+WPFstUMEoWiNZBiP7SSXfO9DJdleqhe OE0AO8TEc8TmruapnZg2G617iFPlfpgtBGfKNjk5gYae7yyqa8OSxJZPrB4xOOjvVoT3 z3MA== X-Gm-Message-State: ALoCoQmWQreo3Bg6LyTvrjvyMx+/ko0/iwHELOJfTuacS+I7upaLKwZbfzhkg3C/eDRWJ//qLowS X-Received: by 10.140.233.211 with SMTP id e202mr5819491qhc.37.1445362439776; Tue, 20 Oct 2015 10:33:59 -0700 (PDT) Received: from tlielax.poochiereds.net ([2606:a000:1125:6079::d5a]) by smtp.googlemail.com with ESMTPSA id m26sm1640925qki.28.2015.10.20.10.33.58 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 20 Oct 2015 10:33:59 -0700 (PDT) From: Jeff Layton X-Google-Original-From: Jeff Layton To: bfields@fieldses.org Cc: linux-nfs@vger.kernel.org, linux-fsdevel@vger.kernel.org, Al Viro Subject: [PATCH v6 02/19] fs: have flush_delayed_fput flush the workqueue job Date: Tue, 20 Oct 2015 13:33:35 -0400 Message-Id: <1445362432-18869-3-git-send-email-jeff.layton@primarydata.com> X-Mailer: git-send-email 2.4.3 In-Reply-To: <1445362432-18869-1-git-send-email-jeff.layton@primarydata.com> References: <1445362432-18869-1-git-send-email-jeff.layton@primarydata.com> Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP I think there's a potential race in flush_delayed_fput. A kthread does an fput() and that file gets added to the list and the delayed work is scheduled. More than 1 jiffy passes, and the workqueue thread picks up the work and starts running it. Then the kthread calls flush_delayed_work. It sees that the list is empty and returns immediately, even though the __fput for its file may not have run yet. Close this by making flush_delayed_fput use flush_delayed_work instead, which should immediately schedule the work to run if it's not already, and block until the workqueue job completes. Cc: Al Viro Signed-off-by: Jeff Layton --- fs/file_table.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/fs/file_table.c b/fs/file_table.c index ad17e05ebf95..52cc6803c07a 100644 --- a/fs/file_table.c +++ b/fs/file_table.c @@ -244,6 +244,8 @@ static void ____fput(struct callback_head *work) __fput(container_of(work, struct file, f_u.fu_rcuhead)); } +static DECLARE_DELAYED_WORK(delayed_fput_work, delayed_fput); + /* * If kernel thread really needs to have the final fput() it has done * to complete, call this. The only user right now is the boot - we @@ -256,11 +258,9 @@ static void ____fput(struct callback_head *work) */ void flush_delayed_fput(void) { - delayed_fput(NULL); + flush_delayed_work(&delayed_fput_work); } -static DECLARE_DELAYED_WORK(delayed_fput_work, delayed_fput); - void fput(struct file *file) { if (atomic_long_dec_and_test(&file->f_count)) {