From patchwork Fri Jan 3 03:11:09 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Libo Chen X-Patchwork-Id: 306398 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 BEACA2C007E for ; Fri, 3 Jan 2014 14:14:00 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752487AbaACDLp (ORCPT ); Thu, 2 Jan 2014 22:11:45 -0500 Received: from szxga01-in.huawei.com ([119.145.14.64]:52651 "EHLO szxga01-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751773AbaACDLo (ORCPT ); Thu, 2 Jan 2014 22:11:44 -0500 Received: from 172.24.2.119 (EHLO szxeml206-edg.china.huawei.com) ([172.24.2.119]) by szxrg01-dlp.huawei.com (MOS 4.3.7-GA FastPath queued) with ESMTP id BPN00528; Fri, 03 Jan 2014 11:11:41 +0800 (CST) Received: from SZXEML453-HUB.china.huawei.com (10.82.67.196) by szxeml206-edg.china.huawei.com (172.24.2.59) with Microsoft SMTP Server (TLS) id 14.3.158.1; Fri, 3 Jan 2014 11:11:15 +0800 Received: from [127.0.0.1] (10.135.72.158) by SZXEML453-HUB.china.huawei.com (10.82.67.196) with Microsoft SMTP Server id 14.3.158.1; Fri, 3 Jan 2014 11:11:10 +0800 Message-ID: <52C62A4D.5010000@huawei.com> Date: Fri, 3 Jan 2014 11:11:09 +0800 From: Libo Chen User-Agent: Mozilla/5.0 (Windows NT 6.1; rv:24.0) Gecko/20100101 Thunderbird/24.0.1 MIME-Version: 1.0 To: David Miller , CC: , LKML , , , , Serge Hallyn , Li Zefan Subject: [RFC PATCH net-next 2/4] cls_cgroup: introduce a helper: bk_cls_classid() X-Originating-IP: [10.135.72.158] X-CFilter-Loop: Reflected Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org it can save classid from skb->sk->sk_classid to skb->bk_classid Signed-off-by: Libo Chen --- include/net/cls_cgroup.h | 11 +++++++++++ net/sched/cls_cgroup.c | 1 - 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/include/net/cls_cgroup.h b/include/net/cls_cgroup.h index 33d03b6..4249ea3 100644 --- a/include/net/cls_cgroup.h +++ b/include/net/cls_cgroup.h @@ -16,6 +16,7 @@ #include #include #include +#include #if IS_ENABLED(CONFIG_NET_CLS_CGROUP) struct cgroup_cls_state @@ -26,6 +27,12 @@ struct cgroup_cls_state void sock_update_classid(struct sock *sk); +static inline void bk_cls_classid(struct sk_buff *skb) +{ + if (skb->sk && skb->sk->sk_classid) + skb->backup_classid = skb->sk->sk_classid; +} + #if IS_BUILTIN(CONFIG_NET_CLS_CGROUP) static inline u32 task_cls_classid(struct task_struct *p) { @@ -61,6 +68,10 @@ static inline u32 task_cls_classid(struct task_struct *p) } #endif #else /* !CGROUP_NET_CLS_CGROUP */ +static inline void bk_cls_classid(struct sk_buff *skb) +{ +} + static inline void sock_update_classid(struct sock *sk) { } diff --git a/net/sched/cls_cgroup.c b/net/sched/cls_cgroup.c index f9d21258..d228a5d 100644 --- a/net/sched/cls_cgroup.c +++ b/net/sched/cls_cgroup.c @@ -20,7 +20,6 @@ #include #include #include -#include #include static inline struct cgroup_cls_state *css_cls_state(struct cgroup_subsys_state *css)