Linux-XFS Archive on lore.kernel.org
 help / color / Atom feed
From: "Darrick J. Wong" <darrick.wong@oracle.com>
To: Christoph Hellwig <hch@lst.de>
Cc: linux-xfs@vger.kernel.org, jstancek@redhat.com
Subject: Re: [PATCH] xfs: fix sub-page uptodate handling
Date: Wed, 4 Dec 2019 13:57:06 -0800
Message-ID: <20191204215706.GT7335@magnolia> (raw)
In-Reply-To: <20191204172804.6589-1-hch@lst.de>

On Wed, Dec 04, 2019 at 06:28:04PM +0100, Christoph Hellwig wrote:
> bio complentions can race when a page spans more than one file system
> block.  Add a spinlock to synchronize marking the page uptodate.
> 
> Fixes: 9dc55f1389f9 ("iomap: add support for sub-pagesize buffered I/O without buffer heads")
> Reported-by: Jan Stancek <jstancek@redhat.com>
> Signed-off-by: Christoph Hellwig <hch@lst.de>

Looks good to me,
Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com>

--D

> ---
>  fs/iomap/buffered-io.c | 35 +++++++++++++++++++++++++----------
>  1 file changed, 25 insertions(+), 10 deletions(-)
> 
> diff --git a/fs/iomap/buffered-io.c b/fs/iomap/buffered-io.c
> index 512856a88106..340c15400423 100644
> --- a/fs/iomap/buffered-io.c
> +++ b/fs/iomap/buffered-io.c
> @@ -28,6 +28,7 @@
>  struct iomap_page {
>  	atomic_t		read_count;
>  	atomic_t		write_count;
> +	spinlock_t		uptodate_lock;
>  	DECLARE_BITMAP(uptodate, PAGE_SIZE / 512);
>  };
>  
> @@ -51,6 +52,7 @@ iomap_page_create(struct inode *inode, struct page *page)
>  	iop = kmalloc(sizeof(*iop), GFP_NOFS | __GFP_NOFAIL);
>  	atomic_set(&iop->read_count, 0);
>  	atomic_set(&iop->write_count, 0);
> +	spin_lock_init(&iop->uptodate_lock);
>  	bitmap_zero(iop->uptodate, PAGE_SIZE / SECTOR_SIZE);
>  
>  	/*
> @@ -139,25 +141,38 @@ iomap_adjust_read_range(struct inode *inode, struct iomap_page *iop,
>  }
>  
>  static void
> -iomap_set_range_uptodate(struct page *page, unsigned off, unsigned len)
> +iomap_iop_set_range_uptodate(struct page *page, unsigned off, unsigned len)
>  {
>  	struct iomap_page *iop = to_iomap_page(page);
>  	struct inode *inode = page->mapping->host;
>  	unsigned first = off >> inode->i_blkbits;
>  	unsigned last = (off + len - 1) >> inode->i_blkbits;
> -	unsigned int i;
>  	bool uptodate = true;
> +	unsigned long flags;
> +	unsigned int i;
>  
> -	if (iop) {
> -		for (i = 0; i < PAGE_SIZE / i_blocksize(inode); i++) {
> -			if (i >= first && i <= last)
> -				set_bit(i, iop->uptodate);
> -			else if (!test_bit(i, iop->uptodate))
> -				uptodate = false;
> -		}
> +	spin_lock_irqsave(&iop->uptodate_lock, flags);
> +	for (i = 0; i < PAGE_SIZE / i_blocksize(inode); i++) {
> +		if (i >= first && i <= last)
> +			set_bit(i, iop->uptodate);
> +		else if (!test_bit(i, iop->uptodate))
> +			uptodate = false;
>  	}
>  
> -	if (uptodate && !PageError(page))
> +	if (uptodate)
> +		SetPageUptodate(page);
> +	spin_unlock_irqrestore(&iop->uptodate_lock, flags);
> +}
> +
> +static void
> +iomap_set_range_uptodate(struct page *page, unsigned off, unsigned len)
> +{
> +	if (PageError(page))
> +		return;
> +
> +	if (page_has_private(page))
> +		iomap_iop_set_range_uptodate(page, off, len);
> +	else
>  		SetPageUptodate(page);
>  }
>  
> -- 
> 2.20.1
> 

  parent reply index

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-12-04 17:28 Christoph Hellwig
2019-12-04 20:58 ` Dave Chinner
2019-12-04 21:57 ` Darrick J. Wong [this message]
2019-12-05  7:44   ` Christoph Hellwig

Reply instructions:

You may reply publically to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20191204215706.GT7335@magnolia \
    --to=darrick.wong@oracle.com \
    --cc=hch@lst.de \
    --cc=jstancek@redhat.com \
    --cc=linux-xfs@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Linux-XFS Archive on lore.kernel.org

Archives are clonable:
	git clone --mirror https://lore.kernel.org/linux-xfs/0 linux-xfs/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 linux-xfs linux-xfs/ https://lore.kernel.org/linux-xfs \
		linux-xfs@vger.kernel.org
	public-inbox-index linux-xfs

Example config snippet for mirrors

Newsgroup available over NNTP:
	nntp://nntp.lore.kernel.org/org.kernel.vger.linux-xfs


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git