Skip to content

Commit 6f89dbc

Browse files
sowminivdavem330
authored andcommitted
skbuff: export mm_[un]account_pinned_pages for other modules
RDS would like to use the helper functions for managing pinned pages added by Commit a91dbff ("sock: ulimit on MSG_ZEROCOPY pages") Signed-off-by: Sowmini Varadhan <[email protected]> Acked-by: Willem de Bruijn <[email protected]> Signed-off-by: David S. Miller <[email protected]>
1 parent ee99b2d commit 6f89dbc

File tree

2 files changed

+7
-2
lines changed

2 files changed

+7
-2
lines changed

include/linux/skbuff.h

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -466,6 +466,9 @@ struct ubuf_info {
466466

467467
#define skb_uarg(SKB) ((struct ubuf_info *)(skb_shinfo(SKB)->destructor_arg))
468468

469+
int mm_account_pinned_pages(struct mmpin *mmp, size_t size);
470+
void mm_unaccount_pinned_pages(struct mmpin *mmp);
471+
469472
struct ubuf_info *sock_zerocopy_alloc(struct sock *sk, size_t size);
470473
struct ubuf_info *sock_zerocopy_realloc(struct sock *sk, size_t size,
471474
struct ubuf_info *uarg);

net/core/skbuff.c

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -890,7 +890,7 @@ struct sk_buff *skb_morph(struct sk_buff *dst, struct sk_buff *src)
890890
}
891891
EXPORT_SYMBOL_GPL(skb_morph);
892892

893-
static int mm_account_pinned_pages(struct mmpin *mmp, size_t size)
893+
int mm_account_pinned_pages(struct mmpin *mmp, size_t size)
894894
{
895895
unsigned long max_pg, num_pg, new_pg, old_pg;
896896
struct user_struct *user;
@@ -919,14 +919,16 @@ static int mm_account_pinned_pages(struct mmpin *mmp, size_t size)
919919

920920
return 0;
921921
}
922+
EXPORT_SYMBOL_GPL(mm_account_pinned_pages);
922923

923-
static void mm_unaccount_pinned_pages(struct mmpin *mmp)
924+
void mm_unaccount_pinned_pages(struct mmpin *mmp)
924925
{
925926
if (mmp->user) {
926927
atomic_long_sub(mmp->num_pg, &mmp->user->locked_vm);
927928
free_uid(mmp->user);
928929
}
929930
}
931+
EXPORT_SYMBOL_GPL(mm_unaccount_pinned_pages);
930932

931933
struct ubuf_info *sock_zerocopy_alloc(struct sock *sk, size_t size)
932934
{

0 commit comments

Comments
 (0)