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.8 required=3.0 tests=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 4BE8DC4724C for ; Fri, 1 May 2020 12:07:09 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 2FF6A2166E for ; Fri, 1 May 2020 12:07:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728600AbgEAMHI (ORCPT ); Fri, 1 May 2020 08:07:08 -0400 Received: from mx0a-001b2d01.pphosted.com ([148.163.156.1]:52530 "EHLO mx0a-001b2d01.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728485AbgEAMHI (ORCPT ); Fri, 1 May 2020 08:07:08 -0400 Received: from pps.filterd (m0098394.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.0.42/8.16.0.42) with SMTP id 041C3HLi053900; Fri, 1 May 2020 08:07:05 -0400 Received: from ppma03ams.nl.ibm.com (62.31.33a9.ip4.static.sl-reverse.com [169.51.49.98]) by mx0a-001b2d01.pphosted.com with ESMTP id 30r7mdggkf-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 01 May 2020 08:07:05 -0400 Received: from pps.filterd (ppma03ams.nl.ibm.com [127.0.0.1]) by ppma03ams.nl.ibm.com (8.16.0.27/8.16.0.27) with SMTP id 041C1DvI015935; Fri, 1 May 2020 12:07:02 GMT Received: from b06avi18878370.portsmouth.uk.ibm.com (b06avi18878370.portsmouth.uk.ibm.com [9.149.26.194]) by ppma03ams.nl.ibm.com with ESMTP id 30mcu5vmtm-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 01 May 2020 12:07:02 +0000 Received: from d06av25.portsmouth.uk.ibm.com (d06av25.portsmouth.uk.ibm.com [9.149.105.61]) by b06avi18878370.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 041C70DZ64553322 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 1 May 2020 12:07:00 GMT Received: from d06av25.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id A159511C054; Fri, 1 May 2020 12:07:00 +0000 (GMT) Received: from d06av25.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id D1DF111C050; Fri, 1 May 2020 12:06:59 +0000 (GMT) Received: from localhost.localdomain (unknown [9.85.72.180]) by d06av25.portsmouth.uk.ibm.com (Postfix) with ESMTP; Fri, 1 May 2020 12:06:59 +0000 (GMT) From: Chandan Rajendra To: "Darrick J. Wong" Cc: linux-xfs@vger.kernel.org Subject: Re: [PATCH 02/21] xfs: refactor log recovery item dispatch for pass2 readhead functions Date: Fri, 01 May 2020 17:40:02 +0530 Message-ID: <4890365.NoYZ9p2UQH@localhost.localdomain> Organization: IBM In-Reply-To: <158820766792.467894.3995732139270270438.stgit@magnolia> References: <158820765488.467894.15408191148091671053.stgit@magnolia> <158820766792.467894.3995732139270270438.stgit@magnolia> MIME-Version: 1.0 Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="us-ascii" X-TM-AS-GCONF: 00 X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.138,18.0.676 definitions=2020-05-01_06:2020-04-30,2020-05-01 signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 impostorscore=0 mlxscore=0 bulkscore=0 lowpriorityscore=0 malwarescore=0 mlxlogscore=999 priorityscore=1501 suspectscore=1 clxscore=1015 phishscore=0 adultscore=0 spamscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2003020000 definitions=main-2005010095 Sender: linux-xfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-xfs@vger.kernel.org On Thursday, April 30, 2020 6:17 AM Darrick J. Wong wrote: > From: Darrick J. Wong > > Move the pass2 readhead code into the per-item source code files and use > the dispatch function to call them. > Readahead is issued for buf, inode and dquot items similar to how it is done in the present code. Reviewed-by: Chandan Rajendra > Signed-off-by: Darrick J. Wong > --- > fs/xfs/libxfs/xfs_log_recover.h | 6 ++ > fs/xfs/xfs_buf_item_recover.c | 11 +++++ > fs/xfs/xfs_dquot_item.c | 34 ++++++++++++++ > fs/xfs/xfs_inode_item_recover.c | 19 ++++++++ > fs/xfs/xfs_log_recover.c | 95 +-------------------------------------- > 5 files changed, 73 insertions(+), 92 deletions(-) > > > diff --git a/fs/xfs/libxfs/xfs_log_recover.h b/fs/xfs/libxfs/xfs_log_recover.h > index 38ae9c371edb..1463eba47254 100644 > --- a/fs/xfs/libxfs/xfs_log_recover.h > +++ b/fs/xfs/libxfs/xfs_log_recover.h > @@ -29,6 +29,9 @@ struct xlog_recover_item_type { > * values mean. > */ > enum xlog_recover_reorder (*reorder_fn)(struct xlog_recover_item *item); > + > + /* Start readahead for pass2, if provided. */ > + void (*ra_pass2_fn)(struct xlog *log, struct xlog_recover_item *item); > }; > > extern const struct xlog_recover_item_type xlog_icreate_item_type; > @@ -90,4 +93,7 @@ struct xlog_recover { > #define XLOG_RECOVER_PASS1 1 > #define XLOG_RECOVER_PASS2 2 > > +void xlog_buf_readahead(struct xlog *log, xfs_daddr_t blkno, uint len, > + const struct xfs_buf_ops *ops); > + > #endif /* __XFS_LOG_RECOVER_H__ */ > diff --git a/fs/xfs/xfs_buf_item_recover.c b/fs/xfs/xfs_buf_item_recover.c > index 07ddf58209c3..c756b8e55fde 100644 > --- a/fs/xfs/xfs_buf_item_recover.c > +++ b/fs/xfs/xfs_buf_item_recover.c > @@ -32,6 +32,17 @@ xlog_buf_reorder_fn( > return XLOG_REORDER_BUFFER_LIST; > } > > +STATIC void > +xlog_recover_buffer_ra_pass2( > + struct xlog *log, > + struct xlog_recover_item *item) > +{ > + struct xfs_buf_log_format *buf_f = item->ri_buf[0].i_addr; > + > + xlog_buf_readahead(log, buf_f->blf_blkno, buf_f->blf_len, NULL); > +} > + > const struct xlog_recover_item_type xlog_buf_item_type = { > .reorder_fn = xlog_buf_reorder_fn, > + .ra_pass2_fn = xlog_recover_buffer_ra_pass2, > }; > diff --git a/fs/xfs/xfs_dquot_item.c b/fs/xfs/xfs_dquot_item.c > index 3bd5b6c7e235..2a05d1239423 100644 > --- a/fs/xfs/xfs_dquot_item.c > +++ b/fs/xfs/xfs_dquot_item.c > @@ -386,7 +386,41 @@ xfs_qm_qoff_logitem_init( > return qf; > } > > +STATIC void > +xlog_recover_dquot_ra_pass2( > + struct xlog *log, > + struct xlog_recover_item *item) > +{ > + struct xfs_mount *mp = log->l_mp; > + struct xfs_disk_dquot *recddq; > + struct xfs_dq_logformat *dq_f; > + uint type; > + > + if (mp->m_qflags == 0) > + return; > + > + recddq = item->ri_buf[1].i_addr; > + if (recddq == NULL) > + return; > + if (item->ri_buf[1].i_len < sizeof(struct xfs_disk_dquot)) > + return; > + > + type = recddq->d_flags & (XFS_DQ_USER | XFS_DQ_PROJ | XFS_DQ_GROUP); > + ASSERT(type); > + if (log->l_quotaoffs_flag & type) > + return; > + > + dq_f = item->ri_buf[0].i_addr; > + ASSERT(dq_f); > + ASSERT(dq_f->qlf_len == 1); > + > + xlog_buf_readahead(log, dq_f->qlf_blkno, > + XFS_FSB_TO_BB(mp, dq_f->qlf_len), > + &xfs_dquot_buf_ra_ops); > +} > + > const struct xlog_recover_item_type xlog_dquot_item_type = { > + .ra_pass2_fn = xlog_recover_dquot_ra_pass2, > }; > > const struct xlog_recover_item_type xlog_quotaoff_item_type = { > diff --git a/fs/xfs/xfs_inode_item_recover.c b/fs/xfs/xfs_inode_item_recover.c > index 478f0a5c08ab..d97d8caa4652 100644 > --- a/fs/xfs/xfs_inode_item_recover.c > +++ b/fs/xfs/xfs_inode_item_recover.c > @@ -21,5 +21,24 @@ > #include "xfs_log_priv.h" > #include "xfs_log_recover.h" > > +STATIC void > +xlog_recover_inode_ra_pass2( > + struct xlog *log, > + struct xlog_recover_item *item) > +{ > + if (item->ri_buf[0].i_len == sizeof(struct xfs_inode_log_format)) { > + struct xfs_inode_log_format *ilfp = item->ri_buf[0].i_addr; > + > + xlog_buf_readahead(log, ilfp->ilf_blkno, ilfp->ilf_len, > + &xfs_inode_buf_ra_ops); > + } else { > + struct xfs_inode_log_format_32 *ilfp = item->ri_buf[0].i_addr; > + > + xlog_buf_readahead(log, ilfp->ilf_blkno, ilfp->ilf_len, > + &xfs_inode_buf_ra_ops); > + } > +} > + > const struct xlog_recover_item_type xlog_inode_item_type = { > + .ra_pass2_fn = xlog_recover_inode_ra_pass2, > }; > diff --git a/fs/xfs/xfs_log_recover.c b/fs/xfs/xfs_log_recover.c > index 8ab107680883..b61323cc5a11 100644 > --- a/fs/xfs/xfs_log_recover.c > +++ b/fs/xfs/xfs_log_recover.c > @@ -2045,7 +2045,7 @@ xlog_put_buffer_cancelled( > return true; > } > > -static void > +void > xlog_buf_readahead( > struct xlog *log, > xfs_daddr_t blkno, > @@ -3912,96 +3912,6 @@ xlog_recover_do_icreate_pass2( > length, be32_to_cpu(icl->icl_gen)); > } > > -STATIC void > -xlog_recover_buffer_ra_pass2( > - struct xlog *log, > - struct xlog_recover_item *item) > -{ > - struct xfs_buf_log_format *buf_f = item->ri_buf[0].i_addr; > - > - xlog_buf_readahead(log, buf_f->blf_blkno, buf_f->blf_len, NULL); > -} > - > -STATIC void > -xlog_recover_inode_ra_pass2( > - struct xlog *log, > - struct xlog_recover_item *item) > -{ > - if (item->ri_buf[0].i_len == sizeof(struct xfs_inode_log_format)) { > - struct xfs_inode_log_format *ilfp = item->ri_buf[0].i_addr; > - > - xlog_buf_readahead(log, ilfp->ilf_blkno, ilfp->ilf_len, > - &xfs_inode_buf_ra_ops); > - } else { > - struct xfs_inode_log_format_32 *ilfp = item->ri_buf[0].i_addr; > - > - xlog_buf_readahead(log, ilfp->ilf_blkno, ilfp->ilf_len, > - &xfs_inode_buf_ra_ops); > - } > -} > - > -STATIC void > -xlog_recover_dquot_ra_pass2( > - struct xlog *log, > - struct xlog_recover_item *item) > -{ > - struct xfs_mount *mp = log->l_mp; > - struct xfs_disk_dquot *recddq; > - struct xfs_dq_logformat *dq_f; > - uint type; > - > - if (mp->m_qflags == 0) > - return; > - > - recddq = item->ri_buf[1].i_addr; > - if (recddq == NULL) > - return; > - if (item->ri_buf[1].i_len < sizeof(struct xfs_disk_dquot)) > - return; > - > - type = recddq->d_flags & (XFS_DQ_USER | XFS_DQ_PROJ | XFS_DQ_GROUP); > - ASSERT(type); > - if (log->l_quotaoffs_flag & type) > - return; > - > - dq_f = item->ri_buf[0].i_addr; > - ASSERT(dq_f); > - ASSERT(dq_f->qlf_len == 1); > - > - xlog_buf_readahead(log, dq_f->qlf_blkno, > - XFS_FSB_TO_BB(mp, dq_f->qlf_len), > - &xfs_dquot_buf_ra_ops); > -} > - > -STATIC void > -xlog_recover_ra_pass2( > - struct xlog *log, > - struct xlog_recover_item *item) > -{ > - switch (ITEM_TYPE(item)) { > - case XFS_LI_BUF: > - xlog_recover_buffer_ra_pass2(log, item); > - break; > - case XFS_LI_INODE: > - xlog_recover_inode_ra_pass2(log, item); > - break; > - case XFS_LI_DQUOT: > - xlog_recover_dquot_ra_pass2(log, item); > - break; > - case XFS_LI_EFI: > - case XFS_LI_EFD: > - case XFS_LI_QUOTAOFF: > - case XFS_LI_RUI: > - case XFS_LI_RUD: > - case XFS_LI_CUI: > - case XFS_LI_CUD: > - case XFS_LI_BUI: > - case XFS_LI_BUD: > - default: > - break; > - } > -} > - > STATIC int > xlog_recover_commit_pass1( > struct xlog *log, > @@ -4138,7 +4048,8 @@ xlog_recover_commit_trans( > error = xlog_recover_commit_pass1(log, trans, item); > break; > case XLOG_RECOVER_PASS2: > - xlog_recover_ra_pass2(log, item); > + if (item->ri_type && item->ri_type->ra_pass2_fn) > + item->ri_type->ra_pass2_fn(log, item); > list_move_tail(&item->ri_list, &ra_list); > items_queued++; > if (items_queued >= XLOG_RECOVER_COMMIT_QUEUE_MAX) { > > -- chandan