From patchwork Tue Jun 16 12:53:13 2020 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: 188024 Delivered-To: patch@linaro.org Received: by 2002:a92:cf06:0:0:0:0:0 with SMTP id c6csp3622950ilo; Tue, 16 Jun 2020 05:55:32 -0700 (PDT) X-Google-Smtp-Source: ABdhPJywmG4aLJdcwP4MJp1u4p7acY3ftXrUOSry3brzyGX13qWPzQaMnZXa1yYDmfT2SjH6oCc7 X-Received: by 2002:a25:770b:: with SMTP id s11mr3822009ybc.157.1592312132364; Tue, 16 Jun 2020 05:55:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1592312132; cv=none; d=google.com; s=arc-20160816; b=Zsk6LZZq/BsJItZkoU0+yIcGh1XGaJTK6M5mmfMkLFr+9v1BQi1pH6e4f0GbLZ4BLu yIP8q4Pk/tBAImuWh4UxmiJ4OiAxfXCvCzKfh1N6VbM3Nepp6ppFzgsLFK4RF3KV8JLd jitc4c4UDzivJJjTTJ8khgWF343IQHd0b6wvwyqFSzZdUO3nnjFAPl39r37AapKEpPWo aVGTno5f9LjhDnzYgg0Q9kdsCA9B/fDMU4LiidyLdMRHtxB5uDhZhGFC9FVqvEgg0SQg 3EXW9vG9yWV7Umna1qStrwZMQqCZckeNjwDQAfMLn54zwuVCPXJeCiDQYpZqVJyuvKNn A8pw== 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:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=+YQiH3+sIht8+/pPMXJHUeuWld2thZ6YfsosCzHZ13w=; b=Exy3MHUZK+09D21x7ZE0PmUJBIUSBzGke4Nlt+WRnnSr1HdgbwhGJYS6gB7Lj4z0Zc gavI05BHBTjV2SJT4mbwo1Zvpiz7Dr1NzTOjmtCj+few9vFoIGaiMs3UU/3HoDIhcatx K0i3aXbTX2FPWh02MaBGBi/qBkb3COTLiZPoFchG8/pUgG6Bj7HGj4Uy4qmzwo7ZRXNO 5v1qWB4KbDRajQn6iLv+ZIqNGxeQbFgJwaKJQ8uGg3STTaWbaRMxasSZFqo1/SmAwlwr WMuoLVkgrESb30hKE/1IM1199CwfQw+2Z/isSYhmsB2zH/ksTiJNiidM9Am34nPxtx0Z OSnQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=E0iaV65j; 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 e127si16991078ybf.458.2020.06.16.05.55.32 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 16 Jun 2020 05:55:32 -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=E0iaV65j; 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 ([::1]:41944 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jlB7j-0007Dy-R2 for patch@linaro.org; Tue, 16 Jun 2020 08:55:31 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33984) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jlB64-00044F-9Y for qemu-devel@nongnu.org; Tue, 16 Jun 2020 08:53:48 -0400 Received: from mail-wm1-x342.google.com ([2a00:1450:4864:20::342]:32895) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jlB5z-00007a-Bu for qemu-devel@nongnu.org; Tue, 16 Jun 2020 08:53:47 -0400 Received: by mail-wm1-x342.google.com with SMTP id j198so2220101wmj.0 for ; Tue, 16 Jun 2020 05:53:39 -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:in-reply-to:references :mime-version:content-transfer-encoding; bh=+YQiH3+sIht8+/pPMXJHUeuWld2thZ6YfsosCzHZ13w=; b=E0iaV65j3PDxpXdycp93g5RIJVNflbqEOJOryeuGUKSC+x3lZ4fECeagRx3Td4Axoe 9PirnoupbB4MX7X2c3bKf59q8y31vbeFlsPyUysc+f/YCFE1FYtMLGRrYRtGbY+6s37A 1xXIxKdCZMgaVf+xbqQWYhA/H0u5bnQybujJz2binnbVvhoUdZp6SKSjBkLV0BC+U9Be 3ILW2KMeJaIJ3CKnPm16kiwdyLJWr2UWd52YrwReOffWx7kgdq6gmSZymDtoXDcNEbT3 Wg6DanRKREnwrirN6Xdtrln2Mi5+yu1DtvCb7xHoS9EWoFqwzS6oke5Kb8Z61ZTuCeUJ LYYw== 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=+YQiH3+sIht8+/pPMXJHUeuWld2thZ6YfsosCzHZ13w=; b=lJedWDVgnHjFVwcL30ZzS0e5d+HDdgEm8+LzQgG7lMB+oAQVg2eAfFoqXbZcwQ9pu0 lSJIXnQlNRLKHkC3qeAN1xvYeh1URUsiNLfzVAGITQuSRBl64V76qiTLTFyjb52W2dpL 14/lLQ8zmXS3bkDLrjWBsF7gYjH+xkiZc8Otgjwqn9FXRagVJsB6A5/n7UrM5GrFT532 ZAYFeje1EPcOP1Lm7YjSFifK6n20V5ffh6aCFOgc4VHI1DSj3ACpDMpNNnkdWA5Sewln fSoILzc268UIMISUEcPuQrKa4mxBW3MNPUPq4ObMW6RhhWeT5SNieKPZGrkNn8VjV5cD YX3w== X-Gm-Message-State: AOAM533Vf4Woizmp1WEprfnjzlosInut5GW6hvWN2RnNx+UzUiZsb9XZ S48sWkz6oul+ryFdhpcb2X5xJA== X-Received: by 2002:a7b:c944:: with SMTP id i4mr3093352wml.22.1592312018553; Tue, 16 Jun 2020 05:53:38 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id o9sm3767881wmh.37.2020.06.16.05.53.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 16 Jun 2020 05:53:33 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 406791FF99; Tue, 16 Jun 2020 13:53:25 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL 10/21] translate-all: call qemu_spin_destroy for PageDesc Date: Tue, 16 Jun 2020 13:53:13 +0100 Message-Id: <20200616125324.19045-11-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200616125324.19045-1-alex.bennee@linaro.org> References: <20200616125324.19045-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::342; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x342.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=_AUTOLEARN X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Robert Foley , qemu-devel@nongnu.org, "Emilio G. Cota" , Paolo Bonzini , =?utf-8?q?Alex_Benn=C3=A9e?= , Richard Henderson Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: "Emilio G. Cota" The radix tree is append-only, but we can fail to insert a PageDesc if the insertion races with another thread. Signed-off-by: Emilio G. Cota Signed-off-by: Robert Foley Reviewed-by: Alex Bennée Signed-off-by: Alex Bennée Message-Id: <20200609200738.445-8-robert.foley@linaro.org> Message-Id: <20200612190237.30436-11-alex.bennee@linaro.org> -- 2.20.1 diff --git a/accel/tcg/translate-all.c b/accel/tcg/translate-all.c index c937210e217..c3d37058a17 100644 --- a/accel/tcg/translate-all.c +++ b/accel/tcg/translate-all.c @@ -547,6 +547,15 @@ static PageDesc *page_find_alloc(tb_page_addr_t index, int alloc) #endif existing = atomic_cmpxchg(lp, NULL, pd); if (unlikely(existing)) { +#ifndef CONFIG_USER_ONLY + { + int i; + + for (i = 0; i < V_L2_SIZE; i++) { + qemu_spin_destroy(&pd[i].lock); + } + } +#endif g_free(pd); pd = existing; }