From: David Hildenbrand <david@redhat.com> To: linux-kernel@vger.kernel.org Cc: linux-mm@kvack.org, virtualization@lists.linux-foundation.org, Andrew Morton <akpm@linux-foundation.org>, "Michael S . Tsirkin" <mst@redhat.com>, David Hildenbrand <david@redhat.com>, Jason Wang <jasowang@redhat.com>, Pankaj Gupta <pankaj.gupta.linux@gmail.com> Subject: [PATCH v1 04/29] virtio-mem: drop rc2 in virtio_mem_mb_plug_and_add() Date: Mon, 12 Oct 2020 14:52:58 +0200 [thread overview] Message-ID: <20201012125323.17509-5-david@redhat.com> (raw) In-Reply-To: <20201012125323.17509-1-david@redhat.com> We can drop rc2, we don't actually need the value. Cc: "Michael S. Tsirkin" <mst@redhat.com> Cc: Jason Wang <jasowang@redhat.com> Cc: Pankaj Gupta <pankaj.gupta.linux@gmail.com> Signed-off-by: David Hildenbrand <david@redhat.com> --- drivers/virtio/virtio_mem.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/virtio/virtio_mem.c b/drivers/virtio/virtio_mem.c index 78c2fbcddcf8..b3eebac7191f 100644 --- a/drivers/virtio/virtio_mem.c +++ b/drivers/virtio/virtio_mem.c @@ -1072,7 +1072,7 @@ static int virtio_mem_mb_plug_and_add(struct virtio_mem *vm, uint64_t *nb_sb) { const int count = min_t(int, *nb_sb, vm->nb_sb_per_mb); - int rc, rc2; + int rc; if (WARN_ON_ONCE(!count)) return -EINVAL; @@ -1103,13 +1103,12 @@ static int virtio_mem_mb_plug_and_add(struct virtio_mem *vm, dev_err(&vm->vdev->dev, "adding memory block %lu failed with %d\n", mb_id, rc); - rc2 = virtio_mem_mb_unplug_sb(vm, mb_id, 0, count); /* * TODO: Linux MM does not properly clean up yet in all cases * where adding of memory failed - especially on -ENOMEM. */ - if (rc2) + if (virtio_mem_mb_unplug_sb(vm, mb_id, 0, count)) new_state = VIRTIO_MEM_MB_STATE_PLUGGED; virtio_mem_mb_set_state(vm, mb_id, new_state); return rc; -- 2.26.2
WARNING: multiple messages have this Message-ID (diff)
From: David Hildenbrand <david@redhat.com> To: linux-kernel@vger.kernel.org Cc: Pankaj Gupta <pankaj.gupta.linux@gmail.com>, "Michael S . Tsirkin" <mst@redhat.com>, virtualization@lists.linux-foundation.org, linux-mm@kvack.org, Andrew Morton <akpm@linux-foundation.org> Subject: [PATCH v1 04/29] virtio-mem: drop rc2 in virtio_mem_mb_plug_and_add() Date: Mon, 12 Oct 2020 14:52:58 +0200 [thread overview] Message-ID: <20201012125323.17509-5-david@redhat.com> (raw) In-Reply-To: <20201012125323.17509-1-david@redhat.com> We can drop rc2, we don't actually need the value. Cc: "Michael S. Tsirkin" <mst@redhat.com> Cc: Jason Wang <jasowang@redhat.com> Cc: Pankaj Gupta <pankaj.gupta.linux@gmail.com> Signed-off-by: David Hildenbrand <david@redhat.com> --- drivers/virtio/virtio_mem.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/virtio/virtio_mem.c b/drivers/virtio/virtio_mem.c index 78c2fbcddcf8..b3eebac7191f 100644 --- a/drivers/virtio/virtio_mem.c +++ b/drivers/virtio/virtio_mem.c @@ -1072,7 +1072,7 @@ static int virtio_mem_mb_plug_and_add(struct virtio_mem *vm, uint64_t *nb_sb) { const int count = min_t(int, *nb_sb, vm->nb_sb_per_mb); - int rc, rc2; + int rc; if (WARN_ON_ONCE(!count)) return -EINVAL; @@ -1103,13 +1103,12 @@ static int virtio_mem_mb_plug_and_add(struct virtio_mem *vm, dev_err(&vm->vdev->dev, "adding memory block %lu failed with %d\n", mb_id, rc); - rc2 = virtio_mem_mb_unplug_sb(vm, mb_id, 0, count); /* * TODO: Linux MM does not properly clean up yet in all cases * where adding of memory failed - especially on -ENOMEM. */ - if (rc2) + if (virtio_mem_mb_unplug_sb(vm, mb_id, 0, count)) new_state = VIRTIO_MEM_MB_STATE_PLUGGED; virtio_mem_mb_set_state(vm, mb_id, new_state); return rc; -- 2.26.2 _______________________________________________ Virtualization mailing list Virtualization@lists.linux-foundation.org https://lists.linuxfoundation.org/mailman/listinfo/virtualization
next prev parent reply other threads:[~2020-10-12 12:54 UTC|newest] Thread overview: 175+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-10-12 12:52 [PATCH v1 00/29] virtio-mem: Big Block Mode (BBM) David Hildenbrand 2020-10-12 12:52 ` David Hildenbrand 2020-10-12 12:52 ` [PATCH v1 01/29] virtio-mem: determine nid only once using memory_add_physaddr_to_nid() David Hildenbrand 2020-10-12 12:52 ` David Hildenbrand 2020-10-15 3:56 ` Wei Yang 2020-10-15 19:26 ` Pankaj Gupta 2020-10-15 19:26 ` Pankaj Gupta 2020-10-12 12:52 ` [PATCH v1 02/29] virtio-mem: simplify calculation in virtio_mem_mb_state_prepare_next_mb() David Hildenbrand 2020-10-12 12:52 ` David Hildenbrand 2020-10-15 4:02 ` Wei Yang 2020-10-15 8:00 ` David Hildenbrand 2020-10-15 8:00 ` David Hildenbrand 2020-10-15 10:00 ` Wei Yang 2020-10-15 10:01 ` David Hildenbrand 2020-10-15 10:01 ` David Hildenbrand 2020-10-15 20:24 ` Pankaj Gupta 2020-10-15 20:24 ` Pankaj Gupta 2020-10-16 9:00 ` David Hildenbrand 2020-10-16 9:00 ` David Hildenbrand 2020-10-12 12:52 ` [PATCH v1 03/29] virtio-mem: simplify MAX_ORDER - 1 / pageblock_order handling David Hildenbrand 2020-10-12 12:52 ` David Hildenbrand 2020-10-15 7:06 ` Wei Yang 2020-10-12 12:52 ` David Hildenbrand [this message] 2020-10-12 12:52 ` [PATCH v1 04/29] virtio-mem: drop rc2 in virtio_mem_mb_plug_and_add() David Hildenbrand 2020-10-12 13:09 ` Pankaj Gupta 2020-10-12 13:09 ` Pankaj Gupta 2020-10-15 7:14 ` Wei Yang 2020-10-12 12:52 ` [PATCH v1 05/29] virtio-mem: generalize check for added memory David Hildenbrand 2020-10-12 12:52 ` David Hildenbrand 2020-10-15 8:28 ` Wei Yang 2020-10-15 8:50 ` David Hildenbrand 2020-10-15 8:50 ` David Hildenbrand 2020-10-16 2:16 ` Wei Yang 2020-10-16 9:11 ` David Hildenbrand 2020-10-16 9:11 ` David Hildenbrand 2020-10-16 10:02 ` Wei Yang 2020-10-16 10:32 ` David Hildenbrand 2020-10-16 10:32 ` David Hildenbrand 2020-10-16 22:38 ` Wei Yang 2020-10-17 7:39 ` David Hildenbrand 2020-10-17 7:39 ` David Hildenbrand 2020-10-18 12:27 ` Wei Yang 2020-10-16 22:39 ` Wei Yang 2020-10-12 12:53 ` [PATCH v1 06/29] virtio-mem: generalize virtio_mem_owned_mb() David Hildenbrand 2020-10-12 12:53 ` David Hildenbrand 2020-10-15 8:32 ` Wei Yang 2020-10-15 8:37 ` David Hildenbrand 2020-10-15 8:37 ` David Hildenbrand 2020-10-15 20:30 ` Pankaj Gupta 2020-10-15 20:30 ` Pankaj Gupta 2020-10-12 12:53 ` [PATCH v1 07/29] virtio-mem: generalize virtio_mem_overlaps_range() David Hildenbrand 2020-10-12 12:53 ` David Hildenbrand 2020-10-20 9:22 ` Pankaj Gupta 2020-10-20 9:22 ` Pankaj Gupta 2020-10-12 12:53 ` [PATCH v1 08/29] virtio-mem: drop last_mb_id David Hildenbrand 2020-10-12 12:53 ` David Hildenbrand 2020-10-15 8:35 ` Wei Yang 2020-10-15 20:32 ` Pankaj Gupta 2020-10-15 20:32 ` Pankaj Gupta 2020-10-12 12:53 ` [PATCH v1 09/29] virtio-mem: don't always trigger the workqueue when offlining memory David Hildenbrand 2020-10-12 12:53 ` David Hildenbrand 2020-10-16 4:03 ` Wei Yang 2020-10-16 9:18 ` David Hildenbrand 2020-10-16 9:18 ` David Hildenbrand 2020-10-18 3:57 ` Wei Yang 2020-10-19 9:04 ` David Hildenbrand 2020-10-19 9:04 ` David Hildenbrand 2020-10-20 0:41 ` Wei Yang 2020-10-20 9:09 ` David Hildenbrand 2020-10-20 9:09 ` David Hildenbrand 2020-10-12 12:53 ` [PATCH v1 10/29] virtio-mem: generalize handling when memory is getting onlined deferred David Hildenbrand 2020-10-12 12:53 ` David Hildenbrand 2020-10-12 12:53 ` [PATCH v1 11/29] virtio-mem: use "unsigned long" for nr_pages when fake onlining/offlining David Hildenbrand 2020-10-12 12:53 ` David Hildenbrand 2020-10-15 20:31 ` Pankaj Gupta 2020-10-15 20:31 ` Pankaj Gupta 2020-10-16 6:11 ` Wei Yang 2020-10-12 12:53 ` [PATCH v1 12/29] virtio-mem: factor out fake-offlining into virtio_mem_fake_offline() David Hildenbrand 2020-10-12 12:53 ` David Hildenbrand 2020-10-16 6:24 ` Wei Yang 2020-10-20 9:31 ` Pankaj Gupta 2020-10-20 9:31 ` Pankaj Gupta 2020-10-12 12:53 ` [PATCH v1 13/29] virtio-mem: factor out handling of fake-offline pages in memory notifier David Hildenbrand 2020-10-12 12:53 ` David Hildenbrand 2020-10-16 7:15 ` Wei Yang 2020-10-16 8:00 ` Wei Yang 2020-10-16 8:57 ` David Hildenbrand 2020-10-16 8:57 ` David Hildenbrand 2020-10-18 12:37 ` Wei Yang 2020-10-18 12:38 ` Wei Yang 2020-10-12 12:53 ` [PATCH v1 14/29] virtio-mem: retry fake-offlining via alloc_contig_range() on ZONE_MOVABLE David Hildenbrand 2020-10-12 12:53 ` David Hildenbrand 2020-10-12 12:53 ` [PATCH v1 15/29] virito-mem: document Sub Block Mode (SBM) David Hildenbrand 2020-10-12 12:53 ` David Hildenbrand 2020-10-15 9:33 ` David Hildenbrand 2020-10-15 9:33 ` David Hildenbrand 2020-10-20 9:38 ` Pankaj Gupta 2020-10-20 9:38 ` Pankaj Gupta 2020-10-16 8:03 ` Wei Yang 2020-10-12 12:53 ` [PATCH v1 16/29] virtio-mem: memory block states are specific to " David Hildenbrand 2020-10-12 12:53 ` David Hildenbrand 2020-10-16 8:40 ` Wei Yang 2020-10-16 8:43 ` Wei Yang 2020-10-20 9:48 ` Pankaj Gupta 2020-10-20 9:48 ` Pankaj Gupta 2020-10-12 12:53 ` [PATCH v1 17/29] virito-mem: subblock " David Hildenbrand 2020-10-12 12:53 ` David Hildenbrand 2020-10-16 8:43 ` Wei Yang 2020-10-20 9:54 ` Pankaj Gupta 2020-10-20 9:54 ` Pankaj Gupta 2020-10-12 12:53 ` [PATCH v1 18/29] virtio-mem: factor out calculation of the bit number within the sb_states bitmap David Hildenbrand 2020-10-12 12:53 ` David Hildenbrand 2020-10-16 8:46 ` Wei Yang 2020-10-20 9:58 ` Pankaj Gupta 2020-10-20 9:58 ` Pankaj Gupta 2020-10-12 12:53 ` [PATCH v1 19/29] virito-mem: existing (un)plug functions are specific to Sub Block Mode (SBM) David Hildenbrand 2020-10-12 12:53 ` David Hildenbrand 2020-10-16 8:49 ` Wei Yang 2020-10-12 12:53 ` [PATCH v1 20/29] virtio-mem: nb_sb_per_mb and subblock_size " David Hildenbrand 2020-10-12 12:53 ` David Hildenbrand 2020-10-16 8:51 ` Wei Yang 2020-10-16 8:53 ` Wei Yang 2020-10-16 13:17 ` David Hildenbrand 2020-10-16 13:17 ` David Hildenbrand 2020-10-18 12:41 ` Wei Yang 2020-10-19 11:57 ` David Hildenbrand 2020-10-19 11:57 ` David Hildenbrand 2020-10-12 12:53 ` [PATCH v1 21/29] virtio-mem: memory notifier callbacks " David Hildenbrand 2020-10-12 12:53 ` David Hildenbrand 2020-10-19 1:57 ` Wei Yang 2020-10-19 10:22 ` David Hildenbrand 2020-10-19 10:22 ` David Hildenbrand 2020-10-12 12:53 ` [PATCH v1 22/29] virtio-mem: memory block ids " David Hildenbrand 2020-10-12 12:53 ` David Hildenbrand 2020-10-16 8:54 ` Wei Yang 2020-10-12 12:53 ` [PATCH v1 23/29] virtio-mem: factor out adding/removing memory from Linux David Hildenbrand 2020-10-12 12:53 ` David Hildenbrand 2020-10-16 8:59 ` Wei Yang 2020-10-12 12:53 ` [PATCH v1 24/29] virtio-mem: print debug messages from virtio_mem_send_*_request() David Hildenbrand 2020-10-12 12:53 ` David Hildenbrand 2020-10-16 9:07 ` Wei Yang 2020-10-12 12:53 ` [PATCH v1 25/29] virtio-mem: Big Block Mode (BBM) memory hotplug David Hildenbrand 2020-10-12 12:53 ` David Hildenbrand 2020-10-16 9:38 ` Wei Yang 2020-10-16 13:13 ` David Hildenbrand 2020-10-16 13:13 ` David Hildenbrand 2020-10-19 2:26 ` Wei Yang 2020-10-19 9:15 ` David Hildenbrand 2020-10-19 9:15 ` David Hildenbrand 2020-10-12 12:53 ` [PATCH v1 26/29] virtio-mem: allow to force Big Block Mode (BBM) and set the big block size David Hildenbrand 2020-10-12 12:53 ` David Hildenbrand 2020-10-12 12:53 ` [PATCH v1 27/29] mm/memory_hotplug: extend offline_and_remove_memory() to handle more than one memory block David Hildenbrand 2020-10-12 12:53 ` David Hildenbrand 2020-10-15 13:08 ` Michael S. Tsirkin 2020-10-15 13:08 ` Michael S. Tsirkin 2020-10-19 3:22 ` Wei Yang 2020-10-12 12:53 ` [PATCH v1 28/29] virtio-mem: Big Block Mode (BBM) - basic memory hotunplug David Hildenbrand 2020-10-12 12:53 ` David Hildenbrand 2020-10-19 3:48 ` Wei Yang 2020-10-19 9:12 ` David Hildenbrand 2020-10-19 9:12 ` David Hildenbrand 2020-10-12 12:53 ` [PATCH v1 29/29] virtio-mem: Big Block Mode (BBM) - safe " David Hildenbrand 2020-10-12 12:53 ` David Hildenbrand 2020-10-19 7:54 ` Wei Yang 2020-10-19 8:50 ` David Hildenbrand 2020-10-19 8:50 ` David Hildenbrand 2020-10-20 0:23 ` Wei Yang 2020-10-20 0:24 ` Wei Yang 2020-10-18 12:49 ` [PATCH v1 00/29] virtio-mem: Big Block Mode (BBM) Wei Yang 2020-10-18 16:35 ` David Hildenbrand 2020-10-18 16:35 ` David Hildenbrand 2020-10-18 15:29 ` Michael S. Tsirkin 2020-10-18 15:29 ` Michael S. Tsirkin 2020-10-18 16:34 ` David Hildenbrand 2020-10-18 16:34 ` 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=20201012125323.17509-5-david@redhat.com \ --to=david@redhat.com \ --cc=akpm@linux-foundation.org \ --cc=jasowang@redhat.com \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-mm@kvack.org \ --cc=mst@redhat.com \ --cc=pankaj.gupta.linux@gmail.com \ --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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.