Received: by 2002:ac0:a5b6:0:0:0:0:0 with SMTP id m51-v6csp2372124imm; Mon, 28 May 2018 06:56:57 -0700 (PDT) X-Google-Smtp-Source: AB8JxZodbp65WNpzgGKBqq7x7l4sfHsKfKXwD4aXZgf77x1Iom1Ch5VHVE4oFl8C86YFywztfvq1 X-Received: by 2002:a17:902:ac8d:: with SMTP id h13-v6mr13851655plr.338.1527515817607; Mon, 28 May 2018 06:56:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1527515817; cv=none; d=google.com; s=arc-20160816; b=MGz10XoGsw9wVmNJOmi18TiWyAku0esU2q+19N4hua4q2KWSJQ36RM7I4B0Gn+YWvv 8u3rYCgZmhahLDpLiZBan3GHt4OV6dkS+I0se1fTdoEV0ZkfmbaScEoXUQ6u4ZrRG4qP /MXLSdkQOt6Z4XOlPx5K/VdOr1a7rSQp8fEvK0pIGKBb2PDgO4Z/7y+PNnqJW+8RUHXp X3GJjNtFAb+AQatJCAspe17TvRtEmRpgk0qNrocmxolBN4icJV21WzJP08uSkfIvfbwF jB1zxphprFyUCNYIIQ6pqNYvw/ltZwPpfIoF3CUpdHv3c+Q5TzyhAwVwfQgQV6nxXjjU B3zQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:user-agent:references :in-reply-to:message-id:date:subject:cc:to:from:dkim-signature :arc-authentication-results; bh=ElYqeEL1kwfPXOnjYhAwz9JklHmO2XFsjiCB327LxZg=; b=kOa1BIFbqumx7EOGK6gL0u+ce07h7/PtJIm6RisAsknhh/z99OtQtfmfzsMyO+6JuV JaaRXU2vjIaxQNEOLR/jskjbIAC1041Xv7FQnNfit2CxeH0wlx7AauTxO6pWetsBBbCA VTS4hHoEPoeSHSfj0GmDaouG0I5a0Q7sauZP6PYP5XHtJPlgTtPfbJF/GBHGKu/Ietmm OLui/RLJLg5w5xVKKNC/SoIJJPatrepaa/Arh4tjNsXJmXjIxcrOmjzJB0en6NbGZsaB KZAR2gz/2prPA/VxtYRiA5+Fq1J05cJnes3L8PQFPpyPxDK6EVOzKQVZvEGdmdH7oh5y fC/w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=tb+Jzc47; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 24-v6si30799188pfj.6.2018.05.28.06.56.42; Mon, 28 May 2018 06:56:57 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=tb+Jzc47; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S939281AbeE1NzB (ORCPT + 99 others); Mon, 28 May 2018 09:55:01 -0400 Received: from mail.kernel.org ([198.145.29.99]:33000 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1162759AbeE1Kl1 (ORCPT ); Mon, 28 May 2018 06:41:27 -0400 Received: from localhost (LFbn-1-12247-202.w90-92.abo.wanadoo.fr [90.92.61.202]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 6A043208A5; Mon, 28 May 2018 10:41:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1527504086; bh=Pa20+0PAwIaQ42WVXklwYQ74pobj1FzriSueKEwd0d8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=tb+Jzc472hd7UlhORpNlQ5NGQshj5ySHYZDdDYIX1jE5i/pVra9AHs6HToWsH07ZN P+R0msP5J8fJwnbL2Jflm6jzR1zVgLeIJ4RPW6biPSwEptlkjnnEIM6gUNP/V7CnOU XK/sDN2cnuhtZRWBcbsjHd3I8sls6FyS4e4AqFCs= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, NeilBrown , Ralf Baechle , Paul Burton , linux-mips@linux-mips.org, James Hogan Subject: [PATCH 4.14 001/496] MIPS: c-r4k: Fix data corruption related to cache coherence Date: Mon, 28 May 2018 11:56:26 +0200 Message-Id: <20180528100319.570433678@linuxfoundation.org> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180528100319.498712256@linuxfoundation.org> References: <20180528100319.498712256@linuxfoundation.org> User-Agent: quilt/0.65 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 4.14-stable review patch. If anyone has any objections, please let me know. ------------------ From: NeilBrown commit 55a2aa08b3af519a9693f99cdf7fa6d8b62d9f65 upstream. When DMA will be performed to a MIPS32 1004K CPS, the L1-cache for the range needs to be flushed and invalidated first. The code currently takes one of two approaches. 1/ If the range is less than the size of the dcache, then HIT type requests flush/invalidate cache lines for the particular addresses. HIT-type requests a globalised by the CPS so this is safe on SMP. 2/ If the range is larger than the size of dcache, then INDEX type requests flush/invalidate the whole cache. INDEX type requests affect the local cache only. CPS does not propagate them in any way. So this invalidation is not safe on SMP CPS systems. Data corruption due to '2' can quite easily be demonstrated by repeatedly "echo 3 > /proc/sys/vm/drop_caches" and then sha1sum a file that is several times the size of available memory. Dropping caches means that large contiguous extents (large than dcache) are more likely. This was not a problem before Linux-4.8 because option 2 was never used if CONFIG_MIPS_CPS was defined. The commit which removed that apparently didn't appreciate the full consequence of the change. We could, in theory, globalize the INDEX based flush by sending an IPI to other cores. These cache invalidation routines can be called with interrupts disabled and synchronous IPI require interrupts to be enabled. Asynchronous IPI may not trigger writeback soon enough. So we cannot use IPI in practice. We can already test if IPI would be needed for an INDEX operation with r4k_op_needs_ipi(R4K_INDEX). If this is true then we mustn't try the INDEX approach as we cannot use IPI. If this is false (e.g. when there is only one core and hence one L1 cache) then it is safe to use the INDEX approach without IPI. This patch avoids options 2 if r4k_op_needs_ipi(R4K_INDEX), and so eliminates the corruption. Fixes: c00ab4896ed5 ("MIPS: Remove cpu_has_safe_index_cacheops") Signed-off-by: NeilBrown Cc: Ralf Baechle Cc: Paul Burton Cc: linux-mips@linux-mips.org Cc: # 4.8+ Patchwork: https://patchwork.linux-mips.org/patch/19259/ Signed-off-by: James Hogan Signed-off-by: Greg Kroah-Hartman --- arch/mips/mm/c-r4k.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) --- a/arch/mips/mm/c-r4k.c +++ b/arch/mips/mm/c-r4k.c @@ -851,9 +851,12 @@ static void r4k_dma_cache_wback_inv(unsi /* * Either no secondary cache or the available caches don't have the * subset property so we have to flush the primary caches - * explicitly + * explicitly. + * If we would need IPI to perform an INDEX-type operation, then + * we have to use the HIT-type alternative as IPI cannot be used + * here due to interrupts possibly being disabled. */ - if (size >= dcache_size) { + if (!r4k_op_needs_ipi(R4K_INDEX) && size >= dcache_size) { r4k_blast_dcache(); } else { R4600_HIT_CACHEOP_WAR_IMPL; @@ -890,7 +893,7 @@ static void r4k_dma_cache_inv(unsigned l return; } - if (size >= dcache_size) { + if (!r4k_op_needs_ipi(R4K_INDEX) && size >= dcache_size) { r4k_blast_dcache(); } else { R4600_HIT_CACHEOP_WAR_IMPL;