Skip to contentSkip to conversation

s390/cio: Squash cp_free and cp_unpin_free

RFC PATCH Pierre Morel 1 participant 1 message Nov 14, 2018 1 message not in the archive s390

lore
Share & tools
lore

A message that is not in the archive (sent off-list or not yet received): [email protected]

Pierre Morel

author Reviewed-by
#1 lore raw
Quoted 56 lines · Eric Farman

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().

Let's avoid the confusion, and make cp_free() do all the work.

---
  drivers/s390/cio/vfio_ccw_cp.c | 30 ++++++++++++------------------
  1 file changed, 12 insertions(+), 18 deletions(-)
drivers/s390/cio/vfio_ccw_cp.c +5 -18
index 70a006ba4d05..a5a701451ef8 100644
@@ -329,22 +329,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;
-
-	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
@@ -695,7 +679,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.
  	 */
@@ -715,7 +699,17 @@ int cp_init(struct channel_program *cp, struct device *mdev, union orb *orb)
   */
  void cp_free(struct channel_program *cp)
  {
-	cp_unpin_free(cp);
+	struct ccwchain *chain, *temp;
+	int i;
+
+	list_for_each_entry_safe(chain, temp, &cp->ccwchain_list, next) {

drivers/s390/cio/vfio_ccw_cp.c int cp_init(struct channel_program *cp, struct device *mdev, union orb *orb) · line 715

Quoted 10 lines
drivers/s390/cio/vfio_ccw_cp.c +7 -0
+		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);
+	}
  }
 
  /**

LGTM

Signature · 2 lines
Pierre Morel
Linux/KVM/QEMU in B�blingen - Germany