From patchwork Tue Nov 5 02:08:16 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vijay Subramanian X-Patchwork-Id: 288359 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id DB68B2C00C8 for ; Tue, 5 Nov 2013 13:12:17 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754417Ab3KECMO (ORCPT ); Mon, 4 Nov 2013 21:12:14 -0500 Received: from mail-pd0-f178.google.com ([209.85.192.178]:46311 "EHLO mail-pd0-f178.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754011Ab3KECMN (ORCPT ); Mon, 4 Nov 2013 21:12:13 -0500 Received: by mail-pd0-f178.google.com with SMTP id x10so7441941pdj.23 for ; Mon, 04 Nov 2013 18:12:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=PpfHGSdZaKJIrC2boOekKRINa1IJRKhfLU5RkfHHed8=; b=Z/oXQZHKa33WEd/PKplltqy+7YD8J1iQA08neINt0TdvCWk3/7yrtoJzfNbPrtQ+Le /imlwqAXil2s5GfKAknRWw9T1CYUgZimfYECr1eY0Y6K2WJczuKpnDm3OR9zy+8HxvBs OgMY1I4GknIRg3ChiujEMlBmWjegS12SnDG5wn9ZQuU4fA8m6YlqXej6Zr+rC60kK/L8 e5N3/QfGc/mRALAgMWvDQahZGjRnrgJOl3NiYxF0WtRgqwsWmJ/hN0A5GuQB6NWZubdv f4AGsmNr8Gd+DUS8wZ3HapxRATPwccFVhJsrNJmoKEWwxismGRVxNSxxRDFZir9QDXv2 oKuQ== X-Received: by 10.68.136.193 with SMTP id qc1mr20565225pbb.111.1383617532628; Mon, 04 Nov 2013 18:12:12 -0800 (PST) Received: from tux.cisco.com (dhcp-128-107-165-80.cisco.com. [128.107.165.80]) by mx.google.com with ESMTPSA id qw8sm31057665pbb.27.2013.11.04.18.12.11 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 04 Nov 2013 18:12:11 -0800 (PST) From: Vijay Subramanian To: netdev@vger.kernel.org Cc: davem@davemloft.net, shemminger@vyatta.com, eric.dumazet@gmail.com, Vijay Subramanian Subject: [PATCH net] net: sch_red: Fix race between timer and red_destroy() Date: Mon, 4 Nov 2013 18:08:16 -0800 Message-Id: <1383617296-20273-1-git-send-email-subramanian.vijay@gmail.com> X-Mailer: git-send-email 1.7.9.5 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Make sure timer does not fire once qdisc is destroyed. Signed-off-by: Vijay Subramanian --- net/sched/sch_red.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/net/sched/sch_red.c b/net/sched/sch_red.c index 633e32d..380507e 100644 --- a/net/sched/sch_red.c +++ b/net/sched/sch_red.c @@ -39,6 +39,7 @@ struct red_sched_data { u32 limit; /* HARD maximal queue length */ unsigned char flags; + bool timeron; /* to prevent race on destroy*/ struct timer_list adapt_timer; struct red_parms parms; struct red_vars vars; @@ -166,6 +167,7 @@ static void red_destroy(struct Qdisc *sch) { struct red_sched_data *q = qdisc_priv(sch); + q->timeron = false; del_timer_sync(&q->adapt_timer); qdisc_destroy(q->qdisc); } @@ -241,7 +243,8 @@ static inline void red_adaptative_timer(unsigned long arg) spin_lock(root_lock); red_adaptative_algo(&q->parms, &q->vars); - mod_timer(&q->adapt_timer, jiffies + HZ/2); + if (q->timeron) + mod_timer(&q->adapt_timer, jiffies + HZ/2); spin_unlock(root_lock); } @@ -250,6 +253,7 @@ static int red_init(struct Qdisc *sch, struct nlattr *opt) struct red_sched_data *q = qdisc_priv(sch); q->qdisc = &noop_qdisc; + q->timeron = true; setup_timer(&q->adapt_timer, red_adaptative_timer, (unsigned long)sch); return red_change(sch, opt); }