Received: by 2002:a25:6193:0:0:0:0:0 with SMTP id v141csp462961ybb; Fri, 3 Apr 2020 06:11:16 -0700 (PDT) X-Google-Smtp-Source: APiQypLfdOux/pPzeaHRH9kGwyBs6RFWAJPPwDZo8s2wo/ZMucQVsleKP9F844lMTk6Xz8P8d4mC X-Received: by 2002:a9d:2004:: with SMTP id n4mr6581839ota.74.1585919476695; Fri, 03 Apr 2020 06:11:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1585919476; cv=none; d=google.com; s=arc-20160816; b=DNWZtkZkVforLrAwnNRTZL3CnoSZSZ+SgB6yUbkU2GK7k6ryiB1BuMJ3fAfVXUrCe/ +K9zPpLN8hs5YG48J8ic77AgJUFMAfDPA6DEiWKGoI0EevxcemPHY9oa61zVBfPU4a3B tPSkeV/Kz3V7TFJLY7+lzRyccnQwB44CMAEF28QFOHuOFOvnpt4m56HqG4sqURH3t48o 97Es+wChZiMOhvZzGM395L4tXRxDi499dYNNaBYLR1jJLB3ljYEaNZuswrd88c8YswVv HXjbLC09NThdSfhOX0V3MZL3Z3JDRIWvuzYywlk18lIHr6POFWom9Hs34KS+aRXU16T/ 8eGQ== 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 :content-language:in-reply-to:mime-version:user-agent:date :message-id:organization:autocrypt:from:references:cc:to:subject :dkim-signature; bh=wlsZAL66fEiTfsDiCMwpQ70rjqh5BqoyrAdBqZgtnKs=; b=V+jC6TnS5oaX4Qoelz751ACIARav2ckvfWB2sNgu3172QvydqBru1aU/DsqDZX02Sr JYsaL05nTNxBll+5LYQPvy2hSbKGN6FIxuiuckEfTOLfcMnhifuT/8IEclnfXHmKkboH 51eE+tAZpbzaKNrBwlXaCHzVH5NNZPt+Q63uzHj9x2HkW+A45svJRzdM8VNYvdnZtpIu qSL6tqlVnSDKce2V5Mz5MICnLbC66kkyKtKnHRqyhYuybCPQQDWqiR9GnYpkjESR3igr RvGbSuy8nDAd5Qtt4CROrLyyYKFiZxBmgXlfFLAv/IsbUp14XQ3GgioDhmMnlIluQ45e fb2w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=VIfQbU0c; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id m7si3451083oim.179.2020.04.03.06.11.03; Fri, 03 Apr 2020 06:11:16 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=VIfQbU0c; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2403906AbgDCNJb (ORCPT + 99 others); Fri, 3 Apr 2020 09:09:31 -0400 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:52451 "EHLO us-smtp-1.mimecast.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726087AbgDCNJb (ORCPT ); Fri, 3 Apr 2020 09:09:31 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1585919370; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:autocrypt:autocrypt; bh=wlsZAL66fEiTfsDiCMwpQ70rjqh5BqoyrAdBqZgtnKs=; b=VIfQbU0c/iPGFP+i8dFBE0nQZMyh90/bXjUKc25kRDzJwhpHRJXjRH+1/p4oY3SSPe0EPN 0uEbHBPO3XTRNyZPA3MYckl1tPJpPlClOxXe+S96kI6RV6GC2xabjEWaRU/seaAoyzEuvi YPlL4UJAWde5KIC7E3iE3vHOUZZvmCY= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-400-pIPupR7pOoyaanNcgq6ODA-1; Fri, 03 Apr 2020 09:09:26 -0400 X-MC-Unique: pIPupR7pOoyaanNcgq6ODA-1 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 38C6F5F9; Fri, 3 Apr 2020 13:09:25 +0000 (UTC) Received: from [10.36.112.213] (ovpn-112-213.ams2.redhat.com [10.36.112.213]) by smtp.corp.redhat.com (Postfix) with ESMTP id 828793AF; Fri, 3 Apr 2020 13:09:23 +0000 (UTC) Subject: Re: [PATCH v1 5/5] KVM: s390: vsie: gmap_table_walk() simplifications To: Janosch Frank , kvm@vger.kernel.org Cc: linux-s390@vger.kernel.org, linux-kernel@vger.kernel.org, Vasily Gorbik , Heiko Carstens , Cornelia Huck , Christian Borntraeger References: <20200402184819.34215-1-david@redhat.com> <20200402184819.34215-6-david@redhat.com> <99c824d1-88ca-c98d-c4e9-75a97c2a8a7b@linux.ibm.com> From: David Hildenbrand Autocrypt: addr=david@redhat.com; prefer-encrypt=mutual; keydata= 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 Organization: Red Hat GmbH Message-ID: <867be74b-0ff2-23e1-3d02-3803c478e205@redhat.com> Date: Fri, 3 Apr 2020 15:09:22 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.6.0 MIME-Version: 1.0 In-Reply-To: <99c824d1-88ca-c98d-c4e9-75a97c2a8a7b@linux.ibm.com> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 03.04.20 15:03, Janosch Frank wrote: > On 4/2/20 8:48 PM, David Hildenbrand wrote: >> Let's use asce_type where applicable. Also, simplify our sanity check for >> valid table levels and convert it into a WARN_ON_ONCE(). Check if we even >> have a valid gmap shadow as the very first step. >> >> Signed-off-by: David Hildenbrand >> --- >> arch/s390/mm/gmap.c | 7 ++++--- >> 1 file changed, 4 insertions(+), 3 deletions(-) >> >> diff --git a/arch/s390/mm/gmap.c b/arch/s390/mm/gmap.c >> index fd32ab566f57..3c801dae7988 100644 >> --- a/arch/s390/mm/gmap.c >> +++ b/arch/s390/mm/gmap.c >> @@ -790,17 +790,18 @@ static inline unsigned long *gmap_table_walk(struct gmap *gmap, >> const int asce_type = gmap->asce & _ASCE_TYPE_MASK; >> unsigned long *table; >> >> - if ((gmap->asce & _ASCE_TYPE_MASK) + 4 < (level * 4)) >> - return NULL; >> if (gmap_is_shadow(gmap) && gmap->removed) >> return NULL; >> >> + if (WARN_ON_ONCE(level > (asce_type >> 2) + 1)) >> + return NULL; >> + >> if (WARN_ON_ONCE(asce_type != _ASCE_TYPE_REGION1) && >> gaddr & (-1UL << (31 + (asce_type >> 2) * 11))) >> return NULL; >> >> table = gmap->table; > > We could also initialize this variable at the top, no? very right, add that. -- Thanks, David / dhildenb