From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754360AbcG1JEF (ORCPT ); Thu, 28 Jul 2016 05:04:05 -0400 Received: from aserp1040.oracle.com ([141.146.126.69]:18969 "EHLO aserp1040.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750946AbcG1JEA (ORCPT ); Thu, 28 Jul 2016 05:04:00 -0400 Message-ID: <5799CA75.6000701@oracle.com> Date: Thu, 28 Jul 2016 17:03:49 +0800 From: Bob Liu User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:17.0) Gecko/20130308 Thunderbird/17.0.4 MIME-Version: 1.0 To: Konrad Rzeszutek Wilk CC: linux-kernel@vger.kernel.org, xen-devel@lists.xenproject.org, roger.pau@citrix.com Subject: Re: [PATCH 1/3] xen-blkfront: fix places not updated after introducing 64KB page granularity References: <1469510377-15131-1-git-send-email-bob.liu@oracle.com> <20160728011942.GB3165@char.us.oracle.com> In-Reply-To: <20160728011942.GB3165@char.us.oracle.com> Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8bit X-Source-IP: userv0021.oracle.com [156.151.31.71] Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 >> Acked-by: Roger Pau Monné > > 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 >>