Skip to content

Commit

Permalink
cifs: keep a reusable kvec array for receives
Browse files Browse the repository at this point in the history
Having to continually allocate a new kvec array is expensive. Allocate
one that's big enough, and only reallocate it as needed.

Reviewed-and-Tested-by: Pavel Shilovsky <piastry@etersoft.ru>
Signed-off-by: Jeff Layton <jlayton@redhat.com>
  • Loading branch information
Jeff Layton committed Oct 19, 2011
1 parent 42c4dfc commit 1041e3f
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 2 deletions.
2 changes: 2 additions & 0 deletions fs/cifs/cifsglob.h
Original file line number Diff line number Diff line change
Expand Up @@ -292,6 +292,8 @@ struct TCP_Server_Info {
bool sec_kerberos; /* supports plain Kerberos */
bool sec_mskerberos; /* supports legacy MS Kerberos */
struct delayed_work echo; /* echo ping workqueue job */
struct kvec *iov; /* reusable kvec array for receives */
unsigned int nr_iov; /* number of kvecs in array */
#ifdef CONFIG_CIFS_FSCACHE
struct fscache_cookie *fscache; /* client index cache cookie */
#endif
Expand Down
22 changes: 20 additions & 2 deletions fs/cifs/connect.c
Original file line number Diff line number Diff line change
Expand Up @@ -410,6 +410,24 @@ kvec_array_init(struct kvec *new, struct kvec *iov, unsigned int nr_segs,
return nr_segs;
}

static struct kvec *
get_server_iovec(struct TCP_Server_Info *server, unsigned int nr_segs)
{
struct kvec *new_iov;

if (server->iov && nr_segs <= server->nr_iov)
return server->iov;

/* not big enough -- allocate a new one and release the old */
new_iov = kmalloc(sizeof(*new_iov) * nr_segs, GFP_NOFS);
if (new_iov) {
kfree(server->iov);
server->iov = new_iov;
server->nr_iov = nr_segs;
}
return new_iov;
}

static int
readv_from_socket(struct TCP_Server_Info *server, struct kvec *iov_orig,
unsigned int nr_segs, unsigned int to_read)
Expand All @@ -420,7 +438,7 @@ readv_from_socket(struct TCP_Server_Info *server, struct kvec *iov_orig,
struct msghdr smb_msg;
struct kvec *iov;

iov = kmalloc(sizeof(*iov_orig) * nr_segs, GFP_NOFS);
iov = get_server_iovec(server, nr_segs);
if (!iov)
return -ENOMEM;

Expand Down Expand Up @@ -464,7 +482,6 @@ readv_from_socket(struct TCP_Server_Info *server, struct kvec *iov_orig,
break;
}
}
kfree(iov);
return total_read;
}

Expand Down Expand Up @@ -669,6 +686,7 @@ static void clean_demultiplex_info(struct TCP_Server_Info *server)
}

kfree(server->hostname);
kfree(server->iov);
kfree(server);

length = atomic_dec_return(&tcpSesAllocCount);
Expand Down

0 comments on commit 1041e3f

Please sign in to comment.