From: Oleksandr <olekstysh@gmail.com>
To: Juergen Gross <jgross@suse.com>,
xen-devel@lists.xenproject.org, linux-kernel@vger.kernel.org
Cc: Boris Ostrovsky <boris.ostrovsky@oracle.com>,
Stefano Stabellini <sstabellini@kernel.org>
Subject: Re: [PATCH v2 19/19] xen/xenbus: eliminate xenbus_grant_ring()
Date: Fri, 29 Apr 2022 18:10:45 +0300 [thread overview]
Message-ID: <bf14e3e1-fc4d-1eee-1dfb-1ba3423f0b6f@gmail.com> (raw)
In-Reply-To: <20220428082743.16593-20-jgross@suse.com>
On 28.04.22 11:27, Juergen Gross wrote:
Hello Juergen
> There is no external user of xenbus_grant_ring() left, so merge it into
> the only caller xenbus_setup_ring().
>
> Signed-off-by: Juergen Gross <jgross@suse.com>
> ---
> V2:
> - make error message more precise (Andrew Cooper)
> ---
> drivers/xen/xenbus/xenbus_client.c | 65 +++++++++---------------------
> include/xen/xenbus.h | 2 -
> 2 files changed, 19 insertions(+), 48 deletions(-)
>
> diff --git a/drivers/xen/xenbus/xenbus_client.c b/drivers/xen/xenbus/xenbus_client.c
> index 1a2e0d94ccd1..d6fdd2d209d3 100644
> --- a/drivers/xen/xenbus/xenbus_client.c
> +++ b/drivers/xen/xenbus/xenbus_client.c
> @@ -363,50 +363,6 @@ static void xenbus_switch_fatal(struct xenbus_device *dev, int depth, int err,
> __xenbus_switch_state(dev, XenbusStateClosing, 1);
> }
>
> -/**
> - * xenbus_grant_ring
> - * @dev: xenbus device
> - * @vaddr: starting virtual address of the ring
> - * @nr_pages: number of pages to be granted
> - * @grefs: grant reference array to be filled in
> - *
> - * Grant access to the given @vaddr to the peer of the given device.
> - * Then fill in @grefs with grant references. Return 0 on success, or
> - * -errno on error. On error, the device will switch to
> - * XenbusStateClosing, and the error will be saved in the store.
> - */
> -int xenbus_grant_ring(struct xenbus_device *dev, void *vaddr,
> - unsigned int nr_pages, grant_ref_t *grefs)
> -{
> - int err;
> - unsigned int i;
> - grant_ref_t gref_head;
> -
> - err = gnttab_alloc_grant_references(nr_pages, &gref_head);
> - if (err) {
> - xenbus_dev_fatal(dev, err, "granting access to ring page");
> - return err;
> - }
> -
> - for (i = 0; i < nr_pages; i++) {
> - unsigned long gfn;
> -
> - if (is_vmalloc_addr(vaddr))
> - gfn = pfn_to_gfn(vmalloc_to_pfn(vaddr));
> - else
> - gfn = virt_to_gfn(vaddr);
> -
> - grefs[i] = gnttab_claim_grant_reference(&gref_head);
> - gnttab_grant_foreign_access_ref(grefs[i], dev->otherend_id,
> - gfn, 0);
> -
> - vaddr = vaddr + XEN_PAGE_SIZE;
> - }
> -
> - return 0;
> -}
> -EXPORT_SYMBOL_GPL(xenbus_grant_ring);
> -
> /*
> * xenbus_setup_ring
> * @dev: xenbus device
> @@ -424,6 +380,7 @@ int xenbus_setup_ring(struct xenbus_device *dev, gfp_t gfp, void **vaddr,
> unsigned int nr_pages, grant_ref_t *grefs)
> {
> unsigned long ring_size = nr_pages * XEN_PAGE_SIZE;
> + grant_ref_t gref_head;
> unsigned int i;
> int ret;
>
> @@ -433,9 +390,25 @@ int xenbus_setup_ring(struct xenbus_device *dev, gfp_t gfp, void **vaddr,
> goto err;
> }
>
> - ret = xenbus_grant_ring(dev, *vaddr, nr_pages, grefs);
> - if (ret)
> + ret = gnttab_alloc_grant_references(nr_pages, &gref_head);
> + if (ret) {
> + xenbus_dev_fatal(dev, ret, "granting access to %u ring pages",
> + nr_pages);
> goto err;
> + }
> +
> + for (i = 0; i < nr_pages; i++) {
> + unsigned long gfn;
> +
> + if (is_vmalloc_addr(*vaddr))
> + gfn = pfn_to_gfn(vmalloc_to_pfn(vaddr[i]));
> + else
> + gfn = virt_to_gfn(vaddr[i]);
> +
> + grefs[i] = gnttab_claim_grant_reference(&gref_head);
gnttab_claim_grant_reference() can return error if no free grant
reference remains.
I understand this patch only moves the code, but probably it would be
better to add a missing check here (and likely rollback already
processed grants if any?).
> + gnttab_grant_foreign_access_ref(grefs[i], dev->otherend_id,
> + gfn, 0);
> + }
>
> return 0;
>
> diff --git a/include/xen/xenbus.h b/include/xen/xenbus.h
> index b533b4adc835..eaa932b99d8a 100644
> --- a/include/xen/xenbus.h
> +++ b/include/xen/xenbus.h
> @@ -224,8 +224,6 @@ int xenbus_watch_pathfmt(struct xenbus_device *dev, struct xenbus_watch *watch,
> const char *pathfmt, ...);
>
> int xenbus_switch_state(struct xenbus_device *dev, enum xenbus_state new_state);
> -int xenbus_grant_ring(struct xenbus_device *dev, void *vaddr,
> - unsigned int nr_pages, grant_ref_t *grefs);
> int xenbus_setup_ring(struct xenbus_device *dev, gfp_t gfp, void **vaddr,
> unsigned int nr_pages, grant_ref_t *grefs);
> void xenbus_teardown_ring(void **vaddr, unsigned int nr_pages,
--
Regards,
Oleksandr Tyshchenko
next prev parent reply other threads:[~2022-04-29 15:10 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-04-28 8:27 [PATCH v2 00/19] xen: simplify frontend side ring setup Juergen Gross
2022-04-28 8:27 ` [PATCH v2 01/19] xen/blkfront: switch blkfront to use INVALID_GRANT_REF Juergen Gross
2022-04-28 8:27 ` [PATCH v2 02/19] xen/netfront: switch netfront " Juergen Gross
2022-04-28 8:27 ` [PATCH v2 03/19] xen/scsifront: remove unused GRANT_INVALID_REF definition Juergen Gross
2022-04-28 8:27 ` [PATCH v2 04/19] xen/usb: switch xen-hcd to use INVALID_GRANT_REF Juergen Gross
2022-04-28 8:27 ` [PATCH v2 05/19] xen/drm: switch xen_drm_front " Juergen Gross
2022-04-28 8:27 ` [PATCH v2 06/19] xen/sound: switch xen_snd_front " Juergen Gross
2022-04-28 8:27 ` [PATCH v2 07/19] xen/dmabuf: switch gntdev-dmabuf " Juergen Gross
2022-04-28 8:27 ` [PATCH v2 08/19] xen/shbuf: switch xen-front-pgdir-shbuf " Juergen Gross
[not found] ` <CAPD2p-nisRgMOzy+w2jx5ULfZTyv4MqtG0wkV9jNn3wNg415sQ@mail.gmail.com>
2022-04-29 15:28 ` Oleksandr
2022-05-02 13:31 ` Juergen Gross
2022-05-02 13:52 ` Oleksandr
2022-05-02 13:28 ` Juergen Gross
2022-04-28 8:27 ` [PATCH v2 09/19] xen: update ring.h Juergen Gross
2022-04-28 8:27 ` [PATCH v2 10/19] xen/xenbus: add xenbus_setup_ring() service function Juergen Gross
2022-04-28 8:27 ` [PATCH v2 11/19] xen/blkfront: use xenbus_setup_ring() and xenbus_teardown_ring() Juergen Gross
2022-04-28 8:27 ` [PATCH v2 12/19] xen/netfront: " Juergen Gross
2022-04-28 8:27 ` [PATCH v2 13/19] xen/tpmfront: " Juergen Gross
2022-04-28 8:27 ` [PATCH v2 14/19] xen/drmfront: " Juergen Gross
2022-04-29 16:10 ` Oleksandr
2022-04-28 8:27 ` [PATCH v2 15/19] xen/pcifront: " Juergen Gross
2022-04-28 8:27 ` [PATCH v2 16/19] xen/scsifront: " Juergen Gross
2022-04-28 8:27 ` [PATCH v2 17/19] xen/usbfront: " Juergen Gross
2022-04-28 8:27 ` [PATCH v2 18/19] xen/sndfront: " Juergen Gross
2022-04-29 18:07 ` Oleksandr
2022-04-28 8:27 ` [PATCH v2 19/19] xen/xenbus: eliminate xenbus_grant_ring() Juergen Gross
2022-04-29 15:10 ` Oleksandr [this message]
2022-05-02 13:30 ` Juergen Gross
2022-05-02 14:12 ` Oleksandr
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=bf14e3e1-fc4d-1eee-1dfb-1ba3423f0b6f@gmail.com \
--to=olekstysh@gmail.com \
--cc=boris.ostrovsky@oracle.com \
--cc=jgross@suse.com \
--cc=linux-kernel@vger.kernel.org \
--cc=sstabellini@kernel.org \
--cc=xen-devel@lists.xenproject.org \
/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: link
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
all inboxes | Powered by JetHome®