Received: by 2002:a25:1985:0:0:0:0:0 with SMTP id 127csp1760165ybz; Sat, 18 Apr 2020 07:56:34 -0700 (PDT) X-Google-Smtp-Source: APiQypKjPyxaIE1S97W/vjHWWK1TtM7BNAIHvjuv6QrsYzCgs8ASC6qwgpus67i16VTOsQyzq/K3 X-Received: by 2002:aa7:cc03:: with SMTP id q3mr7600046edt.131.1587221794233; Sat, 18 Apr 2020 07:56:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1587221794; cv=none; d=google.com; s=arc-20160816; b=FqR+IW4nnRNrB0GaW7M2KRAV63MEwu6G+E66iF9rCL6E+FoKwn1WOFf7Ib6NqDSz7B wjRYlZc5NQ6oAWH4pCtpb0y8B1eVmpjpovW6DJUrehfwqI36YD7tABNbMtzQNbWXhtg1 C4Tlf0bRFyfqLJGkjgkAnjKfLMtQvVUA/7ykB+h+bKArLqOg5yEc6ZX1Gd+WJXlzze8x DZPALZXnXErJD0xRQekK7/1NUu0rEYV59EqQnx12H5RdBfWeWXJPOlqfoOWKtrsGUSWk MJ5xYrKpPuTUy1CM8SW/2U6Aker1C+epG3oC6zmJRPxHht4SdJVFmkhI7i59rzaDcgu+ xQlQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=lFdk7ds1ZB17cEbv5b9qoN22JFIrbAk1Pwq00C3O+7E=; b=LPVvueE3Ij9gQT9poXDL0pc5l/43+trzd0qMbba1jogwWZU8K65cCE3TKvC9O2KM6o DsWcxOV3Pt+EWesqDSOPQneNCRVdfpKF2mnGqyzZmlBRd/t9DG5Wtv0PKrvAHmHPRe3B YWQYov6IBFmGFpnixTJHFBFj/rLtltgGBIWpbL+it1NZ2H/rb/751ZBJ6e9SyewCmEiD 3cTOmrF37NBRwWymGqCwOCrlbT3SI5kBhdvYrnix2JSpms4Z54ejQKhxdU+zBFknFF0A qbBfEteKTni4kHK8MkS4tRmgwa6FF5hGOD4Iz/ahpWRf43dZc27477M12pXEc85GCCuE hnVw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=rhJn0kgW; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id dn4si1996596edb.239.2020.04.18.07.56.11; Sat, 18 Apr 2020 07:56:34 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=rhJn0kgW; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728935AbgDROxl (ORCPT + 99 others); Sat, 18 Apr 2020 10:53:41 -0400 Received: from mail.kernel.org ([198.145.29.99]:51630 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728197AbgDROl5 (ORCPT ); Sat, 18 Apr 2020 10:41:57 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id B364321D82; Sat, 18 Apr 2020 14:41:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1587220916; bh=Z7KdvEPwnuQWnkjL+BM3WAvJLHQISfNthr7UMBLVDas=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=rhJn0kgWvOGuMa0Y3i8mg2lj+N7vhFiskwT84YvqTvf8d87lrrqJAKIWY42yt0bp9 OGb1blYhCze6nj9/uyo2OO8KTeSHGQrhgs+lvqCk1JQdthJXs+488Z1HyEK1VPSK6F wxIu7Qe4HU2q8q+0PhptOW4ygj8qQU+R7hQdyOC4= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: David Hildenbrand , Claudio Imbrenda , Christian Borntraeger , Sasha Levin , kvm@vger.kernel.org, linux-s390@vger.kernel.org Subject: [PATCH AUTOSEL 5.4 55/78] KVM: s390: vsie: Fix delivery of addressing exceptions Date: Sat, 18 Apr 2020 10:40:24 -0400 Message-Id: <20200418144047.9013-55-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200418144047.9013-1-sashal@kernel.org> References: <20200418144047.9013-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: David Hildenbrand [ Upstream commit 4d4cee96fb7a3cc53702a9be8299bf525be4ee98 ] Whenever we get an -EFAULT, we failed to read in guest 2 physical address space. Such addressing exceptions are reported via a program intercept to the nested hypervisor. We faked the intercept, we have to return to guest 2. Instead, right now we would be returning -EFAULT from the intercept handler, eventually crashing the VM. the correct thing to do is to return 1 as rc == 1 is the internal representation of "we have to go back into g2". Addressing exceptions can only happen if the g2->g3 page tables reference invalid g2 addresses (say, either a table or the final page is not accessible - so something that basically never happens in sane environments. Identified by manual code inspection. Fixes: a3508fbe9dc6 ("KVM: s390: vsie: initial support for nested virtualization") Cc: # v4.8+ Signed-off-by: David Hildenbrand Link: https://lore.kernel.org/r/20200403153050.20569-3-david@redhat.com Reviewed-by: Claudio Imbrenda Reviewed-by: Christian Borntraeger [borntraeger@de.ibm.com: fix patch description] Signed-off-by: Christian Borntraeger Signed-off-by: Sasha Levin --- arch/s390/kvm/vsie.c | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/s390/kvm/vsie.c b/arch/s390/kvm/vsie.c index 076090f9e666c..4f6c22d72072a 100644 --- a/arch/s390/kvm/vsie.c +++ b/arch/s390/kvm/vsie.c @@ -1202,6 +1202,7 @@ static int vsie_run(struct kvm_vcpu *vcpu, struct vsie_page *vsie_page) scb_s->iprcc = PGM_ADDRESSING; scb_s->pgmilc = 4; scb_s->gpsw.addr = __rewind_psw(scb_s->gpsw, 4); + rc = 1; } return rc; } -- 2.20.1