From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 22294C433DF for ; Wed, 3 Jun 2020 15:02:30 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id EEDDF20772 for ; Wed, 3 Jun 2020 15:02:29 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="ORhEeP/C" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726087AbgFCPC3 (ORCPT ); Wed, 3 Jun 2020 11:02:29 -0400 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:23749 "EHLO us-smtp-1.mimecast.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1725985AbgFCPC3 (ORCPT ); Wed, 3 Jun 2020 11:02:29 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1591196547; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=8Ab3qKnNn+DkJbATFT37PTUUCz54YJiN2VgNJ0yTJP0=; b=ORhEeP/CJNjx9f33wsDb+sPtmzaPIW2zN8/NrhjSiv2Q1t3U5VifEU8GWVLO4Pt6HKwjxu 4F3myG7OosprP3AwdPfgPiJ/LQA86duIlqKffS0WO8TG2Dcvl6wHT5XrlntBuoZ/ZEnVhs hhryHGa1iRQUH87qQD9QpQfPWB85zAE= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-442-Q9TzMkUkNvWzPBKkeGNRsA-1; Wed, 03 Jun 2020 11:02:25 -0400 X-MC-Unique: Q9TzMkUkNvWzPBKkeGNRsA-1 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 47412106B277; Wed, 3 Jun 2020 15:02:18 +0000 (UTC) Received: from bfoster (dhcp-41-2.bos.redhat.com [10.18.41.2]) by smtp.corp.redhat.com (Postfix) with ESMTPS id E175178EFD; Wed, 3 Jun 2020 15:02:17 +0000 (UTC) Date: Wed, 3 Jun 2020 11:02:16 -0400 From: Brian Foster To: Dave Chinner Cc: linux-xfs@vger.kernel.org Subject: Re: [PATCH 14/30] xfs: unwind log item error flagging Message-ID: <20200603150216.GH12332@bfoster> References: <20200601214251.4167140-1-david@fromorbit.com> <20200601214251.4167140-15-david@fromorbit.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20200601214251.4167140-15-david@fromorbit.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 Sender: linux-xfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-xfs@vger.kernel.org On Tue, Jun 02, 2020 at 07:42:35AM +1000, Dave Chinner wrote: > From: Dave Chinner > > When an buffer IO error occurs, we want to mark all > the log items attached to the buffer as failed. Open code > the error handling loop so that we can modify the flagging for the > different types of objects directly and independently of each other. > > This also allows us to remove the ->iop_error method from the log > item operations. > > Signed-off-by: Dave Chinner > --- Reviewed-by: Brian Foster > fs/xfs/xfs_buf_item.c | 48 ++++++++++++----------------------------- > fs/xfs/xfs_dquot_item.c | 18 ---------------- > fs/xfs/xfs_inode_item.c | 18 ---------------- > fs/xfs/xfs_trans.h | 1 - > 4 files changed, 14 insertions(+), 71 deletions(-) > > diff --git a/fs/xfs/xfs_buf_item.c b/fs/xfs/xfs_buf_item.c > index b6995719e877b..2364a9aa2d71a 100644 > --- a/fs/xfs/xfs_buf_item.c > +++ b/fs/xfs/xfs_buf_item.c > @@ -12,6 +12,7 @@ > #include "xfs_bit.h" > #include "xfs_mount.h" > #include "xfs_trans.h" > +#include "xfs_trans_priv.h" > #include "xfs_buf_item.h" > #include "xfs_inode.h" > #include "xfs_inode_item.h" > @@ -955,37 +956,6 @@ xfs_buf_item_relse( > xfs_buf_item_free(bip); > } > > -/* > - * Invoke the error state callback for each log item affected by the failed I/O. > - * > - * If a metadata buffer write fails with a non-permanent error, the buffer is > - * eventually resubmitted and so the completion callbacks are not run. The error > - * state may need to be propagated to the log items attached to the buffer, > - * however, so the next AIL push of the item knows hot to handle it correctly. > - */ > -STATIC void > -xfs_buf_do_callbacks_fail( > - struct xfs_buf *bp) > -{ > - struct xfs_ail *ailp = bp->b_mount->m_ail; > - struct xfs_log_item *lip; > - > - /* > - * Buffer log item errors are handled directly by xfs_buf_item_push() > - * and xfs_buf_iodone_callback_error, and they have no IO error > - * callbacks. Check only for items in b_li_list. > - */ > - if (list_empty(&bp->b_li_list)) > - return; > - > - spin_lock(&ailp->ail_lock); > - list_for_each_entry(lip, &bp->b_li_list, li_bio_list) { > - if (lip->li_ops->iop_error) > - lip->li_ops->iop_error(lip, bp); > - } > - spin_unlock(&ailp->ail_lock); > -} > - > static bool > xfs_buf_ioerror_sync( > struct xfs_buf *bp) > @@ -1154,13 +1124,18 @@ xfs_buf_inode_iodone( > struct xfs_buf *bp) > { > if (bp->b_error) { > + struct xfs_log_item *lip; > int ret = xfs_buf_iodone_error(bp); > if (!ret) > goto finish_iodone; > if (ret == 1) > return; > ASSERT(ret == 2); > - xfs_buf_do_callbacks_fail(bp); > + spin_lock(&bp->b_mount->m_ail->ail_lock); > + list_for_each_entry(lip, &bp->b_li_list, li_bio_list) { > + xfs_set_li_failed(lip, bp); > + } > + spin_unlock(&bp->b_mount->m_ail->ail_lock); > xfs_buf_relse(bp); > return; > } > @@ -1180,13 +1155,18 @@ xfs_buf_dquot_iodone( > struct xfs_buf *bp) > { > if (bp->b_error) { > + struct xfs_log_item *lip; > int ret = xfs_buf_iodone_error(bp); > if (!ret) > goto finish_iodone; > if (ret == 1) > return; > ASSERT(ret == 2); > - xfs_buf_do_callbacks_fail(bp); > + spin_lock(&bp->b_mount->m_ail->ail_lock); > + list_for_each_entry(lip, &bp->b_li_list, li_bio_list) { > + xfs_set_li_failed(lip, bp); > + } > + spin_unlock(&bp->b_mount->m_ail->ail_lock); > xfs_buf_relse(bp); > return; > } > @@ -1216,7 +1196,7 @@ xfs_buf_iodone( > if (ret == 1) > return; > ASSERT(ret == 2); > - xfs_buf_do_callbacks_fail(bp); > + ASSERT(list_empty(&bp->b_li_list)); > xfs_buf_relse(bp); > return; > } > diff --git a/fs/xfs/xfs_dquot_item.c b/fs/xfs/xfs_dquot_item.c > index 349c92d26570c..d7e4de7151d7f 100644 > --- a/fs/xfs/xfs_dquot_item.c > +++ b/fs/xfs/xfs_dquot_item.c > @@ -113,23 +113,6 @@ xfs_qm_dqunpin_wait( > wait_event(dqp->q_pinwait, (atomic_read(&dqp->q_pincount) == 0)); > } > > -/* > - * Callback used to mark a buffer with XFS_LI_FAILED when items in the buffer > - * have been failed during writeback > - * > - * this informs the AIL that the dquot is already flush locked on the next push, > - * and acquires a hold on the buffer to ensure that it isn't reclaimed before > - * dirty data makes it to disk. > - */ > -STATIC void > -xfs_dquot_item_error( > - struct xfs_log_item *lip, > - struct xfs_buf *bp) > -{ > - ASSERT(!completion_done(&DQUOT_ITEM(lip)->qli_dquot->q_flush)); > - xfs_set_li_failed(lip, bp); > -} > - > STATIC uint > xfs_qm_dquot_logitem_push( > struct xfs_log_item *lip, > @@ -216,7 +199,6 @@ static const struct xfs_item_ops xfs_dquot_item_ops = { > .iop_release = xfs_qm_dquot_logitem_release, > .iop_committing = xfs_qm_dquot_logitem_committing, > .iop_push = xfs_qm_dquot_logitem_push, > - .iop_error = xfs_dquot_item_error > }; > > /* > diff --git a/fs/xfs/xfs_inode_item.c b/fs/xfs/xfs_inode_item.c > index 7049f2ae8d186..86c783dec2bac 100644 > --- a/fs/xfs/xfs_inode_item.c > +++ b/fs/xfs/xfs_inode_item.c > @@ -464,23 +464,6 @@ xfs_inode_item_unpin( > wake_up_bit(&ip->i_flags, __XFS_IPINNED_BIT); > } > > -/* > - * Callback used to mark a buffer with XFS_LI_FAILED when items in the buffer > - * have been failed during writeback > - * > - * This informs the AIL that the inode is already flush locked on the next push, > - * and acquires a hold on the buffer to ensure that it isn't reclaimed before > - * dirty data makes it to disk. > - */ > -STATIC void > -xfs_inode_item_error( > - struct xfs_log_item *lip, > - struct xfs_buf *bp) > -{ > - ASSERT(xfs_isiflocked(INODE_ITEM(lip)->ili_inode)); > - xfs_set_li_failed(lip, bp); > -} > - > STATIC uint > xfs_inode_item_push( > struct xfs_log_item *lip, > @@ -619,7 +602,6 @@ static const struct xfs_item_ops xfs_inode_item_ops = { > .iop_committed = xfs_inode_item_committed, > .iop_push = xfs_inode_item_push, > .iop_committing = xfs_inode_item_committing, > - .iop_error = xfs_inode_item_error > }; > > > diff --git a/fs/xfs/xfs_trans.h b/fs/xfs/xfs_trans.h > index 99a9ab9cab25b..b752501818d25 100644 > --- a/fs/xfs/xfs_trans.h > +++ b/fs/xfs/xfs_trans.h > @@ -74,7 +74,6 @@ struct xfs_item_ops { > void (*iop_committing)(struct xfs_log_item *, xfs_lsn_t commit_lsn); > void (*iop_release)(struct xfs_log_item *); > xfs_lsn_t (*iop_committed)(struct xfs_log_item *, xfs_lsn_t); > - void (*iop_error)(struct xfs_log_item *, xfs_buf_t *); > int (*iop_recover)(struct xfs_log_item *lip, struct xfs_trans *tp); > bool (*iop_match)(struct xfs_log_item *item, uint64_t id); > }; > -- > 2.26.2.761.g0e0b3e54be >