From nobody Thu May 2 15:01:46 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1621363029; cv=none; d=zohomail.com; s=zohoarc; b=a8INnzwwjRxazJgC5hXHM5/C73lYxmACKPi9nMvLKUbvjah2zj4zVwiLZfpiytpIeAiFz0fuP7eLjozgNl17gWOgQHI9LSX2pmYb/ayG9JW3BW6CTgk/qFLgqguWJwahge90+5d0QiRF5Cg2HReLc650uDdmblVa2uQ9fvV4abQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1621363029; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=2KSH1YwMn8zpDyDH9Uq0LVnJ/rgrT/JgFf8hkb+U/HU=; b=eeSVcgLxel3YcwfnlQ/tEgnkaii9sWTWQmpGMBoMuT0maVkMUPp3tHeTesVzgsTmWpm8a4b6eLZGvAXNWeeNlXKSKWhBAKv+hyqHSSV0Wbw5MwCSDEEZXS8s24pe4D1Vz6d1fkAu7HeKyu75ps2MYTli8RhheEacImCFL8sYKl8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by mx.zohomail.com with SMTPS id 1621363029887760.5059368101752; Tue, 18 May 2021 11:37:09 -0700 (PDT) Received: from mail-ed1-f71.google.com (mail-ed1-f71.google.com [209.85.208.71]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-133-LVSOwskjM_u9JWdXtR0rmg-1; Tue, 18 May 2021 14:37:04 -0400 Received: by mail-ed1-f71.google.com with SMTP id c15-20020a05640227cfb029038d710bf29cso254444ede.16 for ; Tue, 18 May 2021 11:37:04 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.redhat.com (31.red-83-51-215.dynamicip.rima-tde.net. [83.51.215.31]) by smtp.gmail.com with ESMTPSA id k13sm4869145ejr.1.2021.05.18.11.37.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 18 May 2021 11:37:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1621363028; 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; bh=2KSH1YwMn8zpDyDH9Uq0LVnJ/rgrT/JgFf8hkb+U/HU=; b=gFpNFEIt2UlQ4k95yPFwmKNkymtjjy1ZW7FXoEemb2tZJt2E9g1vzgZt1b+Y2JqskDvVqR 9Lnu15Ed4GE8KcXKwbKjfCygPf3OOp+qGoFOyG7zEwtqB/s4/dgbLduK1dNLHHH1vxBjGp Wlb61XQjOPxWJ1kuia3ZIXz1Nb/aUHs= X-MC-Unique: LVSOwskjM_u9JWdXtR0rmg-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=2KSH1YwMn8zpDyDH9Uq0LVnJ/rgrT/JgFf8hkb+U/HU=; b=ZfE3BHsNYu72I7NODyyixfqXMkQdI123JabV4d7e4rpu9g8Tnm7SUoZV85rSaBYGZr YozXK2jsW7cYPBfSUL50KxBBCInNf/I00It8A9z/by3KiDuivK4M6qnbmiCI3Q+fOIgR TVxuxw8U1mg3h+X1Q7fQ9M6P4rjFwq1au4H1VblCN3yawgOCJ1uvPYxeheRu/QDNwiVE tLSj3J8sV1LR/cymL+JwUvoGcQkgdtOKuTIcC1LYu3YRA7zcHJoE62LRWqeekxsztR2I vzlP/xgZd+oLv1v2IfIOcD6Kd4yAlwdAJr6HcOwyhpzQeh82s4Yb6Utk9xy5a+L5R8Um 8Fdw== X-Gm-Message-State: AOAM533gebxGxpGZfTtzuZZiWcJAPMhv2PCAWQV7kPzk/aUZF+iEfJpy hXLFnvlLM5bo6/TM2pbldfUfj0cDyT+UOP5+VGrOTQiS4V9ZpMP3zWwdpr18UrjMywFgHux2bgy rllBwwAPGPhhMgg== X-Received: by 2002:a17:906:6a93:: with SMTP id p19mr7530804ejr.319.1621363023165; Tue, 18 May 2021 11:37:03 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxeaiQPF3WOuGpQWdo5nC++r5p8PP/2LpnCBv84WvvRoktgzHIqGPOczdkt801UNrz3CHD0LA== X-Received: by 2002:a17:906:6a93:: with SMTP id p19mr7530793ejr.319.1621363022987; Tue, 18 May 2021 11:37:02 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Bibo Mao , "Michael S. Tsirkin" , Richard Henderson , Paolo Bonzini , Jiaxun Yang , Peter Xu , Huacai Chen , Peter Maydell , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [RFC PATCH 01/25] exec/memory_ldst_cached: Sort declarations Date: Tue, 18 May 2021 20:36:31 +0200 Message-Id: <20210518183655.1711377-2-philmd@redhat.com> X-Mailer: git-send-email 2.26.3 In-Reply-To: <20210518183655.1711377-1-philmd@redhat.com> References: <20210518183655.1711377-1-philmd@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) To ease the file review, sort the declarations by the size of the access (8, 16, 32). Simple code movement, no logical change. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- include/exec/memory_ldst_cached.h.inc | 46 +++++++++++++-------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/include/exec/memory_ldst_cached.h.inc b/include/exec/memory_ld= st_cached.h.inc index 7bc8790d346..c33449d0cd5 100644 --- a/include/exec/memory_ldst_cached.h.inc +++ b/include/exec/memory_ldst_cached.h.inc @@ -24,6 +24,18 @@ #define LD_P(size) \ glue(glue(ld, size), glue(ENDIANNESS, _p)) =20 +static inline uint32_t ADDRESS_SPACE_LD_CACHED(uw)(MemoryRegionCache *cach= e, + hwaddr addr, MemTxAttrs attrs, MemTxResult *result) +{ + assert(addr < cache->len && 2 <=3D cache->len - addr); + fuzz_dma_read_cb(cache->xlat + addr, 2, cache->mrs.mr); + if (likely(cache->ptr)) { + return LD_P(uw)(cache->ptr + addr); + } else { + return ADDRESS_SPACE_LD_CACHED_SLOW(uw)(cache, addr, attrs, result= ); + } +} + static inline uint32_t ADDRESS_SPACE_LD_CACHED(l)(MemoryRegionCache *cache, hwaddr addr, MemTxAttrs attrs, MemTxResult *result) { @@ -48,18 +60,6 @@ static inline uint64_t ADDRESS_SPACE_LD_CACHED(q)(Memory= RegionCache *cache, } } =20 -static inline uint32_t ADDRESS_SPACE_LD_CACHED(uw)(MemoryRegionCache *cach= e, - hwaddr addr, MemTxAttrs attrs, MemTxResult *result) -{ - assert(addr < cache->len && 2 <=3D cache->len - addr); - fuzz_dma_read_cb(cache->xlat + addr, 2, cache->mrs.mr); - if (likely(cache->ptr)) { - return LD_P(uw)(cache->ptr + addr); - } else { - return ADDRESS_SPACE_LD_CACHED_SLOW(uw)(cache, addr, attrs, result= ); - } -} - #undef ADDRESS_SPACE_LD_CACHED #undef ADDRESS_SPACE_LD_CACHED_SLOW #undef LD_P @@ -71,17 +71,6 @@ static inline uint32_t ADDRESS_SPACE_LD_CACHED(uw)(Memor= yRegionCache *cache, #define ST_P(size) \ glue(glue(st, size), glue(ENDIANNESS, _p)) =20 -static inline void ADDRESS_SPACE_ST_CACHED(l)(MemoryRegionCache *cache, - hwaddr addr, uint32_t val, MemTxAttrs attrs, MemTxResult *result) -{ - assert(addr < cache->len && 4 <=3D cache->len - addr); - if (likely(cache->ptr)) { - ST_P(l)(cache->ptr + addr, val); - } else { - ADDRESS_SPACE_ST_CACHED_SLOW(l)(cache, addr, val, attrs, result); - } -} - static inline void ADDRESS_SPACE_ST_CACHED(w)(MemoryRegionCache *cache, hwaddr addr, uint32_t val, MemTxAttrs attrs, MemTxResult *result) { @@ -93,6 +82,17 @@ static inline void ADDRESS_SPACE_ST_CACHED(w)(MemoryRegi= onCache *cache, } } =20 +static inline void ADDRESS_SPACE_ST_CACHED(l)(MemoryRegionCache *cache, + hwaddr addr, uint32_t val, MemTxAttrs attrs, MemTxResult *result) +{ + assert(addr < cache->len && 4 <=3D cache->len - addr); + if (likely(cache->ptr)) { + ST_P(l)(cache->ptr + addr, val); + } else { + ADDRESS_SPACE_ST_CACHED_SLOW(l)(cache, addr, val, attrs, result); + } +} + static inline void ADDRESS_SPACE_ST_CACHED(q)(MemoryRegionCache *cache, hwaddr addr, uint64_t val, MemTxAttrs attrs, MemTxResult *result) { --=20 2.26.3 From nobody Thu May 2 15:01:46 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1621363034; cv=none; d=zohomail.com; s=zohoarc; b=Cz/TpSsUSBSSk4Zs9W85XvRiVjNtnhoIuM8eGeWLcNZJoo/J0GtJHY2uXMFh2K5lmsDQE0RKBKxMhM//icb+hHNAFFV6YPOithy2Q16X8RYDAJ4SUGug4DpAdF8MEep0j6J1GZXrzFkl2TIUcRmRENgX4f2jwOVBkWDuCgdxjwQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1621363034; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=e61v0D0ynpIm14dcmrVNYVFJK3FGIyUAzwhYR7CEaj8=; b=Kjd8eKZOfqhrfOxzQwf8TQxjRwBTLI6C6yHJDRyP082idmg3yKS4iic9sk31j03uQVDGe0gw/bPt7wNOoBlElhRlzQj5GWwp8sHwUecQuZrg4tXb6EspyaKaunZQYXPirIFh1MVJXe+EQsQ2GOLhCy00VMmeCiE9QGX0bg0L7pQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by mx.zohomail.com with SMTPS id 1621363034019876.83536924298; Tue, 18 May 2021 11:37:14 -0700 (PDT) Received: from mail-ed1-f71.google.com (mail-ed1-f71.google.com [209.85.208.71]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-275-66JrU2yrOJuKMg8H2EPyeQ-1; Tue, 18 May 2021 14:37:09 -0400 Received: by mail-ed1-f71.google.com with SMTP id n6-20020a0564020606b029038cdc241890so6235501edv.20 for ; Tue, 18 May 2021 11:37:09 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.redhat.com (31.red-83-51-215.dynamicip.rima-tde.net. [83.51.215.31]) by smtp.gmail.com with ESMTPSA id q16sm10540324ejm.12.2021.05.18.11.37.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 18 May 2021 11:37:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1621363033; 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; bh=e61v0D0ynpIm14dcmrVNYVFJK3FGIyUAzwhYR7CEaj8=; b=XLImIMwRxCzcgGeMtxy1P72Es1ss6xgvreuOnSFDvTjycF5+S0ijdXb6ueGP6mXOhbWKrM dPXmExllhV/5Qs8EwKBx4UwtFILrTZrTzOupNrElDGdm/8x2VYS3ziB2mSwqNZr9WsR9af raO1FP0oFvTWCXeWpjcR0W13nzvVCP4= X-MC-Unique: 66JrU2yrOJuKMg8H2EPyeQ-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=e61v0D0ynpIm14dcmrVNYVFJK3FGIyUAzwhYR7CEaj8=; b=fozJgElL6fNORL0BZ+Pr77Kxi/ghOwqTxDVvpOKEryAgkSjAwG1he/UzMtPbUErgPi 7LMyI6wu14Rwrgzm6XJ63JtCzxeZ3ALgQEN9O9nm1NCpRijNLo8OTB+ydeVZheBn3Ukr C+p/OL3OM1E0+CYnuA/mxRX70krr9ckDDWy02QZ2yG8QN/wnVuNOBsxTrDQPpDUD3qMI mfMUbb8/qiyKWtuQfrta5hPrigC/j4nJsWcfIUlnI2ejQ8moO1i/gk8kEtCf4EDI+bYY uRjeIK3UsRDfR7pjOu2f1P7MI2n/eAz2EOqGjFE5chLnwu7TjQzGDXL1JxQFzNUCp6Wq nCKQ== X-Gm-Message-State: AOAM530gnnSKPhhGvim15HPy03jNuUxrpJ+BLKp2hsPUAScY22RpQjw2 E4qv7XlwxLFP3ETNl+Uhgnw8i7pMY8HIGLvawrRJJNClvWkVwxRNpwEYDRGx/J+uY1VVxUSbFGo DhUN5Sq4PwSPywA== X-Received: by 2002:a17:906:ca50:: with SMTP id jx16mr2140822ejb.386.1621363028204; Tue, 18 May 2021 11:37:08 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxSAVY4MFCxjSzDsWPBfrJLDdLlnHDDGSbr0rhYOknyIGaZYZb8fqnaPuUq7JlPgyOlup+ryA== X-Received: by 2002:a17:906:ca50:: with SMTP id jx16mr2140803ejb.386.1621363028028; Tue, 18 May 2021 11:37:08 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Bibo Mao , "Michael S. Tsirkin" , Richard Henderson , Paolo Bonzini , Jiaxun Yang , Peter Xu , Huacai Chen , Peter Maydell , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [RFC PATCH 02/25] exec/memory_ldst_phys: Sort declarations Date: Tue, 18 May 2021 20:36:32 +0200 Message-Id: <20210518183655.1711377-3-philmd@redhat.com> X-Mailer: git-send-email 2.26.3 In-Reply-To: <20210518183655.1711377-1-philmd@redhat.com> References: <20210518183655.1711377-1-philmd@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) To ease the file review, sort the declarations by the size of the access (8, 16, 32). Simple code movement, no logical change. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- include/exec/memory_ldst_phys.h.inc | 78 ++++++++++++++--------------- 1 file changed, 39 insertions(+), 39 deletions(-) diff --git a/include/exec/memory_ldst_phys.h.inc b/include/exec/memory_ldst= _phys.h.inc index b9dd53c389d..4033795add7 100644 --- a/include/exec/memory_ldst_phys.h.inc +++ b/include/exec/memory_ldst_phys.h.inc @@ -20,6 +20,12 @@ */ =20 #ifdef TARGET_ENDIANNESS +static inline uint32_t glue(lduw_phys, SUFFIX)(ARG1_DECL, hwaddr addr) +{ + return glue(address_space_lduw, SUFFIX)(ARG1, addr, + MEMTXATTRS_UNSPECIFIED, NULL); +} + static inline uint32_t glue(ldl_phys, SUFFIX)(ARG1_DECL, hwaddr addr) { return glue(address_space_ldl, SUFFIX)(ARG1, addr, @@ -32,10 +38,10 @@ static inline uint64_t glue(ldq_phys, SUFFIX)(ARG1_DECL= , hwaddr addr) MEMTXATTRS_UNSPECIFIED, NULL); } =20 -static inline uint32_t glue(lduw_phys, SUFFIX)(ARG1_DECL, hwaddr addr) +static inline void glue(stw_phys, SUFFIX)(ARG1_DECL, hwaddr addr, uint32_t= val) { - return glue(address_space_lduw, SUFFIX)(ARG1, addr, - MEMTXATTRS_UNSPECIFIED, NULL); + glue(address_space_stw, SUFFIX)(ARG1, addr, val, + MEMTXATTRS_UNSPECIFIED, NULL); } =20 static inline void glue(stl_phys, SUFFIX)(ARG1_DECL, hwaddr addr, uint32_t= val) @@ -44,18 +50,30 @@ static inline void glue(stl_phys, SUFFIX)(ARG1_DECL, hw= addr addr, uint32_t val) MEMTXATTRS_UNSPECIFIED, NULL); } =20 -static inline void glue(stw_phys, SUFFIX)(ARG1_DECL, hwaddr addr, uint32_t= val) -{ - glue(address_space_stw, SUFFIX)(ARG1, addr, val, - MEMTXATTRS_UNSPECIFIED, NULL); -} - static inline void glue(stq_phys, SUFFIX)(ARG1_DECL, hwaddr addr, uint64_t= val) { glue(address_space_stq, SUFFIX)(ARG1, addr, val, MEMTXATTRS_UNSPECIFIED, NULL); } #else +static inline uint32_t glue(ldub_phys, SUFFIX)(ARG1_DECL, hwaddr addr) +{ + return glue(address_space_ldub, SUFFIX)(ARG1, addr, + MEMTXATTRS_UNSPECIFIED, NULL); +} + +static inline uint32_t glue(lduw_le_phys, SUFFIX)(ARG1_DECL, hwaddr addr) +{ + return glue(address_space_lduw_le, SUFFIX)(ARG1, addr, + MEMTXATTRS_UNSPECIFIED, NUL= L); +} + +static inline uint32_t glue(lduw_be_phys, SUFFIX)(ARG1_DECL, hwaddr addr) +{ + return glue(address_space_lduw_be, SUFFIX)(ARG1, addr, + MEMTXATTRS_UNSPECIFIED, NUL= L); +} + static inline uint32_t glue(ldl_le_phys, SUFFIX)(ARG1_DECL, hwaddr addr) { return glue(address_space_ldl_le, SUFFIX)(ARG1, addr, @@ -80,36 +98,6 @@ static inline uint64_t glue(ldq_be_phys, SUFFIX)(ARG1_DE= CL, hwaddr addr) MEMTXATTRS_UNSPECIFIED, NULL= ); } =20 -static inline uint32_t glue(ldub_phys, SUFFIX)(ARG1_DECL, hwaddr addr) -{ - return glue(address_space_ldub, SUFFIX)(ARG1, addr, - MEMTXATTRS_UNSPECIFIED, NULL); -} - -static inline uint32_t glue(lduw_le_phys, SUFFIX)(ARG1_DECL, hwaddr addr) -{ - return glue(address_space_lduw_le, SUFFIX)(ARG1, addr, - MEMTXATTRS_UNSPECIFIED, NUL= L); -} - -static inline uint32_t glue(lduw_be_phys, SUFFIX)(ARG1_DECL, hwaddr addr) -{ - return glue(address_space_lduw_be, SUFFIX)(ARG1, addr, - MEMTXATTRS_UNSPECIFIED, NUL= L); -} - -static inline void glue(stl_le_phys, SUFFIX)(ARG1_DECL, hwaddr addr, uint3= 2_t val) -{ - glue(address_space_stl_le, SUFFIX)(ARG1, addr, val, - MEMTXATTRS_UNSPECIFIED, NULL); -} - -static inline void glue(stl_be_phys, SUFFIX)(ARG1_DECL, hwaddr addr, uint3= 2_t val) -{ - glue(address_space_stl_be, SUFFIX)(ARG1, addr, val, - MEMTXATTRS_UNSPECIFIED, NULL); -} - static inline void glue(stb_phys, SUFFIX)(ARG1_DECL, hwaddr addr, uint32_t= val) { glue(address_space_stb, SUFFIX)(ARG1, addr, val, @@ -128,6 +116,18 @@ static inline void glue(stw_be_phys, SUFFIX)(ARG1_DECL= , hwaddr addr, uint32_t va MEMTXATTRS_UNSPECIFIED, NULL); } =20 +static inline void glue(stl_le_phys, SUFFIX)(ARG1_DECL, hwaddr addr, uint3= 2_t val) +{ + glue(address_space_stl_le, SUFFIX)(ARG1, addr, val, + MEMTXATTRS_UNSPECIFIED, NULL); +} + +static inline void glue(stl_be_phys, SUFFIX)(ARG1_DECL, hwaddr addr, uint3= 2_t val) +{ + glue(address_space_stl_be, SUFFIX)(ARG1, addr, val, + MEMTXATTRS_UNSPECIFIED, NULL); +} + static inline void glue(stq_le_phys, SUFFIX)(ARG1_DECL, hwaddr addr, uint6= 4_t val) { glue(address_space_stq_le, SUFFIX)(ARG1, addr, val, --=20 2.26.3 From nobody Thu May 2 15:01:46 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1621363037; cv=none; d=zohomail.com; s=zohoarc; b=h1AdSjOLZW840KaYxjWWZkkpb1mUI/4Q/2CKbm3Qg2i8qb6At3OYSFxrUFoCJSMMitf+LDPKXdgmVAzZb0TM1T3kMLBsNtR9+FmVDl/QnUcIxYIzpvZKgyOD36ggHLYqI6z48lRObPOztxKuhbA9iSHxhb1hPC9zmRYjNVIajz0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1621363037; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=9HmbSl5d9pXpS90PMMdxl3LY29W1LC7gy3N9ueCnGUQ=; b=XG5QTnoxM74pr+5q8nO2gHXYo2bOI7O/SR4PcxI15R1cPxde9GHms1a46FNkir7PCABTPs8qyaHqDIGoSqHFjNheVykFfRg0RqwR97zfiPyybubzuZvRMDYYbyrPt1wnMaLkMk90/x1eDQhwqiwXAjw9WunEqLjgUzr8sMVPJGc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by mx.zohomail.com with SMTPS id 1621363037116219.23325870801057; Tue, 18 May 2021 11:37:17 -0700 (PDT) Received: from mail-ej1-f69.google.com (mail-ej1-f69.google.com [209.85.218.69]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-281-sIEn6m-eMhGJPBQfZTiKEw-1; Tue, 18 May 2021 14:37:14 -0400 Received: by mail-ej1-f69.google.com with SMTP id eb10-20020a170907280ab02903d65bd14481so2462570ejc.21 for ; Tue, 18 May 2021 11:37:14 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.redhat.com (31.red-83-51-215.dynamicip.rima-tde.net. [83.51.215.31]) by smtp.gmail.com with ESMTPSA id i5sm7861279ejv.120.2021.05.18.11.37.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 18 May 2021 11:37:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1621363036; 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; bh=9HmbSl5d9pXpS90PMMdxl3LY29W1LC7gy3N9ueCnGUQ=; b=E4xIapvxEl5vxsvaHKL988vZ/QhcDMUlu8l196LTpmXmgY5zUpeqNT9Zk/rq0tU40m1mq1 fJ09VUNS+GTBtWKPLCEzdkrqrldP2ysPWc92pltnSllk3Mkd3CWBt9Ht0R/V+kQLuzVbnK 1uNfUcEDTfCJxQ6S7v53G1PfCMEmCEA= X-MC-Unique: sIEn6m-eMhGJPBQfZTiKEw-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=9HmbSl5d9pXpS90PMMdxl3LY29W1LC7gy3N9ueCnGUQ=; b=CkOycQE8kBDitECr2vMbldGe5JoxLnCPqFZ2ommaOoe+MyBwISjbqshftXAxxa9WIU 8Mnm7AXibh//bh9HEFN+Am6T2s8EvwTInYsb35/Suo246ZuGZDCSAJaPrAxIXhs5Npmp +i75N148s9arMMG1b3keplIn1xjA4KmWWszeWsPt9bYY6BwXC4zUUzxG8P9x6mx+aub3 O2rqFBXtP4HjSlU+wHLaTckviEtOAaER8opAEy8jkBZ4ndt8GDPy2fNVAqeBr7DLrmZc N4RqFbMWIptlXf4UMNJp6plqFkQ6Sks7ijd3XzuxJnvHSSdOYmO0w5wcO05Wzu/nE0nP sQWg== X-Gm-Message-State: AOAM530R9vu5JGppN+l+C9kofXlIcm+bx/rDB5yOgio8lolN1lwapcxh UKRONJ6dDY7eVquFeVBn4YW04ehMeUwHb3lFQeXp0IdAqSXgjvd+7nZ+EWBrz5dimzMJ9soN3X0 7WA0XJO0vBPxzFg== X-Received: by 2002:a17:906:328c:: with SMTP id 12mr7440847ejw.361.1621363033231; Tue, 18 May 2021 11:37:13 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyOaLPa9LjW/42a1BXxy26w0/1lB6YlK+93L/Soq24MfY6UpIF8yeAuo6xL7vfburNouLjBEg== X-Received: by 2002:a17:906:328c:: with SMTP id 12mr7440838ejw.361.1621363033070; Tue, 18 May 2021 11:37:13 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Bibo Mao , "Michael S. Tsirkin" , Richard Henderson , Paolo Bonzini , Jiaxun Yang , Peter Xu , Huacai Chen , Peter Maydell , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [RFC PATCH 03/25] exec/memory_ldst: Use correct type sizes Date: Tue, 18 May 2021 20:36:33 +0200 Message-Id: <20210518183655.1711377-4-philmd@redhat.com> X-Mailer: git-send-email 2.26.3 In-Reply-To: <20210518183655.1711377-1-philmd@redhat.com> References: <20210518183655.1711377-1-philmd@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Use uint8_t for (unsigned) byte, and uint16_t for (unsigned) 16-bit word. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- include/exec/memory_ldst.h.inc | 16 ++++++++-------- memory_ldst.c.inc | 20 ++++++++++---------- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/include/exec/memory_ldst.h.inc b/include/exec/memory_ldst.h.inc index 46e6c220d35..7c3a641f7ed 100644 --- a/include/exec/memory_ldst.h.inc +++ b/include/exec/memory_ldst.h.inc @@ -20,7 +20,7 @@ */ =20 #ifdef TARGET_ENDIANNESS -extern uint32_t glue(address_space_lduw, SUFFIX)(ARG1_DECL, +extern uint16_t glue(address_space_lduw, SUFFIX)(ARG1_DECL, hwaddr addr, MemTxAttrs attrs, MemTxResult *result); extern uint32_t glue(address_space_ldl, SUFFIX)(ARG1_DECL, hwaddr addr, MemTxAttrs attrs, MemTxResult *result); @@ -29,17 +29,17 @@ extern uint64_t glue(address_space_ldq, SUFFIX)(ARG1_DE= CL, extern void glue(address_space_stl_notdirty, SUFFIX)(ARG1_DECL, hwaddr addr, uint32_t val, MemTxAttrs attrs, MemTxResult *result); extern void glue(address_space_stw, SUFFIX)(ARG1_DECL, - hwaddr addr, uint32_t val, MemTxAttrs attrs, MemTxResult *result); + hwaddr addr, uint16_t val, MemTxAttrs attrs, MemTxResult *result); extern void glue(address_space_stl, SUFFIX)(ARG1_DECL, hwaddr addr, uint32_t val, MemTxAttrs attrs, MemTxResult *result); extern void glue(address_space_stq, SUFFIX)(ARG1_DECL, hwaddr addr, uint64_t val, MemTxAttrs attrs, MemTxResult *result); #else -extern uint32_t glue(address_space_ldub, SUFFIX)(ARG1_DECL, +extern uint8_t glue(address_space_ldub, SUFFIX)(ARG1_DECL, hwaddr addr, MemTxAttrs attrs, MemTxResult *result); -extern uint32_t glue(address_space_lduw_le, SUFFIX)(ARG1_DECL, +extern uint16_t glue(address_space_lduw_le, SUFFIX)(ARG1_DECL, hwaddr addr, MemTxAttrs attrs, MemTxResult *result); -extern uint32_t glue(address_space_lduw_be, SUFFIX)(ARG1_DECL, +extern uint16_t glue(address_space_lduw_be, SUFFIX)(ARG1_DECL, hwaddr addr, MemTxAttrs attrs, MemTxResult *result); extern uint32_t glue(address_space_ldl_le, SUFFIX)(ARG1_DECL, hwaddr addr, MemTxAttrs attrs, MemTxResult *result); @@ -50,11 +50,11 @@ extern uint64_t glue(address_space_ldq_le, SUFFIX)(ARG1= _DECL, extern uint64_t glue(address_space_ldq_be, SUFFIX)(ARG1_DECL, hwaddr addr, MemTxAttrs attrs, MemTxResult *result); extern void glue(address_space_stb, SUFFIX)(ARG1_DECL, - hwaddr addr, uint32_t val, MemTxAttrs attrs, MemTxResult *result); + hwaddr addr, uint8_t val, MemTxAttrs attrs, MemTxResult *result); extern void glue(address_space_stw_le, SUFFIX)(ARG1_DECL, - hwaddr addr, uint32_t val, MemTxAttrs attrs, MemTxResult *result); + hwaddr addr, uint16_t val, MemTxAttrs attrs, MemTxResult *result); extern void glue(address_space_stw_be, SUFFIX)(ARG1_DECL, - hwaddr addr, uint32_t val, MemTxAttrs attrs, MemTxResult *result); + hwaddr addr, uint16_t val, MemTxAttrs attrs, MemTxResult *result); extern void glue(address_space_stl_le, SUFFIX)(ARG1_DECL, hwaddr addr, uint32_t val, MemTxAttrs attrs, MemTxResult *result); extern void glue(address_space_stl_be, SUFFIX)(ARG1_DECL, diff --git a/memory_ldst.c.inc b/memory_ldst.c.inc index b56e9619674..84b868f2946 100644 --- a/memory_ldst.c.inc +++ b/memory_ldst.c.inc @@ -157,7 +157,7 @@ uint64_t glue(address_space_ldq_be, SUFFIX)(ARG1_DECL, DEVICE_BIG_ENDIAN); } =20 -uint32_t glue(address_space_ldub, SUFFIX)(ARG1_DECL, +uint8_t glue(address_space_ldub, SUFFIX)(ARG1_DECL, hwaddr addr, MemTxAttrs attrs, MemTxResult *result) { uint8_t *ptr; @@ -193,7 +193,7 @@ uint32_t glue(address_space_ldub, SUFFIX)(ARG1_DECL, } =20 /* warning: addr must be aligned */ -static inline uint32_t glue(address_space_lduw_internal, SUFFIX)(ARG1_DECL, +static inline uint16_t glue(address_space_lduw_internal, SUFFIX)(ARG1_DECL, hwaddr addr, MemTxAttrs attrs, MemTxResult *result, enum device_endian endian) { @@ -240,21 +240,21 @@ static inline uint32_t glue(address_space_lduw_intern= al, SUFFIX)(ARG1_DECL, return val; } =20 -uint32_t glue(address_space_lduw, SUFFIX)(ARG1_DECL, +uint16_t glue(address_space_lduw, SUFFIX)(ARG1_DECL, hwaddr addr, MemTxAttrs attrs, MemTxResult *result) { return glue(address_space_lduw_internal, SUFFIX)(ARG1, addr, attrs, re= sult, DEVICE_NATIVE_ENDIAN); } =20 -uint32_t glue(address_space_lduw_le, SUFFIX)(ARG1_DECL, +uint16_t glue(address_space_lduw_le, SUFFIX)(ARG1_DECL, hwaddr addr, MemTxAttrs attrs, MemTxResult *result) { return glue(address_space_lduw_internal, SUFFIX)(ARG1, addr, attrs, re= sult, DEVICE_LITTLE_ENDIAN); } =20 -uint32_t glue(address_space_lduw_be, SUFFIX)(ARG1_DECL, +uint16_t glue(address_space_lduw_be, SUFFIX)(ARG1_DECL, hwaddr addr, MemTxAttrs attrs, MemTxResult *result) { return glue(address_space_lduw_internal, SUFFIX)(ARG1, addr, attrs, re= sult, @@ -366,7 +366,7 @@ void glue(address_space_stl_be, SUFFIX)(ARG1_DECL, } =20 void glue(address_space_stb, SUFFIX)(ARG1_DECL, - hwaddr addr, uint32_t val, MemTxAttrs attrs, MemTxResult *result) + hwaddr addr, uint8_t val, MemTxAttrs attrs, MemTxResult *result) { uint8_t *ptr; MemoryRegion *mr; @@ -398,7 +398,7 @@ void glue(address_space_stb, SUFFIX)(ARG1_DECL, =20 /* warning: addr must be aligned */ static inline void glue(address_space_stw_internal, SUFFIX)(ARG1_DECL, - hwaddr addr, uint32_t val, MemTxAttrs attrs, + hwaddr addr, uint16_t val, MemTxAttrs attrs, MemTxResult *result, enum device_endian endian) { uint8_t *ptr; @@ -441,21 +441,21 @@ static inline void glue(address_space_stw_internal, S= UFFIX)(ARG1_DECL, } =20 void glue(address_space_stw, SUFFIX)(ARG1_DECL, - hwaddr addr, uint32_t val, MemTxAttrs attrs, MemTxResult *result) + hwaddr addr, uint16_t val, MemTxAttrs attrs, MemTxResult *result) { glue(address_space_stw_internal, SUFFIX)(ARG1, addr, val, attrs, resul= t, DEVICE_NATIVE_ENDIAN); } =20 void glue(address_space_stw_le, SUFFIX)(ARG1_DECL, - hwaddr addr, uint32_t val, MemTxAttrs attrs, MemTxResult *result) + hwaddr addr, uint16_t val, MemTxAttrs attrs, MemTxResult *result) { glue(address_space_stw_internal, SUFFIX)(ARG1, addr, val, attrs, resul= t, DEVICE_LITTLE_ENDIAN); } =20 void glue(address_space_stw_be, SUFFIX)(ARG1_DECL, - hwaddr addr, uint32_t val, MemTxAttrs attrs, MemTxResult *result) + hwaddr addr, uint16_t val, MemTxAttrs attrs, MemTxResult *result) { glue(address_space_stw_internal, SUFFIX)(ARG1, addr, val, attrs, resul= t, DEVICE_BIG_ENDIAN); --=20 2.26.3 From nobody Thu May 2 15:01:46 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1621363042; cv=none; d=zohomail.com; s=zohoarc; b=BCn/dP3GgSwZXxViKuv1U37/pW+pU4/9r7gIImauN9oJTA5sTxzizCK0VjXNak1NO7DXYk26Nm2MEhW9/Plr5gVkIdyzebRwBho95W+0uMdRRo+yaB8QrcWjrcve90p+kO/HUR+lX87ioMVeyb//quFhcTnJt5K9C9SZzcv+onk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1621363042; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=YLH7tC7sd/ju26noenjhTGGhpMc2gBLlxO2UZKdJboA=; b=IaseApO9w6USKBxjpTS7hRg0zB5GrbvuxidaWziwlUb8rvSPO7Bz5PlE4q2fh40y6EzCIP6OyOLdnHEvgBkoEbQcrBm8nC9A157t2Ixhm3zyiEwPKsVsy5BznY8g5liZUUjZgX97t5t5rJBdwZ7atcaa/HGZvRUpCZiOzNRKd1U= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by mx.zohomail.com with SMTPS id 1621363042084170.96145275268464; Tue, 18 May 2021 11:37:22 -0700 (PDT) Received: from mail-ed1-f72.google.com (mail-ed1-f72.google.com [209.85.208.72]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-85-FX3mgY2iPU-LzQ-JFaI40Q-1; Tue, 18 May 2021 14:37:19 -0400 Received: by mail-ed1-f72.google.com with SMTP id w1-20020aa7da410000b029038d323eeee3so4207464eds.8 for ; Tue, 18 May 2021 11:37:19 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.redhat.com (31.red-83-51-215.dynamicip.rima-tde.net. [83.51.215.31]) by smtp.gmail.com with ESMTPSA id g13sm3993451ejr.63.2021.05.18.11.37.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 18 May 2021 11:37:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1621363041; 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; bh=YLH7tC7sd/ju26noenjhTGGhpMc2gBLlxO2UZKdJboA=; b=TpacIaAVQyOP/hlpXQGGUPm44VAnFa6cnja8rHg+KTJjJOAY828ypj/HA9bKgcM+71W37f k2/ZHcU6N0Pfltc+2VkkB+vXHw5cfi2qNrIHU4DPk6VWF7zlxisIejzVchaypbIZfGAVV4 dqQCHiTwO8xKgbmtlHnfLMmSjbka+WA= X-MC-Unique: FX3mgY2iPU-LzQ-JFaI40Q-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=YLH7tC7sd/ju26noenjhTGGhpMc2gBLlxO2UZKdJboA=; b=FbNZRz0sPHYoiRovwhtDZWMOzXtBf51z2N6QlA6Irs7WgiziZoGbaUMcfRqb80kYc0 Tf9E8RJv9dUKyiqVtfWYIOWOrzPtYYHT9DNmVf0GYKHMHZGZeL7f/z6OMWAeFeXp9dmk 2agUyS29UeOZthZ/H8PK/iO8P4ae8H07WABaiMqcJNKtE66EneShpVjv+4N1tsrOgfDs 4NzSvqfG8hlGzeyFoIJPyJ9yQPMZPm6H6s3DNJHFxseL2qUBUARTZydztD5316tehw88 gLbRHSuO3TtMbXDhUIV8FEFD261bnN+zul1c393QoxuKjImwPEf8ckBiPi7zd40v1U3S U/EA== X-Gm-Message-State: AOAM531WCd28/W/vKHcjdUIPHST70P+DI6oUTeYfp6Jun5yAVLssX/zg cPV2z3pC9yO9hkH+VlsXiOjlpiEgwI+keUWssEbDJ7VAxPa8ccuEH2FMTzD1xa/WNcNdro2oFBG e3sx1I/36wd5Tmg== X-Received: by 2002:a17:906:2b4b:: with SMTP id b11mr7451840ejg.379.1621363038201; Tue, 18 May 2021 11:37:18 -0700 (PDT) X-Google-Smtp-Source: ABdhPJw/LdkZ2ZlBydKFNzHlPnIZ1OrnCGCaOeoOetmr9AHzezUlYe6gVD+JCn2t7ydjlCw8lZOjTg== X-Received: by 2002:a17:906:2b4b:: with SMTP id b11mr7451825ejg.379.1621363038013; Tue, 18 May 2021 11:37:18 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Bibo Mao , "Michael S. Tsirkin" , Richard Henderson , Paolo Bonzini , Jiaxun Yang , Peter Xu , Huacai Chen , Peter Maydell , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [RFC PATCH 04/25] exec/memory_ldst_phys: Use correct type sizes Date: Tue, 18 May 2021 20:36:34 +0200 Message-Id: <20210518183655.1711377-5-philmd@redhat.com> X-Mailer: git-send-email 2.26.3 In-Reply-To: <20210518183655.1711377-1-philmd@redhat.com> References: <20210518183655.1711377-1-philmd@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Use uint8_t for (unsigned) byte, and uint16_t for (unsigned) 16-bit word. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- include/exec/memory_ldst_phys.h.inc | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/include/exec/memory_ldst_phys.h.inc b/include/exec/memory_ldst= _phys.h.inc index 4033795add7..ecd678610d1 100644 --- a/include/exec/memory_ldst_phys.h.inc +++ b/include/exec/memory_ldst_phys.h.inc @@ -20,7 +20,7 @@ */ =20 #ifdef TARGET_ENDIANNESS -static inline uint32_t glue(lduw_phys, SUFFIX)(ARG1_DECL, hwaddr addr) +static inline uint16_t glue(lduw_phys, SUFFIX)(ARG1_DECL, hwaddr addr) { return glue(address_space_lduw, SUFFIX)(ARG1, addr, MEMTXATTRS_UNSPECIFIED, NULL); @@ -38,7 +38,7 @@ static inline uint64_t glue(ldq_phys, SUFFIX)(ARG1_DECL, = hwaddr addr) MEMTXATTRS_UNSPECIFIED, NULL); } =20 -static inline void glue(stw_phys, SUFFIX)(ARG1_DECL, hwaddr addr, uint32_t= val) +static inline void glue(stw_phys, SUFFIX)(ARG1_DECL, hwaddr addr, uint16_t= val) { glue(address_space_stw, SUFFIX)(ARG1, addr, val, MEMTXATTRS_UNSPECIFIED, NULL); @@ -56,19 +56,19 @@ static inline void glue(stq_phys, SUFFIX)(ARG1_DECL, hw= addr addr, uint64_t val) MEMTXATTRS_UNSPECIFIED, NULL); } #else -static inline uint32_t glue(ldub_phys, SUFFIX)(ARG1_DECL, hwaddr addr) +static inline uint8_t glue(ldub_phys, SUFFIX)(ARG1_DECL, hwaddr addr) { return glue(address_space_ldub, SUFFIX)(ARG1, addr, MEMTXATTRS_UNSPECIFIED, NULL); } =20 -static inline uint32_t glue(lduw_le_phys, SUFFIX)(ARG1_DECL, hwaddr addr) +static inline uint16_t glue(lduw_le_phys, SUFFIX)(ARG1_DECL, hwaddr addr) { return glue(address_space_lduw_le, SUFFIX)(ARG1, addr, MEMTXATTRS_UNSPECIFIED, NUL= L); } =20 -static inline uint32_t glue(lduw_be_phys, SUFFIX)(ARG1_DECL, hwaddr addr) +static inline uint16_t glue(lduw_be_phys, SUFFIX)(ARG1_DECL, hwaddr addr) { return glue(address_space_lduw_be, SUFFIX)(ARG1, addr, MEMTXATTRS_UNSPECIFIED, NUL= L); @@ -98,19 +98,19 @@ static inline uint64_t glue(ldq_be_phys, SUFFIX)(ARG1_D= ECL, hwaddr addr) MEMTXATTRS_UNSPECIFIED, NULL= ); } =20 -static inline void glue(stb_phys, SUFFIX)(ARG1_DECL, hwaddr addr, uint32_t= val) +static inline void glue(stb_phys, SUFFIX)(ARG1_DECL, hwaddr addr, uint8_t = val) { glue(address_space_stb, SUFFIX)(ARG1, addr, val, MEMTXATTRS_UNSPECIFIED, NULL); } =20 -static inline void glue(stw_le_phys, SUFFIX)(ARG1_DECL, hwaddr addr, uint3= 2_t val) +static inline void glue(stw_le_phys, SUFFIX)(ARG1_DECL, hwaddr addr, uint1= 6_t val) { glue(address_space_stw_le, SUFFIX)(ARG1, addr, val, MEMTXATTRS_UNSPECIFIED, NULL); } =20 -static inline void glue(stw_be_phys, SUFFIX)(ARG1_DECL, hwaddr addr, uint3= 2_t val) +static inline void glue(stw_be_phys, SUFFIX)(ARG1_DECL, hwaddr addr, uint1= 6_t val) { glue(address_space_stw_be, SUFFIX)(ARG1, addr, val, MEMTXATTRS_UNSPECIFIED, NULL); --=20 2.26.3 From nobody Thu May 2 15:01:46 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1621363047; cv=none; d=zohomail.com; s=zohoarc; b=Am9aDEW6jAQctIwqsezwt1jmTQOPYu5CRGcuM4KSkEDyvMSGlB12gHo63LNaRvhX42yB+JfnB4lIUj1y3xO7dvWSfnWCluQTKk7S+bqe2gG2u6qLQA5H0AjJaZTsNUKBVjOHKPSxyvlU6Fa2nvlfFKSFSPz89nixkZ4KQndODro= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1621363047; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=Z2KMRus6wjZmSwZp3NDF0wx5q7DfpOUE+gwTHQ1DOIM=; b=SfVNKD3Ln2QNCC9GwqTAj1kJqNzSTOR/dhxQemclrJ0H8UysajlSzUM+6EC3/SSgAMfszdO/DPt68g8fRl8t7iAFWPvbA2OyuEYu8bCr4qWkm8AvWUMODOxGo6s/f0DD/rxZtpGQKI1VNR9ww3QQ1HuUkCb3s0UhcNWiGlfqo4c= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by mx.zohomail.com with SMTPS id 1621363047805844.2156963819658; Tue, 18 May 2021 11:37:27 -0700 (PDT) Received: from mail-ej1-f70.google.com (mail-ej1-f70.google.com [209.85.218.70]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-377-psRlNkf5P5iyfewRkfgyCg-1; Tue, 18 May 2021 14:37:24 -0400 Received: by mail-ej1-f70.google.com with SMTP id gt39-20020a1709072da7b02903a8f7736a08so2756631ejc.1 for ; Tue, 18 May 2021 11:37:24 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.redhat.com (31.red-83-51-215.dynamicip.rima-tde.net. [83.51.215.31]) by smtp.gmail.com with ESMTPSA id k13sm4869539ejr.1.2021.05.18.11.37.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 18 May 2021 11:37:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1621363045; 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; bh=Z2KMRus6wjZmSwZp3NDF0wx5q7DfpOUE+gwTHQ1DOIM=; b=Z4BVagjkqU3cyAmFpCh4JAhNpVMfRI+PQNEL1vybV5xm3i7UMPDc11V2Nr3YRzkvuFVRoK C/Z/yDxe4A4uqH6fBUstsDEjrH14L7L07c+FAx8CJbY9zKTr5tGmpxEXKtVUHTDA+GLlQQ rsYThGMRtlgm8OIir7k/5lsvWyfOgoY= X-MC-Unique: psRlNkf5P5iyfewRkfgyCg-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Z2KMRus6wjZmSwZp3NDF0wx5q7DfpOUE+gwTHQ1DOIM=; b=YUMDOFB+dQKkhi1yEtv6UZp/2pAUXczak+04Aoz+jS2hjjUMZHtanF6CjOKVHf7aKQ iOfH/6ia8KvU0fNoZAxd9vFY6djsJLDBsOcWTtoFbtDoW8yyIuTacklI9/RSzLrv2Z8r zfPuhhZwD4TcEWxJRGvyL90QlB0qxaOw/+1lIb/v5vC7k6tkJejj0qOYMOqShFwLsAyx B0F2rTJtbXcUlDDpArW2vcm0lIMCYZ52E9GFKpFjFwDUXOk33/8IVX4xWaTkjeW3oJJl SIe7Ytll5OJeHh48P1+TRlWuoMWApnFMuFdVUh2WQ242WRPo2YWlcFdAp7t7zo1thOc/ o/5w== X-Gm-Message-State: AOAM532mTtRr3NNqKoEKWCZInxVeKNcJiY8OjJux14aRGRiJCws84j5z V/d3JrzudzyEFKlj2O5L6JMFfRHgQpzcb6QfsGTuhxRYWyUK0pwE56DXNESxvLsZOqq4cRk92Mu F1QmTG+J+eExi/g== X-Received: by 2002:a17:906:854e:: with SMTP id h14mr1299369ejy.455.1621363043098; Tue, 18 May 2021 11:37:23 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwH6E+24DKPzpwS7SLv4ZANNH8MZc0+BA9a/2u3GFBr2frPnPRyGx/yU/KhGArKcOTwJ+xhnw== X-Received: by 2002:a17:906:854e:: with SMTP id h14mr1299356ejy.455.1621363042942; Tue, 18 May 2021 11:37:22 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Bibo Mao , "Michael S. Tsirkin" , Richard Henderson , Paolo Bonzini , Jiaxun Yang , Peter Xu , Huacai Chen , Peter Maydell , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [RFC PATCH 05/25] exec/memory_ldst_cached: Use correct type size Date: Tue, 18 May 2021 20:36:35 +0200 Message-Id: <20210518183655.1711377-6-philmd@redhat.com> X-Mailer: git-send-email 2.26.3 In-Reply-To: <20210518183655.1711377-1-philmd@redhat.com> References: <20210518183655.1711377-1-philmd@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Use uint16_t for (unsigned) 16-bit word. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- include/exec/memory_ldst_cached.h.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/exec/memory_ldst_cached.h.inc b/include/exec/memory_ld= st_cached.h.inc index c33449d0cd5..d7834f852c4 100644 --- a/include/exec/memory_ldst_cached.h.inc +++ b/include/exec/memory_ldst_cached.h.inc @@ -24,7 +24,7 @@ #define LD_P(size) \ glue(glue(ld, size), glue(ENDIANNESS, _p)) =20 -static inline uint32_t ADDRESS_SPACE_LD_CACHED(uw)(MemoryRegionCache *cach= e, +static inline uint16_t ADDRESS_SPACE_LD_CACHED(uw)(MemoryRegionCache *cach= e, hwaddr addr, MemTxAttrs attrs, MemTxResult *result) { assert(addr < cache->len && 2 <=3D cache->len - addr); @@ -72,7 +72,7 @@ static inline uint64_t ADDRESS_SPACE_LD_CACHED(q)(MemoryR= egionCache *cache, glue(glue(st, size), glue(ENDIANNESS, _p)) =20 static inline void ADDRESS_SPACE_ST_CACHED(w)(MemoryRegionCache *cache, - hwaddr addr, uint32_t val, MemTxAttrs attrs, MemTxResult *result) + hwaddr addr, uint16_t val, MemTxAttrs attrs, MemTxResult *result) { assert(addr < cache->len && 2 <=3D cache->len - addr); if (likely(cache->ptr)) { --=20 2.26.3 From nobody Thu May 2 15:01:46 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1621363053; cv=none; d=zohomail.com; s=zohoarc; b=BVWJCMuWHyl2dS/JK9uJ1+2vH0KdJxcsu+JAK6hko9vGxahc6MSNrM++hkJHHnDK9MVAPYYsK10xdVP8HojvKI/7rRy3VVm4UcXcTcBiSftZHy5ONXchGyiZSMDmROJVH7VKisDnCAfvacjoBK5BF6dYDxg3IRwYlsAc6TX+9f0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1621363053; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=C7wusLwtBFDnZbn88h3Dk4owU1ZPJsD/w4Pwm7Wu00A=; b=ddcPCRkGfDFkqum3nhOWNHMh1JH0fPGliK3x83JHLfgbMHzbUIIXSBuUvazxWCJu6KKH6uIs97W4L8CVrtQ8t+4EIsxPlOV0tjMmijQteASeLKhjMxpIrbM8Jf1prF8uifR2aBoKaFz10hK7RrzVzXfk3PscGIlVAXEFyX5CSPg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by mx.zohomail.com with SMTPS id 1621363053575182.57151849600803; Tue, 18 May 2021 11:37:33 -0700 (PDT) Received: from mail-ed1-f72.google.com (mail-ed1-f72.google.com [209.85.208.72]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-163-__W2OLdZPyKiyDkQINYa5g-1; Tue, 18 May 2021 14:37:30 -0400 Received: by mail-ed1-f72.google.com with SMTP id s20-20020a0564025214b029038752a2d8f3so6253468edd.2 for ; Tue, 18 May 2021 11:37:30 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.redhat.com (31.red-83-51-215.dynamicip.rima-tde.net. [83.51.215.31]) by smtp.gmail.com with ESMTPSA id g11sm13444419edt.85.2021.05.18.11.37.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 18 May 2021 11:37:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1621363052; 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; bh=C7wusLwtBFDnZbn88h3Dk4owU1ZPJsD/w4Pwm7Wu00A=; b=R3Jmc/kIXIDv72iqJ6nKb4eE8unJRmaidBe70aozgD4PH62LAYCs/wYhIRZ05xkUJ6hh3i uzBB7L16gWihqCOg9yLMgGAy1Gte+eaidQIzip9KlRkwGd1Hgnu/EgcFEgaJ5s9jG48MnA DQt5J5w9wt6SZNWnAN+2jt1/ulTS+Ts= X-MC-Unique: __W2OLdZPyKiyDkQINYa5g-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=C7wusLwtBFDnZbn88h3Dk4owU1ZPJsD/w4Pwm7Wu00A=; b=XdaVgodnonRM69/TcxVwZqC7sFidUFWmB/NT2ZWrKylkZQmnxqhkUSY1kGj9Omz3vL nLg4XjDh5wRzygWFSI1ilGW9k77IKYJmxLDyT5l5S58MIdVfmzdJmumZuds4U3NaV4Cp WV+eLyv18BUk4Lcx50WaJHCH2Fh2FNWdYmnwS+5Jo/dmND1uyChfA0wNxVPust9y2XZC ImmKMb6G+5Ko4Y45trqz5u3ZX+via1kr/rwmmEpM0h2cCaHZ3bcxKnV0q89CAmIKBLey QMXgIZl57GDn1e5gLkvfMO4WK8fKXNuyRtR+GJDbkxhUCEzymXlBbbDOrIq2QgL2q8N6 kYNA== X-Gm-Message-State: AOAM531diwhlFl0J5DWd97cH9vTN7P6HM4eLYf0WQnDnlX/K/P9vd9Sl +bdVealq1w4Na1Gt6pu900zXtEejJ/TJsb+tNdcHMcmz8P3WSZHZNtwhT8cqe7dWfGYyW0R7Hev PGyRe9Po26w74CQ== X-Received: by 2002:a17:907:960b:: with SMTP id gb11mr7385621ejc.123.1621363048238; Tue, 18 May 2021 11:37:28 -0700 (PDT) X-Google-Smtp-Source: ABdhPJw4GJ3r/UfgeQk+p0MiSOfjMwt+3hEFxBreXrSEWejRCJA4FS6tLPTHeXkW+euo030mVwFZog== X-Received: by 2002:a17:907:960b:: with SMTP id gb11mr7385599ejc.123.1621363048019; Tue, 18 May 2021 11:37:28 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Bibo Mao , "Michael S. Tsirkin" , Richard Henderson , Paolo Bonzini , Jiaxun Yang , Peter Xu , Huacai Chen , Peter Maydell , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [RFC PATCH 06/25] exec/memory: Use correct type size Date: Tue, 18 May 2021 20:36:36 +0200 Message-Id: <20210518183655.1711377-7-philmd@redhat.com> X-Mailer: git-send-email 2.26.3 In-Reply-To: <20210518183655.1711377-1-philmd@redhat.com> References: <20210518183655.1711377-1-philmd@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Use uint8_t for (unsigned) byte. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- include/exec/memory.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/exec/memory.h b/include/exec/memory.h index c8b90889241..175d7151a5d 100644 --- a/include/exec/memory.h +++ b/include/exec/memory.h @@ -2305,7 +2305,7 @@ static inline uint8_t address_space_ldub_cached(Memor= yRegionCache *cache, } =20 static inline void address_space_stb_cached(MemoryRegionCache *cache, - hwaddr addr, uint32_t val, MemTxAttrs attrs, MemTxResult *result) + hwaddr addr, uint8_t val, MemTxAttrs attrs, MemTxResult *result) { assert(addr < cache->len); if (likely(cache->ptr)) { --=20 2.26.3 From nobody Thu May 2 15:01:46 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1621363057; cv=none; d=zohomail.com; s=zohoarc; b=Ab5DvLIOjVHcOJP1Ofx6F/+m5HvD79WB4vlrHa7U9A3xPRA6brtONAPbI7/vftDgQoLDn52d5WF0ZvD0C7+o2FwlQvCIcT7AhXjQN94tHjEM5evD+gt/r8ZY15MWBVUhH+CEH+gBiSYItxC5Svmtnv6B1Y/qbvvgldfpOVwcW1g= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1621363057; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=n8p69QDofACFxeVoOjBjmu/iSzxD1vYfqseZWJ45KjA=; b=PPm3mR5LApJ3xxHjPoi5+Up9CkfyJCgiDB88tKfQQHGXD1InIlY8Rfii2sWEij7acLYG9v4at/js3gU66GEdbjuKEQqD4pDnZjY6P9jcEgoK/xL5VJ45l62j7/AwetrJrb8vO5RaI6GTIULtf+0Boc4sjrUBpg7HwdF7zV3ssx8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by mx.zohomail.com with SMTPS id 1621363057866550.0699620847892; Tue, 18 May 2021 11:37:37 -0700 (PDT) Received: from mail-ed1-f69.google.com (mail-ed1-f69.google.com [209.85.208.69]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-493-VCXFV_fwNDOXBNF-fvynBg-1; Tue, 18 May 2021 14:37:35 -0400 Received: by mail-ed1-f69.google.com with SMTP id c21-20020a0564021015b029038c3f08ce5aso6297477edu.18 for ; Tue, 18 May 2021 11:37:34 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.redhat.com (31.red-83-51-215.dynamicip.rima-tde.net. [83.51.215.31]) by smtp.gmail.com with ESMTPSA id h9sm13225232edt.18.2021.05.18.11.37.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 18 May 2021 11:37:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1621363056; 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; bh=n8p69QDofACFxeVoOjBjmu/iSzxD1vYfqseZWJ45KjA=; b=ifUWIXAksaEViOPnlkB2Y3ykdWLUIsxe0BzQBhOoFZpdGy2j18eFMs/FBTrrWnsY1mZGVE adsJd9a21jRxNrcn0jQi2w88E8/hRPqvvmpmNkalGLcDy9ll5eFDw4gND9jt8eqswrJ7PR enyDKGPSnL0fvGtWLsZYNcafTDjbOG8= X-MC-Unique: VCXFV_fwNDOXBNF-fvynBg-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=n8p69QDofACFxeVoOjBjmu/iSzxD1vYfqseZWJ45KjA=; b=LnC/b175dDhmYO5z7z8m4S6Wkua6xDrubYTyugzJhpAg2M+3EykPr+/XAQ9vyeDG1z BqIe9H9PzKBAxq0IF1Z5g47utqZyz1ANmLmxXV7OoV6uC2rDkTdO+jSLORUPwK09n46u i+WQvMT19qXMqTbhdv/JvuOW3yk1LG7qQ1gb9G6vW9FknR21/Uzcp/0mQ6UJ0dFSELwS Kbp31f0megc7ucw/8m0zCfkRPxGgCCHlvu5oQxfePxO3jIxVw/GVZ44Rr6Zf3s+DacTF BeY+QYgYXmjYsDzhyfpvkpF7kMYTbucyc8XllvLyi6CmxO4LXkoeYkr8jNDA6h3XkMRV glug== X-Gm-Message-State: AOAM532oYuijbZrTb7mUMecXxGq2ceoMsXLypTNYEAm2mmMl1hKitDX8 CZzKOihTlF/wfNqHOcAj3yCquHkNWSjkZqSWjfzfWH5mDKWMBjKbKuce5bzQeCyADBUBp80sr9l 4NZq4XQchCuq6Zg== X-Received: by 2002:a17:906:4a81:: with SMTP id x1mr7301655eju.508.1621363053191; Tue, 18 May 2021 11:37:33 -0700 (PDT) X-Google-Smtp-Source: ABdhPJykOVKW+em7Z/NJNkl5QhdilcRxADFmTY/4hw9WkTbkkisaLTwsB+C+UB6B7l5E9MHkml9scg== X-Received: by 2002:a17:906:4a81:: with SMTP id x1mr7301636eju.508.1621363053065; Tue, 18 May 2021 11:37:33 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Bibo Mao , "Michael S. Tsirkin" , Richard Henderson , Paolo Bonzini , Jiaxun Yang , Peter Xu , Huacai Chen , Peter Maydell , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [RFC PATCH 07/25] qemu/bswap: Introduce ST_CONVERT() macro Date: Tue, 18 May 2021 20:36:37 +0200 Message-Id: <20210518183655.1711377-8-philmd@redhat.com> X-Mailer: git-send-email 2.26.3 In-Reply-To: <20210518183655.1711377-1-philmd@redhat.com> References: <20210518183655.1711377-1-philmd@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) To be able to add more load/store operations, introduce the ST_CONVERT() macro. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- include/qemu/bswap.h | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/include/qemu/bswap.h b/include/qemu/bswap.h index 2d3bb8bbedd..86f5ded6acf 100644 --- a/include/qemu/bswap.h +++ b/include/qemu/bswap.h @@ -449,6 +449,23 @@ static inline void stq_be_p(void *ptr, uint64_t v) stq_he_p(ptr, be_bswap(v, 64)); } =20 +#define ST_CONVERT_UNALIGNED(bits, vtype, size)\ +static inline void st ## size ## _he_p(void *ptr, vtype v)\ +{\ + __builtin_memcpy(ptr, &v, sizeof(v));\ +} + +#define ST_CONVERT_END(endian, bits, vtype, size)\ +static inline void st ## size ## _ ## endian ## _p(void *ptr, vtype v)\ +{\ + st ## size ## _he_p(ptr, glue(endian, _bswap)(v, bits));\ +} + +#define ST_CONVERT(bits, vtype, size)\ + ST_CONVERT_UNALIGNED(bits, vtype, size)\ + ST_CONVERT_END(le, bits, vtype, size)\ + ST_CONVERT_END(be, bits, vtype, size) + static inline unsigned long leul_to_cpu(unsigned long v) { #if HOST_LONG_BITS =3D=3D 32 --=20 2.26.3 From nobody Thu May 2 15:01:46 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1621363062; cv=none; d=zohomail.com; s=zohoarc; b=kNE/5DpbMsvh60fsoYAUIKNBf1SVe3nMp6a/2kHFRbat0o7iBw4nar8t8lgsJ6voKzU+WtdVsheh3uvF1yWnFbO7374DCb8uczy58rgdFROWC8bWQ38ZMbasLFt6aqUQi+DxlumF80LA896sUDjgVZTTBC0S3+x0UmdxIjuZynY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1621363062; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=aZKslzViTqwpl3Hg6nYmowKHUbwLNEE55VzLOcIM+9Y=; b=iaaq+I5ItIgV6uTD0fhs0Ay28WNkxD9Ex6q5B0okzb97ufLh37yre8s2j8j0JD+f6wAsF7mJakoeTKYz+VteqZmNQRtu+OHUlUBCgrjZ3wZ7AN88YUn7Eq8SU1bzt7pfTRdGDchjHN3iTAPVMCUSbr3ztVtKFAo82Szp5/EX+t4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.zohomail.com with SMTPS id 162136306218118.086509922916775; Tue, 18 May 2021 11:37:42 -0700 (PDT) Received: from mail-ed1-f72.google.com (mail-ed1-f72.google.com [209.85.208.72]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-290-s4oKDylvPzSoQCHgjTsblg-1; Tue, 18 May 2021 14:37:39 -0400 Received: by mail-ed1-f72.google.com with SMTP id d8-20020a0564020008b0290387d38e3ce0so6269257edu.1 for ; Tue, 18 May 2021 11:37:39 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.redhat.com (31.red-83-51-215.dynamicip.rima-tde.net. [83.51.215.31]) by smtp.gmail.com with ESMTPSA id dj17sm13468997edb.7.2021.05.18.11.37.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 18 May 2021 11:37:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1621363061; 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; bh=aZKslzViTqwpl3Hg6nYmowKHUbwLNEE55VzLOcIM+9Y=; b=jAAPRPN0ctOp5BaW7FsENFys37g9YCCMFJB3DDs1K1jZjVwcjIBmakF1JVeZpQ2ov+u/Qz IBn061nETefSY4/ppvGvc8/GBsO0ZwHVYQkxz3jKu1pjNwFZdwZwJRQs/g1CM4F6OOGOFs sMCZEXeNBsfyrc9waiUbDrAbxez670g= X-MC-Unique: s4oKDylvPzSoQCHgjTsblg-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=aZKslzViTqwpl3Hg6nYmowKHUbwLNEE55VzLOcIM+9Y=; b=IYrD95176yWkWddFIZ/VVxD/OtCvo+tXVraRpP60miLMZlo1e1kJU+TPQfwxkTA3cZ /3jBHYB9ef26E5fqBenWFvjxWx6pk4zLxJXMbXXBjxlCtD0x5i2Ko9VPaUXis9jU7i+J LjFvLPnTpYJ2kbcR1zgkp+a+Qgv9qiKfCQ4rMpnECGnmU8/DsCdXt7DSyBf4fVaNHkWy qz8UqBN+oZBg8BcZRRxO7L2kyHgqF22BUmQ9PeTAgC5X6AIu1Hpo5pb+fTZiE2t8678l jhzHYUw8LQpqrjMGMAqzQ+k1Rh7ZoEhzVDS5bme7lCI2xTaIet6S+svXNcX+TMWOFSuA wZvg== X-Gm-Message-State: AOAM532jmFSO+mYALLw3GfhdavK0AbZLypQmrJLn7MobBYd/ZZwoAXYh qQfUSav41sF41/MZ4ScgqQwUCG1YQs2poiarAszmEMq6zUWEE6rP5vz3nuWinFptHDa3zOX1B4C SRnt1UoIJABkfbw== X-Received: by 2002:aa7:de99:: with SMTP id j25mr8741045edv.91.1621363058223; Tue, 18 May 2021 11:37:38 -0700 (PDT) X-Google-Smtp-Source: ABdhPJw22sGT9sfU4WZUXNOE8AwUGz52Mh9LYDbMwF3CVppfHR+Bv/jH3aNbQFjgG0UOeCVDDZ4lQw== X-Received: by 2002:aa7:de99:: with SMTP id j25mr8741040edv.91.1621363058099; Tue, 18 May 2021 11:37:38 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Bibo Mao , "Michael S. Tsirkin" , Richard Henderson , Paolo Bonzini , Jiaxun Yang , Peter Xu , Huacai Chen , Peter Maydell , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [RFC PATCH 08/25] qemu/bswap: Use ST_CONVERT() macro to emit 16-bit load/store functions Date: Tue, 18 May 2021 20:36:38 +0200 Message-Id: <20210518183655.1711377-9-philmd@redhat.com> X-Mailer: git-send-email 2.26.3 In-Reply-To: <20210518183655.1711377-1-philmd@redhat.com> References: <20210518183655.1711377-1-philmd@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- include/qemu/bswap.h | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) diff --git a/include/qemu/bswap.h b/include/qemu/bswap.h index 86f5ded6acf..4e2bd2e97ee 100644 --- a/include/qemu/bswap.h +++ b/include/qemu/bswap.h @@ -350,11 +350,6 @@ static inline int ldsw_he_p(const void *ptr) return r; } =20 -static inline void stw_he_p(void *ptr, uint16_t v) -{ - __builtin_memcpy(ptr, &v, sizeof(v)); -} - static inline int ldl_he_p(const void *ptr) { int32_t r; @@ -399,11 +394,6 @@ static inline uint64_t ldq_le_p(const void *ptr) return le_bswap(ldq_he_p(ptr), 64); } =20 -static inline void stw_le_p(void *ptr, uint16_t v) -{ - stw_he_p(ptr, le_bswap(v, 16)); -} - static inline void stl_le_p(void *ptr, uint32_t v) { stl_he_p(ptr, le_bswap(v, 32)); @@ -434,11 +424,6 @@ static inline uint64_t ldq_be_p(const void *ptr) return be_bswap(ldq_he_p(ptr), 64); } =20 -static inline void stw_be_p(void *ptr, uint16_t v) -{ - stw_he_p(ptr, be_bswap(v, 16)); -} - static inline void stl_be_p(void *ptr, uint32_t v) { stl_he_p(ptr, be_bswap(v, 32)); @@ -466,6 +451,8 @@ static inline void st ## size ## _ ## endian ## _p(void= *ptr, vtype v)\ ST_CONVERT_END(le, bits, vtype, size)\ ST_CONVERT_END(be, bits, vtype, size) =20 +ST_CONVERT(16, uint16_t, w) + static inline unsigned long leul_to_cpu(unsigned long v) { #if HOST_LONG_BITS =3D=3D 32 --=20 2.26.3 From nobody Thu May 2 15:01:46 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1621363067; cv=none; d=zohomail.com; s=zohoarc; b=nXnGIdGa2kzymD9pYLNLhAW0zYkT9EtMaD7V5Vatl9BKnmFzCpnP0Yto450q5IBqj7NLX14T97AeHJMaAkrn6iMx4RcR46UItnl25iGVIAFjZlbzT0Ic+TZPM7cjjA922eJaBsjkkKjRJJjQ7ESV1Ny0yT2hTih56DL8Ek6fi2A= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1621363067; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=L4UOKckP4V9oUzE7TpxZ0flVen5pbcGekiky6msHo58=; b=UgnbMe24N+sddkKHNeXRx+cC8DfhBb+rvj2Drc6NC7hJLZBL+W3YRFkVqEOA70vgsTEBkbRda/j9Fb1NVFlCOVRzU55pt1X0aiRMRlCc1i1jjFVU79C0fHEIIzeqK4N8OSHehxeYfCABFbMS7ombng/iHQ7y2MXLkAmCQz7ahdU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by mx.zohomail.com with SMTPS id 1621363067436728.1360381456673; Tue, 18 May 2021 11:37:47 -0700 (PDT) Received: from mail-ej1-f72.google.com (mail-ej1-f72.google.com [209.85.218.72]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-253-6cWqbppzOtmqnMH3l3Y5rA-1; Tue, 18 May 2021 14:37:44 -0400 Received: by mail-ej1-f72.google.com with SMTP id i23-20020a17090685d7b02903d089ab83fcso2734829ejy.19 for ; Tue, 18 May 2021 11:37:44 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.redhat.com (31.red-83-51-215.dynamicip.rima-tde.net. [83.51.215.31]) by smtp.gmail.com with ESMTPSA id d11sm5184859ejr.58.2021.05.18.11.37.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 18 May 2021 11:37:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1621363066; 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; bh=L4UOKckP4V9oUzE7TpxZ0flVen5pbcGekiky6msHo58=; b=ILaTOsnyIOz3hFK/MX5KaEyLipq1wJtVA0jK2vZ9K8jMIrwnZuZYIcK++cP7bylp0sMyZg HcCx7HT/Ur/ug95GMjKY2jWsrLcMxt682hk+CPWlcyAxSHlZ7Tg/+GgqBVRkcy+TxJTu6n XODVQmoDkiHkU1uVs3cbu/NpKAFAk/c= X-MC-Unique: 6cWqbppzOtmqnMH3l3Y5rA-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=L4UOKckP4V9oUzE7TpxZ0flVen5pbcGekiky6msHo58=; b=qFYFKe6T53pSNzK4RNHVDw59XlQ40Z2KF0IaIn+Hf0TxkFsp1nG7WAX8kf6GcF8MjU VXBpeg6supfbMuRGtFusfHpNiz7OvWFcuDox2O97DD2FhUzT74+CNl6zQ8lJw981SHhk 1SKxCOOUelC7jkokgAvnBdrQl8FOz78d5eH7yLzrlkyWRTy9K5dBY3ebqC/5xGrKVKIM WlJuXX83mD6puwLZX9ZmibVahgiaT4pqBS7wCtP/lU82Ku6mMYQphqqcWtCYltWYfNbr zhK/D3RMCNQnPOKUSeOE4o+nUeLWvmYJpOHRHrSUtjZg19PU5reiOrBjM0YJy5M3t7Wu a+gg== X-Gm-Message-State: AOAM531xKQWRa5nz5Z89d9Un6+OOX6zE3NMIvE+7n0RU9qxvQJk0dkdx iPq3FwJureAQVX17snBhIajUYgiQEvtKqVsorujedwOKDNS4hazxlTCu8WRfQpfJs8PV6sxwPoM vBpYiz3TK4R8wzw== X-Received: by 2002:a17:906:1c46:: with SMTP id l6mr7488881ejg.328.1621363063408; Tue, 18 May 2021 11:37:43 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyqtEhOspP41DPZl6H/khJhmutvLtF3+XqB6Cf1cI3Y7PnU/TrJhpIdULKfyUr5/8vL3YheXA== X-Received: by 2002:a17:906:1c46:: with SMTP id l6mr7488869ejg.328.1621363063273; Tue, 18 May 2021 11:37:43 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Bibo Mao , "Michael S. Tsirkin" , Richard Henderson , Paolo Bonzini , Jiaxun Yang , Peter Xu , Huacai Chen , Peter Maydell , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [RFC PATCH 09/25] qemu/bswap: Introduce LD_CONVERT() macro Date: Tue, 18 May 2021 20:36:39 +0200 Message-Id: <20210518183655.1711377-10-philmd@redhat.com> X-Mailer: git-send-email 2.26.3 In-Reply-To: <20210518183655.1711377-1-philmd@redhat.com> References: <20210518183655.1711377-1-philmd@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) To be able to add more load/store operations, introduce the LD_CONVERT() macro. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- include/qemu/bswap.h | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/include/qemu/bswap.h b/include/qemu/bswap.h index 4e2bd2e97ee..c2fd4f31d20 100644 --- a/include/qemu/bswap.h +++ b/include/qemu/bswap.h @@ -434,18 +434,37 @@ static inline void stq_be_p(void *ptr, uint64_t v) stq_he_p(ptr, be_bswap(v, 64)); } =20 +#define LD_CONVERT_UNALIGNED(bits, rtype, vtype, size)\ +static inline rtype ld ## size ## _he_p(const void *ptr)\ +{\ + vtype r;\ + __builtin_memcpy(&r, ptr, sizeof(r));\ + return r;\ +} + #define ST_CONVERT_UNALIGNED(bits, vtype, size)\ static inline void st ## size ## _he_p(void *ptr, vtype v)\ {\ __builtin_memcpy(ptr, &v, sizeof(v));\ } =20 +#define LD_CONVERT_END(endian, bits, rtype, vtype, size)\ +static inline rtype ld ## size ## _ ## endian ## _p(const void *ptr)\ +{\ + return (vtype)glue(endian, _bswap)(ld ## size ## _he_p(ptr), bits);\ +} + #define ST_CONVERT_END(endian, bits, vtype, size)\ static inline void st ## size ## _ ## endian ## _p(void *ptr, vtype v)\ {\ st ## size ## _he_p(ptr, glue(endian, _bswap)(v, bits));\ } =20 +#define LD_CONVERT(bits, rtype, vtype, size)\ + LD_CONVERT_UNALIGNED(bits, rtype, vtype, size)\ + LD_CONVERT_END(le, bits, rtype, vtype, size)\ + LD_CONVERT_END(be, bits, rtype, vtype, size) + #define ST_CONVERT(bits, vtype, size)\ ST_CONVERT_UNALIGNED(bits, vtype, size)\ ST_CONVERT_END(le, bits, vtype, size)\ --=20 2.26.3 From nobody Thu May 2 15:01:46 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1621363074; cv=none; d=zohomail.com; s=zohoarc; b=EwUoj26X4bBVUJ/Xb0ZblCexiZM3ryMJYqNBYOGosOLAZ3mkisTVyCIvpMuY85D7MmpeLx2byJSy9/mxUIqv086aOgvSI8089smh89XLKF31ElSUuocWG1NkZUDkDVx2tTsAFBQITvQTZ+VcoH+3QdSVVi1rm2Bs6geqiXdwZnc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1621363074; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=BPTuZOZaAUyGNk5xJrzvkHAhCtxsbeJLCsray2K+DT4=; b=HRGeG6wcOA2SJ19041WuMhcqV0GF3v6t+yBbtJJOX7RaqYRa0xYSScjxKTHMfAeW842PUr8yXzBfDwqfEh9Q3JesMPz6AzxTpO1g3k0Btjys8xGQf4RkFLs2ZRwa9WOMe8Bu+b9h4T+CFzJtdk73abiMZE4XJQUn761gVpFhTzE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by mx.zohomail.com with SMTPS id 1621363074001967.3847654120096; Tue, 18 May 2021 11:37:54 -0700 (PDT) Received: from mail-ej1-f70.google.com (mail-ej1-f70.google.com [209.85.218.70]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-237-yCYnUNZyNKinJpx73pS6yw-1; Tue, 18 May 2021 14:37:49 -0400 Received: by mail-ej1-f70.google.com with SMTP id h18-20020a1709063992b02903d59b32b039so2575252eje.12 for ; Tue, 18 May 2021 11:37:49 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.redhat.com (31.red-83-51-215.dynamicip.rima-tde.net. [83.51.215.31]) by smtp.gmail.com with ESMTPSA id m13sm8129927eds.21.2021.05.18.11.37.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 18 May 2021 11:37:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1621363073; 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; bh=BPTuZOZaAUyGNk5xJrzvkHAhCtxsbeJLCsray2K+DT4=; b=Do4TCwje83J4zOevMjM0ChMi2Qntk2iYXou18rBE25U+mUz5cvAK3Cqi5sJkSH2LvLmu86 w8SaCV6P6aEM1h72e4CO2PcFCnk2nr50m8RThV2QttWl+6fmHPJO7RJNPVDTz8JkHfb3Z4 +c919zp7jyH2JPDx0wYSiyRVk1Auexs= X-MC-Unique: yCYnUNZyNKinJpx73pS6yw-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=BPTuZOZaAUyGNk5xJrzvkHAhCtxsbeJLCsray2K+DT4=; b=qvB0Xn6sIdHbBi6E8g4Utg+CGsQkqRWginsHTiScbVScL/66PFsSn4ptmmolra0fjB YsBobHmn//vlUL8KFo7+FKygf24QVQtk6TdKTVY1Umhe6UTLDjnbLhtZA8nlXdSe4Bvu BMQQkzILhvwogBjAa+JYTLyhvOKQk5QxlyrUmOVJqM5iRrgUnJ6SQ3TLBOo9nFhhI1pV vDoLFSyTTHnVnU+RekHQljex++pX5JkNzuRBUHq7a1PEcqoUgulm1be52jmVIy92WHTD w1H9g5zD+3BPFfRWHOnkEv8NwBbJBRsXtZRhu50pJosvPGPznBj0Q+HjnXUw1lpiKPGz TOvw== X-Gm-Message-State: AOAM532794+UAcHGol/uM/QCK9n8YQacAe8/2u7mxhMXaF1ODXOYowAn I6KrRA3FlO/1Uuj6zYg6lr4a6lTvCmSY/iJSqe+l0EVwlC84bWdqt3cp6IKGAgq6g+lTOnPL4Yc BHONxZUa7biK4Uw== X-Received: by 2002:a17:906:b14f:: with SMTP id bt15mr7721535ejb.126.1621363068304; Tue, 18 May 2021 11:37:48 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzCSastuJp7jB4TQ7qYkPlmgKXuzOrv/bYGUDd6cIUowFmAO0Px/5FQ1QvwF9VSzTiYjSwltA== X-Received: by 2002:a17:906:b14f:: with SMTP id bt15mr7721521ejb.126.1621363068133; Tue, 18 May 2021 11:37:48 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Bibo Mao , "Michael S. Tsirkin" , Richard Henderson , Paolo Bonzini , Jiaxun Yang , Peter Xu , Huacai Chen , Peter Maydell , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [RFC PATCH 10/25] qemu/bswap: Use LD_CONVERT macro to emit 16-bit signed load/store code Date: Tue, 18 May 2021 20:36:40 +0200 Message-Id: <20210518183655.1711377-11-philmd@redhat.com> X-Mailer: git-send-email 2.26.3 In-Reply-To: <20210518183655.1711377-1-philmd@redhat.com> References: <20210518183655.1711377-1-philmd@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- include/qemu/bswap.h | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) diff --git a/include/qemu/bswap.h b/include/qemu/bswap.h index c2fd4f31d20..af9b18f373d 100644 --- a/include/qemu/bswap.h +++ b/include/qemu/bswap.h @@ -343,13 +343,6 @@ static inline int lduw_he_p(const void *ptr) return r; } =20 -static inline int ldsw_he_p(const void *ptr) -{ - int16_t r; - __builtin_memcpy(&r, ptr, sizeof(r)); - return r; -} - static inline int ldl_he_p(const void *ptr) { int32_t r; @@ -379,11 +372,6 @@ static inline int lduw_le_p(const void *ptr) return (uint16_t)le_bswap(lduw_he_p(ptr), 16); } =20 -static inline int ldsw_le_p(const void *ptr) -{ - return (int16_t)le_bswap(lduw_he_p(ptr), 16); -} - static inline int ldl_le_p(const void *ptr) { return le_bswap(ldl_he_p(ptr), 32); @@ -409,11 +397,6 @@ static inline int lduw_be_p(const void *ptr) return (uint16_t)be_bswap(lduw_he_p(ptr), 16); } =20 -static inline int ldsw_be_p(const void *ptr) -{ - return (int16_t)be_bswap(lduw_he_p(ptr), 16); -} - static inline int ldl_be_p(const void *ptr) { return be_bswap(ldl_he_p(ptr), 32); @@ -471,6 +454,7 @@ static inline void st ## size ## _ ## endian ## _p(void= *ptr, vtype v)\ ST_CONVERT_END(be, bits, vtype, size) =20 ST_CONVERT(16, uint16_t, w) +LD_CONVERT(16, int, int16_t, sw) =20 static inline unsigned long leul_to_cpu(unsigned long v) { --=20 2.26.3 From nobody Thu May 2 15:01:46 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1621363077; cv=none; d=zohomail.com; s=zohoarc; b=l8ylay8igchgpWT+4gRO7xFhuqDtG1ynPRaq2MBZ/9wr7QHBBt2sqNlz3H7d3utaOjWkiLvSKsLto8so5KiQ8h1V+MdrL3N5PkLeQ1uEVaLqZbjDoVTUD1CP+4fNjFNqzbcQjXPYUrs8BWqrZu9JfbK3BOM978+34rUgPaZfpe0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1621363077; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=U16c3X0rSV9FYD1KTuocNMeM8+m1WhwCWumESQ9vymU=; b=B/FrIyok7WVowsX4lCl8qmw/+w61Y07eGR36VD2i/4yFhHhvlOvbqcthSkdFPdiIXyUUjKJIqPYO3bSKBm9cooTUYvuNmLmr/q2NHqAI6RA0mgaE0ayoATLqEe3jDa92dQ1wvBH298wgpzhc4x+BIrdth4inPnm04NcB/fh5AHc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by mx.zohomail.com with SMTPS id 1621363077700559.273209695772; Tue, 18 May 2021 11:37:57 -0700 (PDT) Received: from mail-ed1-f72.google.com (mail-ed1-f72.google.com [209.85.208.72]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-29-3VauNfhiNmmN0O4VJZMxEg-1; Tue, 18 May 2021 14:37:54 -0400 Received: by mail-ed1-f72.google.com with SMTP id m6-20020aa7c4860000b029038d4e973878so2083544edq.10 for ; Tue, 18 May 2021 11:37:54 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.redhat.com (31.red-83-51-215.dynamicip.rima-tde.net. [83.51.215.31]) by smtp.gmail.com with ESMTPSA id b25sm13715199edv.9.2021.05.18.11.37.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 18 May 2021 11:37:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1621363076; 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; bh=U16c3X0rSV9FYD1KTuocNMeM8+m1WhwCWumESQ9vymU=; b=AbY4TjXpHgmU2bINFtOTummpdixNreTobL8m3CLIO0DtfObfekQTwAAIOox2MxP0xVyhxz rzDE7KjqL0DlUiIUyU6K60wGjSOaWLmFimVIEqpREUVftwfUWqLeCKwdOBQMbJwmIvbZYR N+adlJJkIOv1BMiGwTIBteG0OWAqyyI= X-MC-Unique: 3VauNfhiNmmN0O4VJZMxEg-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=U16c3X0rSV9FYD1KTuocNMeM8+m1WhwCWumESQ9vymU=; b=lvEhhCA5l4HBoMCa3qudSwHPt+BbAausHhdU/mrbvQqg+v7z3AzqeF5K9RzVxbPzRF MFWTLR0M75Miht/xB/kp4Eexfx9F6kgodVy4sCG9+tPS7OhciLIPShvdDpH14r8HVSY6 pPuzfuZ6KiAoJJw9DRw1hOMHSXe4LIg30uRh+I2E13DhS8xbYO793YxN1ZAnKbeBP2fo hbNxGz9vnl81NvqQ9MsgOrCfZQQ9iguUfCXy4eosjUT+T+UjRemAn4GPqwOWN99HpVOO 0W+IfrDliKjev5KHLTmOL09eCkCItz/z2Xse1UJeoVDMkbP5rK/SSP0ipJEZUo1G2uDy aemw== X-Gm-Message-State: AOAM533ebUnYXpBYVCl0xJ80qWgPoPARmlSps4fshFbjTNZo3ZP/p+xR 66ZG1WwkMNLVKcDqY6Y4wNOOyWFsCsRwxhKSL+4klFfEu/OoEbWBL2U75jToXSCCDz+WR+buDjI 92kB54vse4HkGWQ== X-Received: by 2002:a17:906:1699:: with SMTP id s25mr7305474ejd.238.1621363073329; Tue, 18 May 2021 11:37:53 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyhWd1c84RJ4S+9JW2ul2+H0I8NejwzCUspbBhOOsaF8SM13UF0q5H99Wu5VBrk+JdwBAImCA== X-Received: by 2002:a17:906:1699:: with SMTP id s25mr7305460ejd.238.1621363073197; Tue, 18 May 2021 11:37:53 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Bibo Mao , "Michael S. Tsirkin" , Richard Henderson , Paolo Bonzini , Jiaxun Yang , Peter Xu , Huacai Chen , Peter Maydell , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [RFC PATCH 11/25] qemu/bswap: Use LD_CONVERT macro to emit 16-bit unsigned load/store code Date: Tue, 18 May 2021 20:36:41 +0200 Message-Id: <20210518183655.1711377-12-philmd@redhat.com> X-Mailer: git-send-email 2.26.3 In-Reply-To: <20210518183655.1711377-1-philmd@redhat.com> References: <20210518183655.1711377-1-philmd@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- include/qemu/bswap.h | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) diff --git a/include/qemu/bswap.h b/include/qemu/bswap.h index af9b18f373d..ee86dc4ed8c 100644 --- a/include/qemu/bswap.h +++ b/include/qemu/bswap.h @@ -336,13 +336,6 @@ static inline void stb_p(void *ptr, uint8_t v) * of good performance. */ =20 -static inline int lduw_he_p(const void *ptr) -{ - uint16_t r; - __builtin_memcpy(&r, ptr, sizeof(r)); - return r; -} - static inline int ldl_he_p(const void *ptr) { int32_t r; @@ -367,11 +360,6 @@ static inline void stq_he_p(void *ptr, uint64_t v) __builtin_memcpy(ptr, &v, sizeof(v)); } =20 -static inline int lduw_le_p(const void *ptr) -{ - return (uint16_t)le_bswap(lduw_he_p(ptr), 16); -} - static inline int ldl_le_p(const void *ptr) { return le_bswap(ldl_he_p(ptr), 32); @@ -392,11 +380,6 @@ static inline void stq_le_p(void *ptr, uint64_t v) stq_he_p(ptr, le_bswap(v, 64)); } =20 -static inline int lduw_be_p(const void *ptr) -{ - return (uint16_t)be_bswap(lduw_he_p(ptr), 16); -} - static inline int ldl_be_p(const void *ptr) { return be_bswap(ldl_he_p(ptr), 32); @@ -455,6 +438,7 @@ static inline void st ## size ## _ ## endian ## _p(void= *ptr, vtype v)\ =20 ST_CONVERT(16, uint16_t, w) LD_CONVERT(16, int, int16_t, sw) +LD_CONVERT(16, int, uint16_t, uw) =20 static inline unsigned long leul_to_cpu(unsigned long v) { --=20 2.26.3 From nobody Thu May 2 15:01:46 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1621363083; cv=none; d=zohomail.com; s=zohoarc; b=gImSDfWa16DXSCFX1XSPB3sY45cX62zCUcic/87o/ySnO9s/excZFkw0M5RAgoTf1ugwxRQ8wyR7hUehcpQEJpqF3q8VHTMtbHQ3YvqXQCGenQevfZGCfLXbpwTMRNa9jSSHOc0n4/BZwzRk1ei8D/9SlLC0VLscTbD5fUGuFjQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1621363083; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=RP7AdMkdZ70Ntkgoxzrokk0Z/uTSWiTgTaLgWEFB440=; b=VI7ITBVoUszCy6N/CSC4VIKFsyiDJmrdx3rca9b2VLYZkLZAKwp0Y0re4A8yulJ68WeTqXW78o109cTy23caJo6d3ayYY0OYEx0T1ycZtdfJMXHj8ugfy42YthA7C3gXc0JraVQCHdSP8zLlf2WKvYdut8h2vith2ZaE/w6BU60= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.zohomail.com with SMTPS id 1621363083421519.3368193933368; Tue, 18 May 2021 11:38:03 -0700 (PDT) Received: from mail-ed1-f69.google.com (mail-ed1-f69.google.com [209.85.208.69]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-204-0VmxyGfiO7iH0avtamoi1w-1; Tue, 18 May 2021 14:37:59 -0400 Received: by mail-ed1-f69.google.com with SMTP id h16-20020a0564020950b029038cbdae8cbaso6236960edz.6 for ; Tue, 18 May 2021 11:37:59 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.redhat.com (31.red-83-51-215.dynamicip.rima-tde.net. [83.51.215.31]) by smtp.gmail.com with ESMTPSA id m19sm8167232edd.12.2021.05.18.11.37.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 18 May 2021 11:37:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1621363082; 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; bh=RP7AdMkdZ70Ntkgoxzrokk0Z/uTSWiTgTaLgWEFB440=; b=iO2jDV7NpuWbIjrGufXin6JTxZ2N4d+6nJ6z7gFBpeK1lsHaPLYaoySNmI8QABKAUEYxaT OQQF7vP3wpKnI1z5xu6DeQKRgQbM/dij/kYA8cWOLwEuahl/XzXxZFzZHDBm2u8o6fTQla vjo51N03KUgLcY3YqYuvE7MzwnO+U5w= X-MC-Unique: 0VmxyGfiO7iH0avtamoi1w-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=RP7AdMkdZ70Ntkgoxzrokk0Z/uTSWiTgTaLgWEFB440=; b=d2tR//z3tsmnKjf9ETKhu3HwOkGUDMaJc3W8J6PMz1SNTBTSwZa/sY/kUD8VUWYO3O lypeEh2HEt71B/21drUCCi2Gq28VxKG5rVtePoNd/LCafsz9ANTdUzc5Gr5SXTWepVw/ MsKL6S75QbccJh25MexyIhkxoeChIBgrAEeE3t5Z1nMjh4l+vQHAjaTAnVLOEh2fJwst l58xvqduDFsDmycx4q3mHq2400pDefbiGJoBymiviSh15XM4tDnAAS/2Qr8STv1ajcp3 H4f5AakFv7h0IiMH2u8H8cSY5/YEDFVxLN4eS42gUC34fBl0iaJeQCbJKqB0Xf96nNGX Jcdw== X-Gm-Message-State: AOAM531zvdgRyPL78qGNXLn4zIeiXlX2RsRdccmBYi/7AUIHdQ4Wbi0+ tOmfDU5mFuehwGBx9NjWwEc2rut5AJpbgdYwm07Qk4l1VuPXldclP9GU8Sd9fHBqbQwi64sMQCC UkOOdIYL+4Vioaw== X-Received: by 2002:aa7:c84a:: with SMTP id g10mr8552558edt.326.1621363078319; Tue, 18 May 2021 11:37:58 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwMkLhcLHyNK8kf+OFMZwah41t7r0a7CplSH2aIZuBd8oaPijEJmgtyfykPoFOd2FJ9HxHWDA== X-Received: by 2002:aa7:c84a:: with SMTP id g10mr8552542edt.326.1621363078140; Tue, 18 May 2021 11:37:58 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Bibo Mao , "Michael S. Tsirkin" , Richard Henderson , Paolo Bonzini , Jiaxun Yang , Peter Xu , Huacai Chen , Peter Maydell , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [RFC PATCH 12/25] qemu/bswap: Use LDST_CONVERT macro to emit 32-bit load/store functions Date: Tue, 18 May 2021 20:36:42 +0200 Message-Id: <20210518183655.1711377-13-philmd@redhat.com> X-Mailer: git-send-email 2.26.3 In-Reply-To: <20210518183655.1711377-1-philmd@redhat.com> References: <20210518183655.1711377-1-philmd@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- include/qemu/bswap.h | 37 +++++-------------------------------- 1 file changed, 5 insertions(+), 32 deletions(-) diff --git a/include/qemu/bswap.h b/include/qemu/bswap.h index ee86dc4ed8c..a041be94a7a 100644 --- a/include/qemu/bswap.h +++ b/include/qemu/bswap.h @@ -336,18 +336,6 @@ static inline void stb_p(void *ptr, uint8_t v) * of good performance. */ =20 -static inline int ldl_he_p(const void *ptr) -{ - int32_t r; - __builtin_memcpy(&r, ptr, sizeof(r)); - return r; -} - -static inline void stl_he_p(void *ptr, uint32_t v) -{ - __builtin_memcpy(ptr, &v, sizeof(v)); -} - static inline uint64_t ldq_he_p(const void *ptr) { uint64_t r; @@ -360,41 +348,21 @@ static inline void stq_he_p(void *ptr, uint64_t v) __builtin_memcpy(ptr, &v, sizeof(v)); } =20 -static inline int ldl_le_p(const void *ptr) -{ - return le_bswap(ldl_he_p(ptr), 32); -} - static inline uint64_t ldq_le_p(const void *ptr) { return le_bswap(ldq_he_p(ptr), 64); } =20 -static inline void stl_le_p(void *ptr, uint32_t v) -{ - stl_he_p(ptr, le_bswap(v, 32)); -} - static inline void stq_le_p(void *ptr, uint64_t v) { stq_he_p(ptr, le_bswap(v, 64)); } =20 -static inline int ldl_be_p(const void *ptr) -{ - return be_bswap(ldl_he_p(ptr), 32); -} - static inline uint64_t ldq_be_p(const void *ptr) { return be_bswap(ldq_he_p(ptr), 64); } =20 -static inline void stl_be_p(void *ptr, uint32_t v) -{ - stl_he_p(ptr, be_bswap(v, 32)); -} - static inline void stq_be_p(void *ptr, uint64_t v) { stq_he_p(ptr, be_bswap(v, 64)); @@ -436,9 +404,14 @@ static inline void st ## size ## _ ## endian ## _p(voi= d *ptr, vtype v)\ ST_CONVERT_END(le, bits, vtype, size)\ ST_CONVERT_END(be, bits, vtype, size) =20 +#define LDST_CONVERT(bits, rtype, vtype, size)\ + LD_CONVERT(bits, rtype, vtype, size)\ + ST_CONVERT(bits, vtype, size) + ST_CONVERT(16, uint16_t, w) LD_CONVERT(16, int, int16_t, sw) LD_CONVERT(16, int, uint16_t, uw) +LDST_CONVERT(32, int, uint32_t, l) =20 static inline unsigned long leul_to_cpu(unsigned long v) { --=20 2.26.3 From nobody Thu May 2 15:01:46 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1621363087; cv=none; d=zohomail.com; s=zohoarc; b=Fo8lIrwc7BgSu7hI20mUNenIhLcCXKPmJ17RnbowxL76db9YPPGCklKGmOmsoqvW4Am9RId3FVrfVp0BSJlowyDtz4PXaUKCP+JJLDHEgaovEfbh0Pwz/QbyUmxE4l2XQ4nuM3NoJbMJUdLB8drDGCUn5V64s1+fzkFQb5PZ+aU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1621363087; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=0wXwlzDDQ89KUu5WsVCB5zLKl6e1qLqqM9KpCrBAHaI=; b=NHau7FMOjIf0JGMCMYORVAJzY6nIDeeSdJWhmZE+kgk3n6Tod+1RzNDYCZru1V1Lz6Wwo5QwzB7FX0jqoeX1CXhjRIMEVd7Avq6lCyk4lE3uqhpCuz233hiyAmQ6j+HmybMePo4rBUhF9WX2efgcEU+ZfBxL1ZyecGbBD0in2nQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.zohomail.com with SMTPS id 162136308752983.64919667709103; Tue, 18 May 2021 11:38:07 -0700 (PDT) Received: from mail-ed1-f69.google.com (mail-ed1-f69.google.com [209.85.208.69]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-416-fSPqoVJANYWVhag6tsgiWA-1; Tue, 18 May 2021 14:38:04 -0400 Received: by mail-ed1-f69.google.com with SMTP id i19-20020a05640242d3b0290388cea34ed3so6246865edc.15 for ; Tue, 18 May 2021 11:38:04 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.redhat.com (31.red-83-51-215.dynamicip.rima-tde.net. [83.51.215.31]) by smtp.gmail.com with ESMTPSA id m13sm8130299eds.21.2021.05.18.11.38.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 18 May 2021 11:38:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1621363086; 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; bh=0wXwlzDDQ89KUu5WsVCB5zLKl6e1qLqqM9KpCrBAHaI=; b=AdJcrq3B3YMTdKOECa6y5/qCT/IM9vGGiEewPFqJXMVbG10ShA+PqEJlZVFJ7LWq7jBNyi /3wLmkPjZ7M/cRV1u7T/njRmzdQU6v1IJwcSqZkbCgdBbelCo0hQNOgx1CUQmeT/y3A8Kz IU1tkaFl+PHzoLvu0VZtON5mz/WZmZs= X-MC-Unique: fSPqoVJANYWVhag6tsgiWA-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=0wXwlzDDQ89KUu5WsVCB5zLKl6e1qLqqM9KpCrBAHaI=; b=eiPUnj9Z9USao3H8LPmszUjqvneTgN8w8Wb9MgyCpKZMCqzDfj9vq6JV7Ss4bo9bzm w0P236YiTPBfQz+0NuYQEmCzgeTvb0xpICAd1kOc7MRCey5fvL3VH64rEGy78wsjmLv5 BWwquzhda6zxXscCvXnfY70JecszZkX/mj4goJ9J/IqNhonN5gH0Nvc34CmfYAr85X2H Vutftzqou7DMmeAZLQBa+Ueye6xJ3mO58j5MEb3ZB4ZgQrdPZqYuxkPuKXZc0brUAFD5 AhFc8d5eGSk3/CCcyG0zLhHaH5Hk+kw5nrM3LUahR77AfT9BtnlsbqghvGqmY+U0k4xE 7HbA== X-Gm-Message-State: AOAM532rMap73xz1YvOqLj6j5g48SmdV+ZWgH7A1k7/00FMNtsav7dqN rLnK2T2/ULFyzs57upNfYJbDuV7V/c6Bw/bJIQIg//rdlLSdKdE4B7iFdKFZEwxeuANBn43ZEck I+u5LKop4VPCtCQ== X-Received: by 2002:a05:6402:1649:: with SMTP id s9mr8675722edx.35.1621363083306; Tue, 18 May 2021 11:38:03 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxgRTXsf+cKDK5z8wqE3Gd+E2Y63IhZly/v782HEuH8Vskk3Z0AfyPw1nw1WE46Fp6CW6qB3Q== X-Received: by 2002:a05:6402:1649:: with SMTP id s9mr8675697edx.35.1621363083131; Tue, 18 May 2021 11:38:03 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Bibo Mao , "Michael S. Tsirkin" , Richard Henderson , Paolo Bonzini , Jiaxun Yang , Peter Xu , Huacai Chen , Peter Maydell , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [RFC PATCH 13/25] qemu/bswap: Use LDST_CONVERT macro to emit 64-bit load/store functions Date: Tue, 18 May 2021 20:36:43 +0200 Message-Id: <20210518183655.1711377-14-philmd@redhat.com> X-Mailer: git-send-email 2.26.3 In-Reply-To: <20210518183655.1711377-1-philmd@redhat.com> References: <20210518183655.1711377-1-philmd@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- include/qemu/bswap.h | 33 +-------------------------------- 1 file changed, 1 insertion(+), 32 deletions(-) diff --git a/include/qemu/bswap.h b/include/qemu/bswap.h index a041be94a7a..4cd120ca014 100644 --- a/include/qemu/bswap.h +++ b/include/qemu/bswap.h @@ -336,38 +336,6 @@ static inline void stb_p(void *ptr, uint8_t v) * of good performance. */ =20 -static inline uint64_t ldq_he_p(const void *ptr) -{ - uint64_t r; - __builtin_memcpy(&r, ptr, sizeof(r)); - return r; -} - -static inline void stq_he_p(void *ptr, uint64_t v) -{ - __builtin_memcpy(ptr, &v, sizeof(v)); -} - -static inline uint64_t ldq_le_p(const void *ptr) -{ - return le_bswap(ldq_he_p(ptr), 64); -} - -static inline void stq_le_p(void *ptr, uint64_t v) -{ - stq_he_p(ptr, le_bswap(v, 64)); -} - -static inline uint64_t ldq_be_p(const void *ptr) -{ - return be_bswap(ldq_he_p(ptr), 64); -} - -static inline void stq_be_p(void *ptr, uint64_t v) -{ - stq_he_p(ptr, be_bswap(v, 64)); -} - #define LD_CONVERT_UNALIGNED(bits, rtype, vtype, size)\ static inline rtype ld ## size ## _he_p(const void *ptr)\ {\ @@ -412,6 +380,7 @@ ST_CONVERT(16, uint16_t, w) LD_CONVERT(16, int, int16_t, sw) LD_CONVERT(16, int, uint16_t, uw) LDST_CONVERT(32, int, uint32_t, l) +LDST_CONVERT(64, uint64_t, uint64_t, q) =20 static inline unsigned long leul_to_cpu(unsigned long v) { --=20 2.26.3 From nobody Thu May 2 15:01:46 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1621363092; cv=none; d=zohomail.com; s=zohoarc; b=fzTjsEEwKOVBi3fVemeKWVxODD7GRvd9T+Bt4zhSESdPOhCrqYFUQD93XFCjUDr0PSgWR8RfCMPtXwQG95eFsrslCJLqCYDCu4q+9UMU7Fr6DoB6Imo3gVVd90hpNFBvDh1CGAG5W6N3ZTdFEPCh8B8t8mOjpAFhgS6Q2mLmY4w= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1621363092; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=mh+awpUaZ2yWuu439ZFMUaH3zSpAqoD7H3lWBxX++40=; b=XXlV3z2a1Ju0MoPfvNW9RGGmnyeJEeJdVgMjDj/qLXZwUcCxdFgHLAE+0wqS1m65rJywldJX6vhWcM4WGSsxtofyX/PEudJLzLd8q1fXpniCMUPezWSjhRzcMyoRH9Dpis6XcuNQWSiLDB5j31KC/agkjZr/fgJ6Kt3pNm+h358= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by mx.zohomail.com with SMTPS id 1621363092270932.0503322997939; Tue, 18 May 2021 11:38:12 -0700 (PDT) Received: from mail-ed1-f71.google.com (mail-ed1-f71.google.com [209.85.208.71]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-541-l1qDSwNeOGWoGbbY33HMiA-1; Tue, 18 May 2021 14:38:09 -0400 Received: by mail-ed1-f71.google.com with SMTP id h16-20020a0564020950b029038cbdae8cbaso6237140edz.6 for ; Tue, 18 May 2021 11:38:09 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.redhat.com (31.red-83-51-215.dynamicip.rima-tde.net. [83.51.215.31]) by smtp.gmail.com with ESMTPSA id b25sm13715551edv.9.2021.05.18.11.38.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 18 May 2021 11:38:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1621363091; 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; bh=mh+awpUaZ2yWuu439ZFMUaH3zSpAqoD7H3lWBxX++40=; b=MUwnUmzd08Hdw3c8mjtifwCWuH7l+c5BEHpKrUHXUH1V1gvmTUKcG4+BtO3P4UpW0g7IRq 0JPgDZv7FbyYmlJCXmu+shMFI63bdrHEWG2mgNmiqHLCF2BoNwvF4X3JHwcIVOEpzrS8qy 3af5EJLbN2QKb6jgyJUApWHKW0CI0+0= X-MC-Unique: l1qDSwNeOGWoGbbY33HMiA-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=mh+awpUaZ2yWuu439ZFMUaH3zSpAqoD7H3lWBxX++40=; b=Fu+RhcZk06kpz2s2Kb0DRaoFvpykI7FtNxXGn1tJcKg/AaxE/l0jCttnqACKOLAI7R /lwg52BIcUGgu88nz8hM4akRA87AaZYdz8o+/Qulg8SvSjNRWysdmGWHzSFXxEZExLnA B5bNp3CmxyIIehF4AWJjVMwoYqPYApfsn4YfnUac7tQu4zKeqFqp5i028KvHQZgKeE95 bjRr6LEUznTZHjW0Shxe1Js9KXB76rFq9DyYYuAmEUpll/ACFh8WpxmtTXiPm4Ni+ne9 OTDyylkv5fO5zaNrL+4u+MavLR79ZwUyqvzJgy1zeXuMT/UytnX3W1LFuEI3FvsuCjz3 MneA== X-Gm-Message-State: AOAM5312A1Us1CWRsxh/nzsAS/9o26VokF0gIlL3jGeendIYjUaC1MFb iWD45F9EnK+rVYL80F++ryNUZuhztNiGPChbT31SvUPobdo7NkxQ3YnC/yx10uyVQ9z1i9AvIoK PvamNXpL7wob/Jg== X-Received: by 2002:a17:906:fa83:: with SMTP id lt3mr7308762ejb.261.1621363088400; Tue, 18 May 2021 11:38:08 -0700 (PDT) X-Google-Smtp-Source: ABdhPJw1oWMszBWk7GQeRY5gkpfYvVRDrwExWaLKmjYbxQFKdsK8Fq2bTy5KlkIUeUKN/gBvPKxqTw== X-Received: by 2002:a17:906:fa83:: with SMTP id lt3mr7308737ejb.261.1621363088172; Tue, 18 May 2021 11:38:08 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Bibo Mao , "Michael S. Tsirkin" , Richard Henderson , Paolo Bonzini , Jiaxun Yang , Peter Xu , Huacai Chen , Peter Maydell , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Stefan Hajnoczi Subject: [RFC PATCH 14/25] qemu/bswap: Introduce load/store for aligned pointer Date: Tue, 18 May 2021 20:36:44 +0200 Message-Id: <20210518183655.1711377-15-philmd@redhat.com> X-Mailer: git-send-email 2.26.3 In-Reply-To: <20210518183655.1711377-1-philmd@redhat.com> References: <20210518183655.1711377-1-philmd@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) When the pointer alignment is known to be safe, we can directly swap the data in place, without having to rely on the compiler builtin code. Load/store methods expecting aligned pointer use the 'a' infix. For example to read a 16-bit unsigned value stored in little endianess at an unaligned pointer: val =3D lduw_le_p(&unaligned_ptr); then to store it in big endianess at an aligned pointer: stw_be_ap(&aligned_ptr, val); Suggested-by: Stefan Hajnoczi Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- docs/devel/loads-stores.rst | 27 ++++++++++++++++----------- include/qemu/bswap.h | 22 ++++++++++++++++++++++ 2 files changed, 38 insertions(+), 11 deletions(-) diff --git a/docs/devel/loads-stores.rst b/docs/devel/loads-stores.rst index 568274baec0..88493ba1293 100644 --- a/docs/devel/loads-stores.rst +++ b/docs/devel/loads-stores.rst @@ -13,20 +13,21 @@ documentation of each API -- for that you should look a= t the documentation comments in the relevant header files. =20 =20 -``ld*_p and st*_p`` -~~~~~~~~~~~~~~~~~~~ +``ld*_[a]p and st*_[a]p`` +~~~~~~~~~~~~~~~~~~~~~~~~~ =20 These functions operate on a host pointer, and should be used when you already have a pointer into host memory (corresponding to guest ram or a local buffer). They deal with doing accesses with the desired endianness and with correctly handling -potentially unaligned pointer values. +potentially unaligned pointer values. If the pointer alignment +is known to be safe, then the aligned functions can be used. =20 Function names follow the pattern: =20 -load: ``ld{sign}{size}_{endian}_p(ptr)`` +load: ``ld{sign}{size}_{endian}_{aligned}p(ptr)`` =20 -store: ``st{size}_{endian}_p(ptr, val)`` +store: ``st{size}_{endian}_{aligned}p(ptr, val)`` =20 ``sign`` - (empty) : for 32 or 64 bit sizes @@ -49,24 +50,28 @@ The ``_{endian}`` infix is omitted for target-endian ac= cesses. The target endian accessors are only available to source files which are built per-target. =20 +By using the ``_{aligned}`` infix, unsafe optimizations might be used, +however unaligned pointer might trigger an exception and abort the +process. + There are also functions which take the size as an argument: =20 -load: ``ldn{endian}_p(ptr, sz)`` +load: ``ldn{endian}_{aligned}p(ptr, sz)`` =20 which performs an unsigned load of ``sz`` bytes from ``ptr`` as an ``{endian}`` order value and returns it in a uint64_t. =20 -store: ``stn{endian}_p(ptr, sz, val)`` +store: ``stn{endian}_{aligned}p(ptr, sz, val)`` =20 which stores ``val`` to ``ptr`` as an ``{endian}`` order value of size ``sz`` bytes. =20 =20 Regexes for git grep - - ``\`` - - ``\`` - - ``\`` - - ``\`` + - ``\`` + - ``\`` + - ``\`` + - ``\`` =20 ``cpu_{ld,st}*_mmuidx_ra`` ~~~~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/include/qemu/bswap.h b/include/qemu/bswap.h index 4cd120ca014..3f272c3cb46 100644 --- a/include/qemu/bswap.h +++ b/include/qemu/bswap.h @@ -350,25 +350,47 @@ static inline void st ## size ## _he_p(void *ptr, vty= pe v)\ __builtin_memcpy(ptr, &v, sizeof(v));\ } =20 +#define LD_CONVERT_ALIGNED(bits, rtype, vtype, size)\ +static inline rtype ld ## size ## _he_ap(const void *ptr)\ +{\ + return *(vtype *)ptr;\ +} + +#define ST_CONVERT_ALIGNED(bits, vtype, size)\ +static inline void st ## size ## _he_ap(void *ptr, vtype v)\ +{\ + *(vtype *)ptr =3D v;\ +} + #define LD_CONVERT_END(endian, bits, rtype, vtype, size)\ static inline rtype ld ## size ## _ ## endian ## _p(const void *ptr)\ {\ return (vtype)glue(endian, _bswap)(ld ## size ## _he_p(ptr), bits);\ +}\ +static inline rtype ld ## size ## _ ## endian ## _ap(const void *ptr)\ +{\ + return (vtype)glue(endian, _bswap)(ld ## size ## _he_ap(ptr), bits);\ } =20 #define ST_CONVERT_END(endian, bits, vtype, size)\ static inline void st ## size ## _ ## endian ## _p(void *ptr, vtype v)\ {\ st ## size ## _he_p(ptr, glue(endian, _bswap)(v, bits));\ +}\ +static inline void st ## size ## _ ## endian ## _ap(void *ptr, vtype v)\ +{\ + st ## size ## _he_ap(ptr, glue(endian, _bswap)(v, bits));\ } =20 #define LD_CONVERT(bits, rtype, vtype, size)\ LD_CONVERT_UNALIGNED(bits, rtype, vtype, size)\ + LD_CONVERT_ALIGNED(bits, rtype, vtype, size)\ LD_CONVERT_END(le, bits, rtype, vtype, size)\ LD_CONVERT_END(be, bits, rtype, vtype, size) =20 #define ST_CONVERT(bits, vtype, size)\ ST_CONVERT_UNALIGNED(bits, vtype, size)\ + ST_CONVERT_ALIGNED(bits, vtype, size)\ ST_CONVERT_END(le, bits, vtype, size)\ ST_CONVERT_END(be, bits, vtype, size) =20 --=20 2.26.3 From nobody Thu May 2 15:01:46 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1621363099; cv=none; d=zohomail.com; s=zohoarc; b=W3TzgO0+7GXjLqvESozDdqHvbNLSd10Sq0C4qAmYWYFlsxXQc6x/s17PrzZwpa6M0ePYblk5b/+M1Ibei8JEbMgcYyuLSLhr6eqZazV2MDjRuhKoNqWwNG/44D5G1DlFeht/MYQM9vhDrPTYbGOwTsf45yeqKjYorHqk8S1sAVg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1621363099; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=G1CQjlEiyTHsQeL1tM+IFll2EqQidBT6ui0IRhG8Brg=; b=TKCqOQb6DdiH/sTMjrXQgXV5zO09VFO4L1b76omsndQmMM/fLzmF2P5+TMJzwfClHwRFUvT0phkZdiLn0XFZBJ/sgY4AagpTx/FlOAh1VCJ2r9lp8Di+KIPh+ZYP3ffnEOmLnPOIbOONCjXrUkzkLON7/A4+sVrnTvUvYZxLj40= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.zohomail.com with SMTPS id 1621363099911617.7701346434214; Tue, 18 May 2021 11:38:19 -0700 (PDT) Received: from mail-ed1-f72.google.com (mail-ed1-f72.google.com [209.85.208.72]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-482-g4_iHoBrNTuQxS0Cqik4YA-1; Tue, 18 May 2021 14:38:14 -0400 Received: by mail-ed1-f72.google.com with SMTP id u14-20020a05640207ceb029038d4bfbf3a6so2693974edy.9 for ; Tue, 18 May 2021 11:38:14 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.redhat.com (31.red-83-51-215.dynamicip.rima-tde.net. [83.51.215.31]) by smtp.gmail.com with ESMTPSA id bh3sm10736244ejb.19.2021.05.18.11.38.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 18 May 2021 11:38:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1621363098; 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; bh=G1CQjlEiyTHsQeL1tM+IFll2EqQidBT6ui0IRhG8Brg=; b=ItALiQqEdTe+32vNo1GonCRYF/aFibUEmHPX1Fa0ag3+7KstTtBbFr2UKCkZxI7oZNtzFy Opy2NmijmnLVm6DCcjyyrp+xcNnjm/UrgfXiWq14x1rnBt6aiapqnR8xAhLZWDxT5vXS1I oeGBfXLgb26FB9K2Gh+cBSiPNXmk/e8= X-MC-Unique: g4_iHoBrNTuQxS0Cqik4YA-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=G1CQjlEiyTHsQeL1tM+IFll2EqQidBT6ui0IRhG8Brg=; b=mmDVIvfRx4lTgqN5q+F5Jk8V/12xqTvo1Ti6n9AiVawy50WEoGl+4c0wCZ5lYN96xt rSu2iVzGXIWH+L3AGCHXsijwyEVIMbSXy36JxhZgUf+Puzb6EVC5fPIbtjfC0bWSm1HE sDzPAOsU/4zAHLVHZDz43eWMUQSPFk4qxJBpBqUiJgeJ1+9pGtjQaBrToqbLN2NrgiGx r4LlC2uWLTqJatR+IBCjFlbEdE6qU/tiBONYluX02AcJXXNdyb41QgjX2fcJCPvLEQJS NpG4AR0ZyJnAl4GOfeIbgH9soFSgN9Io2TkRJEuV+fXgLZF2KBLA7snxYJddT4gH3XNO x2ZQ== X-Gm-Message-State: AOAM530dZDmxvB46Zzr81E1tTmf2kvCFD28iYGUMCAX85BFEEq8mx0Xh tZJBJIerMeBVKX7XBd5cwLFD88AfAJ+TKKkqS4l9ys4COLoO73P3Gk7GUYRpohf/hIBCSiiZFaw DrdSwZsO5Ai5HfQ== X-Received: by 2002:aa7:d801:: with SMTP id v1mr8717343edq.349.1621363093265; Tue, 18 May 2021 11:38:13 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwLqxEE8GDlS+G3Ps1Sp0VDZpTa1hPzmdUhyC910X4WOsamv7jbT6X74BtGP6XAufnVT9WRBA== X-Received: by 2002:aa7:d801:: with SMTP id v1mr8717322edq.349.1621363093145; Tue, 18 May 2021 11:38:13 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Bibo Mao , "Michael S. Tsirkin" , Richard Henderson , Paolo Bonzini , Jiaxun Yang , Peter Xu , Huacai Chen , Peter Maydell , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [RFC PATCH 15/25] exec/memory: Add methods for aligned pointer access (address space) Date: Tue, 18 May 2021 20:36:45 +0200 Message-Id: <20210518183655.1711377-16-philmd@redhat.com> X-Mailer: git-send-email 2.26.3 In-Reply-To: <20210518183655.1711377-1-philmd@redhat.com> References: <20210518183655.1711377-1-philmd@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- include/exec/memory.h | 11 +++++++++++ include/exec/memory_ldst_cached.h.inc | 20 ++++++++++++++++---- 2 files changed, 27 insertions(+), 4 deletions(-) diff --git a/include/exec/memory.h b/include/exec/memory.h index 175d7151a5d..7eeabbceef3 100644 --- a/include/exec/memory.h +++ b/include/exec/memory.h @@ -2315,12 +2315,23 @@ static inline void address_space_stb_cached(MemoryR= egionCache *cache, } } =20 +#define address_space_ldub_cached_aligned address_space_ldub_cached +#define address_space_stb_cached_aligned address_space_stb_cached + #define ENDIANNESS _le #include "exec/memory_ldst_cached.h.inc" =20 #define ENDIANNESS _be #include "exec/memory_ldst_cached.h.inc" =20 +#define LDST_ALIGNED +#define ENDIANNESS _le +#include "exec/memory_ldst_cached.h.inc" + +#define LDST_ALIGNED +#define ENDIANNESS _be +#include "exec/memory_ldst_cached.h.inc" + #define SUFFIX _cached #define ARG1 cache #define ARG1_DECL MemoryRegionCache *cache diff --git a/include/exec/memory_ldst_cached.h.inc b/include/exec/memory_ld= st_cached.h.inc index d7834f852c4..db45e688c03 100644 --- a/include/exec/memory_ldst_cached.h.inc +++ b/include/exec/memory_ldst_cached.h.inc @@ -17,12 +17,21 @@ * License along with this library; if not, see . */ =20 +#ifdef LDST_ALIGNED +#define FUNC_SUFFIX _cached_aligned +#define LDST_SUFFIX _ap +#undef LDST_ALIGNED +#else +#define FUNC_SUFFIX _cached +#define LDST_SUFFIX _p +#endif + #define ADDRESS_SPACE_LD_CACHED(size) \ - glue(glue(address_space_ld, size), glue(ENDIANNESS, _cached)) + glue(glue(address_space_ld, size), glue(ENDIANNESS, FUNC_SUFFIX)) #define ADDRESS_SPACE_LD_CACHED_SLOW(size) \ glue(glue(address_space_ld, size), glue(ENDIANNESS, _cached_slow)) #define LD_P(size) \ - glue(glue(ld, size), glue(ENDIANNESS, _p)) + glue(glue(ld, size), glue(ENDIANNESS, LDST_SUFFIX)) =20 static inline uint16_t ADDRESS_SPACE_LD_CACHED(uw)(MemoryRegionCache *cach= e, hwaddr addr, MemTxAttrs attrs, MemTxResult *result) @@ -65,11 +74,11 @@ static inline uint64_t ADDRESS_SPACE_LD_CACHED(q)(Memor= yRegionCache *cache, #undef LD_P =20 #define ADDRESS_SPACE_ST_CACHED(size) \ - glue(glue(address_space_st, size), glue(ENDIANNESS, _cached)) + glue(glue(address_space_st, size), glue(ENDIANNESS, FUNC_SUFFIX)) #define ADDRESS_SPACE_ST_CACHED_SLOW(size) \ glue(glue(address_space_st, size), glue(ENDIANNESS, _cached_slow)) #define ST_P(size) \ - glue(glue(st, size), glue(ENDIANNESS, _p)) + glue(glue(st, size), glue(ENDIANNESS, LDST_SUFFIX)) =20 static inline void ADDRESS_SPACE_ST_CACHED(w)(MemoryRegionCache *cache, hwaddr addr, uint16_t val, MemTxAttrs attrs, MemTxResult *result) @@ -108,4 +117,7 @@ static inline void ADDRESS_SPACE_ST_CACHED(q)(MemoryReg= ionCache *cache, #undef ADDRESS_SPACE_ST_CACHED_SLOW #undef ST_P =20 +#undef FUNC_SUFFIX +#undef LDST_SUFFIX + #undef ENDIANNESS --=20 2.26.3 From nobody Thu May 2 15:01:46 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1621363104; cv=none; d=zohomail.com; s=zohoarc; b=LpJ7enRZYNhVUzWtOLQQGvWC6iRWbv6TFoFfdaY7K/4yxbqhFfREpCJrFz7JDm2dbe+U0tq8cuLTIPoqODeEH7lE+zYw2Ub/bUl+Fg9Xicv8yI/Wr5GBsas/4jUJeBpYsc3G4wNbB9DzOzrcHfxLp3W2iEkAMR3d//bf4eyMZgQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1621363104; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=qqYM/7O26sE43anlCu8uHsOrRtDjTSh1fZivMot9f2U=; b=WU/GagXScheOL4zzoNKAydgIwv8bz8LsmliaICV+ueIgpj408qHXjaEGoY3Y6yOaxJEi++j83OFOmjYzEQFNXPJRBvii9kRuHvvGzDJDva+poPV+U1lDB3S+y75uIl3FhbaOvDFr4h96xx96q2GMdug3iLqYTjnNISdygkQqRaQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by mx.zohomail.com with SMTPS id 1621363104095400.87809652456497; Tue, 18 May 2021 11:38:24 -0700 (PDT) Received: from mail-ed1-f69.google.com (mail-ed1-f69.google.com [209.85.208.69]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-291-71zkICWiPyWH08RIaOoo-A-1; Tue, 18 May 2021 14:38:19 -0400 Received: by mail-ed1-f69.google.com with SMTP id q18-20020a0564025192b02903888712212fso6246905edd.19 for ; Tue, 18 May 2021 11:38:19 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.redhat.com (31.red-83-51-215.dynamicip.rima-tde.net. [83.51.215.31]) by smtp.gmail.com with ESMTPSA id k22sm1498256ejz.108.2021.05.18.11.38.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 18 May 2021 11:38:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1621363103; 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; bh=qqYM/7O26sE43anlCu8uHsOrRtDjTSh1fZivMot9f2U=; b=Uh/ZKL+sACAqi4+ypJJbLSHUkjGTn26h9gOjNMZr1XjZWhXKcxbwWgansQeoe5X26TMtyO WOQ/h4nSF5HVnciBV5CBhaxgjNaW0cJfvIcYprufwFwRbzAU4vpbrFUZmOvWlDvRJQFKUV NnkfbsE6BrH7nJsGkUCr/tStTg29agI= X-MC-Unique: 71zkICWiPyWH08RIaOoo-A-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=qqYM/7O26sE43anlCu8uHsOrRtDjTSh1fZivMot9f2U=; b=sUgEYKyS2uLsAneOqjgWm7ZiOOPLHklZgch6I99GfKJnHCQ56Mh1VuAUU5+fqGX/zZ /e2mkTNVh+vpVy14cm12QXlLfxfaj8B2pMf3nXEKRvdf7T31vx8mjfw+g1IxcXHJZu6z ZOin/ksomgN6rydndw6aS8yamUibWZeLzYI5c8udj3QW301f+rh4wZntaqrP5YOaVx+B QDzlZI/wNobFWpiShi1ZLeypDDd2fW6KT1DOb6bFp3Gi+kpboKUmqF/b+FRHLbhYmzgy Gn6r7pPzkSvfCos7WwdaXNL0AnNDK6BGaPxeKea57l1yRh4HQ44X7hqEFOT3wi1gudl/ RXAg== X-Gm-Message-State: AOAM531vQmCNJ2vINQYqRv/c2WjLhObkx2BEKJ6+6IrZCOnjPrAlJfNS OeLU29z1qEzLl8Aml3XdZMfkz45En60zUTmBeIdbKPCuu7Ubajk1tExV00W8k/UUmMKklgLsTNg gp3uK0hqdeKi6ag== X-Received: by 2002:a17:906:6c96:: with SMTP id s22mr7583195ejr.468.1621363098317; Tue, 18 May 2021 11:38:18 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxvH82nxBgFJavZyhFjeAm/jhHskgo7jepWzdvR3sz8IDH4v59U8/quTmPbVhYd9OV3TwnvlQ== X-Received: by 2002:a17:906:6c96:: with SMTP id s22mr7583186ejr.468.1621363098151; Tue, 18 May 2021 11:38:18 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Bibo Mao , "Michael S. Tsirkin" , Richard Henderson , Paolo Bonzini , Jiaxun Yang , Peter Xu , Huacai Chen , Peter Maydell , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [RFC PATCH 16/25] exec/memory: Add methods for aligned pointer access (physical memory) Date: Tue, 18 May 2021 20:36:46 +0200 Message-Id: <20210518183655.1711377-17-philmd@redhat.com> X-Mailer: git-send-email 2.26.3 In-Reply-To: <20210518183655.1711377-1-philmd@redhat.com> References: <20210518183655.1711377-1-philmd@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- include/exec/memory.h | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/include/exec/memory.h b/include/exec/memory.h index 7eeabbceef3..28c0e68e7d8 100644 --- a/include/exec/memory.h +++ b/include/exec/memory.h @@ -2337,6 +2337,11 @@ static inline void address_space_stb_cached(MemoryRe= gionCache *cache, #define ARG1_DECL MemoryRegionCache *cache #include "exec/memory_ldst_phys.h.inc" =20 +#define SUFFIX _cached_aligned +#define ARG1 cache +#define ARG1_DECL MemoryRegionCache *cache +#include "exec/memory_ldst_phys.h.inc" + /* address_space_cache_init: prepare for repeated access to a physical * memory region * --=20 2.26.3 From nobody Thu May 2 15:01:46 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1621363112; cv=none; d=zohomail.com; s=zohoarc; b=i1OuhpxxCpE7B04HD6w/2fRElREcM4Af1slcOEywtacY+JbgyRezZ6JwAuOu3fEtkeR3Vgl6Tbr4V6sYziYru7p9g7AfShg/lzaXDtkqtp+DIzCTzQmuwkYpG5o987k/f73d6Wfws7Cdvm2GBuAx5GqHiaX3ks4XoSMNGlFAx+Y= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1621363112; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=S06OJbLcsLoisVvd+3p+23m8ISoQC7YgJjRfb76l+Q8=; b=PlOd3tALA6SGBIqrzIP9kc3ox6dGufuAZhdhlR0pGf0poZTRVAJPl1D8rrQ7h/ZgPF5pV4RgURjj2+rrk7LHD1sxnhko2aiMjcJtzB/C67mxr34yIELvU6VXS3YwGERXHPh/0D81Mlc8DtjUocxviER2pDiDUJDwnREly1ek/0A= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by mx.zohomail.com with SMTPS id 1621363112204929.4210194331973; Tue, 18 May 2021 11:38:32 -0700 (PDT) Received: from mail-ed1-f69.google.com (mail-ed1-f69.google.com [209.85.208.69]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-281-398Syl6aNU2pi9gSvvowDQ-1; Tue, 18 May 2021 14:38:24 -0400 Received: by mail-ed1-f69.google.com with SMTP id c21-20020a0564021015b029038c3f08ce5aso6298410edu.18 for ; Tue, 18 May 2021 11:38:24 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.redhat.com (31.red-83-51-215.dynamicip.rima-tde.net. [83.51.215.31]) by smtp.gmail.com with ESMTPSA id t20sm10717899ejc.61.2021.05.18.11.38.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 18 May 2021 11:38:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1621363111; 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; bh=S06OJbLcsLoisVvd+3p+23m8ISoQC7YgJjRfb76l+Q8=; b=DZ8cnfhh0VhQd8YSZgFwRmQVLE0/U2MgLru1dMVaQjkl5iX/WRaYtVwC3OO8HpfEUSaMTA ZtNjn1Xj4RnWyBcYlAuOAbK6GDTbGyGXoMBHiZy/UtdJFLIdQDCG3/ljW1HgWdsoAtV1JE byD4d22MIY31yO5M7XD39VrYC5i4+X8= X-MC-Unique: 398Syl6aNU2pi9gSvvowDQ-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=S06OJbLcsLoisVvd+3p+23m8ISoQC7YgJjRfb76l+Q8=; b=OVz2D5ijs9vteaTu+/hANa3dUg11v2ZXdXWSGStYzx8revmtJoETFR7p+kGGchg2w6 xSwHVDumxJk2qlCjtTMVXOsvYFblejYnJkaecMWXy7P5u2vlMUStW/iYXH8P1Jq5TP5l yMK0zZ+tQgBTUYr0XieM+FwKCvYVD2tTMntZ3rSpUEkI/c8wwI4l5phsZFEsEKforJRG ADS/NDKr7KIYoIijEJWCCSZzHJA9syz4cOGMXT+lt2wYudH7bJ8U0l4FlyDHctJMkYjN 7YGmYtHLeHBs+xvkPGjnFvR8M8U01AscyRmg9B48C2fpuS9PgSl2FWDu9au2zCOXjVnt kvBQ== X-Gm-Message-State: AOAM532b+mZJdemwbVOOmTYYTML7KmSaFktTY7e06pADuCJxhiaqqOrD lGSOZ4fqbcKV+QZhhUosCbOjt9R7QdN95bA8BhVGK5g7Jh8E0k1NRZPIb38WkboostykgEJ3ePM Y5oEvY7yLPOD1ZA== X-Received: by 2002:a17:906:724b:: with SMTP id n11mr7499150ejk.338.1621363103344; Tue, 18 May 2021 11:38:23 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxzVhtxMbvRR9ETzBrmBATamfZ/kYWJ0iALABjMejXqFJjBnht3bmvkstNaQOW4XLUET6fLIQ== X-Received: by 2002:a17:906:724b:: with SMTP id n11mr7499136ejk.338.1621363103197; Tue, 18 May 2021 11:38:23 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Bibo Mao , "Michael S. Tsirkin" , Richard Henderson , Paolo Bonzini , Jiaxun Yang , Peter Xu , Huacai Chen , Peter Maydell , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [RFC PATCH 17/25] hw/virtio: Use correct type sizes Date: Tue, 18 May 2021 20:36:47 +0200 Message-Id: <20210518183655.1711377-18-philmd@redhat.com> X-Mailer: git-send-email 2.26.3 In-Reply-To: <20210518183655.1711377-1-philmd@redhat.com> References: <20210518183655.1711377-1-philmd@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Use uint16_t for unsigned 16-bit data and uint32_t for unsigned 32-bit. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- include/hw/virtio/virtio-access.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/hw/virtio/virtio-access.h b/include/hw/virtio/virtio-a= ccess.h index 6818a23a2d3..ae8c9feffc5 100644 --- a/include/hw/virtio/virtio-access.h +++ b/include/hw/virtio/virtio-access.h @@ -120,7 +120,7 @@ static inline void virtio_stq_p(VirtIODevice *vdev, voi= d *ptr, uint64_t v) } } =20 -static inline int virtio_lduw_p(VirtIODevice *vdev, const void *ptr) +static inline uint16_t virtio_lduw_p(VirtIODevice *vdev, const void *ptr) { if (virtio_access_is_big_endian(vdev)) { return lduw_be_p(ptr); @@ -129,7 +129,7 @@ static inline int virtio_lduw_p(VirtIODevice *vdev, con= st void *ptr) } } =20 -static inline int virtio_ldl_p(VirtIODevice *vdev, const void *ptr) +static inline uint32_t virtio_ldl_p(VirtIODevice *vdev, const void *ptr) { if (virtio_access_is_big_endian(vdev)) { return ldl_be_p(ptr); --=20 2.26.3 From nobody Thu May 2 15:01:46 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1621363121; cv=none; d=zohomail.com; s=zohoarc; b=RXKOPDoGWoFqlBOn6udYAM+7e3zKXWVNC+R8OAGss8HEpWCMIxDSReCXHDKyp/HQDLgZOQtDbjMLVaYAr4753R2P9Wt28ECGibCoyjYMepMkzL3GfXo7Kcmh7Bj4kfKehk0LCgnw+zHRhknO+x4lFTFQ1HKH2nNp0pz16Rv9x+0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1621363121; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=LKxZ1RkYCEJSma5qBZ02Ppnbq2NTdPs4znREVtD8AU8=; b=N2M2Xs+//duHMS4iS/Qv8QxFITvXgFbfELuGaPzaTHkTRRFNUFbuaByGekTXXWwmBUMuoCfxpuHZBhmTtKr05ni/1KF+EYTzRnz2MyXB5c73nmHPP/fC9f6T524cd72zcWvfYBISvQzstXSEn7UGB626IMIZDaVsdtn3G6PimZ4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.zohomail.com with SMTPS id 1621363121313898.3691635825888; Tue, 18 May 2021 11:38:41 -0700 (PDT) Received: from mail-ej1-f69.google.com (mail-ej1-f69.google.com [209.85.218.69]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-202-6oBcM05EPw-gv1FlgsVr1g-1; Tue, 18 May 2021 14:38:29 -0400 Received: by mail-ej1-f69.google.com with SMTP id x20-20020a1709061354b02903cff4894505so2738569ejb.14 for ; Tue, 18 May 2021 11:38:29 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.redhat.com (31.red-83-51-215.dynamicip.rima-tde.net. [83.51.215.31]) by smtp.gmail.com with ESMTPSA id jt11sm10633010ejb.83.2021.05.18.11.38.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 18 May 2021 11:38:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1621363119; 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; bh=LKxZ1RkYCEJSma5qBZ02Ppnbq2NTdPs4znREVtD8AU8=; b=FH2y/9bN2mDxGXbklxKx4gWL8BmHntW3+kf93MWXEAMSQLFXwnGhSLVYIf9EJia6YlgYwr 3jEuc/vGGbtsbOydWgpxLFxxLMbI0osFTg8USwZa4x47GETtPuHygSgQ1D/WgjbHKT/lg0 OCpI/WLDrEgyftFWQzbqwX4uc0Zct7g= X-MC-Unique: 6oBcM05EPw-gv1FlgsVr1g-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=LKxZ1RkYCEJSma5qBZ02Ppnbq2NTdPs4znREVtD8AU8=; b=bSqy/vt9BZ6QgylCjI3msyvckgNaA5T0/BA3Jv8CP2h2KkUcLjSGc8ms8/GCvqPmXh yYN756xNa7QqJZzjTMWRgor2DCqaqVNcvOA/t4b+rqyEiL1bmnfGionjPc5oBljZIjnE WWsgiOq22KEplXipAOSsI+GKOf1W5iazW8VTiBf/PQsUO1OKnCV/UOGM4PV8ktgt/1Wb xuxJ5uui2YGFwvxqlt6qk0QmL7AeoqtLASoFznvEcC3P2POEjlcv+m5pEb9elW2NUa7K 2G4dPEFs0B9LPC6leEFuvWkmO02QrmdHotOyKjYhcVOdz9dG8eh96xihIr2pHNiHdtmf OZmQ== X-Gm-Message-State: AOAM530gG3XittybBQ34+HBQASXZBFRT7nxLfpPsid7aGhOpFn1VA8xY LhilKjvR/AikbY9wYlywBdrKF9sHrDVgjg5zmkKCHTr2y6bNSK3l2MXP23o7v5sKZuH+sUnGoVa yxPXChVoX0O0GlQ== X-Received: by 2002:a17:907:2067:: with SMTP id qp7mr582640ejb.333.1621363108351; Tue, 18 May 2021 11:38:28 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyDq8kPq1/z50t99c/q+5VxS17+gOp3H9+HpTLmfVKghxsdfy9W3DV6faWOHuSaTiAFdDL8TQ== X-Received: by 2002:a17:907:2067:: with SMTP id qp7mr582631ejb.333.1621363108234; Tue, 18 May 2021 11:38:28 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Bibo Mao , "Michael S. Tsirkin" , Richard Henderson , Paolo Bonzini , Jiaxun Yang , Peter Xu , Huacai Chen , Peter Maydell , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [RFC PATCH 18/25] hw/virtio: Introduce VIRTIO_LD_CONVERT() macro Date: Tue, 18 May 2021 20:36:48 +0200 Message-Id: <20210518183655.1711377-19-philmd@redhat.com> X-Mailer: git-send-email 2.26.3 In-Reply-To: <20210518183655.1711377-1-philmd@redhat.com> References: <20210518183655.1711377-1-philmd@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) To be able to add more load/store operations, introduce the VIRTIO_LD_CONVERT() macro. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- include/hw/virtio/virtio-access.h | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/include/hw/virtio/virtio-access.h b/include/hw/virtio/virtio-a= ccess.h index ae8c9feffc5..37e1e6ea535 100644 --- a/include/hw/virtio/virtio-access.h +++ b/include/hw/virtio/virtio-access.h @@ -39,6 +39,35 @@ static inline bool virtio_access_is_big_endian(VirtIODev= ice *vdev) #endif } =20 +#define VIRTIO_LD_CONVERT(size, rtype)\ +static inline rtype virtio_ld ## size ## _phys(VirtIODevice *vdev, hwaddr = pa)\ +{\ + AddressSpace *dma_as =3D vdev->dma_as;\ +\ + if (virtio_access_is_big_endian(vdev)) {\ + return ld ## size ## _be_phys(dma_as, pa);\ + }\ + return ld ## size ## _le_phys(dma_as, pa);\ +}\ +static inline rtype virtio_ld ## size ## _p(VirtIODevice *vdev,\ + const void *ptr)\ +{\ + if (virtio_access_is_big_endian(vdev)) {\ + return ld ## size ## _be_p(ptr);\ + } else {\ + return ld ## size ## _le_p(ptr);\ + }\ +}\ +static inline rtype virtio_ld ## size ## _phys_cached(VirtIODevice *vdev,\ + MemoryRegionCache *c= ache,\ + hwaddr pa)\ +{\ + if (virtio_access_is_big_endian(vdev)) {\ + return ld ## size ## _be_phys_cached(cache, pa);\ + }\ + return ld ## size ## _le_phys_cached(cache, pa);\ +} + static inline uint16_t virtio_lduw_phys(VirtIODevice *vdev, hwaddr pa) { AddressSpace *dma_as =3D vdev->dma_as; --=20 2.26.3 From nobody Thu May 2 15:01:46 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1621363119; cv=none; d=zohomail.com; s=zohoarc; b=TMP+jsAq8Dz+OxwB7ROT+TIHCQ0oHWAkVory5DMXKr8sAXKb3YpsayjjCDwgcfkesMZVaR+gjOQGPS1Bg8bzzkipOe09iC5g1ENPwnLU/WRFvFwSYaRilSFttj7CQen0oajjVew8ezkokMApoZZ1BmbfPYpP81PbxBaIhSttooQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1621363119; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=bd795ibWFjtiUDy/XOhoxakC4+CKhSojCYBy76w9KxQ=; b=NtzMwH9HIbvkFv2q0xDIPeh/Vwygwm74en/whMnmKEgBamQgAGpQUJr8hj7qldb9XXg8VCrPBh1TBZmYsbmYnhqCQoe+i5Sjlnlhmwyg0Sf+IH6pOsYpDLDBvMatXqgRzCzEUe+8qKX00j+lABgOXbTUa/dbY138guHz4FKw9ww= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.zohomail.com with SMTPS id 1621363119384709.5405443079406; Tue, 18 May 2021 11:38:39 -0700 (PDT) Received: from mail-ej1-f72.google.com (mail-ej1-f72.google.com [209.85.218.72]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-162-X9BHE6E5Muu4waq7rVOChA-1; Tue, 18 May 2021 14:38:34 -0400 Received: by mail-ej1-f72.google.com with SMTP id j16-20020a1709062a10b02903ba544485d0so2758715eje.3 for ; Tue, 18 May 2021 11:38:34 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.redhat.com (31.red-83-51-215.dynamicip.rima-tde.net. [83.51.215.31]) by smtp.gmail.com with ESMTPSA id z17sm10624200ejc.69.2021.05.18.11.38.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 18 May 2021 11:38:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1621363118; 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; bh=bd795ibWFjtiUDy/XOhoxakC4+CKhSojCYBy76w9KxQ=; b=KvBvwQhBQBQ5fGxiq6oguygCQV1jwc52J7bv1KzCGR33ivZYYr3+v+zXvNVXYA1mJrRPl1 fJSvysSVMqn9KIV6FywrCl/WtKuFBgCDa1w0aaFvp2J2UUq2ngDQbTcrz/PRtMnI8GaOtV hp9gRdMtcaTBVoGMT2fNsM4HzNREhp8= X-MC-Unique: X9BHE6E5Muu4waq7rVOChA-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=bd795ibWFjtiUDy/XOhoxakC4+CKhSojCYBy76w9KxQ=; b=ayF9vhbchtVVpf9eNNkoibDjffzMbyRke8YJfoa32lQwi5Vh/uWuz5iTzCFtoszMG4 s33Q3rdJhRf1J+oTzvqT9XUSsndWoYuidyuK6jeHqo4tjJCNVKl+i1U0TQPZUBbFfthL Znhqkx0i2XraK/3dNe/Q5XXbLhHXVn7m1h3o6tzIiTvF4tVptCjy9OnNlvha3KBr9elV Ak4jMFJGAluylWH1Vm87l1hz44LpYRuI8KEthOSC5mIOQ4O4qV9B33C+J6nd+5JwnIXc vTiKIaOJ0YHec2nokVxLKzkg9D/f/KCC+/Tcg+i/Za3sUwJ57IHnZBjBTX49YYJ1+uI7 BMqQ== X-Gm-Message-State: AOAM532rOUP9D6IAYg969c0+eFnewADxcyFWWnNkccetZvPLdOb5vgor pNg4Cj0xpewpcYsETtwDruahZB/6HSdBx11wLLxwt/hfvTCIYugQmu+aOkaNyy9fB7f3XRXAPUs L5H+4rg59HvarUw== X-Received: by 2002:aa7:d818:: with SMTP id v24mr8520245edq.290.1621363113470; Tue, 18 May 2021 11:38:33 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzlnrkpwFSfKU0c08T4cMMe38gfG60nAItng5FxSG16/DvFANx6ztKNae4qHKvvhLwA+FRx1w== X-Received: by 2002:aa7:d818:: with SMTP id v24mr8520224edq.290.1621363113227; Tue, 18 May 2021 11:38:33 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Bibo Mao , "Michael S. Tsirkin" , Richard Henderson , Paolo Bonzini , Jiaxun Yang , Peter Xu , Huacai Chen , Peter Maydell , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [RFC PATCH 19/25] hw/virtio: Use LD_CONVERT macro to emit 16-bit unsigned load/store code Date: Tue, 18 May 2021 20:36:49 +0200 Message-Id: <20210518183655.1711377-20-philmd@redhat.com> X-Mailer: git-send-email 2.26.3 In-Reply-To: <20210518183655.1711377-1-philmd@redhat.com> References: <20210518183655.1711377-1-philmd@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- include/hw/virtio/virtio-access.h | 29 +---------------------------- 1 file changed, 1 insertion(+), 28 deletions(-) diff --git a/include/hw/virtio/virtio-access.h b/include/hw/virtio/virtio-a= ccess.h index 37e1e6ea535..594247f6e35 100644 --- a/include/hw/virtio/virtio-access.h +++ b/include/hw/virtio/virtio-access.h @@ -68,15 +68,7 @@ static inline rtype virtio_ld ## size ## _phys_cached(Vi= rtIODevice *vdev,\ return ld ## size ## _le_phys_cached(cache, pa);\ } =20 -static inline uint16_t virtio_lduw_phys(VirtIODevice *vdev, hwaddr pa) -{ - AddressSpace *dma_as =3D vdev->dma_as; - - if (virtio_access_is_big_endian(vdev)) { - return lduw_be_phys(dma_as, pa); - } - return lduw_le_phys(dma_as, pa); -} +VIRTIO_LD_CONVERT(uw, uint16_t) =20 static inline uint32_t virtio_ldl_phys(VirtIODevice *vdev, hwaddr pa) { @@ -149,15 +141,6 @@ static inline void virtio_stq_p(VirtIODevice *vdev, vo= id *ptr, uint64_t v) } } =20 -static inline uint16_t virtio_lduw_p(VirtIODevice *vdev, const void *ptr) -{ - if (virtio_access_is_big_endian(vdev)) { - return lduw_be_p(ptr); - } else { - return lduw_le_p(ptr); - } -} - static inline uint32_t virtio_ldl_p(VirtIODevice *vdev, const void *ptr) { if (virtio_access_is_big_endian(vdev)) { @@ -185,16 +168,6 @@ static inline uint16_t virtio_tswap16(VirtIODevice *vd= ev, uint16_t s) #endif } =20 -static inline uint16_t virtio_lduw_phys_cached(VirtIODevice *vdev, - MemoryRegionCache *cache, - hwaddr pa) -{ - if (virtio_access_is_big_endian(vdev)) { - return lduw_be_phys_cached(cache, pa); - } - return lduw_le_phys_cached(cache, pa); -} - static inline uint32_t virtio_ldl_phys_cached(VirtIODevice *vdev, MemoryRegionCache *cache, hwaddr pa) --=20 2.26.3 From nobody Thu May 2 15:01:46 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1621363123; cv=none; d=zohomail.com; s=zohoarc; b=K++YZxFEoz4AHS4yYa87zoWdB8T36sCtKZqYwas9OKn0te2TcP4omef5jLt8W0EgXJq+tom0TIT+9NXPD2fUddbCb2i1meg9lqnLMUuBvyCT/I9jv6fJd5gkbC9FTFHnf27kzAhaCTcdueQOVLxikZ7rfWX8dgsjakvLVWz6PrQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1621363123; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=nkQ439nwJVtM0Q48vhAoZUVzUukLms9COugvSIGg64M=; b=V+P7eXDIXzd4pEbQImAOROzqIpFZH00B7KL91/VRqp6DC+ExGF2dAeN38X9QnhTqja9MMT2buED7Jpl3oTrb7XPU4rDtZiW/bY/5PlktLUZc+sGz2f2UfzViGRv1N+pZj6L3SZjabYjQTCRVo4BzV7X/tcdZPOAnc2pdOVXIzzQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.zohomail.com with SMTPS id 1621363123317849.7661736586648; Tue, 18 May 2021 11:38:43 -0700 (PDT) Received: from mail-ej1-f72.google.com (mail-ej1-f72.google.com [209.85.218.72]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-494-Sj_-C0XmMxeaqEWpNRUHFQ-1; Tue, 18 May 2021 14:38:39 -0400 Received: by mail-ej1-f72.google.com with SMTP id p25-20020a1709061419b0290378364a6464so2737298ejc.15 for ; Tue, 18 May 2021 11:38:39 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.redhat.com (31.red-83-51-215.dynamicip.rima-tde.net. [83.51.215.31]) by smtp.gmail.com with ESMTPSA id v18sm1602931edc.76.2021.05.18.11.38.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 18 May 2021 11:38:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1621363121; 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; bh=nkQ439nwJVtM0Q48vhAoZUVzUukLms9COugvSIGg64M=; b=HUesh84t2+m3vIsARyiDZPCC+qbpQcr+4KFqFDs+jiWhvp3WBWxoapBtQqa8NtEeTSs3eN huCrWl5p6I16ZZ2h9LPZFUFKtRM/9fjEjonVSxdebL4AiKxKUeI8JsWMddRbYdsMqB0zUP WnsdhscuBtXg/Yi1gC8FqKt4Nffjia0= X-MC-Unique: Sj_-C0XmMxeaqEWpNRUHFQ-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=nkQ439nwJVtM0Q48vhAoZUVzUukLms9COugvSIGg64M=; b=AvfePJ5s3bpjY9bC2hCDRTc0y6UJsp9WEX1yxc/PBkz5Fmoz2XQLgh8B1lrMkSoF2F 1ooe4Nb9MebuDcYcMKnNAlLQKtsMgcvfREby6Q8p3uqpeWTwGW3uoqJEyONZfTKh+bJA 3qAvAn+CfZguBkCU5g9pNsYRBsjeSZXE0PvUqXhC+ERgn3tDaPiljcFI6LTkdWlxp9zp ANa0NqfL/F0pObHlpfnOsTrPcKRAeGDMIGbBFdIt50R76kOMDZIOD8nmQJs2TRsDurJQ iJYpRoi2Ve3FCu/t1Q6mcUg5CT/BcitytfxxvfDFeJenqqYL+oCMvBPoJvCOY7qtWtxS ZYYQ== X-Gm-Message-State: AOAM533nC1GjFq7g6ds5sshpmrCBtmC55Nuh6Uff303Gnivot8vd1YjS FSLScfq8P8DUji7TDufbzWniNcY+I1ULz2+BKWJyykw2Q1VqCU4KblIyYJeJwyrXBHyUWvw3lz6 +jl3ymCwnSZmp6A== X-Received: by 2002:a05:6402:14c2:: with SMTP id f2mr8796478edx.69.1621363118383; Tue, 18 May 2021 11:38:38 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxvQtpgrJ5MmmBPxeO08o3LNXUyat80zCiU7ug+0l7vmM9WYlqOXbTeQWpLp/Pt0nYOPgfZvQ== X-Received: by 2002:a05:6402:14c2:: with SMTP id f2mr8796471edx.69.1621363118255; Tue, 18 May 2021 11:38:38 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Bibo Mao , "Michael S. Tsirkin" , Richard Henderson , Paolo Bonzini , Jiaxun Yang , Peter Xu , Huacai Chen , Peter Maydell , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [RFC PATCH 20/25] hw/virtio: Introduce VIRTIO_ST_CONVERT() macro Date: Tue, 18 May 2021 20:36:50 +0200 Message-Id: <20210518183655.1711377-21-philmd@redhat.com> X-Mailer: git-send-email 2.26.3 In-Reply-To: <20210518183655.1711377-1-philmd@redhat.com> References: <20210518183655.1711377-1-philmd@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) To be able to add more load/store operations, introduce the VIRTIO_ST_CONVERT() macro. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- include/hw/virtio/virtio-access.h | 32 +++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/include/hw/virtio/virtio-access.h b/include/hw/virtio/virtio-a= ccess.h index 594247f6e35..a86819ef2fe 100644 --- a/include/hw/virtio/virtio-access.h +++ b/include/hw/virtio/virtio-access.h @@ -68,6 +68,38 @@ static inline rtype virtio_ld ## size ## _phys_cached(Vi= rtIODevice *vdev,\ return ld ## size ## _le_phys_cached(cache, pa);\ } =20 +#define VIRTIO_ST_CONVERT(size, vtype)\ +static inline void virtio_st## size ## _p(VirtIODevice *vdev,\ + void *ptr, vtype v)\ +{\ + if (virtio_access_is_big_endian(vdev)) {\ + st## size ## _be_p(ptr, v);\ + } else {\ + st## size ## _le_p(ptr, v);\ + }\ +}\ +static inline void virtio_st## size ## _phys(VirtIODevice *vdev,\ + hwaddr pa, vtype value)\ +{\ + AddressSpace *dma_as =3D vdev->dma_as;\ +\ + if (virtio_access_is_big_endian(vdev)) {\ + st## size ## _be_phys(dma_as, pa, value);\ + } else {\ + st## size ## _le_phys(dma_as, pa, value);\ + }\ +}\ +static inline void virtio_st ## size ## _phys_cached(VirtIODevice *vdev,\ + MemoryRegionCache *ca= che,\ + hwaddr pa, vtype valu= e)\ +{\ + if (virtio_access_is_big_endian(vdev)) {\ + st ## size ## _be_phys_cached(cache, pa, value);\ + } else {\ + st ## size ## _le_phys_cached(cache, pa, value);\ + }\ +} + VIRTIO_LD_CONVERT(uw, uint16_t) =20 static inline uint32_t virtio_ldl_phys(VirtIODevice *vdev, hwaddr pa) --=20 2.26.3 From nobody Thu May 2 15:01:46 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1621363128; cv=none; d=zohomail.com; s=zohoarc; b=Zzjr3ysQnkJeJY22ERJ7IKr4W+QqNnzuoMYsBLVJb92YjkWlWaqSptAKfo40je9LFabIypBOrYutfxCYn0+vk5wo+4od7KxdPc4oXw3+HQByRMPm03GvsHKjkthr8+TyfrGBOExgGiOu+9JIuhMPlLgsZlCxDETH3X5oI4OHLY0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1621363128; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=OOncN2JUxXwt1CB1ePQ1qklSQzQ266j0ti3lLzidXpQ=; b=fTMZSYUJIhPddZwupf4LYJTd7s3WtmJoEYcXoc6SCKFleJIRl4CofRX1iMKyGRz9owB+io9Q++8YHrszx3TJIZ70yB40swi8CwLmQN80fop4ysZ4y7f5iNL9wanw9ttO0+4mQw5AOsvkgGvS/D14dFJhkRh8hnnEwCciGrXijb0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by mx.zohomail.com with SMTPS id 1621363128063196.3666674824433; Tue, 18 May 2021 11:38:48 -0700 (PDT) Received: from mail-ed1-f72.google.com (mail-ed1-f72.google.com [209.85.208.72]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-499-n_GVLGYjOjGBwn76h_qxLg-1; Tue, 18 May 2021 14:38:44 -0400 Received: by mail-ed1-f72.google.com with SMTP id y17-20020a0564023591b02903886c26ada4so6257877edc.5 for ; Tue, 18 May 2021 11:38:44 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.redhat.com (31.red-83-51-215.dynamicip.rima-tde.net. [83.51.215.31]) by smtp.gmail.com with ESMTPSA id i2sm7008863edc.96.2021.05.18.11.38.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 18 May 2021 11:38:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1621363126; 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; bh=OOncN2JUxXwt1CB1ePQ1qklSQzQ266j0ti3lLzidXpQ=; b=B5Jmk2hfxvOMPZHH3FRSt7DTidW9xgtuQYxUNgUMRJEHmiU+0CKyHc7ynqiGuOJE4NzSBX 2Sf943gNXOxW/Z9zDDWBwbsJ1C/5Q20yRaOvHU5d1gsMSre/ujrj4+i22IDvj/QnWf5IUO n0Jrl9Dulawne3v1WU539wv67cbZy+0= X-MC-Unique: n_GVLGYjOjGBwn76h_qxLg-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=OOncN2JUxXwt1CB1ePQ1qklSQzQ266j0ti3lLzidXpQ=; b=fx4IbGyjj70ZaEUAdufWgwXuwuPx8Sd20Tzf0L0aYS7y+ZQitpjO5UEWUqWk6eHEc3 Wo5tPRHopweWJPV0s51ZRo/VGhuk95ptPVsTEjoL6sqdwGicjs3Da+fGTTt0dl0FUJir C1BG+wFHpRf5cmP5TsNEs9u/oWINxSWHg9B87itkBEspVmRwCiqP0NAq3ItBndfm/14c zE0KhGgnATvqJLe2eC3iijbTxFeZEhXqQvu7iF9KVPhRvGnPbkVt6WClVzRro8UgIhFM H2jkgzJukBPQcAScamEDjXhUdqmRTaF6K+PpddGhbBj9hO8ecxjy/ApC0nvedZ2t+2AB 7CCg== X-Gm-Message-State: AOAM532ekvdOUiSyvbHVKD4siB0Oea7wn8Y7rSJS5SBhCculTgIp91rp 8OZ9RplArBNntFF1FzApGeAn0ul1QpVdcpPF9VHJ/EeOr8xNCxcuDtP17eszutZqEsUlkaVN9E5 pyP/mOyBeUvIrdw== X-Received: by 2002:a05:6402:354b:: with SMTP id f11mr8811427edd.139.1621363123386; Tue, 18 May 2021 11:38:43 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyPCKgxMyNR+YYL8pCHqk3egdpog5i3vlSZjgcwjLaqLCNd+qZW54mkRkwHArI09gscqZKOIA== X-Received: by 2002:a05:6402:354b:: with SMTP id f11mr8811418edd.139.1621363123253; Tue, 18 May 2021 11:38:43 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Bibo Mao , "Michael S. Tsirkin" , Richard Henderson , Paolo Bonzini , Jiaxun Yang , Peter Xu , Huacai Chen , Peter Maydell , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [RFC PATCH 21/25] hw/virtio: Use ST_CONVERT() macro to emit 16-bit load/store functions Date: Tue, 18 May 2021 20:36:51 +0200 Message-Id: <20210518183655.1711377-22-philmd@redhat.com> X-Mailer: git-send-email 2.26.3 In-Reply-To: <20210518183655.1711377-1-philmd@redhat.com> References: <20210518183655.1711377-1-philmd@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- include/hw/virtio/virtio-access.h | 33 +------------------------------ 1 file changed, 1 insertion(+), 32 deletions(-) diff --git a/include/hw/virtio/virtio-access.h b/include/hw/virtio/virtio-a= ccess.h index a86819ef2fe..4341af9cb0f 100644 --- a/include/hw/virtio/virtio-access.h +++ b/include/hw/virtio/virtio-access.h @@ -101,6 +101,7 @@ static inline void virtio_st ## size ## _phys_cached(Vi= rtIODevice *vdev,\ } =20 VIRTIO_LD_CONVERT(uw, uint16_t) +VIRTIO_ST_CONVERT(w, uint16_t) =20 static inline uint32_t virtio_ldl_phys(VirtIODevice *vdev, hwaddr pa) { @@ -122,18 +123,6 @@ static inline uint64_t virtio_ldq_phys(VirtIODevice *v= dev, hwaddr pa) return ldq_le_phys(dma_as, pa); } =20 -static inline void virtio_stw_phys(VirtIODevice *vdev, hwaddr pa, - uint16_t value) -{ - AddressSpace *dma_as =3D vdev->dma_as; - - if (virtio_access_is_big_endian(vdev)) { - stw_be_phys(dma_as, pa, value); - } else { - stw_le_phys(dma_as, pa, value); - } -} - static inline void virtio_stl_phys(VirtIODevice *vdev, hwaddr pa, uint32_t value) { @@ -146,15 +135,6 @@ static inline void virtio_stl_phys(VirtIODevice *vdev,= hwaddr pa, } } =20 -static inline void virtio_stw_p(VirtIODevice *vdev, void *ptr, uint16_t v) -{ - if (virtio_access_is_big_endian(vdev)) { - stw_be_p(ptr, v); - } else { - stw_le_p(ptr, v); - } -} - static inline void virtio_stl_p(VirtIODevice *vdev, void *ptr, uint32_t v) { if (virtio_access_is_big_endian(vdev)) { @@ -220,17 +200,6 @@ static inline uint64_t virtio_ldq_phys_cached(VirtIODe= vice *vdev, return ldq_le_phys_cached(cache, pa); } =20 -static inline void virtio_stw_phys_cached(VirtIODevice *vdev, - MemoryRegionCache *cache, - hwaddr pa, uint16_t value) -{ - if (virtio_access_is_big_endian(vdev)) { - stw_be_phys_cached(cache, pa, value); - } else { - stw_le_phys_cached(cache, pa, value); - } -} - static inline void virtio_stl_phys_cached(VirtIODevice *vdev, MemoryRegionCache *cache, hwaddr pa, uint32_t value) --=20 2.26.3 From nobody Thu May 2 15:01:46 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1621363134; cv=none; d=zohomail.com; s=zohoarc; b=W76yFHarRMOFYsUOKP3J3LLeah/NUFO+WqxuB3Vtl+2Xsi+VaQbobT0EMGTSX5ypkbd19NCWDr73EZZGfazhas5Gt9sUvQj7FLNSVj7Gh0R7DC8sH8E6hltYfskHLairMvExH4z+nlC4SeeMheOqjjC5Jxg/xTqErlThPb50pqM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1621363134; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=3Fhmv8UDrFXMluj5JtnfTvwHhmVYZmFodUsrjoVpD7s=; b=Kc4WCFUFb+Cb6PLRtdwI05x1fZSCbBS8WKLCA4QRNz9VKxNkJHN5hsxsxByoDKyzkoL5rgiBftg1VMsun8MeFOMqccL7yb5Cx/BE3N9GW42hlVCVE6FFzeP+SWRFP4kdrI4reEHzTapxmvnM8+X1zsnH6CRYZW/ZAFphoQ4/klA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by mx.zohomail.com with SMTPS id 1621363134728804.2998377559986; Tue, 18 May 2021 11:38:54 -0700 (PDT) Received: from mail-ej1-f70.google.com (mail-ej1-f70.google.com [209.85.218.70]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-263-lrlglbpQN2OuxQDeFxLbeg-1; Tue, 18 May 2021 14:38:49 -0400 Received: by mail-ej1-f70.google.com with SMTP id p25-20020a1709061419b0290378364a6464so2737480ejc.15 for ; Tue, 18 May 2021 11:38:49 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.redhat.com (31.red-83-51-215.dynamicip.rima-tde.net. [83.51.215.31]) by smtp.gmail.com with ESMTPSA id b9sm4837578edt.71.2021.05.18.11.38.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 18 May 2021 11:38:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1621363133; 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; bh=3Fhmv8UDrFXMluj5JtnfTvwHhmVYZmFodUsrjoVpD7s=; b=TehBUgKvNkkd3OwZXjDIyRQ5x4U24TmznL6Rkybn/5Fzq0VFVGVeC52TsJpwmJnswvnmci SP3wV/nV7mlPGY6wBxsU7cJrNUTmH+WV1m2QAzJA/FuQ7phMVxuv/SU4YgUV7IZWZUUbT1 6uW+cNXFcokN/vw5Wtvz6ZMED5Rs8gM= X-MC-Unique: lrlglbpQN2OuxQDeFxLbeg-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=3Fhmv8UDrFXMluj5JtnfTvwHhmVYZmFodUsrjoVpD7s=; b=TvF5rKWXZ7YFbwf/JXXsacoUpwAcIkUvQuWjpUJgLuwRF+Uso1TZHbP0bT3FCHeG89 OpyM1/1rrtJGHYbpFjwLyIu5NrPoVlym4DrN7DC1V57y5BaPDH7lA+F6RRheqLAIFGiX 2FGZXY/8fqoUnqfT61gVyQlMIOfT4r8T3s+kahcF/xDR5Ue4RbZRyiHCg+VGqAoaGVcT EtZSjpd0bd7T+wMoVsv1ndotSMZYTiGyXSkYEK7Iao3nyl7Ag1FLyfUIRqvxbpheFYx5 fXwwXLNFyhTW7ciOAHL8V8H9ixbk8L42RH0EEcFivgSRYNXHbSGRO8qAX+sAl39T5NGB mzzw== X-Gm-Message-State: AOAM531gd7roNKj3LNgpsoyU9B0RGQz/B7nEgjT1ZVUl/ibAEyN6QE4e A+fymoJf4zixTod0P8x/FvtrslHqYo5fnaayZ3JqyCitwxOZfSCSefcIKoXeHAcdXdiBSIcPfp4 hBcj7MlvNEneV+Q== X-Received: by 2002:a17:906:a0a:: with SMTP id w10mr7393001ejf.416.1621363128338; Tue, 18 May 2021 11:38:48 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzRm8+VarN6kb1NSoZE3/FrmDAO8K1CLYS4ZhScoYtWoml6P2NUzraCKP1p+VywvjlBt6j7Ww== X-Received: by 2002:a17:906:a0a:: with SMTP id w10mr7392984ejf.416.1621363128157; Tue, 18 May 2021 11:38:48 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Bibo Mao , "Michael S. Tsirkin" , Richard Henderson , Paolo Bonzini , Jiaxun Yang , Peter Xu , Huacai Chen , Peter Maydell , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [RFC PATCH 22/25] hw/virtio: Use LDST_CONVERT macro to emit 32-bit load/store functions Date: Tue, 18 May 2021 20:36:52 +0200 Message-Id: <20210518183655.1711377-23-philmd@redhat.com> X-Mailer: git-send-email 2.26.3 In-Reply-To: <20210518183655.1711377-1-philmd@redhat.com> References: <20210518183655.1711377-1-philmd@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- include/hw/virtio/virtio-access.h | 66 +++---------------------------- 1 file changed, 5 insertions(+), 61 deletions(-) diff --git a/include/hw/virtio/virtio-access.h b/include/hw/virtio/virtio-a= ccess.h index 4341af9cb0f..0df52d190dc 100644 --- a/include/hw/virtio/virtio-access.h +++ b/include/hw/virtio/virtio-access.h @@ -100,18 +100,13 @@ static inline void virtio_st ## size ## _phys_cached(= VirtIODevice *vdev,\ }\ } =20 +#define VIRTIO_LDST_CONVERT(size, rtype, vtype)\ + VIRTIO_LD_CONVERT(size, rtype)\ + VIRTIO_ST_CONVERT(size, vtype) + VIRTIO_LD_CONVERT(uw, uint16_t) VIRTIO_ST_CONVERT(w, uint16_t) - -static inline uint32_t virtio_ldl_phys(VirtIODevice *vdev, hwaddr pa) -{ - AddressSpace *dma_as =3D vdev->dma_as; - - if (virtio_access_is_big_endian(vdev)) { - return ldl_be_phys(dma_as, pa); - } - return ldl_le_phys(dma_as, pa); -} +VIRTIO_LDST_CONVERT(l, int, uint32_t) =20 static inline uint64_t virtio_ldq_phys(VirtIODevice *vdev, hwaddr pa) { @@ -123,27 +118,6 @@ static inline uint64_t virtio_ldq_phys(VirtIODevice *v= dev, hwaddr pa) return ldq_le_phys(dma_as, pa); } =20 -static inline void virtio_stl_phys(VirtIODevice *vdev, hwaddr pa, - uint32_t value) -{ - AddressSpace *dma_as =3D vdev->dma_as; - - if (virtio_access_is_big_endian(vdev)) { - stl_be_phys(dma_as, pa, value); - } else { - stl_le_phys(dma_as, pa, value); - } -} - -static inline void virtio_stl_p(VirtIODevice *vdev, void *ptr, uint32_t v) -{ - if (virtio_access_is_big_endian(vdev)) { - stl_be_p(ptr, v); - } else { - stl_le_p(ptr, v); - } -} - static inline void virtio_stq_p(VirtIODevice *vdev, void *ptr, uint64_t v) { if (virtio_access_is_big_endian(vdev)) { @@ -153,15 +127,6 @@ static inline void virtio_stq_p(VirtIODevice *vdev, vo= id *ptr, uint64_t v) } } =20 -static inline uint32_t virtio_ldl_p(VirtIODevice *vdev, const void *ptr) -{ - if (virtio_access_is_big_endian(vdev)) { - return ldl_be_p(ptr); - } else { - return ldl_le_p(ptr); - } -} - static inline uint64_t virtio_ldq_p(VirtIODevice *vdev, const void *ptr) { if (virtio_access_is_big_endian(vdev)) { @@ -180,16 +145,6 @@ static inline uint16_t virtio_tswap16(VirtIODevice *vd= ev, uint16_t s) #endif } =20 -static inline uint32_t virtio_ldl_phys_cached(VirtIODevice *vdev, - MemoryRegionCache *cache, - hwaddr pa) -{ - if (virtio_access_is_big_endian(vdev)) { - return ldl_be_phys_cached(cache, pa); - } - return ldl_le_phys_cached(cache, pa); -} - static inline uint64_t virtio_ldq_phys_cached(VirtIODevice *vdev, MemoryRegionCache *cache, hwaddr pa) @@ -200,17 +155,6 @@ static inline uint64_t virtio_ldq_phys_cached(VirtIODe= vice *vdev, return ldq_le_phys_cached(cache, pa); } =20 -static inline void virtio_stl_phys_cached(VirtIODevice *vdev, - MemoryRegionCache *cache, - hwaddr pa, uint32_t value) -{ - if (virtio_access_is_big_endian(vdev)) { - stl_be_phys_cached(cache, pa, value); - } else { - stl_le_phys_cached(cache, pa, value); - } -} - static inline void virtio_tswap16s(VirtIODevice *vdev, uint16_t *s) { *s =3D virtio_tswap16(vdev, *s); --=20 2.26.3 From nobody Thu May 2 15:01:46 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1621363137; cv=none; d=zohomail.com; s=zohoarc; b=UR+x+OxWQUhAN6GEi612lFlbahvXtD5oVKs81twhDOfRw0D527rW/Zv/bkdf0oA3ciqtx08cZgms/hyFch6KxZS+eE9ufGi0AgP6etZ95bis6k9PYb4fo5PkAN/Oh6W7Fli1hWXNQD4Va+iMLGyj9PT3mNrX1ap2oQIPuO4mvds= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1621363137; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=xEk8xnP8O33ZJSwD+df7PFRkkbykJzfgf6b1n4NdYiw=; b=lCb/ItK6ijOHjffjUWPyrvWXS/EgISInWLkbdTa8VnePAIU7qg6S393cVbz0Q01TM8A41SgYzrvt//pMY5LGDWriN+o9p6luH55qvg8Zmj4EJ65Vfy/bq0M8n65a4oKeM4N/HDwOQ+P4LrYFh6fvbBmmgJzvTZsUybtnV2JRDh4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.zohomail.com with SMTPS id 1621363137706981.7957421782249; Tue, 18 May 2021 11:38:57 -0700 (PDT) Received: from mail-ed1-f72.google.com (mail-ed1-f72.google.com [209.85.208.72]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-298-2bE2kPoXMOa9-4W0KmNoGA-1; Tue, 18 May 2021 14:38:54 -0400 Received: by mail-ed1-f72.google.com with SMTP id w1-20020aa7da410000b029038d323eeee3so4209179eds.8 for ; Tue, 18 May 2021 11:38:54 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.redhat.com (31.red-83-51-215.dynamicip.rima-tde.net. [83.51.215.31]) by smtp.gmail.com with ESMTPSA id r17sm13274889edt.33.2021.05.18.11.38.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 18 May 2021 11:38:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1621363136; 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; bh=xEk8xnP8O33ZJSwD+df7PFRkkbykJzfgf6b1n4NdYiw=; b=O0CFhqmQM8nrfdzYd/p2EB2j6wbqJvXwmdqK9BQpc3WQdNY+ZeJ1LyBzmRulxbjjWZ+K/3 OYQDvnSxX5QeRMpfzz0KLmFtDyLDQu4u/Mz329OFcgqqJsPcxIdhuGbpgHzaSP6LkCOFKX vLlvGT9z/0GrGg/3Peh5tRkVJsiG3vM= X-MC-Unique: 2bE2kPoXMOa9-4W0KmNoGA-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=xEk8xnP8O33ZJSwD+df7PFRkkbykJzfgf6b1n4NdYiw=; b=OZGqi6pnRs0vSKvOEDDKG7Ch1+TgwECgrE/+9dxeWCRcB0sHE2Yqoxwu1kGHQXimwe VYHTaetIhcqLn7mE/028yMiaS3Y4jDOGH5wMg46pgAj8NRycmwvpDmyLMhMOsrNOEaE6 P9nmeT5ZnnkHM3Jx30Qx2K7To+9NLfLemYOR4jjTPypeNDeOi4fKX/uiDeFEVzK2M6Jw XetWKbYAEBlOiFTpOSDDTIsf1L6nm/9GdaMvfXarPts0IlfsMzxSQwSh2wIb52RtbbzW iWlh0x1hXrXbfEF1UgQz/eQZUHUx0V5CPnm4AZhWhMNWL2MOBOxa4+Y4nbmINdwkb0M0 6bfA== X-Gm-Message-State: AOAM5336yOI24LafjN5uRSHRtT+RXR5bVZtTmWLe2B4UW1Q51ZmC0nAb w1AegP5R9IgtlTXLmcqLgjN1dCg/Vig1ilJQJ4u7wPovBoNIYzl0LsOOZ6wu/7VQwsbtH5G6c85 XMDz2QRLh1juuPw== X-Received: by 2002:a05:6402:17d9:: with SMTP id s25mr8515634edy.337.1621363133252; Tue, 18 May 2021 11:38:53 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxqPiDjpirvcTuktymefzdLqr0h1x+gjXThGtoYvkzgiRx5PfFwdcWWeCMmQtFUTPhuan8oKA== X-Received: by 2002:a05:6402:17d9:: with SMTP id s25mr8515615edy.337.1621363133140; Tue, 18 May 2021 11:38:53 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Bibo Mao , "Michael S. Tsirkin" , Richard Henderson , Paolo Bonzini , Jiaxun Yang , Peter Xu , Huacai Chen , Peter Maydell , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [RFC PATCH 23/25] hw/virtio: Use LDST_CONVERT macro to emit 64-bit load/store functions Date: Tue, 18 May 2021 20:36:53 +0200 Message-Id: <20210518183655.1711377-24-philmd@redhat.com> X-Mailer: git-send-email 2.26.3 In-Reply-To: <20210518183655.1711377-1-philmd@redhat.com> References: <20210518183655.1711377-1-philmd@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- include/hw/virtio/virtio-access.h | 39 +------------------------------ 1 file changed, 1 insertion(+), 38 deletions(-) diff --git a/include/hw/virtio/virtio-access.h b/include/hw/virtio/virtio-a= ccess.h index 0df52d190dc..ae66bbd74f9 100644 --- a/include/hw/virtio/virtio-access.h +++ b/include/hw/virtio/virtio-access.h @@ -107,34 +107,7 @@ static inline void virtio_st ## size ## _phys_cached(V= irtIODevice *vdev,\ VIRTIO_LD_CONVERT(uw, uint16_t) VIRTIO_ST_CONVERT(w, uint16_t) VIRTIO_LDST_CONVERT(l, int, uint32_t) - -static inline uint64_t virtio_ldq_phys(VirtIODevice *vdev, hwaddr pa) -{ - AddressSpace *dma_as =3D vdev->dma_as; - - if (virtio_access_is_big_endian(vdev)) { - return ldq_be_phys(dma_as, pa); - } - return ldq_le_phys(dma_as, pa); -} - -static inline void virtio_stq_p(VirtIODevice *vdev, void *ptr, uint64_t v) -{ - if (virtio_access_is_big_endian(vdev)) { - stq_be_p(ptr, v); - } else { - stq_le_p(ptr, v); - } -} - -static inline uint64_t virtio_ldq_p(VirtIODevice *vdev, const void *ptr) -{ - if (virtio_access_is_big_endian(vdev)) { - return ldq_be_p(ptr); - } else { - return ldq_le_p(ptr); - } -} +VIRTIO_LDST_CONVERT(q, uint64_t, uint64_t) =20 static inline uint16_t virtio_tswap16(VirtIODevice *vdev, uint16_t s) { @@ -145,16 +118,6 @@ static inline uint16_t virtio_tswap16(VirtIODevice *vd= ev, uint16_t s) #endif } =20 -static inline uint64_t virtio_ldq_phys_cached(VirtIODevice *vdev, - MemoryRegionCache *cache, - hwaddr pa) -{ - if (virtio_access_is_big_endian(vdev)) { - return ldq_be_phys_cached(cache, pa); - } - return ldq_le_phys_cached(cache, pa); -} - static inline void virtio_tswap16s(VirtIODevice *vdev, uint16_t *s) { *s =3D virtio_tswap16(vdev, *s); --=20 2.26.3 From nobody Thu May 2 15:01:46 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1621363143; cv=none; d=zohomail.com; s=zohoarc; b=K8wMRCrJ3YglqFhizPzPYTDKvcrOthk+55UEkFz1ANEMpM6JJVTm1B3dNo8+DhwnpxcC6VZccsz3p2JGM+9b7zUdaCzTu5VASSlnUf66n7VhN08UW2zGQSFJwBfF53GqKlPN0IeCmBkK/w5NoDe3bWkq8ZgYudKYCII/AeR8cng= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1621363143; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=F5bc/fLR7X3lBPxXh2gaq/EPG/Hnjmqk5I/R/ixg5NU=; b=iAKEm9iTad+sfw09OmNL+KjsiTKAEKDgNyuJRzx6XYyP1BPf7oz/DFf2RuLm8Q9JM/d6rASY1rC+y1+tGZJdTFy+HuJNt7XRwMgAamqC1ZQxfI30mG2s41wNmLQ1I1GR/XXLnvcPGudQa8vKu+dA6HO1o/wgOzY20r58iVY7vw8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by mx.zohomail.com with SMTPS id 1621363143487697.973752526033; Tue, 18 May 2021 11:39:03 -0700 (PDT) Received: from mail-ej1-f72.google.com (mail-ej1-f72.google.com [209.85.218.72]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-233--JWUwLHIPXCkW9nh5ahUkA-1; Tue, 18 May 2021 14:38:59 -0400 Received: by mail-ej1-f72.google.com with SMTP id i8-20020a1709068508b02903d75f46b7aeso2401013ejx.18 for ; Tue, 18 May 2021 11:38:59 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.redhat.com (31.red-83-51-215.dynamicip.rima-tde.net. [83.51.215.31]) by smtp.gmail.com with ESMTPSA id e6sm1738171ejd.31.2021.05.18.11.38.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 18 May 2021 11:38:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1621363142; 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; bh=F5bc/fLR7X3lBPxXh2gaq/EPG/Hnjmqk5I/R/ixg5NU=; b=Sw2zPk+pJDH5XQZyRIAFkVI7sKcnPAIpdQgQ6V72LJdohLkYJ0MAGvet5XPQd0a/+19vuX 8ji5CObNo7izCvU+htfRbJO2o7vRZfU8dTxHRLWi4yUYFXmIB8Rg7GJ6CAua4BaTxfKhwh QyMonXd9iRlU6Tv3f5h6royMHw/RHE0= X-MC-Unique: -JWUwLHIPXCkW9nh5ahUkA-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=F5bc/fLR7X3lBPxXh2gaq/EPG/Hnjmqk5I/R/ixg5NU=; b=V4DGMe+HthQIZnxZle5dJ/Vi4d0f8MwYJd/j9gQFjhyuGOFo9zTMKXHPhzYhwT3rDC KuoRVWhoEdbLZ9PqTpyPk81w9lB/ASrNvPxrYr6zbtJLcgJQYJ6yGIvi9rnYiFjjjgrT VPkeUW6J4qClv7kS5Oc+YFS3lQ0psyqxMCfgeN90zGzSOzfR2JKqKJ4CLCs6bpHfzSPX Ri2G4WFAKMLMLbMhxsjljqSzs6c3MXTukpyARuDo93isu6Cm0gxavG2YoZX2N4GLKddn vgFZtUNQr1VzTf1Wze22ALxxlny1C2j/IBHFS9ygiud+kw38vBMXx6ANgBnW41fjR6DM I7HA== X-Gm-Message-State: AOAM533U7lPhF6JoIUzbmpbkfUWpXqpP8UCwGuWbdH4Nm6QSNetVybxc cMY3F/XhrbLhyw+O3mv6uMeRKJBIfcuIkqbxzULI1yOSFA1IHGL8MQI1cGVEYEQsWj41UWf3MRi 5y+UHt52BnOQbiw== X-Received: by 2002:a17:906:a84e:: with SMTP id dx14mr7342960ejb.220.1621363138342; Tue, 18 May 2021 11:38:58 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxUTZdzy85UcK5H0rImGDWfRk2nVcwF4b1HLgbSJFPlecoiwU8vAYSzL/WE4QBrgOza/mkmiQ== X-Received: by 2002:a17:906:a84e:: with SMTP id dx14mr7342949ejb.220.1621363138172; Tue, 18 May 2021 11:38:58 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Bibo Mao , "Michael S. Tsirkin" , Richard Henderson , Paolo Bonzini , Jiaxun Yang , Peter Xu , Huacai Chen , Peter Maydell , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Stefan Hajnoczi Subject: [RFC PATCH 24/25] hw/virtio: Add methods for aligned pointer access Date: Tue, 18 May 2021 20:36:54 +0200 Message-Id: <20210518183655.1711377-25-philmd@redhat.com> X-Mailer: git-send-email 2.26.3 In-Reply-To: <20210518183655.1711377-1-philmd@redhat.com> References: <20210518183655.1711377-1-philmd@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Suggested-by: Stefan Hajnoczi Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- include/hw/virtio/virtio-access.h | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/include/hw/virtio/virtio-access.h b/include/hw/virtio/virtio-a= ccess.h index ae66bbd74f9..5b20f004e12 100644 --- a/include/hw/virtio/virtio-access.h +++ b/include/hw/virtio/virtio-access.h @@ -66,6 +66,16 @@ static inline rtype virtio_ld ## size ## _phys_cached(Vi= rtIODevice *vdev,\ return ld ## size ## _be_phys_cached(cache, pa);\ }\ return ld ## size ## _le_phys_cached(cache, pa);\ +}\ +static inline rtype virtio_ld ## size ## _phys_cached_aligned(\ + VirtIODevice *vdev,\ + MemoryRegionCache *c= ache,\ + hwaddr pa)\ +{\ + if (virtio_access_is_big_endian(vdev)) {\ + return ld ## size ## _be_phys_cached_aligned(cache, pa);\ + }\ + return ld ## size ## _le_phys_cached_aligned(cache, pa);\ } =20 #define VIRTIO_ST_CONVERT(size, vtype)\ @@ -98,6 +108,17 @@ static inline void virtio_st ## size ## _phys_cached(Vi= rtIODevice *vdev,\ } else {\ st ## size ## _le_phys_cached(cache, pa, value);\ }\ +}\ +static inline void virtio_st ## size ## _phys_cached_aligned(\ + VirtIODevice *vdev,\ + MemoryRegionCache *ca= che,\ + hwaddr pa, vtype valu= e)\ +{\ + if (virtio_access_is_big_endian(vdev)) {\ + st ## size ## _be_phys_cached_aligned(cache, pa, value);\ + } else {\ + st ## size ## _le_phys_cached_aligned(cache, pa, value);\ + }\ } =20 #define VIRTIO_LDST_CONVERT(size, rtype, vtype)\ --=20 2.26.3 From nobody Thu May 2 15:01:46 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1621363150; cv=none; d=zohomail.com; s=zohoarc; b=eHhHiX58bNVTZLulugqsOxN3U7unPy33hlxls3KCi1W/hd8cJbjuGYmkM1eeoc2qsj8eEckY/6zQnm3AywGB+Zu86ZDcQPla3Ds7m7AYEVrL5+/8IWI3epF63o6yxeYxcCIiylbKI6RwFtUDARBhhbDdxNh3zvTBup4PPRqc8Rg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1621363150; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=YTy8laNpOEvZ5nwMb6BJ8len0GRaZyxbwD2wWuJLiMU=; b=MJRR+atJEEBt6xsZc4/b1ciozl6pncDMpNSFvPtvNcBbn5rnVWzOq9DZGhc3VaQM5EyCrVtTthqk8nvPyA2cSybpYcGkz2IlUFb2KOFypQNU5N7KQm6bsoi/Jhwk5Y5a9sRuxCqes7WOt9LckqxLkn184j7cQwtlgLkC/2r4vUc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.zohomail.com with SMTPS id 1621363150529551.5642954982382; Tue, 18 May 2021 11:39:10 -0700 (PDT) Received: from mail-ej1-f71.google.com (mail-ej1-f71.google.com [209.85.218.71]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-530-LnBnTGU8PgOnA1SAF2hsew-1; Tue, 18 May 2021 14:39:04 -0400 Received: by mail-ej1-f71.google.com with SMTP id sd18-20020a170906ce32b02903cedf584542so2751134ejb.9 for ; Tue, 18 May 2021 11:39:04 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.redhat.com (31.red-83-51-215.dynamicip.rima-tde.net. [83.51.215.31]) by smtp.gmail.com with ESMTPSA id by20sm10484219ejc.74.2021.05.18.11.39.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 18 May 2021 11:39:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1621363149; 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; bh=YTy8laNpOEvZ5nwMb6BJ8len0GRaZyxbwD2wWuJLiMU=; b=GcGKSasvaJwOzHQI5W/3WaZvbpr3LSLEcKhxKhx+5XkeqzKm4/AAT4fwiG/886TCJQtpx9 yuw9kumwHXUSAcQ+YZzfw7r4rmsKk1oGlu+/WZEIBAbXvurc7lqQ2CJmYAKWXQ3TDjg1M1 DS7ITT3W+Da3Qy7cBQXAXkNmK3y6INg= X-MC-Unique: LnBnTGU8PgOnA1SAF2hsew-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=YTy8laNpOEvZ5nwMb6BJ8len0GRaZyxbwD2wWuJLiMU=; b=tjeHXvpxLYXDRtAL0fGcnQll/iyLi5tsEtz8+RbyygWHKXVt7TXaIxcb/Zj0jPz9gh 4FKnM2JmoYSh+sg8Yh4sLsXzZ8tTbBG4LQLk244WmlnmvbWaMzSObzAPnek3iGWh/20/ WZWf0lORub8JsC1N6ku8H/hC91QWRUzSukUK2eItKDq99Bvt4w2QZQGT0bWMvcvmOLrx mnyzpgtRQDnkawHkG95PDZIxk60e4AvnBTqVVHQFQc+yFJAvZ4/Cc209y8eQVPoNV9X0 ReBCUCWBpEq0yyeLdLDmQtC0KMtcIcH4vf+abRDIRHXOMA2tACk2bnxS5Gw862/bs38w WIBw== X-Gm-Message-State: AOAM531Ztite9UbGhbJalwAXAoJq1vrF4S4EVm5It7e5GkxAKHa2yole WhMGBdH2L559v1wiCQONAgWonmQ9Ymgwlt02kSeMxhqTO8KYyw1BxSNo+qkDkaXK9pBDHZ2lSER xzRWGYndWBAeCfw== X-Received: by 2002:aa7:de1a:: with SMTP id h26mr8579031edv.240.1621363143421; Tue, 18 May 2021 11:39:03 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzewI5q9w4LIUHMUMfEoaVDnvZb3rhKtib+QlWRVX3MXnOn4+YpREw+F3uNlY8D0WfXStwvRg== X-Received: by 2002:aa7:de1a:: with SMTP id h26mr8579019edv.240.1621363143290; Tue, 18 May 2021 11:39:03 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Bibo Mao , "Michael S. Tsirkin" , Richard Henderson , Paolo Bonzini , Jiaxun Yang , Peter Xu , Huacai Chen , Peter Maydell , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Stefan Hajnoczi Subject: [RFC PATCH 25/25] hw/virtio: Optimize accesses on vring aligned pointers Date: Tue, 18 May 2021 20:36:55 +0200 Message-Id: <20210518183655.1711377-26-philmd@redhat.com> X-Mailer: git-send-email 2.26.3 In-Reply-To: <20210518183655.1711377-1-philmd@redhat.com> References: <20210518183655.1711377-1-philmd@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) By the virtio spec [*] the vring is aligned, so the 'idx' and 'flag' fields are also 16-bit aligned. Therefore we can use the load/store *aligned* API to set the value. [*] https://docs.oasis-open.org/virtio/virtio/v1.1/csprd01/virtio-v1.1-cspr= d01.html#x1-430008 Reported-by: Bibo Mao Inspired-by: Stefan Hajnoczi Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/virtio/virtio.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/hw/virtio/virtio.c b/hw/virtio/virtio.c index e02544b2df7..ebee9c4e643 100644 --- a/hw/virtio/virtio.c +++ b/hw/virtio/virtio.c @@ -296,7 +296,7 @@ static inline uint16_t vring_avail_flags(VirtQueue *vq) return 0; } =20 - return virtio_lduw_phys_cached(vq->vdev, &caches->avail, pa); + return virtio_lduw_phys_cached_aligned(vq->vdev, &caches->avail, pa); } =20 /* Called within rcu_read_lock(). */ @@ -309,7 +309,8 @@ static inline uint16_t vring_avail_idx(VirtQueue *vq) return 0; } =20 - vq->shadow_avail_idx =3D virtio_lduw_phys_cached(vq->vdev, &caches->av= ail, pa); + vq->shadow_avail_idx =3D virtio_lduw_phys_cached_aligned(vq->vdev, + &caches->avail,= pa); return vq->shadow_avail_idx; } =20 @@ -359,7 +360,7 @@ static uint16_t vring_used_idx(VirtQueue *vq) return 0; } =20 - return virtio_lduw_phys_cached(vq->vdev, &caches->used, pa); + return virtio_lduw_phys_cached_aligned(vq->vdev, &caches->used, pa); } =20 /* Called within rcu_read_lock(). */ @@ -369,7 +370,7 @@ static inline void vring_used_idx_set(VirtQueue *vq, ui= nt16_t val) hwaddr pa =3D offsetof(VRingUsed, idx); =20 if (caches) { - virtio_stw_phys_cached(vq->vdev, &caches->used, pa, val); + virtio_stw_phys_cached_aligned(vq->vdev, &caches->used, pa, val); address_space_cache_invalidate(&caches->used, pa, sizeof(val)); } =20 @@ -388,8 +389,8 @@ static inline void vring_used_flags_set_bit(VirtQueue *= vq, int mask) return; } =20 - flags =3D virtio_lduw_phys_cached(vq->vdev, &caches->used, pa); - virtio_stw_phys_cached(vdev, &caches->used, pa, flags | mask); + flags =3D virtio_lduw_phys_cached_aligned(vq->vdev, &caches->used, pa); + virtio_stw_phys_cached_aligned(vdev, &caches->used, pa, flags | mask); address_space_cache_invalidate(&caches->used, pa, sizeof(flags)); } =20 --=20 2.26.3