* [PATCH v5 0/3] net/xen: Clean up
@ 2015-06-17 11:38 Julien Grall
2015-06-17 11:38 ` [PATCH v5 1/3] net/xen-netfront: Correct printf format in xennet_get_responses Julien Grall
` (5 more replies)
0 siblings, 6 replies; 8+ messages in thread
From: Julien Grall @ 2015-06-17 11:38 UTC (permalink / raw)
To: xen-devel
Cc: linux-kernel, Julien Grall, Wei Liu, Ian Campbell, David Vrabel,
Konrad Rzeszutek Wilk, Boris Ostrovsky, netdev
Hi,
The first 2 patches were originally part of the Xen 64KB series [1]. Although
I think they can go without waiting the rest of the 64KB series.
The third patch has been added in the v4.
Regards,
Cc: Wei Liu <wei.liu2@citrix.com>
Cc: Ian Campbell <ian.campbell@citrix.com>
Cc: David Vrabel <david.vrabel@citrix.com>
Cc: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Cc: Boris Ostrovsky <boris.ostrovsky@oracle.com>
Cc: netdev@vger.kernel.org
[1] http://lkml.org/lkml/2015/5/14/533
Julien Grall (3):
net/xen-netfront: Correct printf format in xennet_get_responses
net/xen-netback: Remove unused code in xenvif_rx_action
net/xen-netback: Don't mix hexa and decimal with 0x in the printf
format
drivers/net/xen-netback/netback.c | 19 +++++++------------
drivers/net/xen-netfront.c | 2 +-
2 files changed, 8 insertions(+), 13 deletions(-)
--
2.1.4
^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH v5 1/3] net/xen-netfront: Correct printf format in xennet_get_responses
2015-06-17 11:38 [PATCH v5 0/3] net/xen: Clean up Julien Grall
@ 2015-06-17 11:38 ` Julien Grall
2015-06-17 11:38 ` Julien Grall
` (4 subsequent siblings)
5 siblings, 0 replies; 8+ messages in thread
From: Julien Grall @ 2015-06-17 11:38 UTC (permalink / raw)
To: xen-devel
Cc: linux-kernel, Julien Grall, David Vrabel, Konrad Rzeszutek Wilk,
Boris Ostrovsky, netdev
rx->status is an int16_t, print it using %d rather than %u in order to
have a meaningful value when the field is negative.
Also use %u rather than %x for rx->offset.
Signed-off-by: Julien Grall <julien.grall@citrix.com>
Reviewed-by: David Vrabel <david.vrabel@citrix.com>
Cc: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Cc: Boris Ostrovsky <boris.ostrovsky@oracle.com>
Cc: netdev@vger.kernel.org
---
Changes in v4:
- Use %u for the rx->offset because offset is unsigned
Changes in v3:
- Use %d for the rx->offset too.
Changes in v2:
- Add David's Reviewed-by
---
drivers/net/xen-netfront.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/net/xen-netfront.c b/drivers/net/xen-netfront.c
index e031c94..281720f 100644
--- a/drivers/net/xen-netfront.c
+++ b/drivers/net/xen-netfront.c
@@ -733,7 +733,7 @@ static int xennet_get_responses(struct netfront_queue *queue,
if (unlikely(rx->status < 0 ||
rx->offset + rx->status > PAGE_SIZE)) {
if (net_ratelimit())
- dev_warn(dev, "rx->offset: %x, size: %u\n",
+ dev_warn(dev, "rx->offset: %u, size: %d\n",
rx->offset, rx->status);
xennet_move_rx_slot(queue, skb, ref);
err = -EINVAL;
--
2.1.4
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH v5 1/3] net/xen-netfront: Correct printf format in xennet_get_responses
2015-06-17 11:38 [PATCH v5 0/3] net/xen: Clean up Julien Grall
2015-06-17 11:38 ` [PATCH v5 1/3] net/xen-netfront: Correct printf format in xennet_get_responses Julien Grall
@ 2015-06-17 11:38 ` Julien Grall
2015-06-17 11:38 ` [PATCH v5 2/3] net/xen-netback: Remove unused code in xenvif_rx_action Julien Grall
` (3 subsequent siblings)
5 siblings, 0 replies; 8+ messages in thread
From: Julien Grall @ 2015-06-17 11:38 UTC (permalink / raw)
To: xen-devel
Cc: netdev, linux-kernel, Julien Grall, David Vrabel, Boris Ostrovsky
rx->status is an int16_t, print it using %d rather than %u in order to
have a meaningful value when the field is negative.
Also use %u rather than %x for rx->offset.
Signed-off-by: Julien Grall <julien.grall@citrix.com>
Reviewed-by: David Vrabel <david.vrabel@citrix.com>
Cc: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Cc: Boris Ostrovsky <boris.ostrovsky@oracle.com>
Cc: netdev@vger.kernel.org
---
Changes in v4:
- Use %u for the rx->offset because offset is unsigned
Changes in v3:
- Use %d for the rx->offset too.
Changes in v2:
- Add David's Reviewed-by
---
drivers/net/xen-netfront.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/net/xen-netfront.c b/drivers/net/xen-netfront.c
index e031c94..281720f 100644
--- a/drivers/net/xen-netfront.c
+++ b/drivers/net/xen-netfront.c
@@ -733,7 +733,7 @@ static int xennet_get_responses(struct netfront_queue *queue,
if (unlikely(rx->status < 0 ||
rx->offset + rx->status > PAGE_SIZE)) {
if (net_ratelimit())
- dev_warn(dev, "rx->offset: %x, size: %u\n",
+ dev_warn(dev, "rx->offset: %u, size: %d\n",
rx->offset, rx->status);
xennet_move_rx_slot(queue, skb, ref);
err = -EINVAL;
--
2.1.4
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH v5 2/3] net/xen-netback: Remove unused code in xenvif_rx_action
2015-06-17 11:38 [PATCH v5 0/3] net/xen: Clean up Julien Grall
2015-06-17 11:38 ` [PATCH v5 1/3] net/xen-netfront: Correct printf format in xennet_get_responses Julien Grall
2015-06-17 11:38 ` Julien Grall
@ 2015-06-17 11:38 ` Julien Grall
2015-06-17 11:38 ` Julien Grall
` (2 subsequent siblings)
5 siblings, 0 replies; 8+ messages in thread
From: Julien Grall @ 2015-06-17 11:38 UTC (permalink / raw)
To: xen-devel; +Cc: linux-kernel, Julien Grall, Wei Liu, Ian Campbell, netdev
The variables old_req_cons and ring_slots_used are assigned but never
used since commit 1650d5455bd2dc6b5ee134bd6fc1a3236c266b5b "xen-netback:
always fully coalesce guest Rx packets".
Signed-off-by: Julien Grall <julien.grall@citrix.com>
Acked-by: Wei Liu <wei.liu2@citrix.com>
Cc: Ian Campbell <ian.campbell@citrix.com>
Cc: netdev@vger.kernel.org
---
Changes in v2:
- Add Wei's Acked-by
---
drivers/net/xen-netback/netback.c | 5 -----
1 file changed, 5 deletions(-)
diff --git a/drivers/net/xen-netback/netback.c b/drivers/net/xen-netback/netback.c
index 0d25943..ba3ae30 100644
--- a/drivers/net/xen-netback/netback.c
+++ b/drivers/net/xen-netback/netback.c
@@ -515,14 +515,9 @@ static void xenvif_rx_action(struct xenvif_queue *queue)
while (xenvif_rx_ring_slots_available(queue, XEN_NETBK_RX_SLOTS_MAX)
&& (skb = xenvif_rx_dequeue(queue)) != NULL) {
- RING_IDX old_req_cons;
- RING_IDX ring_slots_used;
-
queue->last_rx_time = jiffies;
- old_req_cons = queue->rx.req_cons;
XENVIF_RX_CB(skb)->meta_slots_used = xenvif_gop_skb(skb, &npo, queue);
- ring_slots_used = queue->rx.req_cons - old_req_cons;
__skb_queue_tail(&rxq, skb);
}
--
2.1.4
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH v5 2/3] net/xen-netback: Remove unused code in xenvif_rx_action
2015-06-17 11:38 [PATCH v5 0/3] net/xen: Clean up Julien Grall
` (2 preceding siblings ...)
2015-06-17 11:38 ` [PATCH v5 2/3] net/xen-netback: Remove unused code in xenvif_rx_action Julien Grall
@ 2015-06-17 11:38 ` Julien Grall
2015-06-17 11:38 ` [PATCH v5 3/3] net/xen-netback: Don't mix hexa and decimal with 0x in the printf format Julien Grall
2015-06-17 11:38 ` Julien Grall
5 siblings, 0 replies; 8+ messages in thread
From: Julien Grall @ 2015-06-17 11:38 UTC (permalink / raw)
To: xen-devel; +Cc: Julien Grall, netdev, Wei Liu, linux-kernel, Ian Campbell
The variables old_req_cons and ring_slots_used are assigned but never
used since commit 1650d5455bd2dc6b5ee134bd6fc1a3236c266b5b "xen-netback:
always fully coalesce guest Rx packets".
Signed-off-by: Julien Grall <julien.grall@citrix.com>
Acked-by: Wei Liu <wei.liu2@citrix.com>
Cc: Ian Campbell <ian.campbell@citrix.com>
Cc: netdev@vger.kernel.org
---
Changes in v2:
- Add Wei's Acked-by
---
drivers/net/xen-netback/netback.c | 5 -----
1 file changed, 5 deletions(-)
diff --git a/drivers/net/xen-netback/netback.c b/drivers/net/xen-netback/netback.c
index 0d25943..ba3ae30 100644
--- a/drivers/net/xen-netback/netback.c
+++ b/drivers/net/xen-netback/netback.c
@@ -515,14 +515,9 @@ static void xenvif_rx_action(struct xenvif_queue *queue)
while (xenvif_rx_ring_slots_available(queue, XEN_NETBK_RX_SLOTS_MAX)
&& (skb = xenvif_rx_dequeue(queue)) != NULL) {
- RING_IDX old_req_cons;
- RING_IDX ring_slots_used;
-
queue->last_rx_time = jiffies;
- old_req_cons = queue->rx.req_cons;
XENVIF_RX_CB(skb)->meta_slots_used = xenvif_gop_skb(skb, &npo, queue);
- ring_slots_used = queue->rx.req_cons - old_req_cons;
__skb_queue_tail(&rxq, skb);
}
--
2.1.4
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH v5 3/3] net/xen-netback: Don't mix hexa and decimal with 0x in the printf format
2015-06-17 11:38 [PATCH v5 0/3] net/xen: Clean up Julien Grall
` (3 preceding siblings ...)
2015-06-17 11:38 ` Julien Grall
@ 2015-06-17 11:38 ` Julien Grall
2015-06-17 11:38 ` Julien Grall
5 siblings, 0 replies; 8+ messages in thread
From: Julien Grall @ 2015-06-17 11:38 UTC (permalink / raw)
To: xen-devel; +Cc: linux-kernel, Julien Grall, Ian Campbell, Wei Liu, netdev
Prepend 0x to all %x in order to avoid confusion while reading when there is
other decimal value in the log.
Also replace some of the hexadecimal print to decimal to uniformize the
format with netfront.
Signed-off-by: Julien Grall <julien.grall@citrix.com>
Acked-by: Ian Campbell <ian.campbell@citrix.com>
Cc: Wei Liu <wei.liu2@citrix.com>
Cc: netdev@vger.kernel.org
---
Changes in v5:
- Fix commit message
- Add Ian's ack.
Changes in v4:
- Patch added
---
drivers/net/xen-netback/netback.c | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/drivers/net/xen-netback/netback.c b/drivers/net/xen-netback/netback.c
index ba3ae30..11bd9d8 100644
--- a/drivers/net/xen-netback/netback.c
+++ b/drivers/net/xen-netback/netback.c
@@ -748,7 +748,7 @@ static int xenvif_count_requests(struct xenvif_queue *queue,
slots++;
if (unlikely((txp->offset + txp->size) > PAGE_SIZE)) {
- netdev_err(queue->vif->dev, "Cross page boundary, txp->offset: %x, size: %u\n",
+ netdev_err(queue->vif->dev, "Cross page boundary, txp->offset: %u, size: %u\n",
txp->offset, txp->size);
xenvif_fatal_tx_err(queue->vif);
return -EINVAL;
@@ -874,7 +874,7 @@ static inline void xenvif_grant_handle_set(struct xenvif_queue *queue,
if (unlikely(queue->grant_tx_handle[pending_idx] !=
NETBACK_INVALID_HANDLE)) {
netdev_err(queue->vif->dev,
- "Trying to overwrite active handle! pending_idx: %x\n",
+ "Trying to overwrite active handle! pending_idx: 0x%x\n",
pending_idx);
BUG();
}
@@ -887,7 +887,7 @@ static inline void xenvif_grant_handle_reset(struct xenvif_queue *queue,
if (unlikely(queue->grant_tx_handle[pending_idx] ==
NETBACK_INVALID_HANDLE)) {
netdev_err(queue->vif->dev,
- "Trying to unmap invalid handle! pending_idx: %x\n",
+ "Trying to unmap invalid handle! pending_idx: 0x%x\n",
pending_idx);
BUG();
}
@@ -1243,7 +1243,7 @@ static void xenvif_tx_build_gops(struct xenvif_queue *queue,
/* No crossing a page as the payload mustn't fragment. */
if (unlikely((txreq.offset + txreq.size) > PAGE_SIZE)) {
netdev_err(queue->vif->dev,
- "txreq.offset: %x, size: %u, end: %lu\n",
+ "txreq.offset: %u, size: %u, end: %lu\n",
txreq.offset, txreq.size,
(unsigned long)(txreq.offset&~PAGE_MASK) + txreq.size);
xenvif_fatal_tx_err(queue->vif);
@@ -1593,12 +1593,12 @@ static inline void xenvif_tx_dealloc_action(struct xenvif_queue *queue)
queue->pages_to_unmap,
gop - queue->tx_unmap_ops);
if (ret) {
- netdev_err(queue->vif->dev, "Unmap fail: nr_ops %tx ret %d\n",
+ netdev_err(queue->vif->dev, "Unmap fail: nr_ops %tu ret %d\n",
gop - queue->tx_unmap_ops, ret);
for (i = 0; i < gop - queue->tx_unmap_ops; ++i) {
if (gop[i].status != GNTST_okay)
netdev_err(queue->vif->dev,
- " host_addr: %llx handle: %x status: %d\n",
+ " host_addr: 0x%llx handle: 0x%x status: %d\n",
gop[i].host_addr,
gop[i].handle,
gop[i].status);
@@ -1731,7 +1731,7 @@ void xenvif_idx_unmap(struct xenvif_queue *queue, u16 pending_idx)
&queue->mmap_pages[pending_idx], 1);
if (ret) {
netdev_err(queue->vif->dev,
- "Unmap fail: ret: %d pending_idx: %d host_addr: %llx handle: %x status: %d\n",
+ "Unmap fail: ret: %d pending_idx: %d host_addr: %llx handle: 0x%x status: %d\n",
ret,
pending_idx,
tx_unmap_op.host_addr,
--
2.1.4
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH v5 3/3] net/xen-netback: Don't mix hexa and decimal with 0x in the printf format
2015-06-17 11:38 [PATCH v5 0/3] net/xen: Clean up Julien Grall
` (4 preceding siblings ...)
2015-06-17 11:38 ` [PATCH v5 3/3] net/xen-netback: Don't mix hexa and decimal with 0x in the printf format Julien Grall
@ 2015-06-17 11:38 ` Julien Grall
5 siblings, 0 replies; 8+ messages in thread
From: Julien Grall @ 2015-06-17 11:38 UTC (permalink / raw)
To: xen-devel; +Cc: Julien Grall, netdev, Wei Liu, linux-kernel, Ian Campbell
Prepend 0x to all %x in order to avoid confusion while reading when there is
other decimal value in the log.
Also replace some of the hexadecimal print to decimal to uniformize the
format with netfront.
Signed-off-by: Julien Grall <julien.grall@citrix.com>
Acked-by: Ian Campbell <ian.campbell@citrix.com>
Cc: Wei Liu <wei.liu2@citrix.com>
Cc: netdev@vger.kernel.org
---
Changes in v5:
- Fix commit message
- Add Ian's ack.
Changes in v4:
- Patch added
---
drivers/net/xen-netback/netback.c | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/drivers/net/xen-netback/netback.c b/drivers/net/xen-netback/netback.c
index ba3ae30..11bd9d8 100644
--- a/drivers/net/xen-netback/netback.c
+++ b/drivers/net/xen-netback/netback.c
@@ -748,7 +748,7 @@ static int xenvif_count_requests(struct xenvif_queue *queue,
slots++;
if (unlikely((txp->offset + txp->size) > PAGE_SIZE)) {
- netdev_err(queue->vif->dev, "Cross page boundary, txp->offset: %x, size: %u\n",
+ netdev_err(queue->vif->dev, "Cross page boundary, txp->offset: %u, size: %u\n",
txp->offset, txp->size);
xenvif_fatal_tx_err(queue->vif);
return -EINVAL;
@@ -874,7 +874,7 @@ static inline void xenvif_grant_handle_set(struct xenvif_queue *queue,
if (unlikely(queue->grant_tx_handle[pending_idx] !=
NETBACK_INVALID_HANDLE)) {
netdev_err(queue->vif->dev,
- "Trying to overwrite active handle! pending_idx: %x\n",
+ "Trying to overwrite active handle! pending_idx: 0x%x\n",
pending_idx);
BUG();
}
@@ -887,7 +887,7 @@ static inline void xenvif_grant_handle_reset(struct xenvif_queue *queue,
if (unlikely(queue->grant_tx_handle[pending_idx] ==
NETBACK_INVALID_HANDLE)) {
netdev_err(queue->vif->dev,
- "Trying to unmap invalid handle! pending_idx: %x\n",
+ "Trying to unmap invalid handle! pending_idx: 0x%x\n",
pending_idx);
BUG();
}
@@ -1243,7 +1243,7 @@ static void xenvif_tx_build_gops(struct xenvif_queue *queue,
/* No crossing a page as the payload mustn't fragment. */
if (unlikely((txreq.offset + txreq.size) > PAGE_SIZE)) {
netdev_err(queue->vif->dev,
- "txreq.offset: %x, size: %u, end: %lu\n",
+ "txreq.offset: %u, size: %u, end: %lu\n",
txreq.offset, txreq.size,
(unsigned long)(txreq.offset&~PAGE_MASK) + txreq.size);
xenvif_fatal_tx_err(queue->vif);
@@ -1593,12 +1593,12 @@ static inline void xenvif_tx_dealloc_action(struct xenvif_queue *queue)
queue->pages_to_unmap,
gop - queue->tx_unmap_ops);
if (ret) {
- netdev_err(queue->vif->dev, "Unmap fail: nr_ops %tx ret %d\n",
+ netdev_err(queue->vif->dev, "Unmap fail: nr_ops %tu ret %d\n",
gop - queue->tx_unmap_ops, ret);
for (i = 0; i < gop - queue->tx_unmap_ops; ++i) {
if (gop[i].status != GNTST_okay)
netdev_err(queue->vif->dev,
- " host_addr: %llx handle: %x status: %d\n",
+ " host_addr: 0x%llx handle: 0x%x status: %d\n",
gop[i].host_addr,
gop[i].handle,
gop[i].status);
@@ -1731,7 +1731,7 @@ void xenvif_idx_unmap(struct xenvif_queue *queue, u16 pending_idx)
&queue->mmap_pages[pending_idx], 1);
if (ret) {
netdev_err(queue->vif->dev,
- "Unmap fail: ret: %d pending_idx: %d host_addr: %llx handle: %x status: %d\n",
+ "Unmap fail: ret: %d pending_idx: %d host_addr: %llx handle: 0x%x status: %d\n",
ret,
pending_idx,
tx_unmap_op.host_addr,
--
2.1.4
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH v5 0/3] net/xen: Clean up
@ 2015-06-17 11:38 Julien Grall
0 siblings, 0 replies; 8+ messages in thread
From: Julien Grall @ 2015-06-17 11:38 UTC (permalink / raw)
To: xen-devel
Cc: Wei Liu, Ian Campbell, netdev, linux-kernel, Julien Grall,
David Vrabel, Boris Ostrovsky
Hi,
The first 2 patches were originally part of the Xen 64KB series [1]. Although
I think they can go without waiting the rest of the 64KB series.
The third patch has been added in the v4.
Regards,
Cc: Wei Liu <wei.liu2@citrix.com>
Cc: Ian Campbell <ian.campbell@citrix.com>
Cc: David Vrabel <david.vrabel@citrix.com>
Cc: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Cc: Boris Ostrovsky <boris.ostrovsky@oracle.com>
Cc: netdev@vger.kernel.org
[1] http://lkml.org/lkml/2015/5/14/533
Julien Grall (3):
net/xen-netfront: Correct printf format in xennet_get_responses
net/xen-netback: Remove unused code in xenvif_rx_action
net/xen-netback: Don't mix hexa and decimal with 0x in the printf
format
drivers/net/xen-netback/netback.c | 19 +++++++------------
drivers/net/xen-netfront.c | 2 +-
2 files changed, 8 insertions(+), 13 deletions(-)
--
2.1.4
^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2015-06-17 11:39 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-06-17 11:38 [PATCH v5 0/3] net/xen: Clean up Julien Grall
2015-06-17 11:38 ` [PATCH v5 1/3] net/xen-netfront: Correct printf format in xennet_get_responses Julien Grall
2015-06-17 11:38 ` Julien Grall
2015-06-17 11:38 ` [PATCH v5 2/3] net/xen-netback: Remove unused code in xenvif_rx_action Julien Grall
2015-06-17 11:38 ` Julien Grall
2015-06-17 11:38 ` [PATCH v5 3/3] net/xen-netback: Don't mix hexa and decimal with 0x in the printf format Julien Grall
2015-06-17 11:38 ` Julien Grall
-- strict thread matches above, loose matches on Subject: below --
2015-06-17 11:38 [PATCH v5 0/3] net/xen: Clean up Julien Grall
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.