From patchwork Sat Sep 10 08:45:34 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chunyan Zhang X-Patchwork-Id: 75937 Delivered-To: patch@linaro.org Received: by 10.140.106.11 with SMTP id d11csp746822qgf; Sat, 10 Sep 2016 01:46:10 -0700 (PDT) X-Received: by 10.98.155.193 with SMTP id e62mr11435205pfk.131.1473497170813; Sat, 10 Sep 2016 01:46:10 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id l71si7478079pfa.21.2016.09.10.01.46.10; Sat, 10 Sep 2016 01:46:10 -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=@linaro.org; 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; dmarc=pass (p=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754767AbcIJIqF (ORCPT + 27 others); Sat, 10 Sep 2016 04:46:05 -0400 Received: from mail-pf0-f179.google.com ([209.85.192.179]:35439 "EHLO mail-pf0-f179.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753019AbcIJIp6 (ORCPT ); Sat, 10 Sep 2016 04:45:58 -0400 Received: by mail-pf0-f179.google.com with SMTP id w87so36856607pfk.2 for ; Sat, 10 Sep 2016 01:45:57 -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; bh=PqxRiqBwqivzJHRqAVRDte4AORXuqYYPhS7V5pcnHAw=; b=BLR8bmwUUro7jXD0wFwdHT03hJuMemJErDY6olrtX8xrjSLP2dw+ViHYR000+qkAHX oAFmFp2DO6zAXuCoY55YcR8o0J0JKj1dguqgv9J+1kxIU5ePpiJDU680AsNdLnw7RUh+ 4yNRy0TkxjOQ3ZXFvv4CCC5nu2K1qtaRlE+mg= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=PqxRiqBwqivzJHRqAVRDte4AORXuqYYPhS7V5pcnHAw=; b=apSLSlozK7PUEkoTn1lvn0Z/35vwSzFrqsaZz9kpYy4AgN6WNHSJClGxXXOV4FTIFH jUT8bcaJsmQ0YmZhLnis9D/My6U855Ksc17Mq+/LdYKLk6D8R7gP/W1LceZEaOR0p8XA ZLNvsWs4xGDkj7Ophin/S6xwx0WoY0LB2ONC6JLBNtBn60/EAZI61bFcrnYRAXJVqUAL XlVl7We7/UxxB30cL7XMW/fFGGMxN1Lm4ASw4k/40ijN5sPaQ2cWyto/SSFWKTmlkZIZ ISbTD/U7eAHxIjQVX+XwL9CgRMRFIUPZOI0YZzj/iyHpNH/PW2KTgRfBleWLjXLiqJD1 6bPw== X-Gm-Message-State: AE9vXwPB3E/eTVj8yeG4M4LW3901tYI0nyiGoeu39bcwGDWDPEq3Ef31cz7rA6+1ieeYGrLK X-Received: by 10.98.135.134 with SMTP id i128mr14307157pfe.144.1473497157402; Sat, 10 Sep 2016 01:45:57 -0700 (PDT) Received: from ubuntu16.spreadtrum.com ([175.111.195.49]) by smtp.gmail.com with ESMTPSA id ci9sm4916550pad.34.2016.09.10.01.45.54 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sat, 10 Sep 2016 01:45:56 -0700 (PDT) From: Chunyan Zhang To: arnd@arndb.de Cc: linux-arch@vger.kernel.org, linux-kernel@vger.kernel.org, zhang.lyra@gmail.com Subject: [PATCH] percpu: make this_cpu_generic_read notrace Date: Sat, 10 Sep 2016 16:45:34 +0800 Message-Id: <1473497134-27807-1-git-send-email-zhang.chunyan@linaro.org> X-Mailer: git-send-email 2.7.4 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org When debug preempt or preempt tracer is enabled, preempt_count_add/sub() can be traced by function and function graph tracing, and preempt_disable/enable() would call preempt_count_add/sub(), so we should use preempt_disable/enable_notrace in Ftrace subsystem. The function this_cpu_read() started being used by function graph tracing after the commit 345ddcc882d8 ("ftrace: Have set_ftrace_pid use the bitmap like events do"), so it has to use preempt_disable/enable_notrace instead now. Signed-off-by: Chunyan Zhang --- include/asm-generic/percpu.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- 2.7.4 Acked-by: Will Deacon Acked-by: Steven Rostedt diff --git a/include/asm-generic/percpu.h b/include/asm-generic/percpu.h index 4d9f233..70fefec 100644 --- a/include/asm-generic/percpu.h +++ b/include/asm-generic/percpu.h @@ -108,9 +108,9 @@ do { \ #define this_cpu_generic_read(pcp) \ ({ \ typeof(pcp) __ret; \ - preempt_disable(); \ + preempt_disable_notrace(); \ __ret = *this_cpu_ptr(&(pcp)); \ - preempt_enable(); \ + preempt_enable_notrace(); \ __ret; \ })