From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 12797C433EF for ; Thu, 24 Feb 2022 17:58:45 +0000 (UTC) Received: from localhost ([::1]:33818 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nNIO3-0002hJ-UJ for qemu-devel@archiver.kernel.org; Thu, 24 Feb 2022 12:58:43 -0500 Received: from eggs.gnu.org ([209.51.188.92]:41574) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nNIMG-00015t-9S for qemu-devel@nongnu.org; Thu, 24 Feb 2022 12:56:52 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]:29872) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nNIMB-0004RU-Gy for qemu-devel@nongnu.org; Thu, 24 Feb 2022 12:56:49 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1645725406; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=DQZ7PGsnzXi8jaLKTSsmVfcGdvVjNGULPVSRmRrBzOo=; b=Qa7DIbJNZdmTbC2KMz+2l3nCg5O9ibWDJ81L14FXyOpBeaRClwZ9ltyeroFySpk7WlbZ7U 5sykB9PA9pjYESi1kkGNiTwq3x1xQAP3k+nSUfF9mRTFmxmUR74W+rAWjoloFOR64ICRsO TEHz5/ypOeWdbwKWxEM7ZJt7uv7dzwU= Received: from mail-wr1-f69.google.com (mail-wr1-f69.google.com [209.85.221.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-187-7nWVZoNhP6-U5grvdGpPmw-1; Thu, 24 Feb 2022 12:56:45 -0500 X-MC-Unique: 7nWVZoNhP6-U5grvdGpPmw-1 Received: by mail-wr1-f69.google.com with SMTP id g15-20020adfbc8f000000b001e9506e27ddso191103wrh.22 for ; Thu, 24 Feb 2022 09:56:44 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to:user-agent; bh=DQZ7PGsnzXi8jaLKTSsmVfcGdvVjNGULPVSRmRrBzOo=; b=hILmt27hYxLhX3VAUhmaD8u4PbAEv4iqmbTUCFYxVPtNvcKyUwUXtu8fCRWWnxiVgg vxLoR/JqhBvgJFmvxT0wixwv+1MefcLaDLRejkFb4dtt0mb0JFb6d2QZe9Nrs5QaTZsE r3h9IFKZUdJEMzgwjMrKtUgXOY7+Iu9elOqsJnqr9Hq4NbtXiQyqz1mboMw5X6P+iThg lx9AwjWduy3mdoEQoWwWwtCqGWZGCxxq8mNNUEKcdP4JO4KRLqg+cJl+Q5RRKv6vIIXT knFOYxvhxJt13DmwGkTkaJWtIQBBsR0CCLCj7aGk8arrWODnO0hfNFvdmmulY+EVRx1y kTJw== X-Gm-Message-State: AOAM531D8BQbtTG8j2IAUUeMn13CKrRuMzoSEX+7V63cbOtIpLD4K4sg tpIouwfIDDkvV3NIn3RKuLabXoysA3TwO0JPqTGTpPH7uQTwPp4qOF1dGm6lgGiUKSvpePC3gr9 Seh3NJwVvkqwhPDg= X-Received: by 2002:a5d:6103:0:b0:1ed:9e65:b090 with SMTP id v3-20020a5d6103000000b001ed9e65b090mr3136582wrt.332.1645725403874; Thu, 24 Feb 2022 09:56:43 -0800 (PST) X-Google-Smtp-Source: ABdhPJwz32MUQmrGypq7dXzaWXmmftLQv8It4w9y4HSaDTm2ycdo49IRfIBHs6O4Dsi3dxezE/KdgQ== X-Received: by 2002:a5d:6103:0:b0:1ed:9e65:b090 with SMTP id v3-20020a5d6103000000b001ed9e65b090mr3136565wrt.332.1645725403539; Thu, 24 Feb 2022 09:56:43 -0800 (PST) Received: from work-vm (cpc109025-salf6-2-0-cust480.10-2.cable.virginm.net. [82.30.61.225]) by smtp.gmail.com with ESMTPSA id bj8-20020a0560001e0800b001e6993398e3sm10286wrb.80.2022.02.24.09.56.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 24 Feb 2022 09:56:41 -0800 (PST) Date: Thu, 24 Feb 2022 17:56:38 +0000 From: "Dr. David Alan Gilbert" To: Steve Sistare Subject: Re: [PATCH V7 10/29] machine: memfd-alloc option Message-ID: References: <1640199934-455149-1-git-send-email-steven.sistare@oracle.com> <1640199934-455149-11-git-send-email-steven.sistare@oracle.com> MIME-Version: 1.0 In-Reply-To: <1640199934-455149-11-git-send-email-steven.sistare@oracle.com> User-Agent: Mutt/2.1.5 (2021-12-30) Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=dgilbert@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Received-SPF: pass client-ip=170.10.129.124; envelope-from=dgilbert@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -28 X-Spam_score: -2.9 X-Spam_bar: -- X-Spam_report: (-2.9 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.082, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: "Daniel P. Berrange" , "Michael S. Tsirkin" , Jason Zeng , Alex =?iso-8859-1?Q?Benn=E9e?= , Juan Quintela , qemu-devel@nongnu.org, Eric Blake , Markus Armbruster , Zheng Chuan , Alex Williamson , Stefan Hajnoczi , =?iso-8859-1?Q?Marc-Andr=E9?= Lureau , Paolo Bonzini , Philippe =?iso-8859-1?Q?Mathieu-Daud=E9?= Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" * Steve Sistare (steven.sistare@oracle.com) wrote: > Allocate anonymous memory using memfd_create if the memfd-alloc machine > option is set. > > Signed-off-by: Steve Sistare So other than the minor error nit that Guoyi spotted, I think this is pretty good, one other comment below: > --- > hw/core/machine.c | 19 +++++++++++++++++++ > include/hw/boards.h | 1 + > qemu-options.hx | 6 ++++++ > softmmu/physmem.c | 47 ++++++++++++++++++++++++++++++++++++++--------- > softmmu/vl.c | 1 + > trace-events | 1 + > util/qemu-config.c | 4 ++++ > 7 files changed, 70 insertions(+), 9 deletions(-) > > diff --git a/hw/core/machine.c b/hw/core/machine.c > index 53a99ab..7739d88 100644 > --- a/hw/core/machine.c > +++ b/hw/core/machine.c > @@ -392,6 +392,20 @@ static void machine_set_mem_merge(Object *obj, bool value, Error **errp) > ms->mem_merge = value; > } > > +static bool machine_get_memfd_alloc(Object *obj, Error **errp) > +{ > + MachineState *ms = MACHINE(obj); > + > + return ms->memfd_alloc; > +} > + > +static void machine_set_memfd_alloc(Object *obj, bool value, Error **errp) > +{ > + MachineState *ms = MACHINE(obj); > + > + ms->memfd_alloc = value; > +} > + > static bool machine_get_usb(Object *obj, Error **errp) > { > MachineState *ms = MACHINE(obj); > @@ -829,6 +843,11 @@ static void machine_class_init(ObjectClass *oc, void *data) > object_class_property_set_description(oc, "mem-merge", > "Enable/disable memory merge support"); > > + object_class_property_add_bool(oc, "memfd-alloc", > + machine_get_memfd_alloc, machine_set_memfd_alloc); > + object_class_property_set_description(oc, "memfd-alloc", > + "Enable/disable allocating anonymous memory using memfd_create"); > + > object_class_property_add_bool(oc, "usb", > machine_get_usb, machine_set_usb); > object_class_property_set_description(oc, "usb", > diff --git a/include/hw/boards.h b/include/hw/boards.h > index 9c1c190..a57d7a0 100644 > --- a/include/hw/boards.h > +++ b/include/hw/boards.h > @@ -327,6 +327,7 @@ struct MachineState { > char *dt_compatible; > bool dump_guest_core; > bool mem_merge; > + bool memfd_alloc; > bool usb; > bool usb_disabled; > char *firmware; > diff --git a/qemu-options.hx b/qemu-options.hx > index 7d47510..33c8173 100644 > --- a/qemu-options.hx > +++ b/qemu-options.hx > @@ -30,6 +30,7 @@ DEF("machine", HAS_ARG, QEMU_OPTION_machine, \ > " vmport=on|off|auto controls emulation of vmport (default: auto)\n" > " dump-guest-core=on|off include guest memory in a core dump (default=on)\n" > " mem-merge=on|off controls memory merge support (default: on)\n" > + " memfd-alloc=on|off controls allocating anonymous guest RAM using memfd_create (default: off)\n" > " aes-key-wrap=on|off controls support for AES key wrapping (default=on)\n" > " dea-key-wrap=on|off controls support for DEA key wrapping (default=on)\n" > " suppress-vmdesc=on|off disables self-describing migration (default=off)\n" > @@ -76,6 +77,11 @@ SRST > supported by the host, de-duplicates identical memory pages > among VMs instances (enabled by default). > > + ``memfd-alloc=on|off`` > + Enables or disables allocation of anonymous guest RAM using > + memfd_create. Any associated memory-backend objects are created with > + share=on. The memfd-alloc default is off. > + > ``aes-key-wrap=on|off`` > Enables or disables AES key wrapping support on s390-ccw hosts. > This feature controls whether AES wrapping keys will be created > diff --git a/softmmu/physmem.c b/softmmu/physmem.c > index 3524c04..95e2b49 100644 > --- a/softmmu/physmem.c > +++ b/softmmu/physmem.c > @@ -41,6 +41,7 @@ > #include "qemu/config-file.h" > #include "qemu/error-report.h" > #include "qemu/qemu-print.h" > +#include "qemu/memfd.h" > #include "exec/memory.h" > #include "exec/ioport.h" > #include "sysemu/dma.h" > @@ -1964,35 +1965,63 @@ static void ram_block_add(RAMBlock *new_block, Error **errp) > const bool shared = qemu_ram_is_shared(new_block); > RAMBlock *block; > RAMBlock *last_block = NULL; > + struct MemoryRegion *mr = new_block->mr; > ram_addr_t old_ram_size, new_ram_size; > Error *err = NULL; > + const char *name; > + void *addr = 0; > + size_t maxlen; You could move some of these down to the top of the block you're using them. > + MachineState *ms = MACHINE(qdev_get_machine()); > > old_ram_size = last_ram_page(); > > qemu_mutex_lock_ramlist(); > - new_block->offset = find_ram_offset(new_block->max_length); > + maxlen = new_block->max_length; > + new_block->offset = find_ram_offset(maxlen); > > if (!new_block->host) { > if (xen_enabled()) { > - xen_ram_alloc(new_block->offset, new_block->max_length, > - new_block->mr, &err); > + xen_ram_alloc(new_block->offset, maxlen, new_block->mr, &err); > if (err) { > error_propagate(errp, err); > qemu_mutex_unlock_ramlist(); > return; > } > } else { > - new_block->host = qemu_anon_ram_alloc(new_block->max_length, > - &new_block->mr->align, > - shared, noreserve); > - if (!new_block->host) { > + name = memory_region_name(mr); > + if (ms->memfd_alloc) { > + Object *parent = &mr->parent_obj; > + int mfd = -1; /* placeholder until next patch */ > + mr->align = QEMU_VMALLOC_ALIGN; > + if (mfd < 0) { > + mfd = qemu_memfd_create(name, maxlen + mr->align, > + 0, 0, 0, &err); > + if (mfd < 0) { > + return; > + } > + } > + qemu_set_cloexec(mfd); > + /* The memory backend already set its desired flags. */ > + if (!object_dynamic_cast(parent, TYPE_MEMORY_BACKEND)) { > + new_block->flags |= RAM_SHARED; > + } > + addr = file_ram_alloc(new_block, maxlen, mfd, > + false, false, 0, errp); > + trace_anon_memfd_alloc(name, maxlen, addr, mfd); > + } else { > + addr = qemu_anon_ram_alloc(maxlen, &mr->align, > + shared, noreserve); > + } > + > + if (!addr) { > error_setg_errno(errp, errno, > "cannot set up guest memory '%s'", > - memory_region_name(new_block->mr)); > + name); > qemu_mutex_unlock_ramlist(); > return; > } > - memory_try_enable_merging(new_block->host, new_block->max_length); > + memory_try_enable_merging(addr, maxlen); > + new_block->host = addr; > } > } > > diff --git a/softmmu/vl.c b/softmmu/vl.c > index 620a1f1..ab3648a 100644 > --- a/softmmu/vl.c > +++ b/softmmu/vl.c > @@ -2440,6 +2440,7 @@ static void create_default_memdev(MachineState *ms, const char *path) > object_property_set_str(obj, "mem-path", path, &error_fatal); > } > object_property_set_int(obj, "size", ms->ram_size, &error_fatal); > + object_property_set_bool(obj, "share", ms->memfd_alloc, &error_fatal); > object_property_add_child(object_get_objects_root(), mc->default_ram_id, > obj); > /* Ensure backend's memory region name is equal to mc->default_ram_id */ > diff --git a/trace-events b/trace-events > index a637a61..770a9ac 100644 > --- a/trace-events > +++ b/trace-events > @@ -45,6 +45,7 @@ ram_block_discard_range(const char *rbname, void *hva, size_t length, bool need_ > # accel/tcg/cputlb.c > memory_notdirty_write_access(uint64_t vaddr, uint64_t ram_addr, unsigned size) "0x%" PRIx64 " ram_addr 0x%" PRIx64 " size %u" > memory_notdirty_set_dirty(uint64_t vaddr) "0x%" PRIx64 > +anon_memfd_alloc(const char *name, size_t size, void *ptr, int fd) "%s size %zu ptr %p fd %d" > > # gdbstub.c > gdbstub_op_start(const char *device) "Starting gdbstub using device %s" > diff --git a/util/qemu-config.c b/util/qemu-config.c > index 436ab63..3606e5c 100644 > --- a/util/qemu-config.c > +++ b/util/qemu-config.c > @@ -207,6 +207,10 @@ static QemuOptsList machine_opts = { > .type = QEMU_OPT_BOOL, > .help = "enable/disable memory merge support", > },{ > + .name = "memfd-alloc", > + .type = QEMU_OPT_BOOL, > + .help = "enable/disable memfd_create for anonymous memory", > + },{ > .name = "usb", > .type = QEMU_OPT_BOOL, > .help = "Set on/off to enable/disable usb", > -- > 1.8.3.1 > -- Dr. David Alan Gilbert / dgilbert@redhat.com / Manchester, UK