Commit e14c779a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 's390-5.13-4' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux 

Pull s390 fixes from Vasily Gorbik:

 - Fix zcrypt ioctl hang due to AP queue msg counter dropping below 0
   when pending requests are purged.

 - Two fixes for the machine check handler in the entry code.

* tag 's390-5.13-4' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
  s390/ap: Fix hanging ioctl caused by wrong msg counter
  s390/mcck: fix invalid KVM guest condition check
  s390/mcck: fix calculation of SIE critical section size
parents 9ed13a17 e73a99f3

arch/s390/kernel/entry.S

+2 −2
Original line number Diff line number Diff line
@@ -651,9 +651,9 @@ ENDPROC(stack_overflow) 
.Lcleanup_sie_mcck:

	larl	%r13,.Lsie_entry

	slgr	%r9,%r13

	larl	%r13,.Lsie_skip

	lghi	%r13,.Lsie_skip - .Lsie_entry

	clgr	%r9,%r13

	jh	.Lcleanup_sie_int

	jhe	.Lcleanup_sie_int

	oi	__LC_CPU_FLAGS+7, _CIF_MCCK_GUEST

.Lcleanup_sie_int:

	BPENTER	__SF_SIE_FLAGS(%r15),(_TIF_ISOLATE_BP|_TIF_ISOLATE_BP_GUEST)

drivers/s390/crypto/ap_queue.c

+9 −2
Original line number Diff line number Diff line
@@ -135,12 +135,13 @@ static struct ap_queue_status ap_sm_recv(struct ap_queue *aq) 
{

	struct ap_queue_status status;

	struct ap_message *ap_msg;

	bool found = false;



	status = ap_dqap(aq->qid, &aq->reply->psmid,

			 aq->reply->msg, aq->reply->len);

	switch (status.response_code) {

	case AP_RESPONSE_NORMAL:

		aq->queue_count--;

		aq->queue_count = max_t(int, 0, aq->queue_count - 1);

		if (aq->queue_count > 0)

			mod_timer(&aq->timeout,

				  jiffies + aq->request_timeout);
@@ -150,8 +151,14 @@ static struct ap_queue_status ap_sm_recv(struct ap_queue *aq) 
			list_del_init(&ap_msg->list);

			aq->pendingq_count--;

			ap_msg->receive(aq, ap_msg, aq->reply);

			found = true;

			break;

		}

		if (!found) {

			AP_DBF_WARN("%s unassociated reply psmid=0x%016llx on 0x%02x.%04x\n",

				    __func__, aq->reply->psmid,

				    AP_QID_CARD(aq->qid), AP_QID_QUEUE(aq->qid));

		}

		fallthrough;

	case AP_RESPONSE_NO_PENDING_REPLY:

		if (!status.queue_empty || aq->queue_count <= 0)
@@ -232,7 +239,7 @@ static enum ap_sm_wait ap_sm_write(struct ap_queue *aq) 
			   ap_msg->flags & AP_MSG_FLAG_SPECIAL);

	switch (status.response_code) {

	case AP_RESPONSE_NORMAL:

		aq->queue_count++;

		aq->queue_count = max_t(int, 1, aq->queue_count + 1);

		if (aq->queue_count == 1)

			mod_timer(&aq->timeout, jiffies + aq->request_timeout);

		list_move_tail(&ap_msg->list, &aq->pendingq);