* [patch 1/3] qeth: remove cast for kzalloc return value
2013-04-22 11:12 [patch 0/3] s390: network patches for net-next frank.blaschka
@ 2013-04-22 11:12 ` frank.blaschka
2013-04-22 11:12 ` [patch 2/3] qeth: remove unused variable frank.blaschka
` (2 subsequent siblings)
3 siblings, 0 replies; 5+ messages in thread
From: frank.blaschka @ 2013-04-22 11:12 UTC (permalink / raw)
To: davem; +Cc: netdev, linux-s390, Zhang Yanfei, Heiko Carstens
[-- Attachment #1: 600-qeth-kzalloc-cast.diff --]
[-- Type: text/plain, Size: 747 bytes --]
From: Zhang Yanfei <zhangyanfei@cn.fujitsu.com>
remove cast for kzalloc return value.
Signed-off-by: Zhang Yanfei <zhangyanfei@cn.fujitsu.com>
Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: Frank Blaschka <blaschka@linux.vnet.ibm.com>
---
drivers/s390/net/qeth_core_main.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- a/drivers/s390/net/qeth_core_main.c
+++ b/drivers/s390/net/qeth_core_main.c
@@ -316,7 +316,7 @@ static inline int qeth_alloc_cq(struct q
card->qdio.no_in_queues = 2;
- card->qdio.out_bufstates = (struct qdio_outbuf_state *)
+ card->qdio.out_bufstates =
kzalloc(card->qdio.no_out_queues *
QDIO_MAX_BUFFERS_PER_Q *
sizeof(struct qdio_outbuf_state), GFP_KERNEL);
^ permalink raw reply [flat|nested] 5+ messages in thread* [patch 2/3] qeth: remove unused variable
2013-04-22 11:12 [patch 0/3] s390: network patches for net-next frank.blaschka
2013-04-22 11:12 ` [patch 1/3] qeth: remove cast for kzalloc return value frank.blaschka
@ 2013-04-22 11:12 ` frank.blaschka
2013-04-22 11:12 ` [patch 3/3] qeth: Fix missing pointer update frank.blaschka
2013-04-22 19:39 ` [patch 0/3] s390: network patches for net-next David Miller
3 siblings, 0 replies; 5+ messages in thread
From: frank.blaschka @ 2013-04-22 11:12 UTC (permalink / raw)
To: davem; +Cc: netdev, linux-s390, Stefan Raspl
[-- Attachment #1: 601-qeth-unused-variable.diff --]
[-- Type: text/plain, Size: 2274 bytes --]
From: Stefan Raspl <raspl@linux.vnet.ibm.com>
remove unused variable
Signed-off-by: Stefan Raspl <raspl@linux.vnet.ibm.com>
Signed-off-by: Frank Blaschka <blaschka@linux.vnet.ibm.com>
---
drivers/s390/net/qeth_core.h | 2 +-
drivers/s390/net/qeth_core_main.c | 2 +-
drivers/s390/net/qeth_l2_main.c | 3 +--
drivers/s390/net/qeth_l3_main.c | 3 +--
4 files changed, 4 insertions(+), 6 deletions(-)
--- a/drivers/s390/net/qeth_core.h
+++ b/drivers/s390/net/qeth_core.h
@@ -915,7 +915,7 @@ int qeth_send_control_data(struct qeth_c
int (*reply_cb)(struct qeth_card *, struct qeth_reply*, unsigned long),
void *reply_param);
int qeth_get_priority_queue(struct qeth_card *, struct sk_buff *, int, int);
-int qeth_get_elements_no(struct qeth_card *, void *, struct sk_buff *, int);
+int qeth_get_elements_no(struct qeth_card *, struct sk_buff *, int);
int qeth_get_elements_for_frags(struct sk_buff *);
int qeth_do_send_packet_fast(struct qeth_card *, struct qeth_qdio_out_q *,
struct sk_buff *, struct qeth_hdr *, int, int, int);
--- a/drivers/s390/net/qeth_core_main.c
+++ b/drivers/s390/net/qeth_core_main.c
@@ -3698,7 +3698,7 @@ int qeth_get_elements_for_frags(struct s
}
EXPORT_SYMBOL_GPL(qeth_get_elements_for_frags);
-int qeth_get_elements_no(struct qeth_card *card, void *hdr,
+int qeth_get_elements_no(struct qeth_card *card,
struct sk_buff *skb, int elems)
{
int dlen = skb->len - skb->data_len;
--- a/drivers/s390/net/qeth_l2_main.c
+++ b/drivers/s390/net/qeth_l2_main.c
@@ -773,8 +773,7 @@ static int qeth_l2_hard_start_xmit(struc
}
}
- elements = qeth_get_elements_no(card, (void *)hdr, new_skb,
- elements_needed);
+ elements = qeth_get_elements_no(card, new_skb, elements_needed);
if (!elements) {
if (data_offset >= 0)
kmem_cache_free(qeth_core_header_cache, hdr);
--- a/drivers/s390/net/qeth_l3_main.c
+++ b/drivers/s390/net/qeth_l3_main.c
@@ -3037,8 +3037,7 @@ static int qeth_l3_hard_start_xmit(struc
qeth_l3_hdr_csum(card, hdr, new_skb);
}
- elems = qeth_get_elements_no(card, (void *)hdr, new_skb,
- elements_needed);
+ elems = qeth_get_elements_no(card, new_skb, elements_needed);
if (!elems) {
if (data_offset >= 0)
kmem_cache_free(qeth_core_header_cache, hdr);
^ permalink raw reply [flat|nested] 5+ messages in thread* [patch 3/3] qeth: Fix missing pointer update
2013-04-22 11:12 [patch 0/3] s390: network patches for net-next frank.blaschka
2013-04-22 11:12 ` [patch 1/3] qeth: remove cast for kzalloc return value frank.blaschka
2013-04-22 11:12 ` [patch 2/3] qeth: remove unused variable frank.blaschka
@ 2013-04-22 11:12 ` frank.blaschka
2013-04-22 19:39 ` [patch 0/3] s390: network patches for net-next David Miller
3 siblings, 0 replies; 5+ messages in thread
From: frank.blaschka @ 2013-04-22 11:12 UTC (permalink / raw)
To: davem; +Cc: netdev, linux-s390, Stefan Raspl
[-- Attachment #1: 602-qeth-fix-pointer.patch --]
[-- Type: text/plain, Size: 2761 bytes --]
From: Stefan Raspl <raspl@linux.vnet.ibm.com>
qeth_hdr_chk_and_bounce() can possibly shift the skb->data
pointer. However, the existing code didn't update the hdr pointer,
which should point to skb->data, accordingly.
Symptoms of this issue are sporadic recoveries.
Signed-off-by: Stefan Raspl <raspl@linux.vnet.ibm.com>
Signed-off-by: Frank Blaschka <blaschka@linux.vnet.ibm.com>
---
drivers/s390/net/qeth_core.h | 2 +-
drivers/s390/net/qeth_core_main.c | 4 +++-
drivers/s390/net/qeth_l2_main.c | 2 +-
drivers/s390/net/qeth_l3_main.c | 2 +-
4 files changed, 6 insertions(+), 4 deletions(-)
--- a/drivers/s390/net/qeth_core.h
+++ b/drivers/s390/net/qeth_core.h
@@ -929,7 +929,7 @@ void qeth_core_get_drvinfo(struct net_de
void qeth_dbf_longtext(debug_info_t *id, int level, char *text, ...);
int qeth_core_ethtool_get_settings(struct net_device *, struct ethtool_cmd *);
int qeth_set_access_ctrl_online(struct qeth_card *card, int fallback);
-int qeth_hdr_chk_and_bounce(struct sk_buff *, int);
+int qeth_hdr_chk_and_bounce(struct sk_buff *, struct qeth_hdr **, int);
int qeth_configure_cq(struct qeth_card *, enum qeth_cq);
int qeth_hw_trap(struct qeth_card *, enum qeth_diags_trap_action);
int qeth_query_ipassists(struct qeth_card *, enum qeth_prot_versions prot);
--- a/drivers/s390/net/qeth_core_main.c
+++ b/drivers/s390/net/qeth_core_main.c
@@ -3717,7 +3717,7 @@ int qeth_get_elements_no(struct qeth_car
}
EXPORT_SYMBOL_GPL(qeth_get_elements_no);
-int qeth_hdr_chk_and_bounce(struct sk_buff *skb, int len)
+int qeth_hdr_chk_and_bounce(struct sk_buff *skb, struct qeth_hdr **hdr, int len)
{
int hroom, inpage, rest;
@@ -3730,6 +3730,8 @@ int qeth_hdr_chk_and_bounce(struct sk_bu
return 1;
memmove(skb->data - rest, skb->data, skb->len - skb->data_len);
skb->data -= rest;
+ skb->tail -= rest;
+ *hdr = (struct qeth_hdr *)skb->data;
QETH_DBF_MESSAGE(2, "skb bounce len: %d rest: %d\n", len, rest);
}
return 0;
--- a/drivers/s390/net/qeth_l2_main.c
+++ b/drivers/s390/net/qeth_l2_main.c
@@ -781,7 +781,7 @@ static int qeth_l2_hard_start_xmit(struc
}
if (card->info.type != QETH_CARD_TYPE_IQD) {
- if (qeth_hdr_chk_and_bounce(new_skb,
+ if (qeth_hdr_chk_and_bounce(new_skb, &hdr,
sizeof(struct qeth_hdr_layer2)))
goto tx_drop;
rc = qeth_do_send_packet(card, queue, new_skb, hdr,
--- a/drivers/s390/net/qeth_l3_main.c
+++ b/drivers/s390/net/qeth_l3_main.c
@@ -3055,7 +3055,7 @@ static int qeth_l3_hard_start_xmit(struc
else
len = sizeof(struct qeth_hdr_layer3);
- if (qeth_hdr_chk_and_bounce(new_skb, len))
+ if (qeth_hdr_chk_and_bounce(new_skb, &hdr, len))
goto tx_drop;
rc = qeth_do_send_packet(card, queue, new_skb, hdr,
elements_needed);
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [patch 0/3] s390: network patches for net-next
2013-04-22 11:12 [patch 0/3] s390: network patches for net-next frank.blaschka
` (2 preceding siblings ...)
2013-04-22 11:12 ` [patch 3/3] qeth: Fix missing pointer update frank.blaschka
@ 2013-04-22 19:39 ` David Miller
3 siblings, 0 replies; 5+ messages in thread
From: David Miller @ 2013-04-22 19:39 UTC (permalink / raw)
To: frank.blaschka; +Cc: netdev, linux-s390
From: frank.blaschka@de.ibm.com
Date: Mon, 22 Apr 2013 13:12:26 +0200
> here are some s390 related patches for net-next
All applied.
^ permalink raw reply [flat|nested] 5+ messages in thread