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=-8.3 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,UNPARSEABLE_RELAY, URIBL_BLOCKED,USER_AGENT_MUTT 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 0125EC004E6 for ; Thu, 27 Jun 2019 20:44:59 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id BAD3120B7C for ; Thu, 27 Jun 2019 20:44:58 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=oracle.com header.i=@oracle.com header.b="CNn8y1Ls" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726561AbfF0Uo5 (ORCPT ); Thu, 27 Jun 2019 16:44:57 -0400 Received: from userp2130.oracle.com ([156.151.31.86]:33078 "EHLO userp2130.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726443AbfF0Uoy (ORCPT ); Thu, 27 Jun 2019 16:44:54 -0400 Received: from pps.filterd (userp2130.oracle.com [127.0.0.1]) by userp2130.oracle.com (8.16.0.27/8.16.0.27) with SMTP id x5RKiJrE129590; Thu, 27 Jun 2019 20:44:30 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=date : from : to : cc : subject : message-id : references : mime-version : content-type : in-reply-to; s=corp-2018-07-02; bh=GvvOJ3ZYe39vy53jEnW495wz4/bZAY4T5Xov8m3s0XE=; b=CNn8y1LseFDIlhOujGjb1tAvXJRWmLRCU8FPquuYHswqDlwkh8p/9a/MR/ZFbDKsF570 oNR2te3FjFFO2PYOE7hOmsvNJAzsbtM77Herv1UuOPj5jk70/mClcflAdAoI0w+rH1B4 tKt3aGYpw+3/pl6e34yIy8QFUA10NvRCEB4ZdCW9aXjwKYWC9Ll+24afbNCL7Sytdg+y iUzQx5YJZeUDknOvM2z69JmGOhzXAb5rX+5hBLG8HG/e2+PAY4DEM0rdHWVu4CfcBxYm ZJXSEd2ygLUN0QrW8CboN+6X2Geht9pFPasjX8wDptpJHIytTZI3bJfQmaQ5q+/kT0G2 rw== Received: from userp3020.oracle.com (userp3020.oracle.com [156.151.31.79]) by userp2130.oracle.com with ESMTP id 2t9brtjeq8-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 27 Jun 2019 20:44:29 +0000 Received: from pps.filterd (userp3020.oracle.com [127.0.0.1]) by userp3020.oracle.com (8.16.0.27/8.16.0.27) with SMTP id x5RKhVPR104544; Thu, 27 Jun 2019 20:44:29 GMT Received: from userv0122.oracle.com (userv0122.oracle.com [156.151.31.75]) by userp3020.oracle.com with ESMTP id 2tat7dkgsr-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 27 Jun 2019 20:44:29 +0000 Received: from abhmp0012.oracle.com (abhmp0012.oracle.com [141.146.116.18]) by userv0122.oracle.com (8.14.4/8.14.4) with ESMTP id x5RKiR0U021951; Thu, 27 Jun 2019 20:44:27 GMT Received: from localhost (/10.145.179.81) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Thu, 27 Jun 2019 13:44:26 -0700 Date: Thu, 27 Jun 2019 13:44:26 -0700 From: "Darrick J. Wong" To: Christoph Hellwig Cc: Damien Le Moal , Andreas Gruenbacher , linux-xfs@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH 04/13] xfs: initialize iomap->flags in xfs_bmbt_to_iomap Message-ID: <20190627204426.GQ5171@magnolia> References: <20190627104836.25446-1-hch@lst.de> <20190627104836.25446-5-hch@lst.de> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20190627104836.25446-5-hch@lst.de> User-Agent: Mutt/1.9.4 (2018-02-28) X-Proofpoint-Virus-Version: vendor=nai engine=6000 definitions=9301 signatures=668688 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 suspectscore=0 malwarescore=0 phishscore=0 bulkscore=0 spamscore=0 mlxscore=0 mlxlogscore=999 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1810050000 definitions=main-1906270238 X-Proofpoint-Virus-Version: vendor=nai engine=6000 definitions=9301 signatures=668688 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 priorityscore=1501 malwarescore=0 suspectscore=0 phishscore=0 bulkscore=0 spamscore=0 clxscore=1015 lowpriorityscore=0 mlxscore=0 impostorscore=0 mlxlogscore=999 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1810050000 definitions=main-1906270239 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Thu, Jun 27, 2019 at 12:48:27PM +0200, Christoph Hellwig wrote: > Currently we don't overwrite the flags field in the iomap in > xfs_bmbt_to_iomap. This works fine with 0-initialized iomaps on stack, > but is harmful once we want to be able to reuse an iomap in the > writeback code. Replace the shared paramter with a set of initial > flags an thus ensures the flags field is always reinitialized. > > Signed-off-by: Christoph Hellwig Looks ok, Reviewed-by: Darrick J. Wong --D > --- > fs/xfs/xfs_iomap.c | 28 +++++++++++++++++----------- > fs/xfs/xfs_iomap.h | 2 +- > fs/xfs/xfs_pnfs.c | 2 +- > 3 files changed, 19 insertions(+), 13 deletions(-) > > diff --git a/fs/xfs/xfs_iomap.c b/fs/xfs/xfs_iomap.c > index 63d323916bba..6b29452bfba0 100644 > --- a/fs/xfs/xfs_iomap.c > +++ b/fs/xfs/xfs_iomap.c > @@ -57,7 +57,7 @@ xfs_bmbt_to_iomap( > struct xfs_inode *ip, > struct iomap *iomap, > struct xfs_bmbt_irec *imap, > - bool shared) > + u16 flags) > { > struct xfs_mount *mp = ip->i_mount; > > @@ -82,12 +82,11 @@ xfs_bmbt_to_iomap( > iomap->length = XFS_FSB_TO_B(mp, imap->br_blockcount); > iomap->bdev = xfs_find_bdev_for_inode(VFS_I(ip)); > iomap->dax_dev = xfs_find_daxdev_for_inode(VFS_I(ip)); > + iomap->flags = flags; > > if (xfs_ipincount(ip) && > (ip->i_itemp->ili_fsync_fields & ~XFS_ILOG_TIMESTAMP)) > iomap->flags |= IOMAP_F_DIRTY; > - if (shared) > - iomap->flags |= IOMAP_F_SHARED; > return 0; > } > > @@ -543,6 +542,7 @@ xfs_file_iomap_begin_delay( > struct xfs_iext_cursor icur, ccur; > xfs_fsblock_t prealloc_blocks = 0; > bool eof = false, cow_eof = false, shared = false; > + u16 iomap_flags = 0; > int whichfork = XFS_DATA_FORK; > int error = 0; > > @@ -710,7 +710,7 @@ xfs_file_iomap_begin_delay( > * Flag newly allocated delalloc blocks with IOMAP_F_NEW so we punch > * them out if the write happens to fail. > */ > - iomap->flags |= IOMAP_F_NEW; > + iomap_flags |= IOMAP_F_NEW; > trace_xfs_iomap_alloc(ip, offset, count, whichfork, > whichfork == XFS_DATA_FORK ? &imap : &cmap); > done: > @@ -718,14 +718,17 @@ xfs_file_iomap_begin_delay( > if (imap.br_startoff > offset_fsb) { > xfs_trim_extent(&cmap, offset_fsb, > imap.br_startoff - offset_fsb); > - error = xfs_bmbt_to_iomap(ip, iomap, &cmap, true); > + error = xfs_bmbt_to_iomap(ip, iomap, &cmap, > + IOMAP_F_SHARED); > goto out_unlock; > } > /* ensure we only report blocks we have a reservation for */ > xfs_trim_extent(&imap, cmap.br_startoff, cmap.br_blockcount); > shared = true; > } > - error = xfs_bmbt_to_iomap(ip, iomap, &imap, shared); > + if (shared) > + iomap_flags |= IOMAP_F_SHARED; > + error = xfs_bmbt_to_iomap(ip, iomap, &imap, iomap_flags); > out_unlock: > xfs_iunlock(ip, XFS_ILOCK_EXCL); > return error; > @@ -933,6 +936,7 @@ xfs_file_iomap_begin( > xfs_fileoff_t offset_fsb, end_fsb; > int nimaps = 1, error = 0; > bool shared = false; > + u16 iomap_flags = 0; > unsigned lockmode; > > if (XFS_FORCED_SHUTDOWN(mp)) > @@ -1048,11 +1052,13 @@ xfs_file_iomap_begin( > if (error) > return error; > > - iomap->flags |= IOMAP_F_NEW; > + iomap_flags |= IOMAP_F_NEW; > trace_xfs_iomap_alloc(ip, offset, length, XFS_DATA_FORK, &imap); > > out_finish: > - return xfs_bmbt_to_iomap(ip, iomap, &imap, shared); > + if (shared) > + iomap_flags |= IOMAP_F_SHARED; > + return xfs_bmbt_to_iomap(ip, iomap, &imap, iomap_flags); > > out_found: > ASSERT(nimaps); > @@ -1196,7 +1202,7 @@ xfs_seek_iomap_begin( > if (data_fsb < cow_fsb + cmap.br_blockcount) > end_fsb = min(end_fsb, data_fsb); > xfs_trim_extent(&cmap, offset_fsb, end_fsb); > - error = xfs_bmbt_to_iomap(ip, iomap, &cmap, true); > + error = xfs_bmbt_to_iomap(ip, iomap, &cmap, IOMAP_F_SHARED); > /* > * This is a COW extent, so we must probe the page cache > * because there could be dirty page cache being backed > @@ -1218,7 +1224,7 @@ xfs_seek_iomap_begin( > imap.br_state = XFS_EXT_NORM; > done: > xfs_trim_extent(&imap, offset_fsb, end_fsb); > - error = xfs_bmbt_to_iomap(ip, iomap, &imap, false); > + error = xfs_bmbt_to_iomap(ip, iomap, &imap, 0); > out_unlock: > xfs_iunlock(ip, lockmode); > return error; > @@ -1264,7 +1270,7 @@ xfs_xattr_iomap_begin( > if (error) > return error; > ASSERT(nimaps); > - return xfs_bmbt_to_iomap(ip, iomap, &imap, false); > + return xfs_bmbt_to_iomap(ip, iomap, &imap, 0); > } > > const struct iomap_ops xfs_xattr_iomap_ops = { > diff --git a/fs/xfs/xfs_iomap.h b/fs/xfs/xfs_iomap.h > index 5c2f6aa6d78f..71d0ae460c44 100644 > --- a/fs/xfs/xfs_iomap.h > +++ b/fs/xfs/xfs_iomap.h > @@ -16,7 +16,7 @@ int xfs_iomap_write_direct(struct xfs_inode *, xfs_off_t, size_t, > int xfs_iomap_write_unwritten(struct xfs_inode *, xfs_off_t, xfs_off_t, bool); > > int xfs_bmbt_to_iomap(struct xfs_inode *, struct iomap *, > - struct xfs_bmbt_irec *, bool shared); > + struct xfs_bmbt_irec *, u16); > xfs_extlen_t xfs_eof_alignment(struct xfs_inode *ip, xfs_extlen_t extsize); > > static inline xfs_filblks_t > diff --git a/fs/xfs/xfs_pnfs.c b/fs/xfs/xfs_pnfs.c > index 2d95355a8a0a..97cdb57e58bc 100644 > --- a/fs/xfs/xfs_pnfs.c > +++ b/fs/xfs/xfs_pnfs.c > @@ -186,7 +186,7 @@ xfs_fs_map_blocks( > } > xfs_iunlock(ip, XFS_IOLOCK_EXCL); > > - error = xfs_bmbt_to_iomap(ip, iomap, &imap, false); > + error = xfs_bmbt_to_iomap(ip, iomap, &imap, 0); > *device_generation = mp->m_generation; > return error; > out_unlock: > -- > 2.20.1 >