From: "Burakov, Anatoly" <anatoly.burakov@intel.com>
To: Tiwei Bie <tiwei.bie@intel.com>,
maxime.coquelin@redhat.com, zhihong.wang@intel.com, dev@dpdk.org
Cc: seanbh@gmail.com, stable@dpdk.org
Subject: Re: [dpdk-stable] [PATCH 3/3] net/virtio-user: fix memory hotplug support in vhost-kernel
Date: Fri, 7 Sep 2018 10:44:22 +0100 [thread overview]
Message-ID: <a82e230d-7fd7-ade0-d7a9-18265f30b00b@intel.com> (raw)
In-Reply-To: <20180905042852.6212-4-tiwei.bie@intel.com>
On 05-Sep-18 5:28 AM, Tiwei Bie wrote:
> It's possible to have much more hugepage backed memory regions
> than what vhost-kernel supports due to the memory hotplug, which
> may cause problems. A better solution is to have the virtio-user
> pass all the memory ranges reserved by DPDK to vhost-kernel.
>
> Fixes: 12ecb2f63b12 ("net/virtio-user: support memory hotplug")
> Cc: stable@dpdk.org
>
> Signed-off-by: Tiwei Bie <tiwei.bie@intel.com>
> ---
> drivers/net/virtio/virtio_user/vhost_kernel.c | 38 +++++++++----------
> 1 file changed, 18 insertions(+), 20 deletions(-)
>
> diff --git a/drivers/net/virtio/virtio_user/vhost_kernel.c b/drivers/net/virtio/virtio_user/vhost_kernel.c
> index 897fee0af..9338166d9 100644
> --- a/drivers/net/virtio/virtio_user/vhost_kernel.c
> +++ b/drivers/net/virtio/virtio_user/vhost_kernel.c
> @@ -70,41 +70,41 @@ static uint64_t vhost_req_user_to_kernel[] = {
> [VHOST_USER_SET_MEM_TABLE] = VHOST_SET_MEM_TABLE,
> };
>
> -struct walk_arg {
> - struct vhost_memory_kernel *vm;
> - uint32_t region_nr;
> -};
> static int
> -add_memory_region(const struct rte_memseg_list *msl __rte_unused,
> - const struct rte_memseg *ms, size_t len, void *arg)
> +add_memseg_list(const struct rte_memseg_list *msl, void *arg)
> {
> - struct walk_arg *wa = arg;
> + struct vhost_memory_kernel *vm = arg;
> struct vhost_memory_region *mr;
> void *start_addr;
> + uint64_t len;
>
> - if (wa->region_nr >= max_regions)
> + if (vm->nregions >= max_regions)
> return -1;
>
> - mr = &wa->vm->regions[wa->region_nr++];
> - start_addr = ms->addr;
> + start_addr = msl->base_va;
> + len = msl->page_sz * msl->memseg_arr.len;
> +
> + mr = &vm->regions[vm->nregions++];
>
> mr->guest_phys_addr = (uint64_t)(uintptr_t)start_addr;
> mr->userspace_addr = (uint64_t)(uintptr_t)start_addr;
> mr->memory_size = len;
> - mr->mmap_offset = 0;
> + mr->mmap_offset = 0; /* flags_padding */
> +
> + PMD_DRV_LOG(DEBUG, "index=%u addr=%p len=%" PRIu64,
> + vm->nregions - 1, start_addr, len);
>
> return 0;
> }
>
> -/* By default, vhost kernel module allows 64 regions, but DPDK allows
> - * 256 segments. As a relief, below function merges those virtually
> - * adjacent memsegs into one region.
> +/* By default, vhost kernel module allows 64 regions, but DPDK may
> + * have much more memory regions. Below function will treat each
> + * contiguous memory space reserved by DPDK as one region.
> */
> static struct vhost_memory_kernel *
> prepare_vhost_memory_kernel(void)
> {
> struct vhost_memory_kernel *vm;
> - struct walk_arg wa;
>
> vm = malloc(sizeof(struct vhost_memory_kernel) +
> max_regions *
> @@ -112,20 +112,18 @@ prepare_vhost_memory_kernel(void)
> if (!vm)
> return NULL;
>
> - wa.region_nr = 0;
> - wa.vm = vm;
> + vm->nregions = 0;
> + vm->padding = 0;
>
> /*
> * The memory lock has already been taken by memory subsystem
> * or virtio_user_start_device().
> */
> - if (rte_memseg_contig_walk_thread_unsafe(add_memory_region, &wa) < 0) {
> + if (rte_memseg_list_walk_thread_unsafe(add_memseg_list, vm) < 0) {
> free(vm);
> return NULL;
> }
>
> - vm->nregions = wa.region_nr;
> - vm->padding = 0;
> return vm;
> }
>
>
Doesn't that assume single file segments mode?
--
Thanks,
Anatoly
next prev parent reply other threads:[~2018-09-07 9:44 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20180905042852.6212-1-tiwei.bie@intel.com>
2018-09-05 4:28 ` [dpdk-stable] [PATCH 1/3] net/virtio-user: fix deadlock in memory events callback Tiwei Bie
2018-09-05 8:10 ` Sean Harte
2018-09-07 9:30 ` Burakov, Anatoly
2018-09-11 12:52 ` Maxime Coquelin
2018-09-05 4:28 ` [dpdk-stable] [PATCH 3/3] net/virtio-user: fix memory hotplug support in vhost-kernel Tiwei Bie
2018-09-07 9:44 ` Burakov, Anatoly [this message]
2018-09-07 11:37 ` Tiwei Bie
2018-09-07 12:24 ` Burakov, Anatoly
2018-09-10 4:04 ` Tiwei Bie
2018-09-17 10:18 ` Burakov, Anatoly
2018-09-11 13:10 ` Maxime Coquelin
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=a82e230d-7fd7-ade0-d7a9-18265f30b00b@intel.com \
--to=anatoly.burakov@intel.com \
--cc=dev@dpdk.org \
--cc=maxime.coquelin@redhat.com \
--cc=seanbh@gmail.com \
--cc=stable@dpdk.org \
--cc=tiwei.bie@intel.com \
--cc=zhihong.wang@intel.com \
/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;
as well as URLs for NNTP newsgroup(s).