From: Cornelia Huck <cohuck@redhat.com>
To: Heiko Carstens <heiko.carstens@de.ibm.com>,
Vasily Gorbik <gor@linux.ibm.com>,
Christian Borntraeger <borntraeger@de.ibm.com>
Cc: Farhan Ali <alifm@linux.ibm.com>,
Eric Farman <farman@linux.ibm.com>,
Halil Pasic <pasic@linux.ibm.com>,
linux-s390@vger.kernel.org, kvm@vger.kernel.org,
Cornelia Huck <cohuck@redhat.com>
Subject: [PULL 01/14] s390/cio: Squash cp_free() and cp_unpin_free()
Date: Fri, 21 Jun 2019 16:33:42 +0200 [thread overview]
Message-ID: <20190621143355.29175-2-cohuck@redhat.com> (raw)
In-Reply-To: <20190621143355.29175-1-cohuck@redhat.com>
From: Eric Farman <farman@linux.ibm.com>
The routine cp_free() does nothing but call cp_unpin_free(), and while
most places call cp_free() there is one caller of cp_unpin_free() used
when the cp is guaranteed to have not been marked initialized.
This seems like a dubious way to make a distinction, so let's combine
these routines and make cp_free() do all the work.
Signed-off-by: Eric Farman <farman@linux.ibm.com>
Reviewed-by: Cornelia Huck <cohuck@redhat.com>
Message-Id: <20190606202831.44135-2-farman@linux.ibm.com>
Signed-off-by: Cornelia Huck <cohuck@redhat.com>
---
drivers/s390/cio/vfio_ccw_cp.c | 36 +++++++++++++++-------------------
1 file changed, 16 insertions(+), 20 deletions(-)
diff --git a/drivers/s390/cio/vfio_ccw_cp.c b/drivers/s390/cio/vfio_ccw_cp.c
index f73cfcfdd032..47cd7f94f42f 100644
--- a/drivers/s390/cio/vfio_ccw_cp.c
+++ b/drivers/s390/cio/vfio_ccw_cp.c
@@ -412,23 +412,6 @@ static void ccwchain_cda_free(struct ccwchain *chain, int idx)
kfree((void *)(u64)ccw->cda);
}
-/* Unpin the pages then free the memory resources. */
-static void cp_unpin_free(struct channel_program *cp)
-{
- struct ccwchain *chain, *temp;
- int i;
-
- cp->initialized = false;
- list_for_each_entry_safe(chain, temp, &cp->ccwchain_list, next) {
- for (i = 0; i < chain->ch_len; i++) {
- pfn_array_table_unpin_free(chain->ch_pat + i,
- cp->mdev);
- ccwchain_cda_free(chain, i);
- }
- ccwchain_free(chain);
- }
-}
-
/**
* ccwchain_calc_length - calculate the length of the ccw chain.
* @iova: guest physical address of the target ccw chain
@@ -796,7 +779,7 @@ int cp_init(struct channel_program *cp, struct device *mdev, union orb *orb)
/* Now loop for its TICs. */
ret = ccwchain_loop_tic(chain, cp);
if (ret)
- cp_unpin_free(cp);
+ cp_free(cp);
/* It is safe to force: if not set but idals used
* ccwchain_calc_length returns an error.
*/
@@ -819,8 +802,21 @@ int cp_init(struct channel_program *cp, struct device *mdev, union orb *orb)
*/
void cp_free(struct channel_program *cp)
{
- if (cp->initialized)
- cp_unpin_free(cp);
+ struct ccwchain *chain, *temp;
+ int i;
+
+ if (!cp->initialized)
+ return;
+
+ cp->initialized = false;
+ list_for_each_entry_safe(chain, temp, &cp->ccwchain_list, next) {
+ for (i = 0; i < chain->ch_len; i++) {
+ pfn_array_table_unpin_free(chain->ch_pat + i,
+ cp->mdev);
+ ccwchain_cda_free(chain, i);
+ }
+ ccwchain_free(chain);
+ }
}
/**
--
2.20.1
next prev parent reply other threads:[~2019-06-21 14:34 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-06-21 14:33 [PULL 00/14] more vfio-ccw updates for 5.3 Cornelia Huck
2019-06-21 14:33 ` Cornelia Huck [this message]
2019-06-21 14:33 ` [PULL 02/14] s390/cio: Refactor the routine that handles TIC CCWs Cornelia Huck
2019-06-21 14:33 ` [PULL 03/14] s390/cio: Generalize the TIC handler Cornelia Huck
2019-06-21 14:33 ` [PULL 04/14] s390/cio: Use generalized CCW handler in cp_init() Cornelia Huck
2019-06-21 14:33 ` [PULL 05/14] vfio-ccw: Rearrange pfn_array and pfn_array_table arrays Cornelia Huck
2019-06-21 14:33 ` [PULL 06/14] vfio-ccw: Adjust the first IDAW outside of the nested loops Cornelia Huck
2019-06-21 14:33 ` [PULL 07/14] vfio-ccw: Remove pfn_array_table Cornelia Huck
2019-06-21 19:13 ` Eric Farman
2019-06-21 14:33 ` [PULL 08/14] vfio-ccw: Rearrange IDAL allocation in direct CCW Cornelia Huck
2019-06-21 14:33 ` [PULL 09/14] s390/cio: Combine direct and indirect CCW paths Cornelia Huck
2019-06-21 14:33 ` [PULL 10/14] vfio-ccw: Move guest_cp storage into common struct Cornelia Huck
2019-06-21 14:33 ` [PULL 11/14] vfio-ccw: Skip second copy of guest cp to host Cornelia Huck
2019-06-21 14:33 ` [PULL 12/14] vfio-ccw: Copy CCW data outside length calculation Cornelia Huck
2019-06-21 14:33 ` [PULL 13/14] vfio-ccw: Factor out the ccw0-to-ccw1 transition Cornelia Huck
2019-06-21 19:13 ` Eric Farman
2019-06-22 8:38 ` Heiko Carstens
2019-06-21 14:33 ` [PULL 14/14] vfio-ccw: Remove copy_ccw_from_iova() Cornelia Huck
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=20190621143355.29175-2-cohuck@redhat.com \
--to=cohuck@redhat.com \
--cc=alifm@linux.ibm.com \
--cc=borntraeger@de.ibm.com \
--cc=farman@linux.ibm.com \
--cc=gor@linux.ibm.com \
--cc=heiko.carstens@de.ibm.com \
--cc=kvm@vger.kernel.org \
--cc=linux-s390@vger.kernel.org \
--cc=pasic@linux.ibm.com \
/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).