Received: by 2002:a25:23cc:0:0:0:0:0 with SMTP id j195csp612516ybj; Thu, 7 May 2020 03:35:46 -0700 (PDT) X-Google-Smtp-Source: APiQypL5Kfj440d6bcJ2cnFH0WMc7DZGfy46bDVoSZTuCrRiQMItJGpDHosya+1vflhQKw03atFn X-Received: by 2002:a17:907:42d6:: with SMTP id ng6mr11086259ejb.265.1588847745978; Thu, 07 May 2020 03:35:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1588847745; cv=none; d=google.com; s=arc-20160816; b=xtPI+knRDXNlY8sr1J5IwEZC00H7lSUBKPvAu0XUCMnxKcDOd1JH525hscO840XdR3 u/5XFKT5fpnJk4jlGRLc+PjSOJlJApBx6PZ6n90oBErdYsdLJFGbagr+OvX98UoUtokD TYhJN24YBBcLBDWK9Ne5E7OE9bu9v6DkaPCAJ/1suKzqUzP4AoD6EjIGCLYpX7Z3dOb8 f3db1nW03au3Fy7Qag8uGKINWIqmsmHP79OGphSwy5ngEQzTb456WekC4OACxODFIQpR hnQ1kHx+xSRDMo3aE4YrZW3nJT4Is9JuCnZscM6E9khK1UBSL2MragJtOVharV3TK2hL O1sA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=JloAMYIrAzwRZKYfy/i+Bt/oqvn2TDyGvf1Ut0s0/Ao=; b=jxdAOAKrxBuMuBrRGsCPyJ2dNWX4/pHN/BRIfRrtDbgh7NLLkuXQZiFfdOBcbe+6t7 exA1TQ/EVsJ/0jW+jvZUH0UQvXdo8z7KEUTmaNJFj5nYLbLiUSd28+SfoeLUsnY+vjAO 1IVezcetMf+yTKYDStknwQAWQAwgUCrLXGzDzZiqF10IPpRld13RCdQYYQzUH9ggnzbj 7uSaPRGII30tWqSbbq+XfFgCjL/OtFFSdUNTaCA6BGg6n/sMZg2AjSWJLycjubkc2zis ExL7G3IgXZweHMQMhhgrg3KWAf4wOz+seeoiXDvF4XGY9Y2rvK7Ao8Qm37GNYPBB4rY5 Un6g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=Z4SxAdMY; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id i8si2867536ejf.197.2020.05.07.03.35.22; Thu, 07 May 2020 03:35:45 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=Z4SxAdMY; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727785AbgEGKdP (ORCPT + 99 others); Thu, 7 May 2020 06:33:15 -0400 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:51236 "EHLO us-smtp-1.mimecast.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1727099AbgEGKdL (ORCPT ); Thu, 7 May 2020 06:33:11 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1588847589; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=JloAMYIrAzwRZKYfy/i+Bt/oqvn2TDyGvf1Ut0s0/Ao=; b=Z4SxAdMYy7Z8t6MbmZHxf+o2LLdQNWgoN48ZS6xteVZsKF4GCFGOc+6F7XUrjug2eQfpyr eXB/Fnz/q0JjgN+Lqor/wKN0oZzYAZd4tx9XGCw3Wn50kyPSUbmr6FJZ8ukSAi5t9yJubB svXY7aTPkZ76OrHxccI87rGUjWv45eo= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-96-e_YOfhc1NSKJUf8x1daslg-1; Thu, 07 May 2020 06:33:05 -0400 X-MC-Unique: e_YOfhc1NSKJUf8x1daslg-1 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id C108A107ACF2; Thu, 7 May 2020 10:33:03 +0000 (UTC) Received: from t480s.redhat.com (ovpn-113-245.ams2.redhat.com [10.36.113.245]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6172E5D9DA; Thu, 7 May 2020 10:33:00 +0000 (UTC) From: David Hildenbrand To: linux-kernel@vger.kernel.org Cc: linux-mm@kvack.org, virtio-dev@lists.oasis-open.org, virtualization@lists.linux-foundation.org, kvm@vger.kernel.org, Michal Hocko , Andrew Morton , "Michael S . Tsirkin" , David Hildenbrand , Pankaj Gupta , Jason Wang , Oscar Salvador , Igor Mammedov , Dave Young , Dan Williams , Pavel Tatashin , Stefan Hajnoczi , Vlastimil Babka Subject: [PATCH v3 08/15] virtio-mem: Offline and remove completely unplugged memory blocks Date: Thu, 7 May 2020 12:31:12 +0200 Message-Id: <20200507103119.11219-9-david@redhat.com> In-Reply-To: <20200507103119.11219-1-david@redhat.com> References: <20200507103119.11219-1-david@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 Content-Transfer-Encoding: quoted-printable Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Let's offline+remove memory blocks once all subblocks are unplugged. We can use the new Linux MM interface for that. As no memory is in use anymore, this shouldn't take a long time and shouldn't fail. There might be corner cases where the offlining could still fail (especially, if another notifier NACKs the offlining request). Acked-by: Pankaj Gupta Tested-by: Pankaj Gupta Cc: "Michael S. Tsirkin" Cc: Jason Wang Cc: Oscar Salvador Cc: Michal Hocko Cc: Igor Mammedov Cc: Dave Young Cc: Andrew Morton Cc: Dan Williams Cc: Pavel Tatashin Cc: Stefan Hajnoczi Cc: Vlastimil Babka Signed-off-by: David Hildenbrand --- drivers/virtio/virtio_mem.c | 47 +++++++++++++++++++++++++++++++++---- 1 file changed, 43 insertions(+), 4 deletions(-) diff --git a/drivers/virtio/virtio_mem.c b/drivers/virtio/virtio_mem.c index b0b41c73ce89..a2edb87e5ed8 100644 --- a/drivers/virtio/virtio_mem.c +++ b/drivers/virtio/virtio_mem.c @@ -446,6 +446,28 @@ static int virtio_mem_mb_remove(struct virtio_mem *v= m, unsigned long mb_id) return remove_memory(nid, addr, memory_block_size_bytes()); } =20 +/* + * Try to offline and remove a memory block from Linux. + * + * Must not be called with the vm->hotplug_mutex held (possible deadlock= with + * onlining code). + * + * Will not modify the state of the memory block. + */ +static int virtio_mem_mb_offline_and_remove(struct virtio_mem *vm, + unsigned long mb_id) +{ + const uint64_t addr =3D virtio_mem_mb_id_to_phys(mb_id); + int nid =3D vm->nid; + + if (nid =3D=3D NUMA_NO_NODE) + nid =3D memory_add_physaddr_to_nid(addr); + + dev_dbg(&vm->vdev->dev, "offlining and removing memory block: %lu\n", + mb_id); + return offline_and_remove_memory(nid, addr, memory_block_size_bytes()); +} + /* * Trigger the workqueue so the device can perform its magic. */ @@ -537,7 +559,13 @@ static void virtio_mem_notify_offline(struct virtio_= mem *vm, break; } =20 - /* trigger the workqueue, maybe we can now unplug memory. */ + /* + * Trigger the workqueue, maybe we can now unplug memory. Also, + * when we offline and remove a memory block, this will re-trigger + * us immediately - which is often nice because the removal of + * the memory block (e.g., memmap) might have freed up memory + * on other memory blocks we manage. + */ virtio_mem_retry(vm); } =20 @@ -1284,7 +1312,8 @@ static int virtio_mem_mb_unplug_any_sb_offline(stru= ct virtio_mem *vm, * Unplug the desired number of plugged subblocks of an online memory bl= ock. * Will skip subblock that are busy. * - * Will modify the state of the memory block. + * Will modify the state of the memory block. Might temporarily drop the + * hotplug_mutex. * * Note: Can fail after some subblocks were successfully unplugged. Can * return 0 even if subblocks were busy and could not get unplugge= d. @@ -1340,9 +1369,19 @@ static int virtio_mem_mb_unplug_any_sb_online(stru= ct virtio_mem *vm, } =20 /* - * TODO: Once all subblocks of a memory block were unplugged, we want - * to offline the memory block and remove it. + * Once all subblocks of a memory block were unplugged, offline and + * remove it. This will usually not fail, as no memory is in use + * anymore - however some other notifiers might NACK the request. */ + if (virtio_mem_mb_test_sb_unplugged(vm, mb_id, 0, vm->nb_sb_per_mb)) { + mutex_unlock(&vm->hotplug_mutex); + rc =3D virtio_mem_mb_offline_and_remove(vm, mb_id); + mutex_lock(&vm->hotplug_mutex); + if (!rc) + virtio_mem_mb_set_state(vm, mb_id, + VIRTIO_MEM_MB_STATE_UNUSED); + } + return 0; } =20 --=20 2.25.3