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=-9.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,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 4007BC43457 for ; Mon, 12 Oct 2020 12:56:09 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id B02E821D7F for ; Mon, 12 Oct 2020 12:56:08 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="KQWhoq8t" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org B02E821D7F Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 38D4894000C; Mon, 12 Oct 2020 08:56:08 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 33C1B940007; Mon, 12 Oct 2020 08:56:08 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 2047994000C; Mon, 12 Oct 2020 08:56:08 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id E3A05940007 for ; Mon, 12 Oct 2020 08:56:07 -0400 (EDT) Received: from smtpin13.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay05.hostedemail.com (Postfix) with ESMTP id 8777B181AE864 for ; Mon, 12 Oct 2020 12:56:07 +0000 (UTC) X-FDA: 77363271174.13.pain21_17042a0271fa Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin13.hostedemail.com (Postfix) with ESMTP id 5CD8E18140B74 for ; Mon, 12 Oct 2020 12:56:07 +0000 (UTC) X-HE-Tag: pain21_17042a0271fa X-Filterd-Recvd-Size: 14291 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [63.128.21.124]) by imf19.hostedemail.com (Postfix) with ESMTP for ; Mon, 12 Oct 2020 12:56:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1602507366; 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=f8Nusm9Q3UIodGmd2qdyty+RAJQgSi+pxy/2Ikrm7wc=; b=KQWhoq8tpG2VyXVcOgKSebLB8lwpzwrNFRvAB8uLKuHWQXZCjkFUyMugHcqnGtGZNL7GMI /2GiZJf8PLsSRLJ7bm3Op00Y80vaMjnynncptKJb3QCPa10qwPYwZnFzLH5RJbMGvmOsAf BpXR7J3sLJEboZxNOSfqsy3rl+UkFZ4= 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-212-4DVPmcraN3m3e7Ga8dg-Bw-1; Mon, 12 Oct 2020 08:56:03 -0400 X-MC-Unique: 4DVPmcraN3m3e7Ga8dg-Bw-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 87222107AD64; Mon, 12 Oct 2020 12:56:02 +0000 (UTC) Received: from t480s.redhat.com (ovpn-113-251.ams2.redhat.com [10.36.113.251]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6A39860C07; Mon, 12 Oct 2020 12:55:57 +0000 (UTC) From: David Hildenbrand To: linux-kernel@vger.kernel.org Cc: linux-mm@kvack.org, virtualization@lists.linux-foundation.org, Andrew Morton , "Michael S . Tsirkin" , David Hildenbrand , Jason Wang , Pankaj Gupta Subject: [PATCH v1 19/29] virito-mem: existing (un)plug functions are specific to Sub Block Mode (SBM) Date: Mon, 12 Oct 2020 14:53:13 +0200 Message-Id: <20201012125323.17509-20-david@redhat.com> In-Reply-To: <20201012125323.17509-1-david@redhat.com> References: <20201012125323.17509-1-david@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Content-Transfer-Encoding: quoted-printable 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: Let's rename them accordingly. virtio_mem_plug_request() and virtio_mem_unplug_request() will be handled separately. Cc: "Michael S. Tsirkin" Cc: Jason Wang Cc: Pankaj Gupta Signed-off-by: David Hildenbrand --- drivers/virtio/virtio_mem.c | 90 ++++++++++++++++++------------------- 1 file changed, 43 insertions(+), 47 deletions(-) diff --git a/drivers/virtio/virtio_mem.c b/drivers/virtio/virtio_mem.c index 73ff6e9ba839..fc2b1ff3beed 100644 --- a/drivers/virtio/virtio_mem.c +++ b/drivers/virtio/virtio_mem.c @@ -1075,8 +1075,8 @@ static int virtio_mem_send_unplug_all_request(struc= t virtio_mem *vm) * Plug selected subblocks. Updates the plugged state, but not the state * of the memory block. */ -static int virtio_mem_mb_plug_sb(struct virtio_mem *vm, unsigned long mb= _id, - int sb_id, int count) +static int virtio_mem_sbm_plug_sb(struct virtio_mem *vm, unsigned long m= b_id, + int sb_id, int count) { const uint64_t addr =3D virtio_mem_mb_id_to_phys(mb_id) + sb_id * vm->subblock_size; @@ -1096,8 +1096,8 @@ static int virtio_mem_mb_plug_sb(struct virtio_mem = *vm, unsigned long mb_id, * Unplug selected subblocks. Updates the plugged state, but not the sta= te * of the memory block. */ -static int virtio_mem_mb_unplug_sb(struct virtio_mem *vm, unsigned long = mb_id, - int sb_id, int count) +static int virtio_mem_sbm_unplug_sb(struct virtio_mem *vm, unsigned long= mb_id, + int sb_id, int count) { const uint64_t addr =3D virtio_mem_mb_id_to_phys(mb_id) + sb_id * vm->subblock_size; @@ -1122,8 +1122,8 @@ static int virtio_mem_mb_unplug_sb(struct virtio_me= m *vm, unsigned long mb_id, * * Note: can fail after some subblocks were unplugged. */ -static int virtio_mem_mb_unplug_any_sb(struct virtio_mem *vm, - unsigned long mb_id, uint64_t *nb_sb) +static int virtio_mem_sbm_unplug_any_sb(struct virtio_mem *vm, + unsigned long mb_id, uint64_t *nb_sb) { int sb_id, count; int rc; @@ -1144,7 +1144,7 @@ static int virtio_mem_mb_unplug_any_sb(struct virti= o_mem *vm, sb_id--; } =20 - rc =3D virtio_mem_mb_unplug_sb(vm, mb_id, sb_id, count); + rc =3D virtio_mem_sbm_unplug_sb(vm, mb_id, sb_id, count); if (rc) return rc; *nb_sb -=3D count; @@ -1161,18 +1161,18 @@ static int virtio_mem_mb_unplug_any_sb(struct vir= tio_mem *vm, * * Note: can fail after some subblocks were unplugged. */ -static int virtio_mem_mb_unplug(struct virtio_mem *vm, unsigned long mb_= id) +static int virtio_mem_sbm_unplug_mb(struct virtio_mem *vm, unsigned long= mb_id) { uint64_t nb_sb =3D vm->nb_sb_per_mb; =20 - return virtio_mem_mb_unplug_any_sb(vm, mb_id, &nb_sb); + return virtio_mem_sbm_unplug_any_sb(vm, mb_id, &nb_sb); } =20 /* * Prepare tracking data for the next memory block. */ -static int virtio_mem_prepare_next_mb(struct virtio_mem *vm, - unsigned long *mb_id) +static int virtio_mem_sbm_prepare_next_mb(struct virtio_mem *vm, + unsigned long *mb_id) { int rc; =20 @@ -1200,9 +1200,8 @@ static int virtio_mem_prepare_next_mb(struct virtio= _mem *vm, * * Will modify the state of the memory block. */ -static int virtio_mem_mb_plug_and_add(struct virtio_mem *vm, - unsigned long mb_id, - uint64_t *nb_sb) +static int virtio_mem_sbm_plug_and_add_mb(struct virtio_mem *vm, + unsigned long mb_id, uint64_t *nb_sb) { const int count =3D min_t(int, *nb_sb, vm->nb_sb_per_mb); int rc; @@ -1214,7 +1213,7 @@ static int virtio_mem_mb_plug_and_add(struct virtio= _mem *vm, * Plug the requested number of subblocks before adding it to linux, * so that onlining will directly online all plugged subblocks. */ - rc =3D virtio_mem_mb_plug_sb(vm, mb_id, 0, count); + rc =3D virtio_mem_sbm_plug_sb(vm, mb_id, 0, count); if (rc) return rc; =20 @@ -1241,7 +1240,7 @@ static int virtio_mem_mb_plug_and_add(struct virtio= _mem *vm, * TODO: Linux MM does not properly clean up yet in all cases * where adding of memory failed - especially on -ENOMEM. */ - if (virtio_mem_mb_unplug_sb(vm, mb_id, 0, count)) + if (virtio_mem_sbm_unplug_sb(vm, mb_id, 0, count)) new_state =3D VIRTIO_MEM_SBM_MB_PLUGGED; virtio_mem_sbm_set_mb_state(vm, mb_id, new_state); return rc; @@ -1259,8 +1258,9 @@ static int virtio_mem_mb_plug_and_add(struct virtio= _mem *vm, * * Note: Can fail after some subblocks were successfully plugged. */ -static int virtio_mem_mb_plug_any_sb(struct virtio_mem *vm, unsigned lon= g mb_id, - uint64_t *nb_sb, bool online) +static int virtio_mem_sbm_plug_any_sb(struct virtio_mem *vm, + unsigned long mb_id, uint64_t *nb_sb, + bool online) { unsigned long pfn, nr_pages; int sb_id, count; @@ -1279,7 +1279,7 @@ static int virtio_mem_mb_plug_any_sb(struct virtio_= mem *vm, unsigned long mb_id, !virtio_mem_sbm_test_sb_plugged(vm, mb_id, sb_id + count, 1)) count++; =20 - rc =3D virtio_mem_mb_plug_sb(vm, mb_id, sb_id, count); + rc =3D virtio_mem_sbm_plug_sb(vm, mb_id, sb_id, count); if (rc) return rc; *nb_sb -=3D count; @@ -1323,7 +1323,7 @@ static int virtio_mem_plug_request(struct virtio_me= m *vm, uint64_t diff) /* Try to plug subblocks of partially plugged online blocks. */ virtio_mem_sbm_for_each_mb(vm, mb_id, VIRTIO_MEM_SBM_MB_ONLINE_PARTIAL) { - rc =3D virtio_mem_mb_plug_any_sb(vm, mb_id, &nb_sb, true); + rc =3D virtio_mem_sbm_plug_any_sb(vm, mb_id, &nb_sb, true); if (rc || !nb_sb) goto out_unlock; cond_resched(); @@ -1332,7 +1332,7 @@ static int virtio_mem_plug_request(struct virtio_me= m *vm, uint64_t diff) /* Try to plug subblocks of partially plugged offline blocks. */ virtio_mem_sbm_for_each_mb(vm, mb_id, VIRTIO_MEM_SBM_MB_OFFLINE_PARTIAL) { - rc =3D virtio_mem_mb_plug_any_sb(vm, mb_id, &nb_sb, false); + rc =3D virtio_mem_sbm_plug_any_sb(vm, mb_id, &nb_sb, false); if (rc || !nb_sb) goto out_unlock; cond_resched(); @@ -1349,7 +1349,7 @@ static int virtio_mem_plug_request(struct virtio_me= m *vm, uint64_t diff) if (!virtio_mem_could_add_memory(vm, memory_block_size_bytes())) return -ENOSPC; =20 - rc =3D virtio_mem_mb_plug_and_add(vm, mb_id, &nb_sb); + rc =3D virtio_mem_sbm_plug_and_add_mb(vm, mb_id, &nb_sb); if (rc || !nb_sb) return rc; cond_resched(); @@ -1360,10 +1360,10 @@ static int virtio_mem_plug_request(struct virtio_= mem *vm, uint64_t diff) if (!virtio_mem_could_add_memory(vm, memory_block_size_bytes())) return -ENOSPC; =20 - rc =3D virtio_mem_prepare_next_mb(vm, &mb_id); + rc =3D virtio_mem_sbm_prepare_next_mb(vm, &mb_id); if (rc) return rc; - rc =3D virtio_mem_mb_plug_and_add(vm, mb_id, &nb_sb); + rc =3D virtio_mem_sbm_plug_and_add_mb(vm, mb_id, &nb_sb); if (rc) return rc; cond_resched(); @@ -1384,13 +1384,13 @@ static int virtio_mem_plug_request(struct virtio_= mem *vm, uint64_t diff) * * Note: Can fail after some subblocks were successfully unplugged. */ -static int virtio_mem_mb_unplug_any_sb_offline(struct virtio_mem *vm, - unsigned long mb_id, - uint64_t *nb_sb) +static int virtio_mem_sbm_unplug_any_sb_offline(struct virtio_mem *vm, + unsigned long mb_id, + uint64_t *nb_sb) { int rc; =20 - rc =3D virtio_mem_mb_unplug_any_sb(vm, mb_id, nb_sb); + rc =3D virtio_mem_sbm_unplug_any_sb(vm, mb_id, nb_sb); =20 /* some subblocks might have been unplugged even on failure */ if (!virtio_mem_sbm_test_sb_plugged(vm, mb_id, 0, vm->nb_sb_per_mb)) @@ -1422,9 +1422,9 @@ static int virtio_mem_mb_unplug_any_sb_offline(stru= ct virtio_mem *vm, * * Will modify the state of the memory block. */ -static int virtio_mem_mb_unplug_sb_online(struct virtio_mem *vm, - unsigned long mb_id, int sb_id, - int count) +static int virtio_mem_sbm_unplug_sb_online(struct virtio_mem *vm, + unsigned long mb_id, int sb_id, + int count) { const unsigned long nr_pages =3D PFN_DOWN(vm->subblock_size) * count; unsigned long start_pfn; @@ -1438,7 +1438,7 @@ static int virtio_mem_mb_unplug_sb_online(struct vi= rtio_mem *vm, return rc; =20 /* Try to unplug the allocated memory */ - rc =3D virtio_mem_mb_unplug_sb(vm, mb_id, sb_id, count); + rc =3D virtio_mem_sbm_unplug_sb(vm, mb_id, sb_id, count); if (rc) { /* Return the memory to the buddy. */ virtio_mem_fake_online(start_pfn, nr_pages); @@ -1460,17 +1460,17 @@ static int virtio_mem_mb_unplug_sb_online(struct = virtio_mem *vm, * Note: Can fail after some subblocks were successfully unplugged. Can * return 0 even if subblocks were busy and could not get unplugge= d. */ -static int virtio_mem_mb_unplug_any_sb_online(struct virtio_mem *vm, - unsigned long mb_id, - uint64_t *nb_sb) +static int virtio_mem_sbm_unplug_any_sb_online(struct virtio_mem *vm, + unsigned long mb_id, + uint64_t *nb_sb) { int rc, sb_id; =20 /* If possible, try to unplug the complete block in one shot. */ if (*nb_sb >=3D vm->nb_sb_per_mb && virtio_mem_sbm_test_sb_plugged(vm, mb_id, 0, vm->nb_sb_per_mb)) { - rc =3D virtio_mem_mb_unplug_sb_online(vm, mb_id, 0, - vm->nb_sb_per_mb); + rc =3D virtio_mem_sbm_unplug_sb_online(vm, mb_id, 0, + vm->nb_sb_per_mb); if (!rc) { *nb_sb -=3D vm->nb_sb_per_mb; goto unplugged; @@ -1487,7 +1487,7 @@ static int virtio_mem_mb_unplug_any_sb_online(struc= t virtio_mem *vm, if (sb_id < 0) break; =20 - rc =3D virtio_mem_mb_unplug_sb_online(vm, mb_id, sb_id, 1); + rc =3D virtio_mem_sbm_unplug_sb_online(vm, mb_id, sb_id, 1); if (rc =3D=3D -EBUSY) continue; else if (rc) @@ -1535,8 +1535,7 @@ static int virtio_mem_unplug_request(struct virtio_= mem *vm, uint64_t diff) /* Try to unplug subblocks of partially plugged offline blocks. */ virtio_mem_sbm_for_each_mb_rev(vm, mb_id, VIRTIO_MEM_SBM_MB_OFFLINE_PARTIAL) { - rc =3D virtio_mem_mb_unplug_any_sb_offline(vm, mb_id, - &nb_sb); + rc =3D virtio_mem_sbm_unplug_any_sb_offline(vm, mb_id, &nb_sb); if (rc || !nb_sb) goto out_unlock; cond_resched(); @@ -1544,8 +1543,7 @@ static int virtio_mem_unplug_request(struct virtio_= mem *vm, uint64_t diff) =20 /* Try to unplug subblocks of plugged offline blocks. */ virtio_mem_sbm_for_each_mb_rev(vm, mb_id, VIRTIO_MEM_SBM_MB_OFFLINE) { - rc =3D virtio_mem_mb_unplug_any_sb_offline(vm, mb_id, - &nb_sb); + rc =3D virtio_mem_sbm_unplug_any_sb_offline(vm, mb_id, &nb_sb); if (rc || !nb_sb) goto out_unlock; cond_resched(); @@ -1559,8 +1557,7 @@ static int virtio_mem_unplug_request(struct virtio_= mem *vm, uint64_t diff) /* Try to unplug subblocks of partially plugged online blocks. */ virtio_mem_sbm_for_each_mb_rev(vm, mb_id, VIRTIO_MEM_SBM_MB_ONLINE_PARTIAL) { - rc =3D virtio_mem_mb_unplug_any_sb_online(vm, mb_id, - &nb_sb); + rc =3D virtio_mem_sbm_unplug_any_sb_online(vm, mb_id, &nb_sb); if (rc || !nb_sb) goto out_unlock; mutex_unlock(&vm->hotplug_mutex); @@ -1570,8 +1567,7 @@ static int virtio_mem_unplug_request(struct virtio_= mem *vm, uint64_t diff) =20 /* Try to unplug subblocks of plugged online blocks. */ virtio_mem_sbm_for_each_mb_rev(vm, mb_id, VIRTIO_MEM_SBM_MB_ONLINE) { - rc =3D virtio_mem_mb_unplug_any_sb_online(vm, mb_id, - &nb_sb); + rc =3D virtio_mem_sbm_unplug_any_sb_online(vm, mb_id, &nb_sb); if (rc || !nb_sb) goto out_unlock; mutex_unlock(&vm->hotplug_mutex); @@ -1596,7 +1592,7 @@ static int virtio_mem_unplug_pending_mb(struct virt= io_mem *vm) int rc; =20 virtio_mem_sbm_for_each_mb(vm, mb_id, VIRTIO_MEM_SBM_MB_PLUGGED) { - rc =3D virtio_mem_mb_unplug(vm, mb_id); + rc =3D virtio_mem_sbm_unplug_mb(vm, mb_id); if (rc) return rc; virtio_mem_sbm_set_mb_state(vm, mb_id, --=20 2.26.2