qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: "Michael S. Tsirkin" <mst@redhat.com>
To: Xiao Guangrong <guangrong.xiao@linux.intel.com>
Cc: ehabkost@redhat.com, kvm@vger.kernel.org, gleb@kernel.org,
	mtosatti@redhat.com, qemu-devel@nongnu.org, stefanha@redhat.com,
	imammedo@redhat.com, pbonzini@redhat.com,
	dan.j.williams@intel.com, rth@twiddle.net
Subject: Re: [Qemu-devel] [PATCH v6 09/33] exec: allow file_ram_alloc to work on file
Date: Mon, 9 Nov 2015 12:13:52 +0200	[thread overview]
Message-ID: <20151109120731-mutt-send-email-mst@redhat.com> (raw)
In-Reply-To: <1446184587-142784-10-git-send-email-guangrong.xiao@linux.intel.com>

On Fri, Oct 30, 2015 at 01:56:03PM +0800, Xiao Guangrong wrote:
> Currently, file_ram_alloc() only works on directory - it creates a file
> under @path and do mmap on it
> 
> This patch tries to allow it to work on file directly, if @path is a
> directory it works as before, otherwise it treats @path as the target
> file then directly allocate memory from it
> 
> Signed-off-by: Xiao Guangrong <guangrong.xiao@linux.intel.com>
> ---
>  exec.c | 80 ++++++++++++++++++++++++++++++++++++++++++------------------------
>  1 file changed, 51 insertions(+), 29 deletions(-)
> 
> diff --git a/exec.c b/exec.c
> index 3ca7e50..f219010 100644
> --- a/exec.c
> +++ b/exec.c
> @@ -1174,14 +1174,60 @@ void qemu_mutex_unlock_ramlist(void)
>  }
>  
>  #ifdef __linux__
> +static bool path_is_dir(const char *path)
> +{
> +    struct stat fs;
> +
> +    return stat(path, &fs) == 0 && S_ISDIR(fs.st_mode);

This means file doesn't exist is treated as a file.
Can't figure out if that's intentional, should
be documented in any case.

> +}
> +
> +static int open_file_path(RAMBlock *block, const char *path, size_t size)
> +{
> +    char *filename;
> +    char *sanitized_name;
> +    char *c;
> +    int fd;
> +
> +    if (!path_is_dir(path)) {
> +        int flags = (block->flags & RAM_SHARED) ? O_RDWR : O_RDONLY;

Why does this make sense?

> +
> +        flags |= O_EXCL;

And why does this makes sense?

> +        return open(path, flags);
> +    }
> +
> +    /* Make name safe to use with mkstemp by replacing '/' with '_'. */
> +    sanitized_name = g_strdup(memory_region_name(block->mr));
> +    for (c = sanitized_name; *c != '\0'; c++) {
> +        if (*c == '/') {
> +            *c = '_';
> +        }
> +    }
> +    filename = g_strdup_printf("%s/qemu_back_mem.%s.XXXXXX", path,
> +                               sanitized_name);
> +    g_free(sanitized_name);
> +    fd = mkstemp(filename);
> +    if (fd >= 0) {
> +        unlink(filename);
> +        /*
> +         * ftruncate is not supported by hugetlbfs in older
> +         * hosts, so don't bother bailing out on errors.
> +         * If anything goes wrong with it under other filesystems,
> +         * mmap will fail.
> +         */
> +        if (ftruncate(fd, size)) {
> +            perror("ftruncate");
> +        }
> +    }
> +    g_free(filename);
> +
> +    return fd;
> +}
> +
>  static void *file_ram_alloc(RAMBlock *block,
>                              ram_addr_t memory,
>                              const char *path,
>                              Error **errp)
>  {
> -    char *filename;
> -    char *sanitized_name;
> -    char *c;
>      void *area;
>      int fd;
>      uint64_t pagesize;
> @@ -1211,38 +1257,14 @@ static void *file_ram_alloc(RAMBlock *block,
>          goto error;
>      }
>  
> -    /* Make name safe to use with mkstemp by replacing '/' with '_'. */
> -    sanitized_name = g_strdup(memory_region_name(block->mr));
> -    for (c = sanitized_name; *c != '\0'; c++) {
> -        if (*c == '/')
> -            *c = '_';
> -    }
> -
> -    filename = g_strdup_printf("%s/qemu_back_mem.%s.XXXXXX", path,
> -                               sanitized_name);
> -    g_free(sanitized_name);
> +    memory = ROUND_UP(memory, pagesize);
>  
> -    fd = mkstemp(filename);
> +    fd = open_file_path(block, path, memory);
>      if (fd < 0) {
>          error_setg_errno(errp, errno,
>                           "unable to create backing store for path %s", path);
> -        g_free(filename);
>          goto error;
>      }
> -    unlink(filename);
> -    g_free(filename);
> -
> -    memory = ROUND_UP(memory, pagesize);
> -
> -    /*
> -     * ftruncate is not supported by hugetlbfs in older
> -     * hosts, so don't bother bailing out on errors.
> -     * If anything goes wrong with it under other filesystems,
> -     * mmap will fail.
> -     */
> -    if (ftruncate(fd, memory)) {
> -        perror("ftruncate");
> -    }
>  
>      area = qemu_ram_mmap(fd, memory, pagesize, block->flags & RAM_SHARED);
>      if (area == MAP_FAILED) {
> -- 
> 1.8.3.1

  parent reply	other threads:[~2015-11-09 10:14 UTC|newest]

Thread overview: 94+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-10-30  5:55 [Qemu-devel] [PATCH v6 00/33] implement vNVDIMM Xiao Guangrong
2015-10-30  5:55 ` [Qemu-devel] [PATCH v6 01/33] acpi: add aml_derefof Xiao Guangrong
2015-10-30  5:55 ` [Qemu-devel] [PATCH v6 02/33] acpi: add aml_sizeof Xiao Guangrong
2015-10-30  5:55 ` [Qemu-devel] [PATCH v6 03/33] acpi: add aml_create_field Xiao Guangrong
2015-10-30  5:55 ` [Qemu-devel] [PATCH v6 04/33] acpi: add aml_concatenate Xiao Guangrong
2015-10-30  5:55 ` [Qemu-devel] [PATCH v6 05/33] acpi: add aml_object_type Xiao Guangrong
2015-11-09 11:35   ` Michael S. Tsirkin
2015-11-09 12:40     ` Igor Mammedov
2015-10-30  5:56 ` [Qemu-devel] [PATCH v6 06/33] acpi: add aml_method_serialized Xiao Guangrong
2015-11-09 11:14   ` Michael S. Tsirkin
2015-11-09 11:18     ` Xiao Guangrong
2015-10-30  5:56 ` [Qemu-devel] [PATCH v6 07/33] util: introduce qemu_file_get_page_size() Xiao Guangrong
2015-10-30 13:26   ` Vladimir Sementsov-Ogievskiy
2015-10-31  7:26     ` Xiao Guangrong
2015-10-31  9:37       ` Vladimir Sementsov-Ogievskiy
2015-10-31 14:06         ` Xiao Guangrong
2015-10-30 15:54   ` Eduardo Habkost
2015-10-31  8:09     ` Xiao Guangrong
2015-10-31 14:11       ` Eduardo Habkost
2015-10-31 17:03         ` Xiao Guangrong
2015-11-09 20:00       ` Michael S. Tsirkin
2015-10-31  8:25     ` Xiao Guangrong
2015-11-09 10:33   ` Michael S. Tsirkin
2015-11-09 10:55     ` Xiao Guangrong
2015-10-30  5:56 ` [Qemu-devel] [PATCH v6 08/33] exec: allow memory to be allocated from any kind of path Xiao Guangrong
2015-10-30 14:04   ` Vladimir Sementsov-Ogievskiy
2015-10-31  7:44     ` Xiao Guangrong
2015-10-31 13:55       ` Eduardo Habkost
2015-10-31 15:56         ` Xiao Guangrong
2015-11-09 10:39   ` Michael S. Tsirkin
2015-11-09 11:01     ` Xiao Guangrong
2015-10-30  5:56 ` [Qemu-devel] [PATCH v6 09/33] exec: allow file_ram_alloc to work on file Xiao Guangrong
2015-10-30 14:25   ` Vladimir Sementsov-Ogievskiy
2015-10-31  7:53     ` Xiao Guangrong
2015-11-09 10:13   ` Michael S. Tsirkin [this message]
2015-11-09 10:48     ` Xiao Guangrong
2015-10-30  5:56 ` [Qemu-devel] [PATCH v6 10/33] hostmem-file: clean up memory allocation Xiao Guangrong
2015-10-30 14:54   ` Vladimir Sementsov-Ogievskiy
2015-10-30  5:56 ` [Qemu-devel] [PATCH v6 11/33] hostmem-file: use whole file size if possible Xiao Guangrong
2015-10-30 15:27   ` Vladimir Sementsov-Ogievskiy
2015-10-31  7:59     ` Xiao Guangrong
2015-10-30 17:30   ` Eduardo Habkost
2015-10-31  8:46     ` Xiao Guangrong
2015-10-31 13:45       ` Eduardo Habkost
2015-10-31 16:59         ` Xiao Guangrong
2015-11-09 10:17   ` Michael S. Tsirkin
2015-11-09 10:49     ` Xiao Guangrong
2015-10-30  5:56 ` [Qemu-devel] [PATCH v6 12/33] pc-dimm: remove DEFAULT_PC_DIMMSIZE Xiao Guangrong
2015-11-09 10:40   ` Michael S. Tsirkin
2015-11-09 11:03     ` Xiao Guangrong
2015-10-30  5:56 ` [Qemu-devel] [PATCH v6 13/33] pc-dimm: make pc_existing_dimms_capacity static and rename it Xiao Guangrong
2015-10-30 15:38   ` Vladimir Sementsov-Ogievskiy
2015-10-30  5:56 ` [Qemu-devel] [PATCH v6 14/33] pc-dimm: drop the prefix of pc-dimm Xiao Guangrong
2015-10-30 16:10   ` Vladimir Sementsov-Ogievskiy
2015-10-31  8:18     ` Xiao Guangrong
2015-10-30 17:06   ` Eric Blake
2015-10-31  8:23     ` Xiao Guangrong
2015-11-09 20:05   ` Michael S. Tsirkin
2015-10-30  5:56 ` [Qemu-devel] [PATCH v6 15/33] stubs: rename qmp_pc_dimm_device_list.c Xiao Guangrong
2015-10-30  5:56 ` [Qemu-devel] [PATCH v6 16/33] pc-dimm: rename pc-dimm.c and pc-dimm.h Xiao Guangrong
2015-10-31 10:28   ` Vladimir Sementsov-Ogievskiy
2015-10-30  5:56 ` [Qemu-devel] [PATCH v6 17/33] dimm: abstract dimm device from pc-dimm Xiao Guangrong
2015-10-31 10:41   ` Vladimir Sementsov-Ogievskiy
2015-10-30  5:56 ` [Qemu-devel] [PATCH v6 18/33] dimm: get mapped memory region from DIMMDeviceClass->get_memory_region Xiao Guangrong
2015-10-31 10:52   ` Vladimir Sementsov-Ogievskiy
2015-10-31 14:15     ` Xiao Guangrong
2015-11-02  9:18       ` Xiao Guangrong
2015-10-30  5:56 ` [Qemu-devel] [PATCH v6 19/33] dimm: keep the state of the whole backend memory Xiao Guangrong
2015-10-31 11:05   ` Vladimir Sementsov-Ogievskiy
2015-10-31 14:19     ` Xiao Guangrong
2015-11-09 11:04   ` Michael S. Tsirkin
2015-11-09 11:13     ` Xiao Guangrong
2015-10-30  5:56 ` [Qemu-devel] [PATCH v6 20/33] dimm: introduce realize callback Xiao Guangrong
2015-10-31 11:22   ` Vladimir Sementsov-Ogievskiy
2015-10-30  5:56 ` [Qemu-devel] [PATCH v6 21/33] nvdimm: implement NVDIMM device abstract Xiao Guangrong
2015-10-30  5:56 ` [Qemu-devel] [PATCH v6 22/33] docs: add NVDIMM ACPI documentation Xiao Guangrong
2015-10-30  5:56 ` [Qemu-devel] [PATCH v6 23/33] nvdimm acpi: init the resource used by NVDIMM ACPI Xiao Guangrong
2015-10-30  5:56 ` [Qemu-devel] [PATCH v6 24/33] nvdimm acpi: build ACPI NFIT table Xiao Guangrong
2015-10-30  5:56 ` [Qemu-devel] [PATCH v6 25/33] nvdimm acpi: build ACPI nvdimm devices Xiao Guangrong
2015-11-08 17:38   ` Michael S. Tsirkin
2015-11-09  6:07     ` Xiao Guangrong
2015-10-30  5:56 ` [Qemu-devel] [PATCH v6 26/33] nvdimm acpi: save arg3 for NVDIMM device _DSM method Xiao Guangrong
2015-10-30  5:56 ` [Qemu-devel] [PATCH v6 27/33] nvdimm acpi: support function 0 Xiao Guangrong
2015-10-30 10:14   ` Stefan Hajnoczi
2015-10-30 13:01     ` Xiao Guangrong
2015-10-30  5:56 ` [Qemu-devel] [PATCH v6 28/33] nvdimm acpi: support Get Namespace Label Size function Xiao Guangrong
2015-10-30  5:56 ` [Qemu-devel] [PATCH v6 29/33] nvdimm acpi: support Get Namespace Label Data function Xiao Guangrong
2015-10-30  5:56 ` [Qemu-devel] [PATCH v6 30/33] nvdimm acpi: support Set " Xiao Guangrong
2015-10-30  5:56 ` [Qemu-devel] [PATCH v6 31/33] nvdimm: allow using whole backend memory as pmem Xiao Guangrong
2015-10-30  5:56 ` [Qemu-devel] [PATCH v6 32/33] nvdimm acpi: support _FIT method Xiao Guangrong
2015-11-08 17:50   ` Michael S. Tsirkin
2015-11-09  6:37     ` Xiao Guangrong
2015-10-30  5:56 ` [Qemu-devel] [PATCH v6 33/33] nvdimm: add maintain info Xiao Guangrong
2015-10-30 10:15 ` [Qemu-devel] [PATCH v6 00/33] implement vNVDIMM Stefan Hajnoczi

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=20151109120731-mutt-send-email-mst@redhat.com \
    --to=mst@redhat.com \
    --cc=dan.j.williams@intel.com \
    --cc=ehabkost@redhat.com \
    --cc=gleb@kernel.org \
    --cc=guangrong.xiao@linux.intel.com \
    --cc=imammedo@redhat.com \
    --cc=kvm@vger.kernel.org \
    --cc=mtosatti@redhat.com \
    --cc=pbonzini@redhat.com \
    --cc=qemu-devel@nongnu.org \
    --cc=rth@twiddle.net \
    --cc=stefanha@redhat.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).