From patchwork Mon Sep 14 13:45:52 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeff Layton X-Patchwork-Id: 7176361 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 EBF1B9F314 for ; Mon, 14 Sep 2015 13:51:01 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 01405205D8 for ; Mon, 14 Sep 2015 13:51:01 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 04530205B1 for ; Mon, 14 Sep 2015 13:51:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751901AbbINNu6 (ORCPT ); Mon, 14 Sep 2015 09:50:58 -0400 Received: from mail-yk0-f180.google.com ([209.85.160.180]:34714 "EHLO mail-yk0-f180.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753310AbbINNqD (ORCPT ); Mon, 14 Sep 2015 09:46:03 -0400 Received: by ykdg206 with SMTP id g206so152582371ykd.1 for ; Mon, 14 Sep 2015 06:46:02 -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=KxFft42Ktv9GPo6RPpGkYq6QBxUff4uVE0h8l4M01e4=; b=aCuP0roY9nj7eeFJ8lh0C8hN/W+Nj4vcjfCfghL65LjDRSxWJ0g/0pwnH98FD5RcQZ Yg5MgujjrpNBjl8lEo26viT1UzKDXHQ6TTiKivYN1V5tvM84YUBhwMcAO491YPL37q/4 1hXOBJrjnAZN+GY9Zv1DL96VwqX4BABQr7aimsxKwBfVr/GGC5V7bMs0yTF3v6nj5DAt GxcpQ4pqvijKf4R8rbQ8X464IZXN6FJNeFZ/djufTq1pOc2lQEpnEpHeGzVamxcl17g3 YWcsHC9qHbwQIZSO/+McT3Md8Q7RnRwVrZyq/03+BRV7Kd+mXRGJlx9OM7WroBv7IF5t 59mA== X-Gm-Message-State: ALoCoQlrXe+kUJI9azcElyiW8BsbxmATuc/SVCyLycGXAiLW7KaIJRbCgr5UrS7M7L1JBkacDdet X-Received: by 10.129.148.197 with SMTP id l188mr14555463ywg.118.1442238362316; Mon, 14 Sep 2015 06:46:02 -0700 (PDT) Received: from tlielax.poochiereds.net ([2606:a000:1105:8e:3a60:77ff:fe93:a95d]) by smtp.googlemail.com with ESMTPSA id a4sm9601131ywc.15.2015.09.14.06.46.01 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 14 Sep 2015 06:46:01 -0700 (PDT) From: Jeff Layton X-Google-Original-From: Jeff Layton To: Al Viro Cc: bfields@fieldses.org, linux-nfs@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 1/4] fs: have flush_delayed_fput flush the workqueue job Date: Mon, 14 Sep 2015 09:45:52 -0400 Message-Id: <1442238355-8203-2-git-send-email-jeff.layton@primarydata.com> X-Mailer: git-send-email 2.4.3 In-Reply-To: <1442238355-8203-1-git-send-email-jeff.layton@primarydata.com> References: <1442238355-8203-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, T_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. 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 7f9d407c7595..f4833af62eae 100644 --- a/fs/file_table.c +++ b/fs/file_table.c @@ -243,6 +243,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 @@ -255,11 +257,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)) {