From: Paolo Bonzini <pbonzini@redhat.com> To: Vivek Goyal <vgoyal@redhat.com> Cc: linux-kernel@vger.kernel.org, axboe@kernel.dk, snitzer@redhat.com, martin.petersen@oracle.com, david@fromorbit.com, xfs@oss.sgi.com, dm-devel@redhat.com, hch@lst.de Subject: Re: [dm-devel] [PATCH v2 1/3] block: add sysfs entry for discard_alignment Date: Tue, 03 Jul 2012 16:21:34 +0200 [thread overview] Message-ID: <4FF2FFEE.4000401@redhat.com> (raw) In-Reply-To: <20120703140048.GC11272@redhat.com> Il 03/07/2012 16:00, Vivek Goyal ha scritto: >> > >> > Ah, interesting, I missed it completely. I guess it's because queue/ >> > directories only exist for full disks, and the correct alignment varies >> > for each partition. So this patch is unnecessary. > Partition discard_alignments are available in > /sys/block/<disk>/<partition>/discard_alignment. Yes. If it were in queue/, it wouldn't be available. > That raises an interesting question for patch3. If the discard is happening to > a partition, shouldn't you be looking at partition discard_alignment > instead of always looking at queue discard_alignment? Good point! Like this? diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h index ba43f40..3530764 100644 --- a/include/linux/blkdev.h +++ b/include/linux/blkdev.h @@ -1125,6 +1125,16 @@ static inline int queue_limit_discard_alignment(struct queue_limits *lim, sector & (lim->discard_granularity - 1); } +static inline int bdev_discard_alignment(struct block_device *bdev) +{ + struct request_queue *q = bdev_get_queue(bdev); + + if (bdev != bdev->bd_contains) + return bdev->bd_part->discard_alignment; + + return q->limits.discard_alignment; +} + static inline unsigned int queue_discard_zeroes_data(struct request_queue *q) { if (q->limits.max_discard_sectors && q->limits.discard_zeroes_data == 1) diff --git a/block/blk-lib.c b/block/blk-lib.c index b2bde5c..77d8869 100644 --- a/block/blk-lib.c +++ b/block/blk-lib.c @@ -58,7 +58,7 @@ int blkdev_issue_discard(struct block_device *bdev, sector_t sector, /* Zero-sector (unknown) and one-sector granularities are the same. */ granularity = max(q->limits.discard_granularity >> 9, 1U); mask = granularity - 1; - alignment = (q->limits.discard_alignment >> 9) & mask; + alignment = bdev_discard_alignment(bdev) >> 9; /* * Ensure that max_discard_sectors is of the proper Paolo
WARNING: multiple messages have this Message-ID (diff)
From: Paolo Bonzini <pbonzini@redhat.com> To: Vivek Goyal <vgoyal@redhat.com> Cc: axboe@kernel.dk, martin.petersen@oracle.com, snitzer@redhat.com, linux-kernel@vger.kernel.org, xfs@oss.sgi.com, dm-devel@redhat.com, hch@lst.de Subject: Re: [dm-devel] [PATCH v2 1/3] block: add sysfs entry for discard_alignment Date: Tue, 03 Jul 2012 16:21:34 +0200 [thread overview] Message-ID: <4FF2FFEE.4000401@redhat.com> (raw) In-Reply-To: <20120703140048.GC11272@redhat.com> Il 03/07/2012 16:00, Vivek Goyal ha scritto: >> > >> > Ah, interesting, I missed it completely. I guess it's because queue/ >> > directories only exist for full disks, and the correct alignment varies >> > for each partition. So this patch is unnecessary. > Partition discard_alignments are available in > /sys/block/<disk>/<partition>/discard_alignment. Yes. If it were in queue/, it wouldn't be available. > That raises an interesting question for patch3. If the discard is happening to > a partition, shouldn't you be looking at partition discard_alignment > instead of always looking at queue discard_alignment? Good point! Like this? diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h index ba43f40..3530764 100644 --- a/include/linux/blkdev.h +++ b/include/linux/blkdev.h @@ -1125,6 +1125,16 @@ static inline int queue_limit_discard_alignment(struct queue_limits *lim, sector & (lim->discard_granularity - 1); } +static inline int bdev_discard_alignment(struct block_device *bdev) +{ + struct request_queue *q = bdev_get_queue(bdev); + + if (bdev != bdev->bd_contains) + return bdev->bd_part->discard_alignment; + + return q->limits.discard_alignment; +} + static inline unsigned int queue_discard_zeroes_data(struct request_queue *q) { if (q->limits.max_discard_sectors && q->limits.discard_zeroes_data == 1) diff --git a/block/blk-lib.c b/block/blk-lib.c index b2bde5c..77d8869 100644 --- a/block/blk-lib.c +++ b/block/blk-lib.c @@ -58,7 +58,7 @@ int blkdev_issue_discard(struct block_device *bdev, sector_t sector, /* Zero-sector (unknown) and one-sector granularities are the same. */ granularity = max(q->limits.discard_granularity >> 9, 1U); mask = granularity - 1; - alignment = (q->limits.discard_alignment >> 9) & mask; + alignment = bdev_discard_alignment(bdev) >> 9; /* * Ensure that max_discard_sectors is of the proper Paolo _______________________________________________ xfs mailing list xfs@oss.sgi.com http://oss.sgi.com/mailman/listinfo/xfs
next prev parent reply other threads:[~2012-07-03 14:22 UTC|newest] Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top 2012-07-02 13:20 [PATCH v2 0/3] block: improvements for discard alignment Paolo Bonzini 2012-07-02 13:20 ` Paolo Bonzini 2012-07-02 13:20 ` [PATCH v2 1/3] block: add sysfs entry for discard_alignment Paolo Bonzini 2012-07-02 13:20 ` Paolo Bonzini 2012-07-03 2:34 ` [dm-devel] " Vivek Goyal 2012-07-03 2:34 ` Vivek Goyal 2012-07-03 3:59 ` Mike Snitzer 2012-07-03 3:59 ` Mike Snitzer 2012-07-03 11:51 ` [dm-devel] " Paolo Bonzini 2012-07-03 11:51 ` Paolo Bonzini 2012-07-03 14:00 ` Vivek Goyal 2012-07-03 14:00 ` Vivek Goyal 2012-07-03 14:21 ` Paolo Bonzini [this message] 2012-07-03 14:21 ` Paolo Bonzini 2012-07-03 14:39 ` Vivek Goyal 2012-07-03 14:39 ` Vivek Goyal 2012-07-03 14:40 ` Paolo Bonzini 2012-07-03 14:40 ` Paolo Bonzini 2012-07-03 14:45 ` Vivek Goyal 2012-07-03 14:45 ` Vivek Goyal 2012-07-02 13:20 ` [PATCH v2 2/3] block: reorganize rounding of max_discard_sectors Paolo Bonzini 2012-07-02 13:20 ` Paolo Bonzini 2012-07-03 2:49 ` [dm-devel] " Vivek Goyal 2012-07-03 2:49 ` Vivek Goyal 2012-07-03 11:47 ` Paolo Bonzini 2012-07-03 11:47 ` Paolo Bonzini 2012-07-02 13:20 ` [PATCH v2 3/3] block: split discard into aligned requests Paolo Bonzini 2012-07-02 13:20 ` Paolo Bonzini
Reply instructions: You may reply publicly 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=4FF2FFEE.4000401@redhat.com \ --to=pbonzini@redhat.com \ --cc=axboe@kernel.dk \ --cc=david@fromorbit.com \ --cc=dm-devel@redhat.com \ --cc=hch@lst.de \ --cc=linux-kernel@vger.kernel.org \ --cc=martin.petersen@oracle.com \ --cc=snitzer@redhat.com \ --cc=vgoyal@redhat.com \ --cc=xfs@oss.sgi.com \ /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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.