linux-mm.kvack.org archive mirror
 help / color / mirror / Atom feed
From: David Hildenbrand <david@redhat.com>
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 <mhocko@kernel.org>,
	Andrew Morton <akpm@linux-foundation.org>,
	"Michael S . Tsirkin" <mst@redhat.com>,
	David Hildenbrand <david@redhat.com>,
	Jason Wang <jasowang@redhat.com>,
	Oscar Salvador <osalvador@suse.de>,
	Igor Mammedov <imammedo@redhat.com>,
	Dave Young <dyoung@redhat.com>,
	Dan Williams <dan.j.williams@intel.com>,
	Pavel Tatashin <pasha.tatashin@soleen.com>,
	Stefan Hajnoczi <stefanha@redhat.com>,
	Vlastimil Babka <vbabka@suse.cz>
Subject: [PATCH v1 10/11] virtio-mem: Better retry handling
Date: Mon,  2 Mar 2020 14:49:40 +0100	[thread overview]
Message-ID: <20200302134941.315212-11-david@redhat.com> (raw)
In-Reply-To: <20200302134941.315212-1-david@redhat.com>

Let's start with a retry interval of 30 seconds and double the time until
we reach 30 minutes, in case we keep getting errors. Reset the retry
interval in case we succeeded.

Cc: "Michael S. Tsirkin" <mst@redhat.com>
Cc: Jason Wang <jasowang@redhat.com>
Cc: Oscar Salvador <osalvador@suse.de>
Cc: Michal Hocko <mhocko@kernel.org>
Cc: Igor Mammedov <imammedo@redhat.com>
Cc: Dave Young <dyoung@redhat.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Dan Williams <dan.j.williams@intel.com>
Cc: Pavel Tatashin <pasha.tatashin@soleen.com>
Cc: Stefan Hajnoczi <stefanha@redhat.com>
Cc: Vlastimil Babka <vbabka@suse.cz>
Signed-off-by: David Hildenbrand <david@redhat.com>
---
 drivers/virtio/virtio_mem.c | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/drivers/virtio/virtio_mem.c b/drivers/virtio/virtio_mem.c
