From patchwork Fri Dec 13 05:47:50 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cong Wang X-Patchwork-Id: 300891 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 4686B2C00A1 for ; Fri, 13 Dec 2013 16:48:09 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752001Ab3LMFsG (ORCPT ); Fri, 13 Dec 2013 00:48:06 -0500 Received: from mail-pb0-f45.google.com ([209.85.160.45]:36309 "EHLO mail-pb0-f45.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751932Ab3LMFsE (ORCPT ); Fri, 13 Dec 2013 00:48:04 -0500 Received: by mail-pb0-f45.google.com with SMTP id rp16so1928991pbb.4 for ; Thu, 12 Dec 2013 21:48:04 -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:in-reply-to:references; bh=zO3/qYh0suW9Usfk1f3QKd1xDGc5CV1Q8NROePzLy5s=; b=h3BqjHieC2OO96kxj24leqoNnsmDwdaQRMncNJMD03nOSozDdyrG5rqNdqCxtCnuS3 /vHtXW7t/0w9Du3M+HxmIh11YfdiGvQUcb2JphYkT3+Nj4KS7uo0/U/9OXfT3NTVXu+4 xGP3KZZfYYj+yEOvYItJR3zaFi4KJR/QWJ+/73limNuvy+7o+dCsk6EGeRDz70rB7I+g GBUncuUsFw3DVKsMMyoUYQXMLr+LxfiPj9FXayqfzWV0xo5tIp/fyTdiPgayj+WI+kZ8 RdIfXWex155Qr9qO0tMUj57QY0tlmZFIMPUfnXNWLDSowe2M9+a4xkzmlGHMee0m+9Ci cvhw== X-Received: by 10.66.250.129 with SMTP id zc1mr883297pac.153.1386913683970; Thu, 12 Dec 2013 21:48:03 -0800 (PST) Received: from linux-6brj.site (c-24-5-209-215.hsd1.ca.comcast.net. [24.5.209.215]) by mx.google.com with ESMTPSA id xe9sm2559904pab.0.2013.12.12.21.48.02 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 12 Dec 2013 21:48:03 -0800 (PST) From: Cong Wang To: netdev@vger.kernel.org Cc: Cong Wang , Jamal Hadi Salim , "David S. Miller" Subject: [PATCH net-next v3 3/6] net_sched: mirred: remove action when the target device is gone Date: Thu, 12 Dec 2013 21:47:50 -0800 Message-Id: <1386913673-8210-4-git-send-email-xiyou.wangcong@gmail.com> X-Mailer: git-send-email 1.8.1.4 In-Reply-To: <1386913673-8210-1-git-send-email-xiyou.wangcong@gmail.com> References: <1386913673-8210-1-git-send-email-xiyou.wangcong@gmail.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org When the target device is removed, the mirred action is still there but with the dev pointer setting to NULL. This makes the output from 'tc filter' ugly. There is no reason to keep it. Cc: Jamal Hadi Salim Cc: David S. Miller Signed-off-by: Cong Wang --- include/net/tc_act/tc_mirred.h | 4 +++- net/sched/act_mirred.c | 15 +++++++-------- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/include/net/tc_act/tc_mirred.h b/include/net/tc_act/tc_mirred.h index cfe2943..2026cf6 100644 --- a/include/net/tc_act/tc_mirred.h +++ b/include/net/tc_act/tc_mirred.h @@ -7,9 +7,11 @@ struct tcf_mirred { struct tcf_common common; int tcfm_eaction; int tcfm_ifindex; - int tcfm_ok_push; + unsigned int tcfm_ok_push:1; + unsigned int tcfm_bind:1; struct net_device *tcfm_dev; struct list_head tcfm_list; + struct tc_action *tcfm_act; }; #define to_mirred(pc) \ container_of(pc, struct tcf_mirred, common) diff --git a/net/sched/act_mirred.c b/net/sched/act_mirred.c index 2523781..c26bfe5 100644 --- a/net/sched/act_mirred.c +++ b/net/sched/act_mirred.c @@ -136,6 +136,8 @@ static int tcf_mirred_init(struct net *net, struct nlattr *nla, dev_hold(dev); m->tcfm_dev = dev; m->tcfm_ok_push = ok_push; + m->tcfm_bind = bind; + m->tcfm_act = a; } spin_unlock_bh(&m->tcf_lock); if (ret == ACT_P_CREATED) { @@ -169,10 +171,6 @@ static int tcf_mirred(struct sk_buff *skb, const struct tc_action *a, bstats_update(&m->tcf_bstats, skb); dev = m->tcfm_dev; - if (!dev) { - printk_once(KERN_NOTICE "tc mirred: target device is gone\n"); - goto out; - } if (!(dev->flags & IFF_UP)) { net_notice_ratelimited("tc mirred to Houston: device %s is down\n", @@ -244,13 +242,14 @@ static int mirred_device_event(struct notifier_block *unused, unsigned long event, void *ptr) { struct net_device *dev = netdev_notifier_info_to_dev(ptr); - struct tcf_mirred *m; + struct tcf_mirred *m, *tmp; if (event == NETDEV_UNREGISTER) - list_for_each_entry(m, &mirred_list, tcfm_list) { + list_for_each_entry_safe(m, tmp, &mirred_list, tcfm_list) { if (m->tcfm_dev == dev) { - dev_put(dev); - m->tcfm_dev = NULL; + list_del(&m->tcfm_act->list); + tcf_mirred_cleanup(m->tcfm_act, m->tcfm_bind); + kfree(m->tcfm_act); } }