Received: by 2002:ad5:474a:0:0:0:0:0 with SMTP id i10csp3039579imu; Mon, 19 Nov 2018 09:43:08 -0800 (PST) X-Google-Smtp-Source: AJdET5d9gLikft0PfKwHHAOcaVc6a6+HjZ3VUs/znlZ44IsnH1amLVUtVF2lf2lYu0qU8a8RWUpg X-Received: by 2002:a65:6645:: with SMTP id z5mr21231233pgv.351.1542649388390; Mon, 19 Nov 2018 09:43:08 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1542649388; cv=none; d=google.com; s=arc-20160816; b=nU5aL9UFAuV1EI5NsPAsZi+4loYvRVqO99N0VACvSXFuQElDaASoosIH1ai4q5FVXU i5PsuzRW1eHLh63TtLrcpuH/ckGJLN+fFEQto7/xit2kmGfwhPP6w5Bh+6eizpZJTv7d jO6V+/UK+L8+A0BdUQgHV57ygHIc8zjV/ohhVBKF8/rQipRg4m2fJwzUuPbOk9MWhulN ZCGS7LyRO70TDKYpwUgRWvSNp1pmMhtscqxn9HtjpK1rLBUA5lYKhncXftbKPCqjII1U czPV27US70/dBqzQPn0xKbqVJUuzvxVQnHydzHXKnGg7RIqhpMAHxtDmk5P5wQyor6aa xxcQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=WTA92s0rcxH1mVl8Gh9HgjsjxHRguiOmy1p+GvAqq4A=; b=NqdeCavZFXN64gegoYbI1gkztf7z9EpM9c13e55qbdA6MBlbYmdZODiQVDzN5ZohWK GNZpyY6H4UOLnvNZiBunBxgHreAI9C28Cwj0IB7rHAF7ozKpEdyTTSe1Vba7bjejFf2N Af/fwTWAS9PQNaYCW8BOM6AEaOAKnGxiK9N5bFmCrRlGw9Ms5K2FSxXhBfa/W5bQcR4W 8PXP2xFSxe8TYs6Izk5pmrtALG/vQf17ZtQJOOzPqVcPLtH2ou9hYnfPQj+n0EfHI0xy bNTRn9ibfSqyjhIQszbwL1FVHw8jqq66uEAy33gB7uW4ix5tKKFvVMIp1YqFtXgVNver WAYA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=S9pSBt8R; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id e6si32444931pgd.428.2018.11.19.09.42.52; Mon, 19 Nov 2018 09:43:08 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=S9pSBt8R; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2389702AbeKTDN3 (ORCPT + 99 others); Mon, 19 Nov 2018 22:13:29 -0500 Received: from mail.kernel.org ([198.145.29.99]:50226 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2389229AbeKTDN2 (ORCPT ); Mon, 19 Nov 2018 22:13:28 -0500 Received: from localhost (5356596B.cm-6-7b.dynamic.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 84E8520823; Mon, 19 Nov 2018 16:49:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1542646155; bh=5g8zovuRGi46AnDtso5t+bnGv3vGOLsLd/hod8TLe+0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=S9pSBt8RJZL82li2RUBROXCqw8LSvxFFNuyo/aOBgbsFhTiNJTx4baX/BxYIoT6t6 LMIZ6K5U1WnZitKF319sBdphHihc6+v8Cgc1+ltWnXo1qHzg9J1j7BPOz0Ku/08rM6 Meof4zxcssYo4KoSDFd6U9M1AKyw//yF+sf2bMAo= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Wengang Wang , Junxiao Bi , Changwei Ge , Joseph Qi , Mark Fasheh , Joel Becker , Andrew Morton , Linus Torvalds Subject: [PATCH 4.14 057/124] ocfs2: free up write context when direct IO failed Date: Mon, 19 Nov 2018 17:28:31 +0100 Message-Id: <20181119162624.584031057@linuxfoundation.org> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20181119162612.951907286@linuxfoundation.org> References: <20181119162612.951907286@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 4.14-stable review patch. If anyone has any objections, please let me know. ------------------ From: Wengang Wang commit 5040f8df56fb90c7919f1c9b0b6e54c843437456 upstream. The write context should also be freed even when direct IO failed. Otherwise a memory leak is introduced and entries remain in oi->ip_unwritten_list causing the following BUG later in unlink path: ERROR: bug expression: !list_empty(&oi->ip_unwritten_list) ERROR: Clear inode of 215043, inode has unwritten extents ... Call Trace: ? __set_current_blocked+0x42/0x68 ocfs2_evict_inode+0x91/0x6a0 [ocfs2] ? bit_waitqueue+0x40/0x33 evict+0xdb/0x1af iput+0x1a2/0x1f7 do_unlinkat+0x194/0x28f SyS_unlinkat+0x1b/0x2f do_syscall_64+0x79/0x1ae entry_SYSCALL_64_after_hwframe+0x151/0x0 This patch also logs, with frequency limit, direct IO failures. Link: http://lkml.kernel.org/r/20181102170632.25921-1-wen.gang.wang@oracle.com Signed-off-by: Wengang Wang Reviewed-by: Junxiao Bi Reviewed-by: Changwei Ge Reviewed-by: Joseph Qi Cc: Mark Fasheh Cc: Joel Becker Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds Signed-off-by: Greg Kroah-Hartman --- fs/ocfs2/aops.c | 12 ++++++++++-- fs/ocfs2/cluster/masklog.h | 9 +++++++++ 2 files changed, 19 insertions(+), 2 deletions(-) --- a/fs/ocfs2/aops.c +++ b/fs/ocfs2/aops.c @@ -2404,8 +2404,16 @@ static int ocfs2_dio_end_io(struct kiocb /* this io's submitter should not have unlocked this before we could */ BUG_ON(!ocfs2_iocb_is_rw_locked(iocb)); - if (bytes > 0 && private) - ret = ocfs2_dio_end_io_write(inode, private, offset, bytes); + if (bytes <= 0) + mlog_ratelimited(ML_ERROR, "Direct IO failed, bytes = %lld", + (long long)bytes); + if (private) { + if (bytes > 0) + ret = ocfs2_dio_end_io_write(inode, private, offset, + bytes); + else + ocfs2_dio_free_write_ctx(inode, private); + } ocfs2_iocb_clear_rw_locked(iocb); --- a/fs/ocfs2/cluster/masklog.h +++ b/fs/ocfs2/cluster/masklog.h @@ -178,6 +178,15 @@ do { \ ##__VA_ARGS__); \ } while (0) +#define mlog_ratelimited(mask, fmt, ...) \ +do { \ + static DEFINE_RATELIMIT_STATE(_rs, \ + DEFAULT_RATELIMIT_INTERVAL, \ + DEFAULT_RATELIMIT_BURST); \ + if (__ratelimit(&_rs)) \ + mlog(mask, fmt, ##__VA_ARGS__); \ +} while (0) + #define mlog_errno(st) ({ \ int _st = (st); \ if (_st != -ERESTARTSYS && _st != -EINTR && \