index 0274527ac517..8992d0d0e5da 100644
--- a/drivers/virtio/virtio_mem.c
+++ b/drivers/virtio/virtio_mem.c
@@ -138,7 +138,9 @@ struct virtio_mem {
 
 	/* Timer for retrying to plug/unplug memory. */
 	struct hrtimer retry_timer;
-#define VIRTIO_MEM_RETRY_TIMER_MS		30000
+	unsigned int retry_timer_ms;
+#define VIRTIO_MEM_RETRY_TIMER_MIN_MS		30000
+#define VIRTIO_MEM_RETRY_TIMER_MAX_MS		1800000
 
 	/* Memory notifier (online/offline events). */
 	struct notifier_block memory_notifier;
@@ -1544,6 +1546,7 @@ static void virtio_mem_run_wq(struct work_struct *work)
 
 	switch (rc) {
 	case 0:
+		vm->retry_timer_ms = VIRTIO_MEM_RETRY_TIMER_MIN_MS;
 		break;
 	case -ENOSPC:
 		/*
@@ -1559,8 +1562,7 @@ static void virtio_mem_run_wq(struct work_struct *work)
 		 */
 	case -ENOMEM:
 		/* Out of memory, try again later. */
-		hrtimer_start(&vm->retry_timer,
-			      ms_to_ktime(VIRTIO_MEM_RETRY_TIMER_MS),
+		hrtimer_start(&vm->retry_timer, ms_to_ktime(vm->retry_timer_ms),
 			      HRTIMER_MODE_REL);
 		break;
 	case -EAGAIN:
@@ -1580,6 +1582,8 @@ static enum hrtimer_restart virtio_mem_timer_expired(struct hrtimer *timer)
 					     retry_timer);
 
 	virtio_mem_retry(vm);
+	vm->retry_timer_ms = min_t(unsigned int, vm->retry_timer_ms * 2,
+				   VIRTIO_MEM_RETRY_TIMER_MAX_MS);
 	return HRTIMER_NORESTART;
 }
 
@@ -1746,6 +1750,7 @@ static int virtio_mem_probe(struct virtio_device *vdev)
 	spin_lock_init(&vm->removal_lock);
 	hrtimer_init(&vm->retry_timer, CLOCK_MONOTONIC, HRTIMER_MODE_REL);
 	vm->retry_timer.function = virtio_mem_timer_expired;
+	vm->retry_timer_ms = VIRTIO_MEM_RETRY_TIMER_MIN_MS;
 
 	/* register the virtqueue */
 	rc = virtio_mem_init_vq(vm);
-- 
2.24.1



  parent reply	other threads:[~2020-03-02 13:53 UTC|newest]

Thread overview: 30+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-03-02 13:49 [PATCH v1 00/11] virtio-mem: paravirtualized memory David Hildenbrand
2020-03-02 13:49 ` [PATCH v1 01/11] ACPI: NUMA: export pxm_to_node David Hildenbrand
2020-03-02 14:03   ` Michal Hocko
2020-03-02 14:09     ` David Hildenbrand
2020-03-02 13:49 ` [PATCH v1 02/11] virtio-mem: Paravirtualized memory hotplug David Hildenbrand
2020-03-03  2:24   ` kbuild test robot
2020-03-03  8:06     ` David Hildenbrand
2020-03-02 13:49 ` [PATCH v1 03/11] virtio-mem: Paravirtualized memory hotunplug part 1 David Hildenbrand
2020-03-02 13:49 ` [PATCH v1 04/11] mm: Export alloc_contig_range() / free_contig_range() David Hildenbrand
2020-03-02 14:05   ` Michal Hocko
2020-03-02 14:17     ` David Hildenbrand
2020-03-02 13:49 ` [PATCH v1 05/11] virtio-mem: Paravirtualized memory hotunplug part 2 David Hildenbrand
2020-03-02 13:49 ` [PATCH v1 06/11] mm: Allow to offline unmovable PageOffline() pages via MEM_GOING_OFFLINE David Hildenbrand
2020-03-02 17:40   ` Alexander Duyck
2020-03-02 18:41     ` David Hildenbrand
2020-03-10 11:47   ` Michal Hocko
2020-03-10 11:48     ` David Hildenbrand
2020-03-02 13:49 ` [PATCH v1 07/11] virtio-mem: Allow to offline partially unplugged memory blocks David Hildenbrand
2020-03-10 11:43   ` Michal Hocko
2020-03-10 11:46     ` David Hildenbrand
2020-03-10 11:59       ` Michal Hocko
2020-03-10 12:09         ` David Hildenbrand
2020-03-02 13:49 ` [PATCH v1 08/11] mm/memory_hotplug: Introduce offline_and_remove_memory() David Hildenbrand
2020-03-02 14:27   ` Michal Hocko
2020-03-02 13:49 ` [PATCH v1 09/11] virtio-mem: Offline and remove completely unplugged memory blocks David Hildenbrand
2020-03-02 13:49 ` David Hildenbrand [this message]
2020-03-02 13:49 ` [PATCH v1 11/11] MAINTAINERS: Add myself as virtio-mem maintainer David Hildenbrand
2020-03-02 18:15 ` [PATCH v1 00/11] virtio-mem: paravirtualized memory David Hildenbrand
2020-03-02 18:29   ` Michal Hocko
2020-03-02 18:41     ` David Hildenbrand

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20200302134941.315212-11-david@redhat.com \
    --to=david@redhat.com \
    --cc=akpm@linux-foundation.org \
    --cc=dan.j.williams@intel.com \
    --cc=dyoung@redhat.com \
    --cc=imammedo@redhat.com \
    --cc=jasowang@redhat.com \
    --cc=kvm@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-mm@kvack.org \
    --cc=mhocko@kernel.org \
    --cc=mst@redhat.com \
    --cc=osalvador@suse.de \
    --cc=pasha.tatashin@soleen.com \
    --cc=stefanha@redhat.com \
    --cc=vbabka@suse.cz \
    --cc=virtio-dev@lists.oasis-open.org \
    --cc=virtualization@lists.linux-foundation.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).