Merge tag 'kvm-ppc-next-5.5-2' of... (96710247) · Commits · 戴 / test

arch/powerpc/kvm/book3s_xive_native.c

+29 −15

Original line number	Diff line number	Diff line
		@@ -50,6 +50,24 @@ static void kvmppc_xive_native_cleanup_queue(struct kvm_vcpu *vcpu, int prio)
		}
		}

		static int kvmppc_xive_native_configure_queue(u32 vp_id, struct xive_q *q,
		u8 prio, __be32 *qpage,
		u32 order, bool can_escalate)
		{
		int rc;
		__be32 *qpage_prev = q->qpage;

		rc = xive_native_configure_queue(vp_id, q, prio, qpage, order,
		can_escalate);
		if (rc)
		return rc;

		if (qpage_prev)
		put_page(virt_to_page(qpage_prev));

		return rc;
		}

		void kvmppc_xive_native_cleanup_vcpu(struct kvm_vcpu *vcpu)
		{
		struct kvmppc_xive_vcpu *xc = vcpu->arch.xive_vcpu;
		@@ -575,7 +593,7 @@ static int kvmppc_xive_native_set_queue_config(struct kvmppc_xive *xive,
		q->guest_qaddr = 0;
		q->guest_qshift = 0;

		rc = xive_native_configure_queue(xc->vp_id, q, priority,
		rc = kvmppc_xive_native_configure_queue(xc->vp_id, q, priority,
		NULL, 0, true);
		if (rc) {
		pr_err("Failed to reset queue %d for VCPU %d: %d\n",
		@@ -583,11 +601,6 @@ static int kvmppc_xive_native_set_queue_config(struct kvmppc_xive *xive,
		return rc;
		}

		if (q->qpage) {
		put_page(virt_to_page(q->qpage));
		q->qpage = NULL;
		}

		return 0;
		}

		@@ -617,12 +630,6 @@ static int kvmppc_xive_native_set_queue_config(struct kvmppc_xive *xive,

		srcu_idx = srcu_read_lock(&kvm->srcu);
		gfn = gpa_to_gfn(kvm_eq.qaddr);
		page = gfn_to_page(kvm, gfn);
		if (is_error_page(page)) {
		srcu_read_unlock(&kvm->srcu, srcu_idx);
		pr_err("Couldn't get queue page %llx!\n", kvm_eq.qaddr);
		return -EINVAL;
		}

		page_size = kvm_host_page_size(kvm, gfn);
		if (1ull << kvm_eq.qshift > page_size) {
		@@ -631,6 +638,13 @@ static int kvmppc_xive_native_set_queue_config(struct kvmppc_xive *xive,
		return -EINVAL;
		}

		page = gfn_to_page(kvm, gfn);
		if (is_error_page(page)) {
		srcu_read_unlock(&kvm->srcu, srcu_idx);
		pr_err("Couldn't get queue page %llx!\n", kvm_eq.qaddr);
		return -EINVAL;
		}

		qaddr = page_to_virt(page) + (kvm_eq.qaddr & ~PAGE_MASK);
		srcu_read_unlock(&kvm->srcu, srcu_idx);

		@@ -646,7 +660,7 @@ static int kvmppc_xive_native_set_queue_config(struct kvmppc_xive *xive,
		* OPAL level because the use of END ESBs is not supported by
		* Linux.
		*/
		rc = xive_native_configure_queue(xc->vp_id, q, priority,
		rc = kvmppc_xive_native_configure_queue(xc->vp_id, q, priority,
		(__be32 *) qaddr, kvm_eq.qshift, true);
		if (rc) {
		pr_err("Failed to configure queue %d for VCPU %d: %d\n",

Admin message