From patchwork Fri Jun 15 15:50:10 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Petazzoni X-Patchwork-Id: 10466819 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 2FB57601C2 for ; Fri, 15 Jun 2018 15:50:17 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1E91F26247 for ; Fri, 15 Jun 2018 15:50:17 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 130D528E02; Fri, 15 Jun 2018 15:50:17 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.9 required=2.0 tests=BAYES_00, MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B594026247 for ; Fri, 15 Jun 2018 15:50:16 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965639AbeFOPuQ (ORCPT ); Fri, 15 Jun 2018 11:50:16 -0400 Received: from mail.bootlin.com ([62.4.15.54]:51712 "EHLO mail.bootlin.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S964778AbeFOPuP (ORCPT ); Fri, 15 Jun 2018 11:50:15 -0400 Received: by mail.bootlin.com (Postfix, from userid 110) id 59EFF20728; Fri, 15 Jun 2018 17:50:14 +0200 (CEST) Received: from localhost (AAubervilliers-681-1-37-30.w90-88.abo.wanadoo.fr [90.88.156.30]) by mail.bootlin.com (Postfix) with ESMTPSA id 3287C207A5; Fri, 15 Jun 2018 17:50:14 +0200 (CEST) From: Thomas Petazzoni To: Yoshinori Sato , Rich Felker , linux-sh@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Thomas Petazzoni Subject: [PATCH] arch/sh: fix SH4 flush_dcache_all() for SMP Date: Fri, 15 Jun 2018 17:50:10 +0200 Message-Id: <20180615155010.8019-1-thomas.petazzoni@bootlin.com> X-Mailer: git-send-email 2.14.4 Sender: linux-sh-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-sh@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The SH4 flush_dcache_all() function uses current_cpu_data, which internally uses smp_processor_id(). However, it is incorrect to use smp_processor_id() in a context where migration is enabled, because the processor on which the code is running can change at any point in time. To avoid this, we enclose the code flushing the dcache in a get_cpu() / put_cpu() section so that migration is disabled. Signed-off-by: Thomas Petazzoni --- Note: I am not sure at all this is the best fix. Careful review and suggestions are welcome. arch/sh/mm/cache-sh4.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/arch/sh/mm/cache-sh4.c b/arch/sh/mm/cache-sh4.c index eee911422cf9..cde8d7f8acbb 100644 --- a/arch/sh/mm/cache-sh4.c +++ b/arch/sh/mm/cache-sh4.c @@ -149,13 +149,17 @@ static void flush_icache_all(void) static void flush_dcache_all(void) { unsigned long addr, end_addr, entry_offset; + struct sh_cpuinfo *cpud; + int cpu; + + cpu = get_cpu(); + cpud = &cpu_data[cpu]; end_addr = CACHE_OC_ADDRESS_ARRAY + - (current_cpu_data.dcache.sets << - current_cpu_data.dcache.entry_shift) * - current_cpu_data.dcache.ways; + (cpud->dcache.sets << cpud->dcache.entry_shift) * + cpud->dcache.ways; - entry_offset = 1 << current_cpu_data.dcache.entry_shift; + entry_offset = 1 << cpud->dcache.entry_shift; for (addr = CACHE_OC_ADDRESS_ARRAY; addr < end_addr; ) { __raw_writel(0, addr); addr += entry_offset; @@ -167,6 +171,8 @@ static void flush_dcache_all(void) __raw_writel(0, addr); addr += entry_offset; __raw_writel(0, addr); addr += entry_offset; } + + put_cpu(); } static void sh4_flush_cache_all(void *unused)