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 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 smtp.lore.kernel.org (Postfix) with ESMTPS id 9B03ACDB463 for ; Wed, 11 Oct 2023 16:31:33 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qqc7A-0000yf-Fw; Wed, 11 Oct 2023 12:31:16 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qqc78-0000vs-Pd for qemu-devel@nongnu.org; Wed, 11 Oct 2023 12:31:14 -0400 Received: from frasgout.his.huawei.com ([185.176.79.56]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qqc73-0004lD-Rw for qemu-devel@nongnu.org; Wed, 11 Oct 2023 12:31:14 -0400 Received: from lhrpeml500005.china.huawei.com (unknown [172.18.147.201]) by frasgout.his.huawei.com (SkyGuard) with ESMTP id 4S5JD45rCWz6K7F5; Thu, 12 Oct 2023 00:30:44 +0800 (CST) Received: from localhost (10.126.175.8) by lhrpeml500005.china.huawei.com (7.191.163.240) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.31; Wed, 11 Oct 2023 17:31:05 +0100 Date: Wed, 11 Oct 2023 17:31:04 +0100 To: Ani Sinha CC: Paolo Bonzini , Richard Henderson , Eduardo Habkost , "Michael S. Tsirkin" , Marcel Apfelbaum , Subject: Re: [PATCH] hw/i386/cxl: ensure maxram is greater than ram size for calculating cxl range Message-ID: <20231011173104.000016f5@Huawei.com> In-Reply-To: <20231011105335.42296-1-anisinha@redhat.com> References: <20231011105335.42296-1-anisinha@redhat.com> Organization: Huawei Technologies Research and Development (UK) Ltd. X-Mailer: Claws Mail 4.1.0 (GTK 3.24.33; x86_64-w64-mingw32) MIME-Version: 1.0 Content-Type: text/plain; charset="US-ASCII" Content-Transfer-Encoding: 7bit X-Originating-IP: [10.126.175.8] X-ClientProxiedBy: lhrpeml100001.china.huawei.com (7.191.160.183) To lhrpeml500005.china.huawei.com (7.191.163.240) X-CFilter-Loop: Reflected Received-SPF: pass client-ip=185.176.79.56; envelope-from=jonathan.cameron@huawei.com; helo=frasgout.his.huawei.com X-Spam_score_int: -41 X-Spam_score: -4.2 X-Spam_bar: ---- X-Spam_report: (-4.2 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_MED=-2.3, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: Jonathan Cameron From: Jonathan Cameron via Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org On Wed, 11 Oct 2023 16:23:35 +0530 Ani Sinha wrote: > pc_get_device_memory_range() finds the device memory size by calculating the > difference between maxram and ram sizes. This calculation makes sense only when > maxram is greater than the ram size. Make sure we check for that before calling > pc_get_device_memory_range(). > > Signed-off-by: Ani Sinha Whilst this is similar to other cases, I can't remember or quickly work out if the 'else' path here is appropriate. Can we add something to the patch description to talk about that? For reference it's: cxl_base = pc_above_4g_end(pcms); > --- > hw/i386/pc.c | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > diff --git a/hw/i386/pc.c b/hw/i386/pc.c > index f72e2c3b35..948c58171c 100644 > --- a/hw/i386/pc.c > +++ b/hw/i386/pc.c > @@ -820,10 +820,12 @@ static void pc_get_device_memory_range(PCMachineState *pcms, > static uint64_t pc_get_cxl_range_start(PCMachineState *pcms) > { > PCMachineClass *pcmc = PC_MACHINE_GET_CLASS(pcms); > + MachineState *ms = MACHINE(pcms); > hwaddr cxl_base; > ram_addr_t size; > > - if (pcmc->has_reserved_memory) { > + if (pcmc->has_reserved_memory && > + (ms->ram_size < ms->maxram_size)) { > pc_get_device_memory_range(pcms, &cxl_base, &size); > cxl_base += size; > } else { From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from list by lists.gnu.org with archive (Exim 4.90_1) id 1qqc79-0000wF-Ak for mharc-qemu-devel@gnu.org; Wed, 11 Oct 2023 12:31:15 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qqc78-0000vs-Pd for qemu-devel@nongnu.org; Wed, 11 Oct 2023 12:31:14 -0400 Received: from frasgout.his.huawei.com ([185.176.79.56]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qqc73-0004lD-Rw for qemu-devel@nongnu.org; Wed, 11 Oct 2023 12:31:14 -0400 Received: from lhrpeml500005.china.huawei.com (unknown [172.18.147.201]) by frasgout.his.huawei.com (SkyGuard) with ESMTP id 4S5JD45rCWz6K7F5; Thu, 12 Oct 2023 00:30:44 +0800 (CST) Received: from localhost (10.126.175.8) by lhrpeml500005.china.huawei.com (7.191.163.240) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.31; Wed, 11 Oct 2023 17:31:05 +0100 Date: Wed, 11 Oct 2023 17:31:04 +0100 From: Jonathan Cameron To: Ani Sinha CC: Paolo Bonzini , Richard Henderson , Eduardo Habkost , "Michael S. Tsirkin" , Marcel Apfelbaum , Subject: Re: [PATCH] hw/i386/cxl: ensure maxram is greater than ram size for calculating cxl range Message-ID: <20231011173104.000016f5@Huawei.com> In-Reply-To: <20231011105335.42296-1-anisinha@redhat.com> References: <20231011105335.42296-1-anisinha@redhat.com> Organization: Huawei Technologies Research and Development (UK) Ltd. X-Mailer: Claws Mail 4.1.0 (GTK 3.24.33; x86_64-w64-mingw32) MIME-Version: 1.0 Content-Type: text/plain; charset="US-ASCII" Content-Transfer-Encoding: 7bit X-Originating-IP: [10.126.175.8] X-ClientProxiedBy: lhrpeml100001.china.huawei.com (7.191.160.183) To lhrpeml500005.china.huawei.com (7.191.163.240) X-CFilter-Loop: Reflected Received-SPF: pass client-ip=185.176.79.56; envelope-from=jonathan.cameron@huawei.com; helo=frasgout.his.huawei.com X-Spam_score_int: -41 X-Spam_score: -4.2 X-Spam_bar: ---- X-Spam_report: (-4.2 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_MED=-2.3, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 11 Oct 2023 16:31:15 -0000 Message-ID: <20231011163104.u7laYzyoJzpQ_2Qy9Huvom8MGZQIdPyCmZ15gXfNzXU@z> On Wed, 11 Oct 2023 16:23:35 +0530 Ani Sinha wrote: > pc_get_device_memory_range() finds the device memory size by calculating the > difference between maxram and ram sizes. This calculation makes sense only when > maxram is greater than the ram size. Make sure we check for that before calling > pc_get_device_memory_range(). > > Signed-off-by: Ani Sinha Whilst this is similar to other cases, I can't remember or quickly work out if the 'else' path here is appropriate. Can we add something to the patch description to talk about that? For reference it's: cxl_base = pc_above_4g_end(pcms); > --- > hw/i386/pc.c | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > diff --git a/hw/i386/pc.c b/hw/i386/pc.c > index f72e2c3b35..948c58171c 100644 > --- a/hw/i386/pc.c > +++ b/hw/i386/pc.c > @@ -820,10 +820,12 @@ static void pc_get_device_memory_range(PCMachineState *pcms, > static uint64_t pc_get_cxl_range_start(PCMachineState *pcms) > { > PCMachineClass *pcmc = PC_MACHINE_GET_CLASS(pcms); > + MachineState *ms = MACHINE(pcms); > hwaddr cxl_base; > ram_addr_t size; > > - if (pcmc->has_reserved_memory) { > + if (pcmc->has_reserved_memory && > + (ms->ram_size < ms->maxram_size)) { > pc_get_device_memory_range(pcms, &cxl_base, &size); > cxl_base += size; > } else {