Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 373437
b: refs/heads/master
c: 8ae4f4f
h: refs/heads/master
i:
  373435: 2786f36
v: v3
  • Loading branch information
Alex Elder authored and Sage Weil committed May 2, 2013
1 parent cdf494d commit 51f4270
Show file tree
Hide file tree
Showing 3 changed files with 60 additions and 63 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 36153ec9dd6287d7cedf6afb51453c445d946cee
refs/heads/master: 8ae4f4f5c056150d5480710ab356801e84d01a3d
8 changes: 4 additions & 4 deletions trunk/include/linux/ceph/messenger.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -104,13 +104,13 @@ struct ceph_msg_data {
};
struct ceph_pagelist *pagelist;
};
struct ceph_msg_data_cursor *cursor;
};

struct ceph_msg_data_cursor {
size_t resid; /* bytes not yet consumed */
bool last_piece; /* now at last piece of data item */
bool need_crc; /* new piece; crc update needed */
struct ceph_msg_data *data; /* data item this describes */
size_t resid; /* bytes not yet consumed */
bool last_piece; /* current is last piece */
bool need_crc; /* crc update needed */
union {
#ifdef CONFIG_BLOCK
struct { /* bio */
Expand Down
113 changes: 55 additions & 58 deletions trunk/net/ceph/messenger.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -722,10 +722,10 @@ static void con_out_kvec_add(struct ceph_connection *con,
* entry in the current bio iovec, or the first entry in the next
* bio in the list.
*/
static void ceph_msg_data_bio_cursor_init(struct ceph_msg_data *data,
static void ceph_msg_data_bio_cursor_init(struct ceph_msg_data_cursor *cursor,
size_t length)
{
struct ceph_msg_data_cursor *cursor = data->cursor;
struct ceph_msg_data *data = cursor->data;
struct bio *bio;

BUG_ON(data->type != CEPH_MSG_DATA_BIO);
Expand All @@ -741,11 +741,11 @@ static void ceph_msg_data_bio_cursor_init(struct ceph_msg_data *data,
cursor->last_piece = length <= bio->bi_io_vec[0].bv_len;
}

static struct page *ceph_msg_data_bio_next(struct ceph_msg_data *data,
static struct page *ceph_msg_data_bio_next(struct ceph_msg_data_cursor *cursor,
size_t *page_offset,
size_t *length)
{
struct ceph_msg_data_cursor *cursor = data->cursor;
struct ceph_msg_data *data = cursor->data;
struct bio *bio;
struct bio_vec *bio_vec;
unsigned int index;
Expand All @@ -772,14 +772,14 @@ static struct page *ceph_msg_data_bio_next(struct ceph_msg_data *data,
return bio_vec->bv_page;
}

static bool ceph_msg_data_bio_advance(struct ceph_msg_data *data, size_t bytes)
static bool ceph_msg_data_bio_advance(struct ceph_msg_data_cursor *cursor,
size_t bytes)
{
struct ceph_msg_data_cursor *cursor = data->cursor;
struct bio *bio;
struct bio_vec *bio_vec;
unsigned int index;

BUG_ON(data->type != CEPH_MSG_DATA_BIO);
BUG_ON(cursor->data->type != CEPH_MSG_DATA_BIO);

bio = cursor->bio;
BUG_ON(!bio);
Expand Down Expand Up @@ -823,10 +823,10 @@ static bool ceph_msg_data_bio_advance(struct ceph_msg_data *data, size_t bytes)
* For a page array, a piece comes from the first page in the array
* that has not already been fully consumed.
*/
static void ceph_msg_data_pages_cursor_init(struct ceph_msg_data *data,
static void ceph_msg_data_pages_cursor_init(struct ceph_msg_data_cursor *cursor,
size_t length)
{
struct ceph_msg_data_cursor *cursor = data->cursor;
struct ceph_msg_data *data = cursor->data;
int page_count;

BUG_ON(data->type != CEPH_MSG_DATA_PAGES);
Expand All @@ -845,11 +845,11 @@ static void ceph_msg_data_pages_cursor_init(struct ceph_msg_data *data,
cursor->last_piece = (size_t)cursor->page_offset + length <= PAGE_SIZE;
}

static struct page *ceph_msg_data_pages_next(struct ceph_msg_data *data,
size_t *page_offset,
size_t *length)
static struct page *
ceph_msg_data_pages_next(struct ceph_msg_data_cursor *cursor,
size_t *page_offset, size_t *length)
{
struct ceph_msg_data_cursor *cursor = data->cursor;
struct ceph_msg_data *data = cursor->data;

BUG_ON(data->type != CEPH_MSG_DATA_PAGES);

Expand All @@ -865,12 +865,10 @@ static struct page *ceph_msg_data_pages_next(struct ceph_msg_data *data,
return data->pages[cursor->page_index];
}

static bool ceph_msg_data_pages_advance(struct ceph_msg_data *data,
static bool ceph_msg_data_pages_advance(struct ceph_msg_data_cursor *cursor,
size_t bytes)
{
struct ceph_msg_data_cursor *cursor = data->cursor;

BUG_ON(data->type != CEPH_MSG_DATA_PAGES);
BUG_ON(cursor->data->type != CEPH_MSG_DATA_PAGES);

BUG_ON(cursor->page_offset + bytes > PAGE_SIZE);

Expand All @@ -894,10 +892,11 @@ static bool ceph_msg_data_pages_advance(struct ceph_msg_data *data,
* For a pagelist, a piece is whatever remains to be consumed in the
* first page in the list, or the front of the next page.
*/
static void ceph_msg_data_pagelist_cursor_init(struct ceph_msg_data *data,
static void
ceph_msg_data_pagelist_cursor_init(struct ceph_msg_data_cursor *cursor,
size_t length)
{
struct ceph_msg_data_cursor *cursor = data->cursor;
struct ceph_msg_data *data = cursor->data;
struct ceph_pagelist *pagelist;
struct page *page;

Expand All @@ -919,11 +918,11 @@ static void ceph_msg_data_pagelist_cursor_init(struct ceph_msg_data *data,
cursor->last_piece = length <= PAGE_SIZE;
}

static struct page *ceph_msg_data_pagelist_next(struct ceph_msg_data *data,
size_t *page_offset,
size_t *length)
static struct page *
ceph_msg_data_pagelist_next(struct ceph_msg_data_cursor *cursor,
size_t *page_offset, size_t *length)
{
struct ceph_msg_data_cursor *cursor = data->cursor;
struct ceph_msg_data *data = cursor->data;
struct ceph_pagelist *pagelist;

BUG_ON(data->type != CEPH_MSG_DATA_PAGELIST);
Expand All @@ -941,13 +940,13 @@ static struct page *ceph_msg_data_pagelist_next(struct ceph_msg_data *data,
else
*length = PAGE_SIZE - *page_offset;

return data->cursor->page;
return cursor->page;
}

static bool ceph_msg_data_pagelist_advance(struct ceph_msg_data *data,
static bool ceph_msg_data_pagelist_advance(struct ceph_msg_data_cursor *cursor,
size_t bytes)
{
struct ceph_msg_data_cursor *cursor = data->cursor;
struct ceph_msg_data *data = cursor->data;
struct ceph_pagelist *pagelist;

BUG_ON(data->type != CEPH_MSG_DATA_PAGELIST);
Expand Down Expand Up @@ -983,51 +982,52 @@ static bool ceph_msg_data_pagelist_advance(struct ceph_msg_data *data,
* be processed in that piece. It also tracks whether the current
* piece is the last one in the data item.
*/
static void ceph_msg_data_cursor_init(struct ceph_msg_data *data,
size_t length)
static void ceph_msg_data_cursor_init(struct ceph_msg *msg, size_t length)
{
switch (data->type) {
struct ceph_msg_data_cursor *cursor = &msg->cursor;

cursor->data = msg->data;
switch (cursor->data->type) {
case CEPH_MSG_DATA_PAGELIST:
ceph_msg_data_pagelist_cursor_init(data, length);
ceph_msg_data_pagelist_cursor_init(cursor, length);
break;
case CEPH_MSG_DATA_PAGES:
ceph_msg_data_pages_cursor_init(data, length);
ceph_msg_data_pages_cursor_init(cursor, length);
break;
#ifdef CONFIG_BLOCK
case CEPH_MSG_DATA_BIO:
ceph_msg_data_bio_cursor_init(data, length);
ceph_msg_data_bio_cursor_init(cursor, length);
break;
#endif /* CONFIG_BLOCK */
case CEPH_MSG_DATA_NONE:
default:
/* BUG(); */
break;
}
data->cursor->need_crc = true;
cursor->need_crc = true;
}

/*
* Return the page containing the next piece to process for a given
* data item, and supply the page offset and length of that piece.
* Indicate whether this is the last piece in this data item.
*/
static struct page *ceph_msg_data_next(struct ceph_msg_data *data,
size_t *page_offset,
size_t *length,
static struct page *ceph_msg_data_next(struct ceph_msg_data_cursor *cursor,
size_t *page_offset, size_t *length,
bool *last_piece)
{
struct page *page;

switch (data->type) {
switch (cursor->data->type) {
case CEPH_MSG_DATA_PAGELIST:
page = ceph_msg_data_pagelist_next(data, page_offset, length);
page = ceph_msg_data_pagelist_next(cursor, page_offset, length);
break;
case CEPH_MSG_DATA_PAGES:
page = ceph_msg_data_pages_next(data, page_offset, length);
page = ceph_msg_data_pages_next(cursor, page_offset, length);
break;
#ifdef CONFIG_BLOCK
case CEPH_MSG_DATA_BIO:
page = ceph_msg_data_bio_next(data, page_offset, length);
page = ceph_msg_data_bio_next(cursor, page_offset, length);
break;
#endif /* CONFIG_BLOCK */
case CEPH_MSG_DATA_NONE:
Expand All @@ -1039,7 +1039,7 @@ static struct page *ceph_msg_data_next(struct ceph_msg_data *data,
BUG_ON(*page_offset + *length > PAGE_SIZE);
BUG_ON(!*length);
if (last_piece)
*last_piece = data->cursor->last_piece;
*last_piece = cursor->last_piece;

return page;
}
Expand All @@ -1048,30 +1048,30 @@ static struct page *ceph_msg_data_next(struct ceph_msg_data *data,
* Returns true if the result moves the cursor on to the next piece
* of the data item.
*/
static bool ceph_msg_data_advance(struct ceph_msg_data *data, size_t bytes)
static bool ceph_msg_data_advance(struct ceph_msg_data_cursor *cursor,
size_t bytes)
{
struct ceph_msg_data_cursor *cursor = data->cursor;
bool new_piece;

BUG_ON(bytes > cursor->resid);
switch (data->type) {
switch (cursor->data->type) {
case CEPH_MSG_DATA_PAGELIST:
new_piece = ceph_msg_data_pagelist_advance(data, bytes);
new_piece = ceph_msg_data_pagelist_advance(cursor, bytes);
break;
case CEPH_MSG_DATA_PAGES:
new_piece = ceph_msg_data_pages_advance(data, bytes);
new_piece = ceph_msg_data_pages_advance(cursor, bytes);
break;
#ifdef CONFIG_BLOCK
case CEPH_MSG_DATA_BIO:
new_piece = ceph_msg_data_bio_advance(data, bytes);
new_piece = ceph_msg_data_bio_advance(cursor, bytes);
break;
#endif /* CONFIG_BLOCK */
case CEPH_MSG_DATA_NONE:
default:
BUG();
break;
}
data->cursor->need_crc = new_piece;
cursor->need_crc = new_piece;

return new_piece;
}
Expand All @@ -1083,7 +1083,7 @@ static void prepare_message_data(struct ceph_msg *msg, u32 data_len)

/* Initialize data cursor */

ceph_msg_data_cursor_init(msg->data, (size_t)data_len);
ceph_msg_data_cursor_init(msg, (size_t)data_len);
}

/*
Expand Down Expand Up @@ -1404,7 +1404,7 @@ static u32 ceph_crc32c_page(u32 crc, struct page *page,
static int write_partial_message_data(struct ceph_connection *con)
{
struct ceph_msg *msg = con->out_msg;
struct ceph_msg_data_cursor *cursor = msg->data->cursor;
struct ceph_msg_data_cursor *cursor = &msg->cursor;
bool do_datacrc = !con->msgr->nocrc;
u32 crc;

Expand All @@ -1430,7 +1430,7 @@ static int write_partial_message_data(struct ceph_connection *con)
bool need_crc;
int ret;

page = ceph_msg_data_next(msg->data, &page_offset, &length,
page = ceph_msg_data_next(&msg->cursor, &page_offset, &length,
&last_piece);
ret = ceph_tcp_sendpage(con->sock, page, page_offset,
length, last_piece);
Expand All @@ -1442,7 +1442,7 @@ static int write_partial_message_data(struct ceph_connection *con)
}
if (do_datacrc && cursor->need_crc)
crc = ceph_crc32c_page(crc, page, page_offset, length);
need_crc = ceph_msg_data_advance(msg->data, (size_t)ret);
need_crc = ceph_msg_data_advance(&msg->cursor, (size_t)ret);
}

dout("%s %p msg %p done\n", __func__, con, msg);
Expand Down Expand Up @@ -2102,7 +2102,7 @@ static int read_partial_message_section(struct ceph_connection *con,
static int read_partial_msg_data(struct ceph_connection *con)
{
struct ceph_msg *msg = con->in_msg;
struct ceph_msg_data_cursor *cursor = msg->data->cursor;
struct ceph_msg_data_cursor *cursor = &msg->cursor;
const bool do_datacrc = !con->msgr->nocrc;
struct page *page;
size_t page_offset;
Expand All @@ -2117,7 +2117,7 @@ static int read_partial_msg_data(struct ceph_connection *con)
if (do_datacrc)
crc = con->in_data_crc;
while (cursor->resid) {
page = ceph_msg_data_next(msg->data, &page_offset, &length,
page = ceph_msg_data_next(&msg->cursor, &page_offset, &length,
NULL);
ret = ceph_tcp_recvpage(con->sock, page, page_offset, length);
if (ret <= 0) {
Expand All @@ -2129,7 +2129,7 @@ static int read_partial_msg_data(struct ceph_connection *con)

if (do_datacrc)
crc = ceph_crc32c_page(crc, page, page_offset, ret);
(void) ceph_msg_data_advance(msg->data, (size_t)ret);
(void) ceph_msg_data_advance(&msg->cursor, (size_t)ret);
}
if (do_datacrc)
con->in_data_crc = crc;
Expand Down Expand Up @@ -2991,7 +2991,6 @@ void ceph_msg_data_set_pages(struct ceph_msg *msg, struct page **pages,

data = ceph_msg_data_create(CEPH_MSG_DATA_PAGES);
BUG_ON(!data);
data->cursor = &msg->cursor;
data->pages = pages;
data->length = length;
data->alignment = alignment & ~PAGE_MASK;
Expand All @@ -3013,7 +3012,6 @@ void ceph_msg_data_set_pagelist(struct ceph_msg *msg,

data = ceph_msg_data_create(CEPH_MSG_DATA_PAGELIST);
BUG_ON(!data);
data->cursor = &msg->cursor;
data->pagelist = pagelist;

msg->data = data;
Expand All @@ -3033,7 +3031,6 @@ void ceph_msg_data_set_bio(struct ceph_msg *msg, struct bio *bio,

data = ceph_msg_data_create(CEPH_MSG_DATA_BIO);
BUG_ON(!data);
data->cursor = &msg->cursor;
data->bio = bio;
data->bio_length = length;

Expand Down

0 comments on commit 51f4270

Please sign in to comment.