From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.2 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id C0756C3A5A1 for ; Fri, 23 Aug 2019 01:09:00 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 98F87233A2 for ; Fri, 23 Aug 2019 01:09:00 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 98F87233A2 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linux.intel.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:50776 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i0y4Z-0007PK-L2 for qemu-devel@archiver.kernel.org; Thu, 22 Aug 2019 21:08:59 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47050) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i0y3t-00070b-1X for qemu-devel@nongnu.org; Thu, 22 Aug 2019 21:08:17 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i0y3s-0000UL-1Z for qemu-devel@nongnu.org; Thu, 22 Aug 2019 21:08:16 -0400 Received: from mga01.intel.com ([192.55.52.88]:38086) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1i0y3r-0000TJ-PT for qemu-devel@nongnu.org; Thu, 22 Aug 2019 21:08:15 -0400 X-Amp-Result: UNKNOWN X-Amp-Original-Verdict: FILE UNKNOWN X-Amp-File-Uploaded: False Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga101.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 22 Aug 2019 18:08:13 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.64,419,1559545200"; d="scan'208";a="208377298" Received: from richard.sh.intel.com (HELO localhost) ([10.239.159.54]) by fmsmga002.fm.intel.com with ESMTP; 22 Aug 2019 18:08:12 -0700 Date: Fri, 23 Aug 2019 09:07:50 +0800 From: Wei Yang To: Paolo Bonzini Message-ID: <20190823010750.GA21179@richard> References: <20190321082555.21118-1-richardw.yang@linux.intel.com> <20190321082555.21118-3-richardw.yang@linux.intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.9.4 (2018-02-28) X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 192.55.52.88 Subject: Re: [Qemu-devel] [PATCH 2/6] exec.c: remove an unnecessary assert on PHYS_MAP_NODE_NIL in phys_map_node_alloc() X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: Wei Yang Cc: rth@twiddle.net, mst@redhat.com, Wei Yang , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" On Thu, Aug 22, 2019 at 12:24:32PM +0200, Paolo Bonzini wrote: >On 21/03/19 09:25, Wei Yang wrote: >> PHYS_MAP_NODE_NIL is assigned to PhysPageEntry.ptr in case this is not a >> leaf entry, while map->nodes_nb range in [0, nodes_nb_alloc). >> >> Seems we are asserting on two different things, just remove it. > >The assertion checks that this "if" is not entered incorrectly: > > if (lp->skip && lp->ptr == PHYS_MAP_NODE_NIL) { > lp->ptr = phys_map_node_alloc(map, level == 0); > } > Hmm... I may not get your point. phys_map_node_alloc() will get an available PhysPageEntry and return its index, which will be assigned to its parent's ptr. The "if" checks on the parent's ptr, while the assertion asserts the index for the new child. I may miss something? >Paolo > >> Signed-off-by: Wei Yang >> --- >> exec.c | 1 - >> 1 file changed, 1 deletion(-) >> >> diff --git a/exec.c b/exec.c >> index 98ebd0dd1d..8e8b6bb1f9 100644 >> --- a/exec.c >> +++ b/exec.c >> @@ -242,7 +242,6 @@ static uint32_t phys_map_node_alloc(PhysPageMap *map, bool leaf) >> >> ret = map->nodes_nb++; >> p = map->nodes[ret]; >> - assert(ret != PHYS_MAP_NODE_NIL); >> assert(ret != map->nodes_nb_alloc); >> >> e.skip = leaf ? 0 : 1; >> -- Wei Yang Help you, Help me