From patchwork Fri Aug 17 14:58:12 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Wagner X-Patchwork-Id: 178238 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 B8D4B2C00AA for ; Sat, 18 Aug 2012 00:58:53 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758208Ab2HQO6r (ORCPT ); Fri, 17 Aug 2012 10:58:47 -0400 Received: from hotel311.server4you.de ([85.25.146.15]:33845 "EHLO hotel311.server4you.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758204Ab2HQO62 (ORCPT ); Fri, 17 Aug 2012 10:58:28 -0400 Received: from candlejack.bmw-carit.intra (mail.bmw-carit.de [62.245.222.98]) (Authenticated sender: wagi) by hotel311.server4you.de (Postfix) with ESMTPSA id DD8B6CBE10A; Fri, 17 Aug 2012 16:58:14 +0200 (CEST) From: Daniel Wagner To: netdev@vger.kernel.org, cgroups@vger.kernel.org Cc: Daniel Wagner , "David S. Miller" , Gao feng , Jamal Hadi Salim , John Fastabend , Li Zefan , Neil Horman , Tejun Heo Subject: [PATCH v1 3/5] cgroup: Protect access to task_cls_classid() when built as module Date: Fri, 17 Aug 2012 16:58:12 +0200 Message-Id: <1345215494-9181-4-git-send-email-wagi@monom.org> X-Mailer: git-send-email 1.7.12.rc1.16.g05a20c8 In-Reply-To: <1345215494-9181-1-git-send-email-wagi@monom.org> References: <1345215494-9181-1-git-send-email-wagi@monom.org> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Daniel Wagner The module version of task_cls_classid() checks if net_cls_sbusys_id is valid to indentify when it is okay to access the controller. Instead relying on the subusys_id to be set, make it explicit with a jump label. Signed-off-by: Daniel Wagner Cc: "David S. Miller" Cc: Gao feng Cc: Jamal Hadi Salim Cc: John Fastabend Cc: Li Zefan Cc: Neil Horman Cc: Tejun Heo Cc: netdev@vger.kernel.org Cc: cgroups@vger.kernel.org --- include/net/cls_cgroup.h | 5 ++++- net/core/sock.c | 5 +++++ net/sched/cls_cgroup.c | 9 +++++++++ 3 files changed, 18 insertions(+), 1 deletion(-) diff --git a/include/net/cls_cgroup.h b/include/net/cls_cgroup.h index 401672c..bbbd957 100644 --- a/include/net/cls_cgroup.h +++ b/include/net/cls_cgroup.h @@ -16,6 +16,7 @@ #include #include #include +#include #ifdef CONFIG_CGROUPS struct cgroup_cls_state @@ -44,6 +45,8 @@ static inline u32 task_cls_classid(struct task_struct *p) } #elif IS_MODULE(CONFIG_NET_CLS_CGROUP) +extern struct static_key cgroup_cls_enabled; +#define clscg_enabled static_key_false(&cgroup_cls_enabled) extern int net_cls_subsys_id; @@ -52,7 +55,7 @@ static inline u32 task_cls_classid(struct task_struct *p) int id; u32 classid = 0; - if (in_interrupt()) + if (!clscg_enabled || in_interrupt()) return 0; rcu_read_lock(); diff --git a/net/core/sock.c b/net/core/sock.c index 8f67ced..8106e77 100644 --- a/net/core/sock.c +++ b/net/core/sock.c @@ -327,6 +327,11 @@ int __sk_backlog_rcv(struct sock *sk, struct sk_buff *skb) EXPORT_SYMBOL(__sk_backlog_rcv); #if defined(CONFIG_CGROUPS) +#if IS_MODULE(CONFIG_NET_CLS_CGROUP) +struct static_key cgroup_cls_enabled = STATIC_KEY_INIT_FALSE; +EXPORT_SYMBOL_GPL(cgroup_cls_enabled); +#endif + #if !defined(CONFIG_NET_CLS_CGROUP) int net_cls_subsys_id = -1; EXPORT_SYMBOL_GPL(net_cls_subsys_id); diff --git a/net/sched/cls_cgroup.c b/net/sched/cls_cgroup.c index 7743ea8..0635894 100644 --- a/net/sched/cls_cgroup.c +++ b/net/sched/cls_cgroup.c @@ -44,12 +44,21 @@ static struct cgroup_subsys_state *cgrp_create(struct cgroup *cgrp) if (cgrp->parent) cs->classid = cgrp_cls_state(cgrp->parent)->classid; +#if IS_MODULE(CONFIG_NET_CLS_CGROUP) + else if (!clscg_enabled) + static_key_slow_inc(&cgroup_cls_enabled); +#endif return &cs->css; } static void cgrp_destroy(struct cgroup *cgrp) { +#if IS_MODULE(CONFIG_NET_CLS_CGROUP) + if (!cgrp->parent && clscg_enabled) + static_key_slow_dec(&cgroup_cls_enabled); +#endif + kfree(cgrp_cls_state(cgrp)); }