Commit 602ef894 authored by David Hildenbrand's avatar David Hildenbrand Committed by Michael S. Tsirkin
Browse files

virito-mem: existing (un)plug functions are specific to Sub Block Mode (SBM) 



Let's rename them accordingly. virtio_mem_plug_request() and
virtio_mem_unplug_request() will be handled separately.

Reviewed-by: default avatarWei Yang <richard.weiyang@linux.alibaba.com>
Cc: "Michael S. Tsirkin" <mst@redhat.com>
Cc: Jason Wang <jasowang@redhat.com>
Cc: Pankaj Gupta <pankaj.gupta.linux@gmail.com>
Signed-off-by: default avatarDavid Hildenbrand <david@redhat.com>
Link: https://lore.kernel.org/r/20201112133815.13332-23-david@redhat.com


Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>
parent 8a6f082b

drivers/virtio/virtio_mem.c

+43 −47
Original line number Diff line number Diff line
@@ -1099,7 +1099,7 @@ static int virtio_mem_send_unplug_all_request(struct 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,

static int virtio_mem_sbm_plug_sb(struct virtio_mem *vm, unsigned long mb_id,

				  int sb_id, int count)

{

	const uint64_t addr = virtio_mem_mb_id_to_phys(mb_id) +
@@ -1117,7 +1117,7 @@ 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 state

 * of the memory block.

 */

static int virtio_mem_mb_unplug_sb(struct virtio_mem *vm, unsigned long mb_id,

static int virtio_mem_sbm_unplug_sb(struct virtio_mem *vm, unsigned long mb_id,

				    int sb_id, int count)

{

	const uint64_t addr = virtio_mem_mb_id_to_phys(mb_id) +
@@ -1140,7 +1140,7 @@ static int virtio_mem_mb_unplug_sb(struct virtio_mem *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,

static int virtio_mem_sbm_unplug_any_sb(struct virtio_mem *vm,

					unsigned long mb_id, uint64_t *nb_sb)

{

	int sb_id, count;
@@ -1162,7 +1162,7 @@ static int virtio_mem_mb_unplug_any_sb(struct virtio_mem *vm, 
			sb_id--;

		}



		rc = virtio_mem_mb_unplug_sb(vm, mb_id, sb_id, count);

		rc = virtio_mem_sbm_unplug_sb(vm, mb_id, sb_id, count);

		if (rc)

			return rc;

		*nb_sb -= count;
@@ -1179,17 +1179,17 @@ static int virtio_mem_mb_unplug_any_sb(struct virtio_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 = vm->sbm.sbs_per_mb;



	return virtio_mem_mb_unplug_any_sb(vm, mb_id, &nb_sb);

	return virtio_mem_sbm_unplug_any_sb(vm, mb_id, &nb_sb);

}



/*

 * Prepare tracking data for the next memory block.

 */

static int virtio_mem_prepare_next_mb(struct virtio_mem *vm,

static int virtio_mem_sbm_prepare_next_mb(struct virtio_mem *vm,

					  unsigned long *mb_id)

{

	int rc;
@@ -1218,9 +1218,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 = min_t(int, *nb_sb, vm->sbm.sbs_per_mb);

	int rc;
@@ -1232,7 +1231,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 = virtio_mem_mb_plug_sb(vm, mb_id, 0, count);

	rc = virtio_mem_sbm_plug_sb(vm, mb_id, 0, count);

	if (rc)

		return rc;
@@ -1259,7 +1258,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 = VIRTIO_MEM_SBM_MB_PLUGGED;

		virtio_mem_sbm_set_mb_state(vm, mb_id, new_state);

		return rc;
@@ -1277,8 +1276,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 long 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;
@@ -1297,7 +1297,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++;



		rc = virtio_mem_mb_plug_sb(vm, mb_id, sb_id, count);

		rc = virtio_mem_sbm_plug_sb(vm, mb_id, sb_id, count);

		if (rc)

			return rc;

		*nb_sb -= count;
@@ -1341,7 +1341,7 @@ static int virtio_mem_plug_request(struct virtio_mem *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 = virtio_mem_mb_plug_any_sb(vm, mb_id, &nb_sb, true);

		rc = virtio_mem_sbm_plug_any_sb(vm, mb_id, &nb_sb, true);

		if (rc || !nb_sb)

			goto out_unlock;

		cond_resched();
@@ -1350,7 +1350,7 @@ static int virtio_mem_plug_request(struct virtio_mem *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 = virtio_mem_mb_plug_any_sb(vm, mb_id, &nb_sb, false);

		rc = virtio_mem_sbm_plug_any_sb(vm, mb_id, &nb_sb, false);

		if (rc || !nb_sb)

			goto out_unlock;

		cond_resched();
@@ -1367,7 +1367,7 @@ 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;



		rc = virtio_mem_mb_plug_and_add(vm, mb_id, &nb_sb);

		rc = virtio_mem_sbm_plug_and_add_mb(vm, mb_id, &nb_sb);

		if (rc || !nb_sb)

			return rc;

		cond_resched();
@@ -1378,10 +1378,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;



		rc = virtio_mem_prepare_next_mb(vm, &mb_id);

		rc = virtio_mem_sbm_prepare_next_mb(vm, &mb_id);

		if (rc)

			return rc;

		rc = virtio_mem_mb_plug_and_add(vm, mb_id, &nb_sb);

		rc = virtio_mem_sbm_plug_and_add_mb(vm, mb_id, &nb_sb);

		if (rc)

			return rc;

		cond_resched();
@@ -1402,13 +1402,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,

static int virtio_mem_sbm_unplug_any_sb_offline(struct virtio_mem *vm,

						unsigned long mb_id,

						uint64_t *nb_sb)

{

	int rc;



	rc = virtio_mem_mb_unplug_any_sb(vm, mb_id, nb_sb);

	rc = virtio_mem_sbm_unplug_any_sb(vm, mb_id, nb_sb);



	/* some subblocks might have been unplugged even on failure */

	if (!virtio_mem_sbm_test_sb_plugged(vm, mb_id, 0, vm->sbm.sbs_per_mb))
@@ -1440,7 +1440,7 @@ static int virtio_mem_mb_unplug_any_sb_offline(struct virtio_mem *vm, 
 *

 * Will modify the state of the memory block.

 */

static int virtio_mem_mb_unplug_sb_online(struct virtio_mem *vm,

static int virtio_mem_sbm_unplug_sb_online(struct virtio_mem *vm,

					   unsigned long mb_id, int sb_id,

					   int count)

{
@@ -1456,7 +1456,7 @@ static int virtio_mem_mb_unplug_sb_online(struct virtio_mem *vm, 
		return rc;



	/* Try to unplug the allocated memory */

	rc = virtio_mem_mb_unplug_sb(vm, mb_id, sb_id, count);

	rc = 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);
@@ -1478,7 +1478,7 @@ 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 unplugged.

 */

static int virtio_mem_mb_unplug_any_sb_online(struct virtio_mem *vm,

static int virtio_mem_sbm_unplug_any_sb_online(struct virtio_mem *vm,

					       unsigned long mb_id,

					       uint64_t *nb_sb)

{
@@ -1487,7 +1487,7 @@ static int virtio_mem_mb_unplug_any_sb_online(struct virtio_mem *vm, 
	/* If possible, try to unplug the complete block in one shot. */

	if (*nb_sb >= vm->sbm.sbs_per_mb &&

	    virtio_mem_sbm_test_sb_plugged(vm, mb_id, 0, vm->sbm.sbs_per_mb)) {

		rc = virtio_mem_mb_unplug_sb_online(vm, mb_id, 0,

		rc = virtio_mem_sbm_unplug_sb_online(vm, mb_id, 0,

						     vm->sbm.sbs_per_mb);

		if (!rc) {

			*nb_sb -= vm->sbm.sbs_per_mb;
@@ -1505,7 +1505,7 @@ static int virtio_mem_mb_unplug_any_sb_online(struct virtio_mem *vm, 
		if (sb_id < 0)

			break;



		rc = virtio_mem_mb_unplug_sb_online(vm, mb_id, sb_id, 1);

		rc = virtio_mem_sbm_unplug_sb_online(vm, mb_id, sb_id, 1);

		if (rc == -EBUSY)

			continue;

		else if (rc)
@@ -1553,8 +1553,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 = virtio_mem_mb_unplug_any_sb_offline(vm, mb_id,

							 &nb_sb);

		rc = virtio_mem_sbm_unplug_any_sb_offline(vm, mb_id, &nb_sb);

		if (rc || !nb_sb)

			goto out_unlock;

		cond_resched();
@@ -1562,8 +1561,7 @@ static int virtio_mem_unplug_request(struct virtio_mem *vm, uint64_t diff) 


	/* Try to unplug subblocks of plugged offline blocks. */

	virtio_mem_sbm_for_each_mb_rev(vm, mb_id, VIRTIO_MEM_SBM_MB_OFFLINE) {

		rc = virtio_mem_mb_unplug_any_sb_offline(vm, mb_id,

							 &nb_sb);

		rc = virtio_mem_sbm_unplug_any_sb_offline(vm, mb_id, &nb_sb);

		if (rc || !nb_sb)

			goto out_unlock;

		cond_resched();
@@ -1577,8 +1575,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 = virtio_mem_mb_unplug_any_sb_online(vm, mb_id,

							&nb_sb);

		rc = virtio_mem_sbm_unplug_any_sb_online(vm, mb_id, &nb_sb);

		if (rc || !nb_sb)

			goto out_unlock;

		mutex_unlock(&vm->hotplug_mutex);
@@ -1588,8 +1585,7 @@ static int virtio_mem_unplug_request(struct virtio_mem *vm, uint64_t diff) 


	/* Try to unplug subblocks of plugged online blocks. */

	virtio_mem_sbm_for_each_mb_rev(vm, mb_id, VIRTIO_MEM_SBM_MB_ONLINE) {

		rc = virtio_mem_mb_unplug_any_sb_online(vm, mb_id,

							&nb_sb);

		rc = virtio_mem_sbm_unplug_any_sb_online(vm, mb_id, &nb_sb);

		if (rc || !nb_sb)

			goto out_unlock;

		mutex_unlock(&vm->hotplug_mutex);
@@ -1614,7 +1610,7 @@ static int virtio_mem_unplug_pending_mb(struct virtio_mem *vm) 
	int rc;



	virtio_mem_sbm_for_each_mb(vm, mb_id, VIRTIO_MEM_SBM_MB_PLUGGED) {

		rc = virtio_mem_mb_unplug(vm, mb_id);

		rc = virtio_mem_sbm_unplug_mb(vm, mb_id);

		if (rc)

			return rc;

		virtio_mem_sbm_set_mb_state(vm, mb_id,