From nobody Tue Nov 26 06:59:25 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1709549135; cv=none; d=zohomail.com; s=zohoarc; b=Eeega+sjCHJ7D1L5mUBZdX7Lbr9SrsdDZGo6khFbZBk0h9kJhmGQM7M9xxZw+NmfH/Aw62K9xvpBM+QEsWOw7FX2nG2UWi7Ick9oP0IFMfHpnzdWDRT3bbsslQzkE6DU5C9H1J+iNGj/VSoW+8ySRSJcLqwTSTLG191hWWSffOg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1709549135; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=njyBLCIS4gewEjmYCVl3Zq3Lwp00j5JPg6RIx/fhaRY=; b=ObFoyhHQ5/8vOFPWB1Q6E4N77dmOofudzn4SB0VNoB1iRssVTMGimx1J0SWEm0jglPcKf3JX/QWRXUR1ww83rsKX/eu6YL9jJK8LD6I0vGBLPvL7GBSM/TFUyu6hkrW18yzx7dgzdt0aPZiH2/2UBXzmRY0SIa/THmfbxAcbpBQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1709549135207487.48895490060636; Mon, 4 Mar 2024 02:45:35 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rh5ny-0006MK-Rz; Mon, 04 Mar 2024 05:44:22 -0500 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 1rh5nx-0006LY-FN for qemu-devel@nongnu.org; Mon, 04 Mar 2024 05:44:21 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rh5nt-00046m-6T for qemu-devel@nongnu.org; Mon, 04 Mar 2024 05:44:21 -0500 Received: from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-689-YmGVHIYBOAyJ_p30_4UQWQ-1; Mon, 04 Mar 2024 05:44:13 -0500 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id CD7641C0BA40; Mon, 4 Mar 2024 10:44:12 +0000 (UTC) Received: from thuth-p1g4.redhat.com (unknown [10.39.192.70]) by smtp.corp.redhat.com (Postfix) with ESMTP id D36031C060B1; Mon, 4 Mar 2024 10:44:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1709549056; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=njyBLCIS4gewEjmYCVl3Zq3Lwp00j5JPg6RIx/fhaRY=; b=JP2NOm/xtWbQrI+aU7Cjsini2N2whK1R2zF2EpxkZS+E0Ct9/oma5k0gM0kPSPLTq4v0Qv xHSGFf0fgb/oHgh8mPvJ5Q7/Q8NpHn0ke81xclzEu3MNI4Wn5apQYulla/QH3IoIwmJijV uAGDU45dC2VaS3CJJAqSFOGBFWvg7+E= X-MC-Unique: YmGVHIYBOAyJ_p30_4UQWQ-1 From: Thomas Huth To: Jonathan Cameron , qemu-devel@nongnu.org Cc: Fan Ni , "Michael S. Tsirkin" , Marcel Apfelbaum , qemu-trivial@nongnu.org Subject: [PATCH 1/3] hw/cxl/cxl-cdat: Fix type of buf in ct3_load_cdat() Date: Mon, 4 Mar 2024 11:44:04 +0100 Message-ID: <20240304104406.59855-2-thuth@redhat.com> In-Reply-To: <20240304104406.59855-1-thuth@redhat.com> References: <20240304104406.59855-1-thuth@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.7 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -26 X-Spam_score: -2.7 X-Spam_bar: -- X-Spam_report: (-2.7 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.589, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=unavailable 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: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1709549136401100007 Content-Type: text/plain; charset="utf-8" When setting GLIB_VERSION_MAX_ALLOWED to GLIB_VERSION_2_58 or higher (which we'll certainly do in the not too distant future), glib adds type safety checks to the g_steal_pointer() macro. This trigger an error in the ct3_load_cdat() function: The local char *buf variable is assigned to uint8_t *buf in CDATObject, i.e. a pointer of a different type. Change the local variable to the same type as buf in CDATObject to avoid the error. Signed-off-by: Thomas Huth Reviewed-by: Jonathan Cameron --- hw/cxl/cxl-cdat.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hw/cxl/cxl-cdat.c b/hw/cxl/cxl-cdat.c index 2fea975671..551545f782 100644 --- a/hw/cxl/cxl-cdat.c +++ b/hw/cxl/cxl-cdat.c @@ -114,7 +114,7 @@ static void ct3_build_cdat(CDATObject *cdat, Error **er= rp) static void ct3_load_cdat(CDATObject *cdat, Error **errp) { g_autofree CDATEntry *cdat_st =3D NULL; - g_autofree char *buf =3D NULL; + g_autofree uint8_t *buf =3D NULL; uint8_t sum =3D 0; int num_ent; int i =3D 0, ent =3D 1; @@ -171,7 +171,7 @@ static void ct3_load_cdat(CDATObject *cdat, Error **err= p) cdat_st[ent].base =3D hdr; cdat_st[ent].length =3D hdr->length; =20 - while (buf + i < (char *)cdat_st[ent].base + cdat_st[ent].length) { + while (buf + i < (uint8_t *)cdat_st[ent].base + cdat_st[ent].lengt= h) { assert(i < file_size); sum +=3D buf[i++]; } --=20 2.44.0 From nobody Tue Nov 26 06:59:25 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1709549121; cv=none; d=zohomail.com; s=zohoarc; b=M90pe6C6VPd7Y53nMgKqA10YCNP1Mw2cH7wkQr7/L511O68mOwtGS9eoU2NkiN7H+RKWBeWjWfm9ib/BhgqNuoiWcQDVQvcronQ3UhH16Neqa37jR7u6ebruJxskVWCAC7cQRpfNSGRZMYdVKkKeHTdLTQ/J25gCuTOZ8FR4MRc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1709549121; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=bddr7713wXn9ehS0lvEtkXSMBdFoA3ddkKz6YSM36IM=; b=JEhnKpCxCGb8DtTgfWned6SGhcrUq2RdXDqPgbnWktO4ZXheQ/cVmUOHdyYsbx1AfgTVzBlRtFggjKhU9iq5Ov+SuHIod3bc8bXHZ5DFs/vylVTLx0pZjAH0m2W3ro/8c/gNrV9gYH6flsRQsgMz4MUaZVVCU+mhKWq4hGJP1kk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1709549121337708.3572509713977; Mon, 4 Mar 2024 02:45:21 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rh5o2-0006Mr-HO; Mon, 04 Mar 2024 05:44:26 -0500 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 1rh5nz-0006MZ-HZ for qemu-devel@nongnu.org; Mon, 04 Mar 2024 05:44:23 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rh5nx-00047X-Of for qemu-devel@nongnu.org; Mon, 04 Mar 2024 05:44:23 -0500 Received: from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-370-kyK9S-iVOLmQSrvJA39wNA-1; Mon, 04 Mar 2024 05:44:15 -0500 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 7685C1C0BA43; Mon, 4 Mar 2024 10:44:15 +0000 (UTC) Received: from thuth-p1g4.redhat.com (unknown [10.39.192.70]) by smtp.corp.redhat.com (Postfix) with ESMTP id 467AF1C060AF; Mon, 4 Mar 2024 10:44:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1709549059; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=bddr7713wXn9ehS0lvEtkXSMBdFoA3ddkKz6YSM36IM=; b=JolChdfgR94FgNq5CxcUsfPWRjTsCjrIhCKjXVcfT8ZFyPo/b6sCtarIQO2g2039ElzQLV aBJQogmNRLGHjJ5T3sX5bUNluYPB3mW950ASOFhJCK5nRjtSPPRHBILfsVgBIBgDpJ+dUM KoWgP3kCifuAtB7+sKruo1pwz9Ay5xw= X-MC-Unique: kyK9S-iVOLmQSrvJA39wNA-1 From: Thomas Huth To: Jonathan Cameron , qemu-devel@nongnu.org Cc: Fan Ni , "Michael S. Tsirkin" , Marcel Apfelbaum , qemu-trivial@nongnu.org Subject: [PATCH 2/3] hw/pci-bridge/cxl_upstream: Fix problem with g_steal_pointer() Date: Mon, 4 Mar 2024 11:44:05 +0100 Message-ID: <20240304104406.59855-3-thuth@redhat.com> In-Reply-To: <20240304104406.59855-1-thuth@redhat.com> References: <20240304104406.59855-1-thuth@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.7 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -26 X-Spam_score: -2.7 X-Spam_bar: -- X-Spam_report: (-2.7 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.589, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=-0.01, RCVD_IN_MSPIKE_WL=-0.01, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 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: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1709549122347100003 Content-Type: text/plain; charset="utf-8" When setting GLIB_VERSION_MAX_ALLOWED to GLIB_VERSION_2_58 or higher, glib adds type safety checks to the g_steal_pointer() macro. This triggers errors in the build_cdat_table() function which uses the g_steal_pointer() for type-casting from one pointer type to the other (which also looks quite weird since the local pointers have all been declared with g_autofree though they are never freed here). Let's fix it by using a proper typecast instead. For making this possible, we have to remove the QEMU_PACKED attribute from some structs since GCC otherwise complains that the source and destination pointer might have different alignment restrictions. Removing the QEMU_PACKED should be fine here since the structs are already naturally aligned. Anyway, add some QEMU_BUILD_BUG_ON() statements to make sure that we've got the right sizes (without padding in the structs). Signed-off-by: Thomas Huth Reviewed-by: Jonathan Cameron --- include/hw/cxl/cxl_cdat.h | 8 +++++--- hw/pci-bridge/cxl_upstream.c | 8 ++++---- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/include/hw/cxl/cxl_cdat.h b/include/hw/cxl/cxl_cdat.h index 8e3d094608..b44cefaad6 100644 --- a/include/hw/cxl/cxl_cdat.h +++ b/include/hw/cxl/cxl_cdat.h @@ -130,7 +130,8 @@ typedef struct CDATSslbisHeader { uint8_t data_type; uint8_t reserved[3]; uint64_t entry_base_unit; -} QEMU_PACKED CDATSslbisHeader; +} CDATSslbisHeader; +QEMU_BUILD_BUG_ON(sizeof(CDATSslbisHeader) !=3D 16); =20 #define CDAT_PORT_ID_USP 0x100 /* Switch Scoped Latency and Bandwidth Entry - CDAT Table 10 */ @@ -139,12 +140,13 @@ typedef struct CDATSslbe { uint16_t port_y_id; uint16_t latency_bandwidth; uint16_t reserved; -} QEMU_PACKED CDATSslbe; +} CDATSslbe; +QEMU_BUILD_BUG_ON(sizeof(CDATSslbe) !=3D 8); =20 typedef struct CDATSslbis { CDATSslbisHeader sslbis_header; CDATSslbe sslbe[]; -} QEMU_PACKED CDATSslbis; +} CDATSslbis; =20 typedef struct CDATEntry { void *base; diff --git a/hw/pci-bridge/cxl_upstream.c b/hw/pci-bridge/cxl_upstream.c index e87eb40177..537f9affb8 100644 --- a/hw/pci-bridge/cxl_upstream.c +++ b/hw/pci-bridge/cxl_upstream.c @@ -192,8 +192,8 @@ enum { =20 static int build_cdat_table(CDATSubHeader ***cdat_table, void *priv) { - g_autofree CDATSslbis *sslbis_latency =3D NULL; - g_autofree CDATSslbis *sslbis_bandwidth =3D NULL; + CDATSslbis *sslbis_latency; + CDATSslbis *sslbis_bandwidth; CXLUpstreamPort *us =3D CXL_USP(priv); PCIBus *bus =3D &PCI_BRIDGE(us)->sec_bus; int devfn, sslbis_size, i; @@ -270,8 +270,8 @@ static int build_cdat_table(CDATSubHeader ***cdat_table= , void *priv) *cdat_table =3D g_new0(CDATSubHeader *, CXL_USP_CDAT_NUM_ENTRIES); =20 /* Header always at start of structure */ - (*cdat_table)[CXL_USP_CDAT_SSLBIS_LAT] =3D g_steal_pointer(&sslbis_lat= ency); - (*cdat_table)[CXL_USP_CDAT_SSLBIS_BW] =3D g_steal_pointer(&sslbis_band= width); + (*cdat_table)[CXL_USP_CDAT_SSLBIS_LAT] =3D (CDATSubHeader *)sslbis_lat= ency; + (*cdat_table)[CXL_USP_CDAT_SSLBIS_BW] =3D (CDATSubHeader *)sslbis_band= width; =20 return CXL_USP_CDAT_NUM_ENTRIES; } --=20 2.44.0 From nobody Tue Nov 26 06:59:25 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1709549123; cv=none; d=zohomail.com; s=zohoarc; b=CzyE4HbZJBDY1wybKFWMOaliRhrT3d+uVxpD926Atl2/cQHz3dxMPbKXIG1SBr1fpC63VHusK4YFVX6U5Pe7fKyovlEJXluVLQzq4+sMqhOg3gTHy4sWdP2siGzzYab6HEluwyigj0HYrJsBQoASnCmNw5yyR7HtS5GZ4FWVUS4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1709549123; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=rhR7+x86Od4O3g4vLC5WnQ5uQbaEtOIZwizKLMyBpUk=; b=a9jArcA9SmCO24SUNvbry94FDj2iFvDCAdtClR2cLKUgojzOvaneqbrIaJgMACHO2daCDxSJm3G2gT5QaillLZX3XS8zED+TcRrusskW9CYINqR+n5bWt/gCdyEHKyIdGlKogyQ2l7mf/o256PzvBRcVcaTGeq9k3Ww2YnFOU8I= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1709549123363141.45719941562652; Mon, 4 Mar 2024 02:45:23 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rh5o7-0006OI-Cu; Mon, 04 Mar 2024 05:44:31 -0500 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 1rh5o1-0006Mx-Ux for qemu-devel@nongnu.org; Mon, 04 Mar 2024 05:44:26 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rh5ny-00048V-Bd for qemu-devel@nongnu.org; Mon, 04 Mar 2024 05:44:25 -0500 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-86-9AJSpp5HNpWNzQ8vGy_v-Q-1; Mon, 04 Mar 2024 05:44:18 -0500 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id DB45384AE40; Mon, 4 Mar 2024 10:44:17 +0000 (UTC) Received: from thuth-p1g4.redhat.com (unknown [10.39.192.70]) by smtp.corp.redhat.com (Postfix) with ESMTP id CAF321C060B1; Mon, 4 Mar 2024 10:44:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1709549061; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=rhR7+x86Od4O3g4vLC5WnQ5uQbaEtOIZwizKLMyBpUk=; b=Wm16vvmSSBGqbmiqoG4xve4tK/luiXQQ441CR1ziE1/wXMqRdsuOllqEuvCaUyo556Y46M om12yGdxXgTdb1SNdINnxfRydQiQxQEwyHLq0vkv52f3AEEfUG6qZKXlSuPwPng7rgRrix D1Y7i30eOTZqqm2Olscu/kRtuOpyBLk= X-MC-Unique: 9AJSpp5HNpWNzQ8vGy_v-Q-1 From: Thomas Huth To: Jonathan Cameron , qemu-devel@nongnu.org Cc: Fan Ni , "Michael S. Tsirkin" , Marcel Apfelbaum , qemu-trivial@nongnu.org Subject: [PATCH 3/3] hw/mem/cxl_type3: Fix problem with g_steal_pointer() Date: Mon, 4 Mar 2024 11:44:06 +0100 Message-ID: <20240304104406.59855-4-thuth@redhat.com> In-Reply-To: <20240304104406.59855-1-thuth@redhat.com> References: <20240304104406.59855-1-thuth@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.7 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -26 X-Spam_score: -2.7 X-Spam_bar: -- X-Spam_report: (-2.7 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.589, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=-0.01, RCVD_IN_MSPIKE_WL=-0.01, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 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: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1709549124527100001 Content-Type: text/plain; charset="utf-8" When setting GLIB_VERSION_MAX_ALLOWED to GLIB_VERSION_2_58 or higher, glib adds type safety checks to the g_steal_pointer() macro. This triggers errors in the ct3_build_cdat_entries_for_mr() function which uses the g_steal_pointer() for type-casting from one pointer type to the other (which also looks quite weird since the local pointers have all been declared with g_autofree though they are never freed here). Fix it by using a proper typecast instead. For making this possible, we have to remove the QEMU_PACKED attribute from some structs since GCC otherwise complains that the source and destination pointer might have different alignment restrictions. Removing the QEMU_PACKED should be fine here since the structs are already naturally aligned. Anyway, add some QEMU_BUILD_BUG_ON() statements to make sure that we've got the right sizes (without padding in the structs). Signed-off-by: Thomas Huth Reviewed-by: Jonathan Cameron --- include/hw/cxl/cxl_cdat.h | 9 ++++++--- hw/mem/cxl_type3.c | 24 ++++++++++++------------ 2 files changed, 18 insertions(+), 15 deletions(-) diff --git a/include/hw/cxl/cxl_cdat.h b/include/hw/cxl/cxl_cdat.h index b44cefaad6..17a09066dc 100644 --- a/include/hw/cxl/cxl_cdat.h +++ b/include/hw/cxl/cxl_cdat.h @@ -82,7 +82,8 @@ typedef struct CDATDsmas { uint16_t reserved; uint64_t DPA_base; uint64_t DPA_length; -} QEMU_PACKED CDATDsmas; +} CDATDsmas; +QEMU_BUILD_BUG_ON(sizeof(CDATDsmas) !=3D 24); =20 /* Device Scoped Latency and Bandwidth Information Structure - CDAT Table = 5 */ typedef struct CDATDslbis { @@ -95,7 +96,8 @@ typedef struct CDATDslbis { uint64_t entry_base_unit; uint16_t entry[3]; uint16_t reserved2; -} QEMU_PACKED CDATDslbis; +} CDATDslbis; +QEMU_BUILD_BUG_ON(sizeof(CDATDslbis) !=3D 24); =20 /* Device Scoped Memory Side Cache Information Structure - CDAT Table 6 */ typedef struct CDATDsmscis { @@ -122,7 +124,8 @@ typedef struct CDATDsemts { uint16_t reserved; uint64_t DPA_offset; uint64_t DPA_length; -} QEMU_PACKED CDATDsemts; +} CDATDsemts; +QEMU_BUILD_BUG_ON(sizeof(CDATDsemts) !=3D 24); =20 /* Switch Scoped Latency and Bandwidth Information Structure - CDAT Table = 9 */ typedef struct CDATSslbisHeader { diff --git a/hw/mem/cxl_type3.c b/hw/mem/cxl_type3.c index e8801805b9..b679dfae1c 100644 --- a/hw/mem/cxl_type3.c +++ b/hw/mem/cxl_type3.c @@ -46,12 +46,12 @@ static void ct3_build_cdat_entries_for_mr(CDATSubHeader= **cdat_table, int dsmad_handle, MemoryRegion *= mr, bool is_pmem, uint64_t dpa_base) { - g_autofree CDATDsmas *dsmas =3D NULL; - g_autofree CDATDslbis *dslbis0 =3D NULL; - g_autofree CDATDslbis *dslbis1 =3D NULL; - g_autofree CDATDslbis *dslbis2 =3D NULL; - g_autofree CDATDslbis *dslbis3 =3D NULL; - g_autofree CDATDsemts *dsemts =3D NULL; + CDATDsmas *dsmas; + CDATDslbis *dslbis0; + CDATDslbis *dslbis1; + CDATDslbis *dslbis2; + CDATDslbis *dslbis3; + CDATDsemts *dsemts; =20 dsmas =3D g_malloc(sizeof(*dsmas)); *dsmas =3D (CDATDsmas) { @@ -135,12 +135,12 @@ static void ct3_build_cdat_entries_for_mr(CDATSubHead= er **cdat_table, }; =20 /* Header always at start of structure */ - cdat_table[CT3_CDAT_DSMAS] =3D g_steal_pointer(&dsmas); - cdat_table[CT3_CDAT_DSLBIS0] =3D g_steal_pointer(&dslbis0); - cdat_table[CT3_CDAT_DSLBIS1] =3D g_steal_pointer(&dslbis1); - cdat_table[CT3_CDAT_DSLBIS2] =3D g_steal_pointer(&dslbis2); - cdat_table[CT3_CDAT_DSLBIS3] =3D g_steal_pointer(&dslbis3); - cdat_table[CT3_CDAT_DSEMTS] =3D g_steal_pointer(&dsemts); + cdat_table[CT3_CDAT_DSMAS] =3D (CDATSubHeader *)dsmas; + cdat_table[CT3_CDAT_DSLBIS0] =3D (CDATSubHeader *)dslbis0; + cdat_table[CT3_CDAT_DSLBIS1] =3D (CDATSubHeader *)dslbis1; + cdat_table[CT3_CDAT_DSLBIS2] =3D (CDATSubHeader *)dslbis2; + cdat_table[CT3_CDAT_DSLBIS3] =3D (CDATSubHeader *)dslbis3; + cdat_table[CT3_CDAT_DSEMTS] =3D (CDATSubHeader *)dsemts; } =20 static int ct3_build_cdat_table(CDATSubHeader ***cdat_table, void *priv) --=20 2.44.0