UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

tipc: call tsk_set_importance from tipc_topsrv_create_listener 

Avoid using kernel_setsockopt for the TIPC_IMPORTANCE option when we can
just use the internal helper.  The only change needed is to pass a struct
sock instead of tipc_sock, which is private to socket.c

Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Christoph Hellwig 2020-05-28 07:12:36 +02:00 committed by David S. Miller
parent 298cd88a66
commit 095ae61253
3 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
net/tipc/socket.c
View File

@ -196,19 +196,19 @@ static int tsk_importance(struct tipc_sock *tsk)
return msg_importance(&tsk->phdr); return msg_importance(&tsk->phdr);
} }
static int tsk_set_importance(struct tipc_sock *tsk, int imp)
{
if (imp > TIPC_CRITICAL_IMPORTANCE)
return -EINVAL;
msg_set_importance(&tsk->phdr, (u32)imp);
return 0;
}
static struct tipc_sock *tipc_sk(const struct sock *sk) static struct tipc_sock *tipc_sk(const struct sock *sk)
{ {
return container_of(sk, struct tipc_sock, sk); return container_of(sk, struct tipc_sock, sk);
} }
int tsk_set_importance(struct sock *sk, int imp)
{
if (imp > TIPC_CRITICAL_IMPORTANCE)
return -EINVAL;
msg_set_importance(&tipc_sk(sk)->phdr, (u32)imp);
return 0;
}
static bool tsk_conn_cong(struct tipc_sock *tsk) static bool tsk_conn_cong(struct tipc_sock *tsk)
{ {
return tsk->snt_unacked > tsk->snd_win; return tsk->snt_unacked > tsk->snd_win;
@ -2721,7 +2721,7 @@ static int tipc_accept(struct socket *sock, struct socket *new_sock, int flags,
/* Connect new socket to it's peer */ /* Connect new socket to it's peer */
tipc_sk_finish_conn(new_tsock, msg_origport(msg), msg_orignode(msg)); tipc_sk_finish_conn(new_tsock, msg_origport(msg), msg_orignode(msg));
tsk_set_importance(new_tsock, msg_importance(msg)); tsk_set_importance(new_sk, msg_importance(msg));
if (msg_named(msg)) { if (msg_named(msg)) {
new_tsock->conn_type = msg_nametype(msg); new_tsock->conn_type = msg_nametype(msg);
new_tsock->conn_instance = msg_nameinst(msg); new_tsock->conn_instance = msg_nameinst(msg);
@ -3139,7 +3139,7 @@ static int tipc_setsockopt(struct socket *sock, int lvl, int opt,
switch (opt) { switch (opt) {
case TIPC_IMPORTANCE: case TIPC_IMPORTANCE:
res = tsk_set_importance(tsk, value); res = tsk_set_importance(sk, value);
break; break;
case TIPC_SRC_DROPPABLE: case TIPC_SRC_DROPPABLE:
if (sock->type != SOCK_STREAM) if (sock->type != SOCK_STREAM)

2
net/tipc/socket.h
View File

@ -75,4 +75,6 @@ u32 tipc_sock_get_portid(struct sock *sk);
bool tipc_sk_overlimit1(struct sock *sk, struct sk_buff *skb); bool tipc_sk_overlimit1(struct sock *sk, struct sk_buff *skb);
bool tipc_sk_overlimit2(struct sock *sk, struct sk_buff *skb); bool tipc_sk_overlimit2(struct sock *sk, struct sk_buff *skb);
int tsk_set_importance(struct sock *sk, int imp);
#endif #endif

6
net/tipc/topsrv.c
View File

@ -497,7 +497,6 @@ static void tipc_topsrv_listener_data_ready(struct sock *sk)
static int tipc_topsrv_create_listener(struct tipc_topsrv *srv) static int tipc_topsrv_create_listener(struct tipc_topsrv *srv)
{ {
int imp = TIPC_CRITICAL_IMPORTANCE;
struct socket *lsock = NULL; struct socket *lsock = NULL;
struct sockaddr_tipc saddr; struct sockaddr_tipc saddr;
struct sock *sk; struct sock *sk;
@ -514,8 +513,9 @@ static int tipc_topsrv_create_listener(struct tipc_topsrv *srv)
sk->sk_user_data = srv; sk->sk_user_data = srv;
write_unlock_bh(&sk->sk_callback_lock); write_unlock_bh(&sk->sk_callback_lock);
rc = kernel_setsockopt(lsock, SOL_TIPC, TIPC_IMPORTANCE, lock_sock(sk);
(char *)&imp, sizeof(imp)); rc = tsk_set_importance(sk, TIPC_CRITICAL_IMPORTANCE);
release_sock(sk);
if (rc < 0) if (rc < 0)
goto err; goto err;