From patchwork Tue Dec 7 20:38:47 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Frank Heimes X-Patchwork-Id: 1564871 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=canonical.com header.i=@canonical.com header.a=rsa-sha256 header.s=20210705 header.b=g4XuL786; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4J7sbM2YZ4z9ssD for ; Wed, 8 Dec 2021 07:39:10 +1100 (AEDT) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1muhEo-0003hZ-8d; Tue, 07 Dec 2021 20:38:58 +0000 Received: from smtp-relay-canonical-0.internal ([10.131.114.83] helo=smtp-relay-canonical-0.canonical.com) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1muhEl-0003gc-Kj for kernel-team@lists.ubuntu.com; Tue, 07 Dec 2021 20:38:55 +0000 Received: from T570.fritz.box (p54abb5f9.dip0.t-ipconnect.de [84.171.181.249]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-canonical-0.canonical.com (Postfix) with ESMTPSA id 6AFC13FFE1 for ; Tue, 7 Dec 2021 20:38:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1638909535; bh=nV/s35vAVJ5KKoUKkZpZWGoIXag51xclsjQqB+f2ncY=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=g4XuL786iLub1KnLQxlq7T70/Z/6AVKcB5CQiY274kbhPiCn7aY+YaBxHQiEeh1/5 jfzUR2TLjnrIKtBifvnjv0xBpmnKljfJa4L7oAWYrW34hwQ2ubZWtg5/FfjCjXRidE Hm8xCkLv5WonhI0illy74ndLllmnO9E7UhSkKYIcRLE1rZrmvYcJHquxQq1B/STDXT iaVS3beSSJWdoS8V5igmfJgEMJgbdaLp93tVYuh+tPRUAl38Et+77/4VmogxxCSeDI bxAU4y674KI4asBp7vfSc1618yR1iCos6ib4I8C/2xwMiIfSRp5o0V2v1IbMPNOZbG zKftKfBhXxubA== From: frank.heimes@canonical.com To: kernel-team@lists.ubuntu.com Subject: [SRU][F][PATCH 3/4] KVM: s390: remove diag318 reset code Date: Tue, 7 Dec 2021 21:38:47 +0100 Message-Id: <20211207203850.3212728-4-frank.heimes@canonical.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211207203850.3212728-1-frank.heimes@canonical.com> References: <20211207203850.3212728-1-frank.heimes@canonical.com> MIME-Version: 1.0 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" From: Collin Walling BugLink: https://bugs.launchpad.net/bugs/1953334 The diag318 data must be set to 0 by VM-wide reset events triggered by diag308. As such, KVM should not handle resetting this data via the VCPU ioctls. Fixes: 23a60f834406 ("s390/kvm: diagnose 0x318 sync and reset") Signed-off-by: Collin Walling Reviewed-by: Christian Borntraeger Reviewed-by: Janosch Frank Acked-by: Cornelia Huck Signed-off-by: Christian Borntraeger Link: https://lore.kernel.org/r/20201104181032.109800-1-walling@linux.ibm.com (backported from commit 6cbf1e960fa52e4c63a6dfa4cda8736375b34ccc) Signed-off-by: Frank Heimes --- arch/s390/kvm/kvm-s390.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/arch/s390/kvm/kvm-s390.c b/arch/s390/kvm/kvm-s390.c index a8adbe7ffc89..5dda764fa16b 100644 --- a/arch/s390/kvm/kvm-s390.c +++ b/arch/s390/kvm/kvm-s390.c @@ -3556,7 +3556,6 @@ static void kvm_arch_vcpu_ioctl_initial_reset(struct kvm_vcpu *vcpu) vcpu->arch.sie_block->pp = 0; vcpu->arch.sie_block->fpf &= ~FPF_BPBC; vcpu->arch.sie_block->todpr = 0; - vcpu->arch.sie_block->cpnc = 0; } } @@ -3574,7 +3573,6 @@ static void kvm_arch_vcpu_ioctl_clear_reset(struct kvm_vcpu *vcpu) regs->etoken = 0; regs->etoken_extension = 0; - regs->diag318 = 0; } int kvm_arch_vcpu_ioctl_set_regs(struct kvm_vcpu *vcpu, struct kvm_regs *regs)