From: Jan Dakinevich <jan.dakinevich@virtuozzo.com>
To: "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>
Cc: Denis Lunev <den@virtuozzo.com>,
Konstantin Khorenko <khorenko@virtuozzo.com>
Subject: [PATCH 3/3] netlink: use generic skb_set_owner_r()
Date: Thu, 22 Aug 2019 09:50:52 +0000 [thread overview]
Message-ID: <1566467448-9550-4-git-send-email-jan.dakinevich@virtuozzo.com> (raw)
In-Reply-To: <1566467448-9550-1-git-send-email-jan.dakinevich@virtuozzo.com>
Since skb destructor is not used for data deallocating,
netlink_skb_set_owner_r() almost completely repeates generic
skb_set_owner_r(). Thus, both netlink_skb_set_owner_r() and
netlink_skb_destructor() are not required anymore.
Signed-off-by: Jan Dakinevich <jan.dakinevich@virtuozzo.com>
---
net/netlink/af_netlink.c | 23 ++++-------------------
1 file changed, 4 insertions(+), 19 deletions(-)
diff --git a/net/netlink/af_netlink.c b/net/netlink/af_netlink.c
index 04a3457..b0c2eb2 100644
--- a/net/netlink/af_netlink.c
+++ b/net/netlink/af_netlink.c
@@ -358,21 +358,6 @@ static void netlink_rcv_wake(struct sock *sk)
wake_up_interruptible(&nlk->wait);
}
-static void netlink_skb_destructor(struct sk_buff *skb)
-{
- if (skb->sk != NULL)
- sock_rfree(skb);
-}
-
-static void netlink_skb_set_owner_r(struct sk_buff *skb, struct sock *sk)
-{
- WARN_ON(skb->sk != NULL);
- skb->sk = sk;
- skb->destructor = netlink_skb_destructor;
- atomic_add(skb->truesize, &sk->sk_rmem_alloc);
- sk_mem_charge(sk, skb->truesize);
-}
-
static void netlink_sock_destruct(struct sock *sk)
{
struct netlink_sock *nlk = nlk_sk(sk);
@@ -1225,7 +1210,7 @@ int netlink_attachskb(struct sock *sk, struct sk_buff *skb,
}
return 1;
}
- netlink_skb_set_owner_r(skb, sk);
+ skb_set_owner_r(skb, sk);
return 0;
}
@@ -1286,7 +1271,7 @@ static int netlink_unicast_kernel(struct sock *sk, struct sk_buff *skb,
ret = -ECONNREFUSED;
if (nlk->netlink_rcv != NULL) {
ret = skb->len;
- netlink_skb_set_owner_r(skb, sk);
+ skb_set_owner_r(skb, sk);
NETLINK_CB(skb).sk = ssk;
netlink_deliver_tap_kernel(sk, ssk, skb);
nlk->netlink_rcv(skb);
@@ -1367,7 +1352,7 @@ static int netlink_broadcast_deliver(struct sock *sk, struct sk_buff *skb)
if (atomic_read(&sk->sk_rmem_alloc) <= sk->sk_rcvbuf &&
!test_bit(NETLINK_S_CONGESTED, &nlk->state)) {
- netlink_skb_set_owner_r(skb, sk);
+ skb_set_owner_r(skb, sk);
__netlink_sendskb(sk, skb);
return atomic_read(&sk->sk_rmem_alloc) > (sk->sk_rcvbuf >> 1);
}
@@ -2227,7 +2212,7 @@ static int netlink_dump(struct sock *sk)
* single netdev. The outcome is MSG_TRUNC error.
*/
skb_reserve(skb, skb_tailroom(skb) - alloc_size);
- netlink_skb_set_owner_r(skb, sk);
+ skb_set_owner_r(skb, sk);
if (nlk->dump_done_errno > 0) {
cb->extack = &extack;
--
2.1.4
next prev parent reply other threads:[~2019-08-22 9:50 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-08-22 9:50 [PATCH 0/3] rework netlink skb allocation Jan Dakinevich
2019-08-22 9:50 ` [PATCH 2/3] netlink: always use vmapped memory for skb data Jan Dakinevich
2019-08-22 9:50 ` [PATCH 1/3] skbuff: use kvfree() to deallocate head Jan Dakinevich
2019-08-22 9:50 ` Jan Dakinevich [this message]
2019-08-22 10:48 [PATCH 0/3] rework netlink skb allocation Jan Dakinevich
2019-08-22 10:48 ` [PATCH 3/3] netlink: use generic skb_set_owner_r() Jan Dakinevich
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1566467448-9550-4-git-send-email-jan.dakinevich@virtuozzo.com \
--to=jan.dakinevich@virtuozzo.com \
--cc=den@virtuozzo.com \
--cc=khorenko@virtuozzo.com \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®