Return-Path: <linux-rt-users-owner@vger.kernel.org> Received: from rack3slot8.osadl.org (rack3slot8.osadl.org [127.0.0.1]) by rack3slot8.osadl.org (8.13.8/8.13.8/CE-2010120801) with ESMTP id r1DGEICP031494 for <ce@thllin.ceag.ch>; Wed, 13 Feb 2013 17:14:18 +0100 Received: from toro.web-alm.net (uucp@localhost) by rack3slot8.osadl.org (8.13.8/8.13.8/Submit) with bsmtp id r1DGEIKt031492 for ce@mailgate.computer-experts.de; Wed, 13 Feb 2013 17:14:18 +0100 Received: from www.osadl.org (www.osadl.org [62.245.132.105]) by toro.web-alm.net (8.12.11.20060308/8.12.11/Web-Alm-2003112001) with ESMTP id r1DGDQKH006733 for <ce@ceag.ch>; Wed, 13 Feb 2013 17:13:26 +0100 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by www.osadl.org (8.13.8/8.13.8/OSADL-2007092901) with ESMTP id r1DGDMul023576 for <Carsten.Emde@osadl.org>; Wed, 13 Feb 2013 17:13:22 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934297Ab3BMQMx (ORCPT <rfc822;Carsten.Emde@osadl.org>); Wed, 13 Feb 2013 11:12:53 -0500 Received: from www.linutronix.de ([62.245.132.108]:59705 "EHLO Galois.linutronix.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S934116Ab3BMQMv (ORCPT <rfc822;linux-rt-users@vger.kernel.org>); Wed, 13 Feb 2013 11:12:51 -0500 Received: from localhost ([127.0.0.1] helo=localhost.localdomain) by Galois.linutronix.de with esmtp (Exim 4.72) (envelope-from <bigeasy@linutronix.de>) id 1U5ex0-0005iT-9n; Wed, 13 Feb 2013 17:12:50 +0100 From: Sebastian Andrzej Siewior <bigeasy@linutronix.de> To: Steven Rostedt <rostedt@goodmis.org> Cc: linux-kernel@vger.kernel.org, linux-rt-users@vger.kernel.org, Carsten Emde <C.Emde@osadl.org>, Thomas Gleixner <tglx@linutronix.de>, Sebastian Andrzej Siewior <bigeasy@linutronix.de> Subject: [PATCH 01/16] softirq: Make serving softirqs a task flag Date: Wed, 13 Feb 2013 17:11:56 +0100 Message-Id: <1360771932-27150-2-git-send-email-bigeasy@linutronix.de> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1360771932-27150-1-git-send-email-bigeasy@linutronix.de> References: <1360771932-27150-1-git-send-email-bigeasy@linutronix.de> X-Linutronix-Spam-Score: -1.0 X-Linutronix-Spam-Level: - X-Linutronix-Spam-Status: No , -1.0 points, 5.0 required, ALL_TRUSTED=-1,SHORTCIRCUIT=-0.0001 Sender: linux-rt-users-owner@vger.kernel.org Precedence: bulk List-ID: <linux-rt-users.vger.kernel.org> X-Mailing-List: linux-rt-users@vger.kernel.org X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_LOW autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on rack3slot8.osadl.org X-Virus-Scanned: ClamAV version 0.94.2, clamav-milter version 0.94.2 on rack3slot8.osadl.org X-Virus-Status: Clean From: Thomas Gleixner <tglx@linutronix.de> Avoid the percpu softirq_runner pointer magic by using a task flag. Signed-off-by: Thomas Gleixner <tglx@linutronix.de> [bigeasy@linutronix: different PF_IN_SOFTIRQ bit] Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> --- include/linux/sched.h | 1 + kernel/softirq.c | 20 +++----------------- 2 files changed, 4 insertions(+), 17 deletions(-) Index: linux-3.2.39-rt59/include/linux/sched.h =================================================================== @ linux-3.2.39-rt59/include/linux/sched.h:1835 @ extern void thread_group_times(struct ta /* * Per process flags */ +#define PF_IN_SOFTIRQ 0x00000001 /* Task is serving softirq */ #define PF_STARTING 0x00000002 /* being created */ #define PF_EXITING 0x00000004 /* getting shut down */ #define PF_EXITPIDONE 0x00000008 /* pi exit done on shut down */ Index: linux-3.2.39-rt59/kernel/softirq.c =================================================================== --- linux-3.2.39-rt59.orig/kernel/softirq.c +++ linux-3.2.39-rt59/kernel/softirq.c @ linux-3.2.39-rt59/include/linux/sched.h:386 @ static inline void ksoftirqd_clr_sched_p * On RT we serialize softirq execution with a cpu local lock */ static DEFINE_LOCAL_IRQ_LOCK(local_softirq_lock); -static DEFINE_PER_CPU(struct task_struct *, local_softirq_runner); static void __do_softirq_common(int need_rcu_bh_qs); @ linux-3.2.39-rt59/include/linux/sched.h:440 @ void _local_bh_enable(void) } EXPORT_SYMBOL(_local_bh_enable); -/* For tracing */ -int notrace __in_softirq(void) -{ - if (__get_cpu_var(local_softirq_lock).owner == current) - return __get_cpu_var(local_softirq_lock).nestcnt; - return 0; -} - int in_serving_softirq(void) { - int res; - - preempt_disable(); - res = __get_cpu_var(local_softirq_runner) == current; - preempt_enable(); - return res; + return current->flags & PF_IN_SOFTIRQ; } EXPORT_SYMBOL(in_serving_softirq); @ linux-3.2.39-rt59/include/linux/sched.h:460 @ static void __do_softirq_common(int need /* Reset the pending bitmask before enabling irqs */ set_softirq_pending(0); - __get_cpu_var(local_softirq_runner) = current; + current->flags |= PF_IN_SOFTIRQ; lockdep_softirq_enter(); @ linux-3.2.39-rt59/include/linux/sched.h:471 @ static void __do_softirq_common(int need wakeup_softirqd(); lockdep_softirq_exit(); - __get_cpu_var(local_softirq_runner) = NULL; + current->flags &= ~PF_IN_SOFTIRQ; current->softirq_nestcnt--; }