From patchwork Fri Nov 14 03:40:19 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tetsuya Mukawa X-Patchwork-Id: 1269 Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [IPv6:::1]) by dpdk.org (Postfix) with ESMTP id 59D077F6C; Fri, 14 Nov 2014 04:30:26 +0100 (CET) Received: from mail-pa0-f53.google.com (mail-pa0-f53.google.com [209.85.220.53]) by dpdk.org (Postfix) with ESMTP id D56E77F29 for ; Fri, 14 Nov 2014 04:30:21 +0100 (CET) Received: by mail-pa0-f53.google.com with SMTP id kx10so16670849pab.40 for ; Thu, 13 Nov 2014 19:40:22 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:message-id:date:from:user-agent:mime-version:to :cc:subject:references:in-reply-to:content-type :content-transfer-encoding; bh=5hkRPvKPakoJorv0PqM1mA0U25uqy1n5RlwCjozpMZE=; b=eW0QIAe6mPc3keKlcRDu0veqg2JxgiahjlOtUnx2MBNLdHmD9vkEfzbLC7uN4vTfqd h9V/PnSlIn/fh8M1mu7hK8eu3A1UCbGToXPJq2mMTdogHEVZISeeJ+c8xl3bsTYVbyzh twjx6MEwCoArxWwGMQBzwn5vGTJ+q9o6X5P3ZaMKTpcXu9bt5bVkAkhO8hfekW7NmcYQ 4NOHT598es8BSMBHiFUhb6atpDa68ZFHkofRFQioZyZuROd3qy+FrCk/WFQVZIFsXKDQ WysFTDftiW9ZX85OJS1iqOn38C87YqDladpb3aAfp2/zP4RrC1NA9qI95EgfePYP8dTe U+5w== X-Gm-Message-State: ALoCoQlb2WFe1DG56/FM8p+x62xEeKYN89rWZguQkzCymCh1XI8vX9UUe0mL4pKlxJn7hiTUygT4 X-Received: by 10.67.1.39 with SMTP id bd7mr6976696pad.57.1415936422670; Thu, 13 Nov 2014 19:40:22 -0800 (PST) Received: from [10.16.129.101] (napt.igel.co.jp. [219.106.231.132]) by mx.google.com with ESMTPSA id yl6sm26004175pbc.91.2014.11.13.19.40.21 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 13 Nov 2014 19:40:22 -0800 (PST) Message-ID: <546579A3.3010804@igel.co.jp> Date: Fri, 14 Nov 2014 12:40:19 +0900 From: Tetsuya Mukawa User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:24.0) Gecko/20100101 Thunderbird/24.6.0 MIME-Version: 1.0 To: Linhaifeng , "Xie, Huawei" References: <5462DE39.1070006@igel.co.jp> <54645007.3010301@huawei.com> <54656950.1050204@igel.co.jp> <54657365.7090504@huawei.com> In-Reply-To: <54657365.7090504@huawei.com> Cc: "dev@dpdk.org" Subject: Re: [dpdk-dev] vhost-user technical isssues X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches and discussions about DPDK List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Hi Lin, (2014/11/14 12:13), Linhaifeng wrote: > > size should be same as mmap and > guest_mem -= (memory.regions[i].mmap_offset / sizeof(*guest_mem)); > Thanks. It should be. How about following patch? ------------------------------------------------------- #define QEMU_CMD_CHR " -chardev socket,id=chr0,path=%s" #define QEMU_CMD_NETDEV " -netdev vhost-user,id=net0,chardev=chr0,vhostforce" @@ -221,13 +221,16 @@ static void read_guest_mem(void) /* check for sanity */ g_assert_cmpint(fds_num, >, 0); - g_assert_cmpint(fds_num, ==, memory.nregions); + //g_assert_cmpint(fds_num, ==, memory.nregions); + fprintf(stderr, "%s(%d)\n", __func__, __LINE__); /* iterate all regions */ for (i = 0; i < fds_num; i++) { + int ret = 0; /* We'll check only the region statring at 0x0*/ - if (memory.regions[i].guest_phys_addr != 0x0) { + if (memory.regions[i].guest_phys_addr == 0x0) { + close(fds[i]); continue; } @@ -237,6 +240,7 @@ static void read_guest_mem(void) guest_mem = mmap(0, size, PROT_READ | PROT_WRITE, MAP_SHARED, fds[i], 0); + fprintf(stderr, "region=%d, mmap=%p, size=%lu\n", i, guest_mem, size); g_assert(guest_mem != MAP_FAILED); guest_mem += (memory.regions[i].mmap_offset / sizeof(*guest_mem)); @@ -247,8 +251,10 @@ static void read_guest_mem(void) g_assert_cmpint(a, ==, b); } - - munmap(guest_mem, memory.regions[i].memory_size); + guest_mem -= (memory.regions[i].mmap_offset / sizeof(*guest_mem)); + ret = munmap(guest_mem, memory.regions[i].memory_size); + fprintf(stderr, "region=%d, munmap=%p, size=%lu, ret=%d\n", + i, guest_mem, size, ret); } g_assert_cmpint(1, ==, 1); ------------------------------------------------------- I am using 1GB hugepage size. $ sudo QTEST_HUGETLBFS_PATH=/mnt/huge make check region=0, mmap=0x2aaac0000000, size=6291456000 region=0, munmap=0x2aaac0000000, size=6291456000, ret=-1 << failed 6291456000 is not aligned by 1GB. When I specify 4096MB as guest memory size, munmap() doesn't return error like following. $ sudo QTEST_HUGETLBFS_PATH=/mnt/huge make check region=0, mmap=0x2aaac0000000, size=4294967296 region=0, munmap=0x2aaac0000000, size=4294967296, ret=0 Thanks, Tetsuya diff --git a/tests/vhost-user-test.c b/tests/vhost-user-test.c index 75fedf0..be4b171 100644 --- a/tests/vhost-user-test.c +++ b/tests/vhost-user-test.c @@ -37,7 +37,7 @@ #endif #define QEMU_CMD_ACCEL " -machine accel=tcg" -#define QEMU_CMD_MEM " -m 512 -object memory-backend-file,id=mem,size=512M,"\ +#define QEMU_CMD_MEM " -m 6000 -object memory-backend-file,id=mem,size=6000M,"\ "mem-path=%s,share=on -numa node,memdev=mem"