Commit ed13615d authored by Julian Wiedmann's avatar Julian Wiedmann Committed by David S. Miller

s390/qeth: simplify RX buffer tracking

Since RX buffers may contain multiple packets, qeth's NAPI poll code can
exhaust its budget in the middle of an RX buffer. Thus we keep track of
our current position within the active RX buffer, so we can resume
processing here in the next NAPI poll period.

Clean up that code by tracking the index of the active buffer element,
instead of a pointer to it.
Also simplify the code that advances to the next RX buffer when the
current buffer has been fully processed.

v2: - remove QDIO_ELEMENT_NO() macro (davem)
Signed-off-by: default avatarJulian Wiedmann <jwi@linux.ibm.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 29f3490b
...@@ -752,7 +752,7 @@ enum qeth_addr_disposition { ...@@ -752,7 +752,7 @@ enum qeth_addr_disposition {
struct qeth_rx { struct qeth_rx {
int b_count; int b_count;
int b_index; int b_index;
struct qdio_buffer_element *b_element; u8 buf_element;
int e_offset; int e_offset;
int qdio_err; int qdio_err;
}; };
......
...@@ -5332,14 +5332,13 @@ static inline int qeth_is_last_sbale(struct qdio_buffer_element *sbale) ...@@ -5332,14 +5332,13 @@ static inline int qeth_is_last_sbale(struct qdio_buffer_element *sbale)
} }
static int qeth_extract_skb(struct qeth_card *card, static int qeth_extract_skb(struct qeth_card *card,
struct qeth_qdio_buffer *qethbuffer, struct qeth_qdio_buffer *qethbuffer, u8 *element_no,
struct qdio_buffer_element **__element,
int *__offset) int *__offset)
{ {
struct qdio_buffer_element *element = *__element;
struct qeth_priv *priv = netdev_priv(card->dev); struct qeth_priv *priv = netdev_priv(card->dev);
struct qdio_buffer *buffer = qethbuffer->buffer; struct qdio_buffer *buffer = qethbuffer->buffer;
struct napi_struct *napi = &card->napi; struct napi_struct *napi = &card->napi;
struct qdio_buffer_element *element;
unsigned int linear_len = 0; unsigned int linear_len = 0;
bool uses_frags = false; bool uses_frags = false;
int offset = *__offset; int offset = *__offset;
...@@ -5349,6 +5348,8 @@ static int qeth_extract_skb(struct qeth_card *card, ...@@ -5349,6 +5348,8 @@ static int qeth_extract_skb(struct qeth_card *card,
struct sk_buff *skb; struct sk_buff *skb;
int skb_len = 0; int skb_len = 0;
element = &buffer->element[*element_no];
next_packet: next_packet:
/* qeth_hdr must not cross element boundaries */ /* qeth_hdr must not cross element boundaries */
while (element->length < offset + sizeof(struct qeth_hdr)) { while (element->length < offset + sizeof(struct qeth_hdr)) {
...@@ -5504,7 +5505,7 @@ static int qeth_extract_skb(struct qeth_card *card, ...@@ -5504,7 +5505,7 @@ static int qeth_extract_skb(struct qeth_card *card,
if (!skb) if (!skb)
goto next_packet; goto next_packet;
*__element = element; *element_no = element - &buffer->element[0];
*__offset = offset; *__offset = offset;
qeth_receive_skb(card, skb, hdr, uses_frags); qeth_receive_skb(card, skb, hdr, uses_frags);
...@@ -5519,7 +5520,7 @@ static int qeth_extract_skbs(struct qeth_card *card, int budget, ...@@ -5519,7 +5520,7 @@ static int qeth_extract_skbs(struct qeth_card *card, int budget,
*done = false; *done = false;
while (budget) { while (budget) {
if (qeth_extract_skb(card, buf, &card->rx.b_element, if (qeth_extract_skb(card, buf, &card->rx.buf_element,
&card->rx.e_offset)) { &card->rx.e_offset)) {
*done = true; *done = true;
break; break;
...@@ -5550,10 +5551,6 @@ int qeth_poll(struct napi_struct *napi, int budget) ...@@ -5550,10 +5551,6 @@ int qeth_poll(struct napi_struct *napi, int budget)
card->rx.b_count = 0; card->rx.b_count = 0;
break; break;
} }
card->rx.b_element =
&card->qdio.in_q->bufs[card->rx.b_index]
.buffer->element[0];
card->rx.e_offset = 0;
} }
while (card->rx.b_count) { while (card->rx.b_count) {
...@@ -5572,15 +5569,12 @@ int qeth_poll(struct napi_struct *napi, int budget) ...@@ -5572,15 +5569,12 @@ int qeth_poll(struct napi_struct *napi, int budget)
buffer->pool_entry); buffer->pool_entry);
qeth_queue_input_buffer(card, card->rx.b_index); qeth_queue_input_buffer(card, card->rx.b_index);
card->rx.b_count--; card->rx.b_count--;
if (card->rx.b_count) {
card->rx.b_index = /* Step forward to next buffer: */
QDIO_BUFNR(card->rx.b_index + 1); card->rx.b_index =
card->rx.b_element = QDIO_BUFNR(card->rx.b_index + 1);
&card->qdio.in_q card->rx.buf_element = 0;
->bufs[card->rx.b_index] card->rx.e_offset = 0;
.buffer->element[0];
card->rx.e_offset = 0;
}
} }
if (work_done >= budget) if (work_done >= budget)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment