Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754383AbbGUKaM (ORCPT ); Tue, 21 Jul 2015 06:30:12 -0400 Received: from smtp02.citrix.com ([66.165.176.63]:45382 "EHLO SMTP02.CITRIX.COM" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754261AbbGUKaI (ORCPT ); Tue, 21 Jul 2015 06:30:08 -0400 X-IronPort-AV: E=Sophos;i="5.15,515,1432598400"; d="scan'208";a="286008315" Message-ID: <55AE1F2A.6010300@citrix.com> Date: Tue, 21 Jul 2015 12:30:02 +0200 From: =?UTF-8?B?Um9nZXIgUGF1IE1vbm7DqQ==?= User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.9; rv:31.0) Gecko/20100101 Thunderbird/31.7.0 MIME-Version: 1.0 To: Julien Grall , CC: , , , , "Konrad Rzeszutek Wilk" , Boris Ostrovsky , David Vrabel Subject: Re: [PATCH v2 07/20] block/xen-blkfront: split get_grant in 2 References: <1436474552-31789-1-git-send-email-julien.grall@citrix.com> <1436474552-31789-8-git-send-email-julien.grall@citrix.com> In-Reply-To: <1436474552-31789-8-git-send-email-julien.grall@citrix.com> Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 8bit X-DLP: MIA1 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 3597 Lines: 110 El 09/07/15 a les 22.42, Julien Grall ha escrit: > Prepare the code to support 64KB page granularity. The first > implementation will use a full Linux page per indirect and persistent > grant. When non-persistent grant is used, each page of a bio request > may be split in multiple grant. > > Furthermore, the field page of the grant structure is only used to copy > data from persistent grant or indirect grant. Avoid to set it for other > use case as it will have no meaning given the page will be split in > multiple grant. > > Provide 2 functions, to setup indirect grant, the other for bio page. > > Signed-off-by: Julien Grall > Cc: Konrad Rzeszutek Wilk > Cc: Roger Pau Monné > Cc: Boris Ostrovsky > Cc: David Vrabel > --- > Changes in v2: > - Patch added > --- > drivers/block/xen-blkfront.c | 85 ++++++++++++++++++++++++++++++-------------- > 1 file changed, 59 insertions(+), 26 deletions(-) > > diff --git a/drivers/block/xen-blkfront.c b/drivers/block/xen-blkfront.c > index 7b81d23..95fd067 100644 > --- a/drivers/block/xen-blkfront.c > +++ b/drivers/block/xen-blkfront.c > @@ -242,34 +242,77 @@ out_of_memory: > return -ENOMEM; > } > > -static struct grant *get_grant(grant_ref_t *gref_head, > - struct page *page, > - struct blkfront_info *info) > +static struct grant *get_free_grant(struct blkfront_info *info) > { > struct grant *gnt_list_entry; > - unsigned long buffer_mfn; > > BUG_ON(list_empty(&info->grants)); > gnt_list_entry = list_first_entry(&info->grants, struct grant, > - node); > + node); Stray change? > list_del(&gnt_list_entry->node); > > - if (gnt_list_entry->gref != GRANT_INVALID_REF) { > + if (gnt_list_entry->gref != GRANT_INVALID_REF) > info->persistent_gnts_c--; > + > + return gnt_list_entry; > +} > + > +static void grant_foreign_access(const struct grant *gnt_list_entry, > + const struct blkfront_info *info) Given that this is just a wrapper I would make it an inline function, or even consider removing it and just call gnttab_page_grant_foreign_access_ref directly. > +{ > + gnttab_page_grant_foreign_access_ref(gnt_list_entry->gref, > + info->xbdev->otherend_id, > + gnt_list_entry->page, > + 0); > +} > + > +static struct grant *get_grant(grant_ref_t *gref_head, > + unsigned long mfn, > + struct blkfront_info *info) Indentation. > +{ > + struct grant *gnt_list_entry = get_free_grant(info); > + > + if (gnt_list_entry->gref != GRANT_INVALID_REF) > return gnt_list_entry; > + > + /* Assign a gref to this page */ > + gnt_list_entry->gref = gnttab_claim_grant_reference(gref_head); > + BUG_ON(gnt_list_entry->gref == -ENOSPC); > + if (info->feature_persistent) > + grant_foreign_access(gnt_list_entry, info); > + else { > + /* Grant access to the MFN passed by the caller */ > + gnttab_grant_foreign_access_ref(gnt_list_entry->gref, > + info->xbdev->otherend_id, > + mfn, 0); > } > > + return gnt_list_entry; > +} > + > +static struct grant *get_indirect_grant(grant_ref_t *gref_head, > + struct blkfront_info *info) Indentation. Roger. -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/