Received: by 2002:a25:1985:0:0:0:0:0 with SMTP id 127csp1757216ybz; Sat, 18 Apr 2020 07:52:36 -0700 (PDT) X-Google-Smtp-Source: APiQypLPizOS4d4gJYVn99veh8s0NSLgT5/qSAqmZ+UVV6Rf/LwZJ9C4/IXpT3GHLMy1DmNmh7eK X-Received: by 2002:a17:906:829a:: with SMTP id h26mr7861376ejx.133.1587221556689; Sat, 18 Apr 2020 07:52:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1587221556; cv=none; d=google.com; s=arc-20160816; b=XffL+xFO/Dpy7nbGX/DNiNYWtPt4KfKC9NqMEpcNYezrYuf5JTXkZoivJ3jOcCXPKH gCY49uBOSGlPK9HuY+PMUk8NfwwmEqisNLmBlq8p8++PkoxlM7xDZqcvVknBllQ4u5RN tF1FvAkBJ4QlxfanDiY78UrehbxWMqkWJXy/eUsEBTgShJlv+SakkBFRnWRzHgr644An lQBIllp4+D6NlzU3OGeP3hXmicPB4o6I/O3zJYsvLohuxKtf+FgYLzmGPENTWJIp5e7d jmb/IIFKxlJwCBjzBaHTLE68gazqPtI/AxbFWD/+ktX0HI6bOko/VUbQOCanW2EzZw8H Qhxg== 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=+HTQVLNLNEaZWVB/SPGpF2XgOsaNCULqPduQE84xuno=; b=QHZaMblP+ppTXKivcsuQfTSOU5FgiOUI3LyFe/BSs0QqJGK3x+GUw8vQHIhhFZaMIc lY4ULdT6DjzqBvJNd3ljJtcpluvVbTTsGoIxuJ2iWQlFkFg2/DKQS4+d4sny93OeNhEc RCp4QjpFtbn87UV4LPhzqOlgolOh4gSsBYZqdPHS7hfw+lAAGl77Cba3nndV11IHN69t mpHuT5cEVJcjpqcQNnrNPjpeqHaQggZlSHv5cUGc7//IKiovlrSqS73wAgufFYVMrn31 M6+zyEsmzWbAKFqRA+u0cVhAZ5dBw92ZyZgyG5HUsvxCrwBgaHB4a5i0b2g3jMmsTYHq llTw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=hBQF1phu; 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 t21si16824456edq.436.2020.04.18.07.52.14; Sat, 18 Apr 2020 07:52:36 -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=hBQF1phu; 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 S1728892AbgDROuP (ORCPT + 99 others); Sat, 18 Apr 2020 10:50:15 -0400 Received: from mail.kernel.org ([198.145.29.99]:54068 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726310AbgDROnM (ORCPT ); Sat, 18 Apr 2020 10:43:12 -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 1F7B722251; Sat, 18 Apr 2020 14:43:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1587220991; bh=lcxOEHExrjxo9o6tAp4IpVHPJUik2QWRIZUszzt0B8U=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=hBQF1phuGK04Iva6vjqWSSe8viwKYcEbkgvP822Qt/WCByzxIAZUzrPzQ1oOZ6gOS QrmwB7nu0dBAawE7arn7OLxMnReSDeL2uQxs/LAU4p7R9vLrqsHJVWfn44KwH6PG24 guoJ1zIze7zTEmQVDIe0mhnKiDjvWnSG7qz7y2g8= 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 4.19 35/47] KVM: s390: vsie: Fix delivery of addressing exceptions Date: Sat, 18 Apr 2020 10:42:15 -0400 Message-Id: <20200418144227.9802-35-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200418144227.9802-1-sashal@kernel.org> References: <20200418144227.9802-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 a2b28cd1e3fed..17d73b71df1d8 100644 --- a/arch/s390/kvm/vsie.c +++ b/arch/s390/kvm/vsie.c @@ -1024,6 +1024,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