All of lore.kernel.org
 help / color / mirror / Atom feed
From: Daniel Henrique Barboza <danielhb413@gmail.com>
To: qemu-devel@nongnu.org
Cc: Daniel Henrique Barboza <danielhb413@gmail.com>,
	qemu-ppc@nongnu.org, groug@kaod.org, david@gibson.dropbear.id.au
Subject: [PATCH 2/5] spapr.c: check unplug_request flag in spapr_memory_unplug_request()
Date: Fri, 26 Feb 2021 13:32:58 -0300	[thread overview]
Message-ID: <20210226163301.419727-3-danielhb413@gmail.com> (raw)
In-Reply-To: <20210226163301.419727-1-danielhb413@gmail.com>

Now that we're asserting the first DRC LMB earlier, use it to query if
the DRC is already pending unplug and, in this case, issue the same
error we already do.

The previous check was introduced in commit 2a129767ebb1 and it works,
but it's easier to check the unplug_requested  flag instead of looking
for the existence of the sPAPRDIMMState. It's also compliant with what
is already done in other unplug_request functions for other devices.

Signed-off-by: Daniel Henrique Barboza <danielhb413@gmail.com>
---
 hw/ppc/spapr.c | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c
index 74e046b522..149dc2113f 100644
--- a/hw/ppc/spapr.c
+++ b/hw/ppc/spapr.c
@@ -3681,13 +3681,7 @@ static void spapr_memory_unplug_request(HotplugHandler *hotplug_dev,
                                 addr_start / SPAPR_MEMORY_BLOCK_SIZE);
     g_assert(drc_start);
 
-    /*
-     * An existing pending dimm state for this DIMM means that there is an
-     * unplug operation in progress, waiting for the spapr_lmb_release
-     * callback to complete the job (BQL can't cover that far). In this case,
-     * bail out to avoid detaching DRCs that were already released.
-     */
-    if (spapr_pending_dimm_unplugs_find(spapr, dimm)) {
+    if (spapr_drc_unplug_requested(drc_start)) {
         error_setg(errp, "Memory unplug already in progress for device %s",
                    dev->id);
         return;
-- 
2.29.2



  parent reply	other threads:[~2021-02-26 16:46 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-02-26 16:32 [PATCH 0/5] send QAPI_EVENT_MEM_UNPLUG_ERROR for ppc64 unplugs Daniel Henrique Barboza
2021-02-26 16:32 ` [PATCH 1/5] spapr.c: assert first DRC LMB earlier in spapr_memory_unplug_request() Daniel Henrique Barboza
2021-03-01 14:11   ` Greg Kurz
2021-02-26 16:32 ` Daniel Henrique Barboza [this message]
2021-03-01 14:13   ` [PATCH 2/5] spapr.c: check unplug_request flag " Greg Kurz
2021-03-02  2:03   ` David Gibson
2021-03-02 10:39     ` Daniel Henrique Barboza
2021-02-26 16:32 ` [PATCH 3/5] spapr.c: add 'unplug already in progress' message for PHB unplug Daniel Henrique Barboza
2021-03-01 14:14   ` Greg Kurz
2021-03-02  2:06   ` David Gibson
2021-02-26 16:33 ` [PATCH 4/5] spapr_pci.c: add 'unplug already in progress' message for PCI unplug Daniel Henrique Barboza
2021-03-01 14:14   ` Greg Kurz
2021-03-02  2:08   ` David Gibson
2021-02-26 16:33 ` [PATCH 5/5] spapr.c: send QAPI event when memory hotunplug fails Daniel Henrique Barboza
2021-03-01 14:19   ` Greg Kurz
2021-03-02  2:11   ` David Gibson

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=20210226163301.419727-3-danielhb413@gmail.com \
    --to=danielhb413@gmail.com \
    --cc=david@gibson.dropbear.id.au \
    --cc=groug@kaod.org \
    --cc=qemu-devel@nongnu.org \
    --cc=qemu-ppc@nongnu.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 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.