From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B1FF02E92B3 for ; Fri, 27 Jun 2025 15:10:56 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.133.124 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1751037058; cv=none; b=D88xgu9U7IioLk2xpJ39OWLC7WjnwPyQ8e8tcR+2HPNkKf/aelsLhHPjkHQK13WcCabo5rFolbaY8WS1dNdzMLSLABE3zqZHu+He7ZDmfUj2d50+3ZVfzaUav9COLXf3ETrj+0BZFYTjQxpvIx+47YLVqaYyOLa1YysxmB/5JsI= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1751037058; c=relaxed/simple; bh=/OXqtSvPg+k3AqO7qzky2yzDoCuXDl3KOx88Ba0kcOE=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=oC3uE8D3spj2l6iMD/hcV32wQAijXkQ+Zq8bXmoUorD79SsvDYhzQcP+e6I7K0YUyjKhr6vrJcuvHfJxXvprzUiDnFc3S3DpDRX/UXwNfQDRu0h/jVvdygq42az1wJ4A32iG7NIIJ09cKT0vk4iyDcw9xv6fnU10gVnB4ls1RjA= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=br0YuKpX; arc=none smtp.client-ip=170.10.133.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="br0YuKpX" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1751037055; 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=2zLLrPPni+LNLupOh21b7NzZcq1VuLK+h5aTqE/Uei0=; b=br0YuKpXv5cKd6dfAoHTodI83wGoHVQQY0Bo3z9DAsbIZ6v06N4i3jMJbG5b8aDtpmbUj1 ye0RPb/mgLzk9ZUa/v38l2EO743Hg1fpTcYWFdGCLLJHFPASGKukcaC4nUfSa8iI8Zc/xK XIbVv9Q2Z3aqSwFVf9OEfp50tIft+Bk= Received: from mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-554-RVa0SdgBMyqojgjpLRHIJA-1; Fri, 27 Jun 2025 11:10:51 -0400 X-MC-Unique: RVa0SdgBMyqojgjpLRHIJA-1 X-Mimecast-MFC-AGG-ID: RVa0SdgBMyqojgjpLRHIJA_1751037050 Received: from mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.17]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 5F8881944A83; Fri, 27 Jun 2025 15:10:50 +0000 (UTC) Received: from bfoster (unknown [10.22.64.142]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id B1D741956095; Fri, 27 Jun 2025 15:10:48 +0000 (UTC) Date: Fri, 27 Jun 2025 11:14:26 -0400 From: Brian Foster To: Christoph Hellwig Cc: Christian Brauner , "Darrick J. Wong" , Joanne Koong , linux-xfs@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-doc@vger.kernel.org, linux-block@vger.kernel.org, gfs2@lists.linux.dev Subject: Re: [PATCH 05/12] iomap: add public helpers for uptodate state manipulation Message-ID: References: <20250627070328.975394-1-hch@lst.de> <20250627070328.975394-6-hch@lst.de> Precedence: bulk X-Mailing-List: linux-block@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20250627070328.975394-6-hch@lst.de> X-Scanned-By: MIMEDefang 3.0 on 10.30.177.17 On Fri, Jun 27, 2025 at 09:02:38AM +0200, Christoph Hellwig wrote: > From: Joanne Koong > > Add a new iomap_start_folio_write helper to abstract away the > write_bytes_pending handling, and export it and the existing > iomap_finish_folio_write for non-iomap writeback in fuse. > > Signed-off-by: Joanne Koong > [hch: split from a larger patch] > Signed-off-by: Christoph Hellwig > --- Reviewed-by: Brian Foster > fs/iomap/buffered-io.c | 20 +++++++++++++++----- > include/linux/iomap.h | 5 +++++ > 2 files changed, 20 insertions(+), 5 deletions(-) > > diff --git a/fs/iomap/buffered-io.c b/fs/iomap/buffered-io.c > index a72ab487c8ab..d152456d41a8 100644 > --- a/fs/iomap/buffered-io.c > +++ b/fs/iomap/buffered-io.c > @@ -1535,7 +1535,18 @@ vm_fault_t iomap_page_mkwrite(struct vm_fault *vmf, const struct iomap_ops *ops, > } > EXPORT_SYMBOL_GPL(iomap_page_mkwrite); > > -static void iomap_finish_folio_write(struct inode *inode, struct folio *folio, > +void iomap_start_folio_write(struct inode *inode, struct folio *folio, > + size_t len) > +{ > + struct iomap_folio_state *ifs = folio->private; > + > + WARN_ON_ONCE(i_blocks_per_folio(inode, folio) > 1 && !ifs); > + if (ifs) > + atomic_add(len, &ifs->write_bytes_pending); > +} > +EXPORT_SYMBOL_GPL(iomap_start_folio_write); > + > +void iomap_finish_folio_write(struct inode *inode, struct folio *folio, > size_t len) > { > struct iomap_folio_state *ifs = folio->private; > @@ -1546,6 +1557,7 @@ static void iomap_finish_folio_write(struct inode *inode, struct folio *folio, > if (!ifs || atomic_sub_and_test(len, &ifs->write_bytes_pending)) > folio_end_writeback(folio); > } > +EXPORT_SYMBOL_GPL(iomap_finish_folio_write); > > /* > * We're now finished for good with this ioend structure. Update the page > @@ -1668,7 +1680,6 @@ ssize_t iomap_add_to_ioend(struct iomap_writeback_ctx *wpc, struct folio *folio, > loff_t pos, loff_t end_pos, unsigned int dirty_len) > { > struct iomap_ioend *ioend = wpc->wb_ctx; > - struct iomap_folio_state *ifs = folio->private; > size_t poff = offset_in_folio(folio, pos); > unsigned int ioend_flags = 0; > unsigned int map_len = min_t(u64, dirty_len, > @@ -1711,8 +1722,7 @@ ssize_t iomap_add_to_ioend(struct iomap_writeback_ctx *wpc, struct folio *folio, > if (!bio_add_folio(&ioend->io_bio, folio, map_len, poff)) > goto new_ioend; > > - if (ifs) > - atomic_add(map_len, &ifs->write_bytes_pending); > + iomap_start_folio_write(wpc->inode, folio, map_len); > > /* > * Clamp io_offset and io_size to the incore EOF so that ondisk > @@ -1880,7 +1890,7 @@ static int iomap_writepage_map(struct iomap_writeback_ctx *wpc, > * all blocks. > */ > WARN_ON_ONCE(atomic_read(&ifs->write_bytes_pending) != 0); > - atomic_inc(&ifs->write_bytes_pending); > + iomap_start_folio_write(inode, folio, 1); > } > > /* > diff --git a/include/linux/iomap.h b/include/linux/iomap.h > index b65951cdb0b5..1a07d8fa9459 100644 > --- a/include/linux/iomap.h > +++ b/include/linux/iomap.h > @@ -460,6 +460,11 @@ void iomap_sort_ioends(struct list_head *ioend_list); > ssize_t iomap_add_to_ioend(struct iomap_writeback_ctx *wpc, struct folio *folio, > loff_t pos, loff_t end_pos, unsigned int dirty_len); > int ioend_writeback_submit(struct iomap_writeback_ctx *wpc, int error); > + > +void iomap_start_folio_write(struct inode *inode, struct folio *folio, > + size_t len); > +void iomap_finish_folio_write(struct inode *inode, struct folio *folio, > + size_t len); > int iomap_writepages(struct iomap_writeback_ctx *wpc); > > /* > -- > 2.47.2 > >