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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6D350C71153 for ; Mon, 4 Sep 2023 16:53:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237790AbjIDQxp (ORCPT ); Mon, 4 Sep 2023 12:53:45 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56432 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233620AbjIDQxo (ORCPT ); Mon, 4 Sep 2023 12:53:44 -0400 Received: from frasgout.his.huawei.com (frasgout.his.huawei.com [185.176.79.56]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A48EFCC4 for ; Mon, 4 Sep 2023 09:53:41 -0700 (PDT) Received: from lhrpeml500005.china.huawei.com (unknown [172.18.147.226]) by frasgout.his.huawei.com (SkyGuard) with ESMTP id 4RfZTW1sW3z6K6nC; Tue, 5 Sep 2023 00:53:35 +0800 (CST) Received: from localhost (10.48.153.57) 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; Mon, 4 Sep 2023 17:53:39 +0100 Date: Mon, 4 Sep 2023 17:53:38 +0100 From: Jonathan Cameron To: Gregory Price CC: , , , , Gregory Price Subject: Re: [PATCH 2/5] cxl/type3: Cleanup multiple CXL_TYPE3() calls in read/write functions Message-ID: <20230904175338.00000af9@Huawei.com> In-Reply-To: <20230901012914.226527-3-gregory.price@memverge.com> References: <20230901012914.226527-1-gregory.price@memverge.com> <20230901012914.226527-3-gregory.price@memverge.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.48.153.57] X-ClientProxiedBy: lhrpeml100001.china.huawei.com (7.191.160.183) To lhrpeml500005.china.huawei.com (7.191.163.240) X-CFilter-Loop: Reflected Precedence: bulk List-ID: X-Mailing-List: linux-cxl@vger.kernel.org On Thu, 31 Aug 2023 21:29:11 -0400 Gregory Price wrote: > Call CXL_TYPE3 once at top of function to avoid multiple invocations. > > Signed-off-by: Gregory Price Good cleanup on it's own. I'll queue this one up on the backend of the sanitize set that introduces the second use in each of these functions. That series might take a while to land upstream though as the CCI rework is in front of them currently. I'm not sure I want the pain of reording those two series. Jonathan > --- > hw/mem/cxl_type3.c | 10 ++++++---- > 1 file changed, 6 insertions(+), 4 deletions(-) > > diff --git a/hw/mem/cxl_type3.c b/hw/mem/cxl_type3.c > index fd9d134d46..80d596ee10 100644 > --- a/hw/mem/cxl_type3.c > +++ b/hw/mem/cxl_type3.c > @@ -1248,17 +1248,18 @@ static int cxl_type3_hpa_to_as_and_dpa(CXLType3Dev *ct3d, > MemTxResult cxl_type3_read(PCIDevice *d, hwaddr host_addr, uint64_t *data, > unsigned size, MemTxAttrs attrs) > { > + CXLType3Dev *ct3d = CXL_TYPE3(d); > uint64_t dpa_offset = 0; > AddressSpace *as = NULL; > int res; > > - res = cxl_type3_hpa_to_as_and_dpa(CXL_TYPE3(d), host_addr, size, > + res = cxl_type3_hpa_to_as_and_dpa(ct3d, host_addr, size, > &as, &dpa_offset); > if (res) { > return MEMTX_ERROR; > } > > - if (sanitize_running(&CXL_TYPE3(d)->cci)) { > + if (sanitize_running(&ct3d->cci)) { > qemu_guest_getrandom_nofail(data, size); > return MEMTX_OK; > } > @@ -1268,16 +1269,17 @@ MemTxResult cxl_type3_read(PCIDevice *d, hwaddr host_addr, uint64_t *data, > MemTxResult cxl_type3_write(PCIDevice *d, hwaddr host_addr, uint64_t data, > unsigned size, MemTxAttrs attrs) > { > + CXLType3Dev *ct3d = CXL_TYPE3(d); > uint64_t dpa_offset = 0; > AddressSpace *as = NULL; > int res; > > - res = cxl_type3_hpa_to_as_and_dpa(CXL_TYPE3(d), host_addr, size, > + res = cxl_type3_hpa_to_as_and_dpa(ct3d, host_addr, size, > &as, &dpa_offset); > if (res) { > return MEMTX_ERROR; > } > - if (sanitize_running(&CXL_TYPE3(d)->cci)) { > + if (sanitize_running(&ct3d->cci)) { > return MEMTX_OK; > } > return address_space_write(as, dpa_offset, attrs, &data, size);