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

Commit 86f8515f authored by Daniel Borkmann's avatar Daniel Borkmann Committed by Pablo Neira Ayuso
Browse files

net: netprio: rename config to be more consistent with cgroup configs 



While we're at it and introduced CGROUP_NET_CLASSID, lets also make
NETPRIO_CGROUP more consistent with the rest of cgroups and rename it
into CONFIG_CGROUP_NET_PRIO so that for networking, we now have
CONFIG_CGROUP_NET_{PRIO,CLASSID}. This not only makes the CONFIG
option consistent among networking cgroups, but also among cgroups
CONFIG conventions in general as the vast majority has a prefix of
CONFIG_CGROUP_<SUBSYS>.

Signed-off-by: default avatarDaniel Borkmann <dborkman@redhat.com>
Cc: Zefan Li <lizefan@huawei.com>
Cc: cgroups@vger.kernel.org
Acked-by: default avatarLi Zefan <lizefan@huawei.com>
Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
parent fe1217c4

include/linux/cgroup_subsys.h

+1 −1
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ SUBSYS(blkio) 
SUBSYS(perf)

#endif



#if IS_SUBSYS_ENABLED(CONFIG_NETPRIO_CGROUP)

#if IS_SUBSYS_ENABLED(CONFIG_CGROUP_NET_PRIO)

SUBSYS(net_prio)

#endif

include/linux/netdevice.h

+1 −1
Original line number Diff line number Diff line
@@ -1444,7 +1444,7 @@ struct net_device { 
	/* max exchange id for FCoE LRO by ddp */

	unsigned int		fcoe_ddp_xid;

#endif

#if IS_ENABLED(CONFIG_NETPRIO_CGROUP)

#if IS_ENABLED(CONFIG_CGROUP_NET_PRIO)

	struct netprio_map __rcu *priomap;

#endif

	/* phy device may attach itself for hardware timestamping */

include/net/netprio_cgroup.h

+6 −12
Original line number Diff line number Diff line
@@ -13,12 +13,12 @@ 


#ifndef _NETPRIO_CGROUP_H

#define _NETPRIO_CGROUP_H



#include <linux/cgroup.h>

#include <linux/hardirq.h>

#include <linux/rcupdate.h>





#if IS_ENABLED(CONFIG_NETPRIO_CGROUP)

#if IS_ENABLED(CONFIG_CGROUP_NET_PRIO)

struct netprio_map {

	struct rcu_head rcu;

	u32 priomap_len;
@@ -27,8 +27,7 @@ struct netprio_map { 


void sock_update_netprioidx(struct sock *sk);



#if IS_BUILTIN(CONFIG_NETPRIO_CGROUP)



#if IS_BUILTIN(CONFIG_CGROUP_NET_PRIO)

static inline u32 task_netprioidx(struct task_struct *p)

{

	struct cgroup_subsys_state *css;
@@ -40,9 +39,7 @@ static inline u32 task_netprioidx(struct task_struct *p) 
	rcu_read_unlock();

	return idx;

}



#elif IS_MODULE(CONFIG_NETPRIO_CGROUP)



#elif IS_MODULE(CONFIG_CGROUP_NET_PRIO)

static inline u32 task_netprioidx(struct task_struct *p)

{

	struct cgroup_subsys_state *css;
@@ -56,9 +53,7 @@ static inline u32 task_netprioidx(struct task_struct *p) 
	return idx;

}

#endif



#else /* !CONFIG_NETPRIO_CGROUP */



#else /* !CONFIG_CGROUP_NET_PRIO */

static inline u32 task_netprioidx(struct task_struct *p)

{

	return 0;
@@ -66,6 +61,5 @@ static inline u32 task_netprioidx(struct task_struct *p) 


#define sock_update_netprioidx(sk)



#endif /* CONFIG_NETPRIO_CGROUP */



#endif /* CONFIG_CGROUP_NET_PRIO */

#endif  /* _NET_CLS_CGROUP_H */

include/net/sock.h

+1 −1
Original line number Diff line number Diff line
@@ -395,7 +395,7 @@ struct sock { 
	unsigned short		sk_ack_backlog;

	unsigned short		sk_max_ack_backlog;

	__u32			sk_priority;

#if IS_ENABLED(CONFIG_NETPRIO_CGROUP)

#if IS_ENABLED(CONFIG_CGROUP_NET_PRIO)

	__u32			sk_cgrp_prioidx;

#endif

	struct pid		*sk_peer_pid;

net/Kconfig

+2 −2
Original line number Diff line number Diff line
@@ -238,12 +238,12 @@ config XPS 
	depends on SMP

	default y



config NETPRIO_CGROUP

config CGROUP_NET_PRIO

	tristate "Network priority cgroup"

	depends on CGROUPS

	---help---

	  Cgroup subsystem for use in assigning processes to network priorities on

	  a per-interface basis

	  a per-interface basis.



config CGROUP_NET_CLASSID

	boolean "Network classid cgroup"