Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8fb974c9 authored by Daniel Wagner's avatar Daniel Wagner Committed by Tejun Heo
Browse files

cgroup: net_cls: Do not define task_cls_classid() when not selected 



task_cls_classid() should not be defined in case the configuration is
CONFIG_NET_CLS_CGROUP=n. The reason is that in a following patch the
net_cls_subsys_id will only be defined if CONFIG_NET_CLS_CGROUP!=n.
When net_cls is not built at all a callee should only get an empty
task_cls_classid() without any references to net_cls_subsys_id.

Signed-off-by: default avatarDaniel Wagner <daniel.wagner@bmw-carit.de>
Signed-off-by: default avatarTejun Heo <tj@kernel.org>
Acked-by: default avatarLi Zefan <lizefan@huawei.com>
Acked-by: default avatarNeil Horman <nhorman@tuxdriver.com>
Cc: Gao feng <gaofeng@cn.fujitsu.com>
Cc: Jamal Hadi Salim <jhs@mojatatu.com>
Cc: John Fastabend <john.r.fastabend@intel.com>
Cc: netdev@vger.kernel.org
Cc: cgroups@vger.kernel.org
parent f3419807

include/net/cls_cgroup.h

+6 −5
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ 
#include <linux/hardirq.h>

#include <linux/rcupdate.h>



#ifdef CONFIG_CGROUPS

#if IS_ENABLED(CONFIG_NET_CLS_CGROUP)

struct cgroup_cls_state

{

	struct cgroup_subsys_state css;
@@ -26,7 +26,7 @@ struct cgroup_cls_state 


extern void sock_update_classid(struct sock *sk);



#ifdef CONFIG_NET_CLS_CGROUP

#if IS_BUILTIN(CONFIG_NET_CLS_CGROUP)

static inline u32 task_cls_classid(struct task_struct *p)

{

	int classid;
@@ -41,7 +41,8 @@ static inline u32 task_cls_classid(struct task_struct *p) 


	return classid;

}

#else

#elif IS_MODULE(CONFIG_NET_CLS_CGROUP)



extern int net_cls_subsys_id;



static inline u32 task_cls_classid(struct task_struct *p)
@@ -63,7 +64,7 @@ static inline u32 task_cls_classid(struct task_struct *p) 
	return classid;

}

#endif

#else

#else /* !CGROUP_NET_CLS_CGROUP */

static inline void sock_update_classid(struct sock *sk)

{

}
@@ -72,5 +73,5 @@ static inline u32 task_cls_classid(struct task_struct *p) 
{

	return 0;

}

#endif

#endif /* CGROUP_NET_CLS_CGROUP */

#endif  /* _NET_CLS_CGROUP_H */

net/core/sock.c

+2 −0
Original line number Diff line number Diff line
@@ -1223,6 +1223,7 @@ static void sk_prot_free(struct proto *prot, struct sock *sk) 
}



#ifdef CONFIG_CGROUPS

#if IS_ENABLED(CONFIG_NET_CLS_CGROUP)

void sock_update_classid(struct sock *sk)

{

	u32 classid;
@@ -1234,6 +1235,7 @@ void sock_update_classid(struct sock *sk) 
		sk->sk_classid = classid;

}

EXPORT_SYMBOL(sock_update_classid);

#endif



void sock_update_netprioidx(struct sock *sk, struct task_struct *task)

{