From: roger.pau@citrix•com (Roger Pau Monné)
To: linux-arm-kernel@lists•infradead.org
Subject: [PATCH v2 07/20] block/xen-blkfront: split get_grant in 2
Date: Tue, 21 Jul 2015 12:30:02 +0200 [thread overview]
Message-ID: <55AE1F2A.6010300@citrix.com> (raw)
In-Reply-To: <1436474552-31789-8-git-send-email-julien.grall@citrix.com>
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 <julien.grall@citrix•com>
> Cc: Konrad Rzeszutek Wilk <konrad.wilk@oracle•com>
> Cc: Roger Pau Monn? <roger.pau@citrix•com>
> Cc: Boris Ostrovsky <boris.ostrovsky@oracle•com>
> Cc: David Vrabel <david.vrabel@citrix•com>
> ---
> 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.
next prev parent reply other threads:[~2015-07-21 10:30 UTC|newest]
Thread overview: 87+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-07-09 20:42 [PATCH v2 00/20] xen/arm64: Add support for 64KB page Julien Grall
2015-07-09 20:42 ` [PATCH v2 01/20] xen: Add Xen specific page definition Julien Grall
2015-07-16 14:19 ` Stefano Stabellini
2015-07-16 14:52 ` Julien Grall
2015-07-24 9:28 ` [Xen-devel] " David Vrabel
2015-07-24 9:39 ` Julien Grall
2015-07-24 9:48 ` David Vrabel
2015-07-24 9:51 ` Julien Grall
2015-07-24 10:34 ` David Vrabel
2015-07-24 10:43 ` Ian Campbell
2015-07-24 13:03 ` Julien Grall
2015-07-09 20:42 ` [PATCH v2 02/20] xen: Introduce a function to split a Linux page into Xen page Julien Grall
2015-07-16 14:23 ` Stefano Stabellini
2015-07-16 14:54 ` [Xen-devel] " Julien Grall
2015-07-24 9:31 ` David Vrabel
2015-07-24 9:54 ` Julien Grall
2015-07-24 10:10 ` David Vrabel
2015-07-24 10:20 ` Julien Grall
2015-08-05 14:30 ` Julien Grall
2015-08-05 15:50 ` David Vrabel
2015-08-05 16:06 ` Julien Grall
2015-07-09 20:42 ` [PATCH v2 03/20] xen/grant: Introduce helpers to split a page into grant Julien Grall
2015-07-16 15:01 ` Stefano Stabellini
2015-07-16 16:07 ` Julien Grall
2015-07-17 13:10 ` [Xen-devel] " Julien Grall
2015-07-09 20:42 ` [PATCH v2 04/20] xen/grant: Add helper gnttab_page_grant_foreign_access_ref Julien Grall
2015-07-16 15:05 ` Stefano Stabellini
2015-07-16 16:12 ` [Xen-devel] " Julien Grall
2015-07-24 9:35 ` David Vrabel
2015-07-09 20:42 ` [PATCH v2 05/20] block/xen-blkfront: Split blkif_queue_request in 2 Julien Grall
2015-07-21 9:54 ` Roger Pau Monné
2015-07-21 11:12 ` [Xen-devel] " Julien Grall
2015-07-09 20:42 ` [PATCH v2 06/20] block/xen-blkfront: Store a page rather a pfn in the grant structure Julien Grall
2015-07-16 15:11 ` Stefano Stabellini
2015-07-23 17:18 ` Julien Grall
2015-07-21 10:16 ` Roger Pau Monné
2015-07-21 11:19 ` [Xen-devel] " Julien Grall
2015-07-09 20:42 ` [PATCH v2 07/20] block/xen-blkfront: split get_grant in 2 Julien Grall
2015-07-21 10:30 ` Roger Pau Monné [this message]
2015-07-21 13:03 ` [Xen-devel] " Julien Grall
2015-07-09 20:42 ` [PATCH v2 08/20] net/xen-netback: xenvif_gop_frag_copy: move GSO check out of the loop Julien Grall
2015-07-09 20:42 ` [PATCH v2 09/20] xen/biomerge: Don't allow biovec to be merge when Linux is not using 4KB page Julien Grall
2015-07-10 19:12 ` Konrad Rzeszutek Wilk
2015-07-15 8:56 ` [Xen-devel] " Julien Grall
2015-07-16 15:33 ` Stefano Stabellini
2015-07-16 16:15 ` [Xen-devel] " Julien Grall
2015-07-16 18:30 ` Konrad Rzeszutek Wilk
2015-07-17 13:20 ` Stefano Stabellini
2015-07-17 14:44 ` Julien Grall
2015-07-17 14:45 ` Stefano Stabellini
2015-07-17 14:46 ` Julien Grall
2015-07-09 20:42 ` [PATCH v2 10/20] xen/xenbus: Use Xen page definition Julien Grall
2015-07-16 15:35 ` Stefano Stabellini
2015-07-24 9:49 ` David Vrabel
2015-07-09 20:42 ` [PATCH v2 11/20] tty/hvc: xen: Use xen " Julien Grall
2015-07-16 15:36 ` Stefano Stabellini
2015-07-24 9:52 ` David Vrabel
2015-07-09 20:42 ` [PATCH v2 12/20] xen/balloon: Don't rely on the page granularity is the same for Xen and Linux Julien Grall
2015-07-17 14:03 ` Stefano Stabellini
2015-07-17 14:32 ` Julien Grall
2015-07-09 20:42 ` [PATCH v2 13/20] xen/events: fifo: Make it running on 64KB granularity Julien Grall
2015-07-16 15:43 ` Stefano Stabellini
2015-07-16 16:18 ` [Xen-devel] " Julien Grall
2015-07-17 13:06 ` Stefano Stabellini
2015-07-24 10:36 ` David Vrabel
2015-08-06 15:43 ` [Xen-devel] " Julien Grall
2015-07-09 20:42 ` [PATCH v2 14/20] xen/grant-table: " Julien Grall
2015-07-16 15:47 ` Stefano Stabellini
2015-07-16 16:23 ` [Xen-devel] " Julien Grall
2015-07-17 13:37 ` Stefano Stabellini
2015-07-09 20:42 ` [PATCH v2 15/20] block/xen-blkfront: Make it running on 64KB page granularity Julien Grall
2015-07-21 11:06 ` Roger Pau Monné
2015-07-21 13:07 ` [Xen-devel] " Julien Grall
2015-07-09 20:42 ` [PATCH v2 16/20] block/xen-blkback: " Julien Grall
2015-07-09 20:42 ` [PATCH v2 17/20] net/xen-netfront: " Julien Grall
2015-07-20 17:26 ` [Xen-devel] " Julien Grall
2015-07-09 20:42 ` [PATCH v2 18/20] net/xen-netback: " Julien Grall
2015-07-09 20:42 ` [PATCH v2 19/20] xen/privcmd: Add support for Linux " Julien Grall
2015-07-13 20:13 ` Boris Ostrovsky
2015-07-13 22:05 ` Julien Grall
2015-07-14 15:28 ` Boris Ostrovsky
2015-07-14 15:37 ` Julien Grall
2015-07-16 17:12 ` Stefano Stabellini
2015-07-16 17:16 ` Stefano Stabellini
2015-07-17 12:50 ` [Xen-devel] " Julien Grall
2015-07-09 20:42 ` [PATCH v2 20/20] arm/xen: Add support for " Julien Grall
2015-07-20 17:54 ` [Xen-devel] [PATCH v2 00/20] xen/arm64: Add support for 64KB page Julien Grall
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=55AE1F2A.6010300@citrix.com \
--to=roger.pau@citrix$(echo .)com \
--cc=linux-arm-kernel@lists$(echo .)infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox