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 X-Spam-Level: X-Spam-Status: No, score=-6.6 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 36A3DC433E0 for ; Thu, 11 Jun 2020 10:32:47 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id EB38920760 for ; Thu, 11 Jun 2020 10:32:46 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="pI/ZXc1e" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org EB38920760 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 805516B0027; Thu, 11 Jun 2020 06:32:46 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 7B5FE6B0029; Thu, 11 Jun 2020 06:32:46 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 6CC838D0084; Thu, 11 Jun 2020 06:32:46 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0229.hostedemail.com [216.40.44.229]) by kanga.kvack.org (Postfix) with ESMTP id 55D0D6B0027 for ; Thu, 11 Jun 2020 06:32:46 -0400 (EDT) Received: from smtpin12.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay02.hostedemail.com (Postfix) with ESMTP id 1D449356C for ; Thu, 11 Jun 2020 10:32:46 +0000 (UTC) X-FDA: 76916567532.12.brass07_0010ada26dd3 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin12.hostedemail.com (Postfix) with ESMTP id D7EF81800AAB3 for ; Thu, 11 Jun 2020 10:32:45 +0000 (UTC) X-HE-Tag: brass07_0010ada26dd3 X-Filterd-Recvd-Size: 7607 Received: from mail-wr1-f68.google.com (mail-wr1-f68.google.com [209.85.221.68]) by imf33.hostedemail.com (Postfix) with ESMTP for ; Thu, 11 Jun 2020 10:32:45 +0000 (UTC) Received: by mail-wr1-f68.google.com with SMTP id q11so5611820wrp.3 for ; Thu, 11 Jun 2020 03:32:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=S1DHOFo6gIegKvTMa5vbni7NQMyet4sax/6N+ioAZRQ=; b=pI/ZXc1eS0mK6/HSIeSOkMR5Ulb1J0U1FAAMsjazR2pRoXOesvMKckUWV5e5ad67Mn iY0jcieN+vghiUkZWeEsKFFU6o/pg9xedcTeMfDMIpEtQYFzhT2frUj5u58c6BhzdC4/ IRdoSj9rKrKpRR2cE4tIYJuV5ts33u/tzYhKmU71+6mvT3qDtfkZbo1+jpd5Fr/6rjkI Q1YwaINlhCR8qGEUfsFG4X1NFTkXCcrOk+9RcjEHo3duAar+dHbma+0DkNRpdwUHn9M8 9dvlUk1Tbtaq5LPkmzZmxKE9EmPO5hdOKFZUC+3nKkdzRR+85NX0zsyZ0orvDNZ8ZFa8 cHOA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=S1DHOFo6gIegKvTMa5vbni7NQMyet4sax/6N+ioAZRQ=; b=judUihYcyzAvW1M4LcObEodutggU8GCFqKqnmdN9BSpNEP6sRCBWM3tJkXpWVyasOP o+S6BVuqYi6E9+VG14b43tzTTpmFVJSrEl0poXO6p/MvmgeLHz4zJ1cv7/gkliKzYbUQ qFI57wNGmaZwEhdVibCrYyLTgykPsC4mg+hYXK4K8fzn7vGC8Kt9ffXh6rWiLrzRaew0 YR01+6mGW7kIfrE9xEQ5BZtI76yMgKH0qR93PgKtzGRc++ZY6ja8wlFGjjjeYNs1IuSc t1LjBo16KDcGziG/IuFPB0wzW2rtNpdDmvP3OB54B7/F+PujBymJVF8gwls/kUFT4CKp /L+Q== X-Gm-Message-State: AOAM532iqs0Ph5pRwPc/3xbEPXBTZCcVxB1mw0vjk9XegVq8WzLRLa4P seixTPN8SXpdfadT09YT5NDs936rD58rNHg6ipQ= X-Google-Smtp-Source: ABdhPJxjK3svYNT9cJJ+Ew1PeDQwIvwXhWHUG/rQXV+svRZUBu1+K3XXVBzHIKJWELOu9xonGk0kl0vLaU+gucmQ9bU= X-Received: by 2002:adf:fd81:: with SMTP id d1mr9042165wrr.96.1591871564244; Thu, 11 Jun 2020 03:32:44 -0700 (PDT) MIME-Version: 1.0 References: <20200611093518.5737-1-david@redhat.com> In-Reply-To: <20200611093518.5737-1-david@redhat.com> From: Pankaj Gupta Date: Thu, 11 Jun 2020 12:32:33 +0200 Message-ID: Subject: Re: [PATCH v1] virtio-mem: add memory via add_memory_driver_managed() To: David Hildenbrand Cc: LKML , Linux MM , virtio-dev@lists.oasis-open.org, virtualization@lists.linux-foundation.org, kvm@vger.kernel.org, "Michael S . Tsirkin" , Jason Wang , teawater Content-Type: text/plain; charset="UTF-8" X-Rspamd-Queue-Id: D7EF81800AAB3 X-Spamd-Result: default: False [0.00 / 100.00] X-Rspamd-Server: rspam05 X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: > Virtio-mem managed memory is always detected and added by the virtio-mem > driver, never using something like the firmware-provided memory map. > This is the case after an ordinary system reboot, and has to be guaranteed > after kexec. Especially, virtio-mem added memory resources can contain > inaccessible parts ("unblocked memory blocks"), blindly forwarding them > to a kexec kernel is dangerous, as unplugged memory will get accessed > (esp. written). > > Let's use the new way of adding special driver-managed memory introduced > in commit 75ac4c58bc0d ("mm/memory_hotplug: introduce > add_memory_driver_managed()"). Is this commit id correct? > > This will result in no entries in /sys/firmware/memmap ("raw firmware- > provided memory map"), the memory resource will be flagged > IORESOURCE_MEM_DRIVER_MANAGED (esp., kexec_file_load() will not place > kexec images on this memory), and it is exposed as "System RAM > (virtio_mem)" in /proc/iomem, so esp. kexec-tools can properly handle it. > > Example /proc/iomem before this change: > [...] > 140000000-333ffffff : virtio0 > 140000000-147ffffff : System RAM > 334000000-533ffffff : virtio1 > 338000000-33fffffff : System RAM > 340000000-347ffffff : System RAM > 348000000-34fffffff : System RAM > [...] > > Example /proc/iomem after this change: > [...] > 140000000-333ffffff : virtio0 > 140000000-147ffffff : System RAM (virtio_mem) > 334000000-533ffffff : virtio1 > 338000000-33fffffff : System RAM (virtio_mem) > 340000000-347ffffff : System RAM (virtio_mem) > 348000000-34fffffff : System RAM (virtio_mem) > [...] > > Cc: "Michael S. Tsirkin" > Cc: Pankaj Gupta > Cc: teawater > Signed-off-by: David Hildenbrand > --- > > Based on latest Linus' tree (and not a tag) because > - virtio-mem has just been merged via the vhost tree > - add_memory_driver_managed() has been merged a week ago via the -mm tree > > I'd like to have this patch in 5.8, with the initial merge of virtio-mem > if possible (so the user space representation of virtio-mem added memory > resources won't change anymore). > > --- > drivers/virtio/virtio_mem.c | 25 ++++++++++++++++++++++--- > 1 file changed, 22 insertions(+), 3 deletions(-) > > diff --git a/drivers/virtio/virtio_mem.c b/drivers/virtio/virtio_mem.c > index 50c689f250450..d2eab3558a9e1 100644 > --- a/drivers/virtio/virtio_mem.c > +++ b/drivers/virtio/virtio_mem.c > @@ -101,6 +101,11 @@ struct virtio_mem { > > /* The parent resource for all memory added via this device. */ > struct resource *parent_resource; > + /* > + * Copy of "System RAM (virtio_mem)" to be used for > + * add_memory_driver_managed(). > + */ > + const char *resource_name; > > /* Summary of all memory block states. */ > unsigned long nb_mb_state[VIRTIO_MEM_MB_STATE_COUNT]; > @@ -414,8 +419,20 @@ static int virtio_mem_mb_add(struct virtio_mem *vm, unsigned long mb_id) > if (nid == NUMA_NO_NODE) > nid = memory_add_physaddr_to_nid(addr); > > + /* > + * When force-unloading the driver and we still have memory added to > + * Linux, the resource name has to stay. > + */ > + if (!vm->resource_name) { > + vm->resource_name = kstrdup_const("System RAM (virtio_mem)", > + GFP_KERNEL); > + if (!vm->resource_name) > + return -ENOMEM; > + } > + > dev_dbg(&vm->vdev->dev, "adding memory block: %lu\n", mb_id); > - return add_memory(nid, addr, memory_block_size_bytes()); > + return add_memory_driver_managed(nid, addr, memory_block_size_bytes(), > + vm->resource_name); > } > > /* > @@ -1890,10 +1907,12 @@ static void virtio_mem_remove(struct virtio_device *vdev) > vm->nb_mb_state[VIRTIO_MEM_MB_STATE_OFFLINE_PARTIAL] || > vm->nb_mb_state[VIRTIO_MEM_MB_STATE_ONLINE] || > vm->nb_mb_state[VIRTIO_MEM_MB_STATE_ONLINE_PARTIAL] || > - vm->nb_mb_state[VIRTIO_MEM_MB_STATE_ONLINE_MOVABLE]) > + vm->nb_mb_state[VIRTIO_MEM_MB_STATE_ONLINE_MOVABLE]) { > dev_warn(&vdev->dev, "device still has system memory added\n"); > - else > + } else { > virtio_mem_delete_resource(vm); > + kfree_const(vm->resource_name); > + } > > /* remove all tracking data - no locking needed */ > vfree(vm->mb_state); Looks good to me. Reviewed-by: Pankaj Gupta