From patchwork Mon Jun 3 15:01:20 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 165601 Delivered-To: patch@linaro.org Received: by 2002:a92:9e1a:0:0:0:0:0 with SMTP id q26csp4582203ili; Mon, 3 Jun 2019 08:02:17 -0700 (PDT) X-Google-Smtp-Source: APXvYqwalK+Kbz+zwnBz3pGAMn/NvtP0SP1asr4X36wBW1Xyumx/tGeRk/iYm0puz6p9YtmkrdNw X-Received: by 2002:ac8:34ce:: with SMTP id x14mr23915774qtb.33.1559574131579; Mon, 03 Jun 2019 08:02:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1559574131; cv=none; d=google.com; s=arc-20160816; b=KR4w/JnUt3sK4lnjyx7vyNQobGUicoePCFwoaL6Cld3wRBb8/LkhAYezKIMktw6mlK A/I05fHutKrt/MO4QiJYTl1n/SxkA1wK+w5TmOm8dTNA9M2d53JKAD6Gi6F2y7AvpLPB ysXs1FeatOc8xrNSkzJbaowfsiUooR7C0KARs6Q2/PlScECVhDIh8B8KtJ/SL1mOGr4J LoIfyUiKCOn21GhDooWXm267juk4H7soGZMIuhj4j0gEY2GctVAA87mGEv3PLA/7xDWh KDUcZkJ8aICQIym6QS9XikvubEhcLwAoIgYnx7HOtZTHOXQp+jCzJ+S7M8H1XQLyIdyi AYpA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:message-id:date:to:from :dkim-signature; bh=VyhF5x0WzFov9r43y8si0eLCX0eXOqkE4ayiLm7MPMI=; b=KKIQ6s52q2yzGGC6UOhHUPd7D/JDSuVgGHQrJCUWaEJzqlmhorPZIYHQ2KnV9idZkb jBhVPgHRVBJfhHkFGCCHOT85sa8f+e3AaFfCfbgoumBH1sCfOgXelwNe4k2LITvk/ruw v5XIS7aYeDb1Z4807texUFcaEK97ho7VsbTEN2t9QsHSaAZkowlPrItOft6i9ArmGLdD 7C9pXIRaFpRBby/3+ASiLRYz+ha2WXIZhlcst2OzW/qjygC5JYB3q1RON161I+xCV4Tq K4cQTBTmmeDv2xzpHh2bAXL9bWa+Jl2CXXJVemceXzBHUDNWl6ZKsUJqfIMM3Ts/arAo Udpg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=DynfSc7E; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id u63si4058329qkc.266.2019.06.03.08.02.11 for (version=TLS1 cipher=AES128-SHA bits=128/128); Mon, 03 Jun 2019 08:02:11 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=DynfSc7E; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([127.0.0.1]:36248 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hXoTS-00082g-SU for patch@linaro.org; Mon, 03 Jun 2019 11:02:10 -0400 Received: from eggs.gnu.org ([209.51.188.92]:39051) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hXoSt-0007iN-Eu for qemu-devel@nongnu.org; Mon, 03 Jun 2019 11:01:37 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hXoSp-0003sg-20 for qemu-devel@nongnu.org; Mon, 03 Jun 2019 11:01:33 -0400 Received: from mail-wm1-x341.google.com ([2a00:1450:4864:20::341]:39626) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hXoSn-0003lP-K5 for qemu-devel@nongnu.org; Mon, 03 Jun 2019 11:01:30 -0400 Received: by mail-wm1-x341.google.com with SMTP id z23so11446187wma.4 for ; Mon, 03 Jun 2019 08:01:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=VyhF5x0WzFov9r43y8si0eLCX0eXOqkE4ayiLm7MPMI=; b=DynfSc7EL7hZN/zwitvwwfWkq09dOSgZxOTnsDW9VQ/Up2lRvd580+rvR+fYmAr4L/ K5BRNZkA/r+Q81tk7ohVY8yGz3BN/OrJlfvAlFdTD61dru560s52yJh/ushATBYZaiBD bP01b9LAdxR5r8Q4SJOuZEtN/luvUaI5ZLGR1esH4liaOkvvTgwRLDTfUjX4Jv0d1lSE NbqfQPTTkBOuShRIOOPfy+9vTrXHY6nR5Glj4J1OeMBsw39wJlI2jjWWXksfBEFBrv1w q3WNE8X8m6+I2PIT/tDrIVyhKCvP/kMkJRN41q37kSa+e1thUH/LQ/lArHh/c83g+WDx eOOA== 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:mime-version :content-transfer-encoding; bh=VyhF5x0WzFov9r43y8si0eLCX0eXOqkE4ayiLm7MPMI=; b=e0Zz16MPnxwNcLje7hx7RXX+K7ut4pfY9w2yuJ4yoZoxXtQcGFCcnGCySYgRLdAwhO jBqZW3MNj2neLriJYUKiEB7kE8DTk6uXwx1q5orjVvmvQW8z0HlCR5zAmTNk6rLu7Yda TcCWjjDmlRp439Ub2XmnP6gXx0yvLPmfgGfZ+smObM5nCDNElHcbczlyFcj6hVY+iY9E yTCgbnVQmdRC8cHST7Hh1MmDCHhJahaTGW+PN/tApdGmZ2nMWQJNI8R9FFu0pf3XJGNT 2h5HEyuDSKUoZzkrObyomRcR/qtJnPoAFiGh2e0GyRcq0E5GeLaprIxuMmwQjlfT9Huk UNDg== X-Gm-Message-State: APjAAAWuXQpUv+pZXzv6tP/jtRcusHAYJomIHA5bWirm3CZnnRQ3gq+2 V/sCg60+EJ6FQI/gjBxY76Z/FQ== X-Received: by 2002:a1c:5687:: with SMTP id k129mr14050053wmb.133.1559574086490; Mon, 03 Jun 2019 08:01:26 -0700 (PDT) Received: from zen.linaroharston ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id p2sm5412769wrx.90.2019.06.03.08.01.25 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Mon, 03 Jun 2019 08:01:25 -0700 (PDT) Received: from zen.linaroharston. (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 5EEDC1FF87; Mon, 3 Jun 2019 16:01:25 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Date: Mon, 3 Jun 2019 16:01:20 +0100 Message-Id: <20190603150120.29255-1-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::341 Subject: [Qemu-devel] [RFC PATCH] cputlb: use uint64_t for interim values for unaligned load X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: 1830872@bugs.launchpad.net, qemu-arm@nongnu.org, Paolo Bonzini , =?utf-8?q?Alex_Benn=C3=A9e?= , randrianasulu@gmail.com, Richard Henderson Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" When running on 32 bit TCG backends a wide unaligned load ends up truncating data before returning to the guest. We specifically have the return type as uint64_t to avoid any premature truncation so we should use the same for the interim types. Hopefully fixes #1830872 Signed-off-by: Alex Bennée --- accel/tcg/cputlb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.20.1 Reviewed-by: Richard Henderson Reviewed-by: Philippe Mathieu-Daudé Tested-by: Igor Mammedov diff --git a/accel/tcg/cputlb.c b/accel/tcg/cputlb.c index cdcc3771020..b796ab1cbea 100644 --- a/accel/tcg/cputlb.c +++ b/accel/tcg/cputlb.c @@ -1303,7 +1303,7 @@ load_helper(CPUArchState *env, target_ulong addr, TCGMemOpIdx oi, && unlikely((addr & ~TARGET_PAGE_MASK) + size - 1 >= TARGET_PAGE_SIZE)) { target_ulong addr1, addr2; - tcg_target_ulong r1, r2; + uint64_t r1, r2; unsigned shift; do_unaligned_access: addr1 = addr & ~(size - 1);