| Message ID | 1469510377-15131-1-git-send-email-bob.liu@oracle.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Tue, Jul 26, 2016 at 01:19:35PM +0800, Bob Liu wrote: > Two places didn't get updated when 64KB page granularity was introduced, this > patch fix them. > > Signed-off-by: Bob Liu <bob.liu@oracle.com> > Acked-by: Roger Pau Monné <roger.pau@citrix.com> Could you rebase this on xen-tip/for-linus-4.8 pls? > --- > drivers/block/xen-blkfront.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/block/xen-blkfront.c b/drivers/block/xen-blkfront.c > index fcc5b4e..032fc94 100644 > --- a/drivers/block/xen-blkfront.c > +++ b/drivers/block/xen-blkfront.c > @@ -1321,7 +1321,7 @@ free_shadow: > rinfo->ring_ref[i] = GRANT_INVALID_REF; > } > } > - free_pages((unsigned long)rinfo->ring.sring, get_order(info->nr_ring_pages * PAGE_SIZE)); > + free_pages((unsigned long)rinfo->ring.sring, get_order(info->nr_ring_pages * XEN_PAGE_SIZE)); > rinfo->ring.sring = NULL; > > if (rinfo->irq) > @@ -2013,7 +2013,7 @@ static int blkif_recover(struct blkfront_info *info) > > blkfront_gather_backend_features(info); > segs = info->max_indirect_segments ? : BLKIF_MAX_SEGMENTS_PER_REQUEST; > - blk_queue_max_segments(info->rq, segs); > + blk_queue_max_segments(info->rq, segs / GRANTS_PER_PSEG); > > for (r_index = 0; r_index < info->nr_rings; r_index++) { > struct blkfront_ring_info *rinfo = &info->rinfo[r_index]; > -- > 1.7.10.4 >
On 07/28/2016 09:19 AM, Konrad Rzeszutek Wilk wrote: > On Tue, Jul 26, 2016 at 01:19:35PM +0800, Bob Liu wrote: >> Two places didn't get updated when 64KB page granularity was introduced, this >> patch fix them. >> >> Signed-off-by: Bob Liu <bob.liu@oracle.com> >> Acked-by: Roger Pau Monné <roger.pau@citrix.com> > > Could you rebase this on xen-tip/for-linus-4.8 pls? Done, sent the v2 for you to pick up. > >> --- >> drivers/block/xen-blkfront.c | 4 ++-- >> 1 file changed, 2 insertions(+), 2 deletions(-) >> >> diff --git a/drivers/block/xen-blkfront.c b/drivers/block/xen-blkfront.c >> index fcc5b4e..032fc94 100644 >> --- a/drivers/block/xen-blkfront.c >> +++ b/drivers/block/xen-blkfront.c >> @@ -1321,7 +1321,7 @@ free_shadow: >> rinfo->ring_ref[i] = GRANT_INVALID_REF; >> } >> } >> - free_pages((unsigned long)rinfo->ring.sring, get_order(info->nr_ring_pages * PAGE_SIZE)); >> + free_pages((unsigned long)rinfo->ring.sring, get_order(info->nr_ring_pages * XEN_PAGE_SIZE)); >> rinfo->ring.sring = NULL; >> >> if (rinfo->irq) >> @@ -2013,7 +2013,7 @@ static int blkif_recover(struct blkfront_info *info) >> >> blkfront_gather_backend_features(info); >> segs = info->max_indirect_segments ? : BLKIF_MAX_SEGMENTS_PER_REQUEST; >> - blk_queue_max_segments(info->rq, segs); >> + blk_queue_max_segments(info->rq, segs / GRANTS_PER_PSEG); >> >> for (r_index = 0; r_index < info->nr_rings; r_index++) { >> struct blkfront_ring_info *rinfo = &info->rinfo[r_index]; >> -- >> 1.7.10.4 >>
diff --git a/drivers/block/xen-blkfront.c b/drivers/block/xen-blkfront.c index fcc5b4e..032fc94 100644 --- a/drivers/block/xen-blkfront.c +++ b/drivers/block/xen-blkfront.c @@ -1321,7 +1321,7 @@ free_shadow: rinfo->ring_ref[i] = GRANT_INVALID_REF; } } - free_pages((unsigned long)rinfo->ring.sring, get_order(info->nr_ring_pages * PAGE_SIZE)); + free_pages((unsigned long)rinfo->ring.sring, get_order(info->nr_ring_pages * XEN_PAGE_SIZE)); rinfo->ring.sring = NULL; if (rinfo->irq) @@ -2013,7 +2013,7 @@ static int blkif_recover(struct blkfront_info *info) blkfront_gather_backend_features(info); segs = info->max_indirect_segments ? : BLKIF_MAX_SEGMENTS_PER_REQUEST; - blk_queue_max_segments(info->rq, segs); + blk_queue_max_segments(info->rq, segs / GRANTS_PER_PSEG); for (r_index = 0; r_index < info->nr_rings; r_index++) { struct blkfront_ring_info *rinfo = &info->rinfo[r_index];