From: Kefeng Wang <wangkefeng.wang@huawei.com>
To: <linux-kernel@vger.kernel.org>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
"David S. Miller" <davem@davemloft.net>,
Pablo Neira Ayuso <pablo@netfilter.org>,
"Stephen Hemminger" <stephen@networkplumber.org>,
Johannes Berg <johannes@sipsolutions.net>,
"John W. Linville" <linville@tuxdriver.com>,
Stanislaw Gruszka <sgruszka@redhat.com>,
Johannes Berg <johannes.berg@intel.com>,
Francois Romieu <romieu@fr.zoreil.com>,
"Ben Hutchings" <bhutchings@solarflare.com>,
Chas Williams <chas@cmf.nrl.navy.mil>,
Marc Kleine-Budde <mkl@pengutronix.de>,
Samuel Ortiz <samuel@sortiz.org>,
Paul Mackerras <paulus@samba.org>,
Oliver Neukum <oneukum@suse.de>,
Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>,
"Boris Ostrovsky" <boris.ostrovsky@oracle.com>,
David Vrabel <david.vrabel@citrix.com>,
Rusty Russell <rusty@rustcorp.com.au>,
"Michael S. Tsirkin" <mst@redhat.com>,
<netfilter@vger.kernel.org>,
<netdev@vger.ker
Subject: [PATCH 15/18] net: xen: use wrapper functions of net_ratelimit() to simplify code
Date: Tue, 15 Oct 2013 19:45:11 +0800 [thread overview]
Message-ID: <1381837514-50660-16-git-send-email-wangkefeng.wang@huawei.com> (raw)
In-Reply-To: <1381837514-50660-1-git-send-email-wangkefeng.wang@huawei.com>
Wrapper functions net_ratelimited_function() and net_XXX_ratelimited()
are called to simplify code.
Signed-off-by: Kefeng Wang <wangkefeng.wang@huawei.com>
---
drivers/net/xen-netback/netback.c | 21 +++++++++------------
drivers/net/xen-netfront.c | 27 +++++++++------------------
2 files changed, 18 insertions(+), 30 deletions(-)
diff --git a/drivers/net/xen-netback/netback.c b/drivers/net/xen-netback/netback.c
index f3e591c..bceb2ad 100644
--- a/drivers/net/xen-netback/netback.c
+++ b/drivers/net/xen-netback/netback.c
@@ -776,10 +776,9 @@ static int xenvif_count_requests(struct xenvif *vif,
* dropped
*/
if (!drop_err && slots >= XEN_NETBK_LEGACY_SLOTS_MAX) {
- if (net_ratelimit())
- netdev_dbg(vif->dev,
- "Too many slots (%d) exceeding limit (%d), dropping packet\n",
- slots, XEN_NETBK_LEGACY_SLOTS_MAX);
+ net_ratelimited_function(netdev_dbg, vif->dev,
+ "Too many slots (%d) exceeding limit (%d), dropping packet\n",
+ slots, XEN_NETBK_LEGACY_SLOTS_MAX);
drop_err = -E2BIG;
}
@@ -799,10 +798,9 @@ static int xenvif_count_requests(struct xenvif *vif,
* Consume all slots and drop the packet.
*/
if (!drop_err && txp->size > first->size) {
- if (net_ratelimit())
- netdev_dbg(vif->dev,
- "Invalid tx request, slot size %u > remaining size %u\n",
- txp->size, first->size);
+ net_ratelimited_function(netdev_dbg, vif->dev,
+ "Invalid tx request, slot size %u > remaining size %u\n",
+ txp->size, first->size);
drop_err = -EIO;
}
@@ -1170,10 +1168,9 @@ static int checksum_setup(struct xenvif *vif, struct sk_buff *skb)
}
break;
default:
- if (net_ratelimit())
- netdev_err(vif->dev,
- "Attempting to checksum a non-TCP/UDP packet, dropping a protocol %d packet\n",
- iph->protocol);
+ net_ratelimited_function(netdev_err, vif->dev,
+ "Attempting to checksum a non-TCP/UDP packet, dropping a protocol %d packet\n",
+ iph->protocol);
goto out;
}
diff --git a/drivers/net/xen-netfront.c b/drivers/net/xen-netfront.c
index 36808bf..11eeef1 100644
--- a/drivers/net/xen-netfront.c
+++ b/drivers/net/xen-netfront.c
@@ -690,8 +690,7 @@ static int xennet_get_extras(struct netfront_info *np,
grant_ref_t ref;
if (unlikely(cons + 1 == rp)) {
- if (net_ratelimit())
- dev_warn(dev, "Missing extra info\n");
+ net_ratelimited_function(dev_warn, dev, "Missing extra info\n");
err = -EBADR;
break;
}
@@ -701,8 +700,7 @@ static int xennet_get_extras(struct netfront_info *np,
if (unlikely(!extra->type ||
extra->type >= XEN_NETIF_EXTRA_TYPE_MAX)) {
- if (net_ratelimit())
- dev_warn(dev, "Invalid extra type: %d\n",
+ net_ratelimited_function(dev_warn, dev, "Invalid extra type: %d\n",
extra->type);
err = -EINVAL;
} else {
@@ -742,8 +740,7 @@ static int xennet_get_responses(struct netfront_info *np,
for (;;) {
if (unlikely(rx->status < 0 ||
rx->offset + rx->status > PAGE_SIZE)) {
- if (net_ratelimit())
- dev_warn(dev, "rx->offset: %x, size: %u\n",
+ net_ratelimited_function(dev_warn, dev, "rx->offset: %x, size: %u\n",
rx->offset, rx->status);
xennet_move_rx_slot(np, skb, ref);
err = -EINVAL;
@@ -756,8 +753,7 @@ static int xennet_get_responses(struct netfront_info *np,
* situation to the system controller to reboot the backend.
*/
if (ref == GRANT_INVALID_REF) {
- if (net_ratelimit())
- dev_warn(dev, "Bad rx response id %d.\n",
+ net_ratelimited_function(dev_warn, dev, "Bad rx response id %d.\n",
rx->id);
err = -EINVAL;
goto next;
@@ -775,8 +771,7 @@ next:
break;
if (cons + slots == rp) {
- if (net_ratelimit())
- dev_warn(dev, "Need more slots\n");
+ net_ratelimited_function(dev_warn, dev, "Need more slots\n");
err = -ENOENT;
break;
}
@@ -788,8 +783,7 @@ next:
}
if (unlikely(slots > max)) {
- if (net_ratelimit())
- dev_warn(dev, "Too many slots\n");
+ net_ratelimited_function(dev_warn, dev, "Too many slots\n");
err = -E2BIG;
}
@@ -803,15 +797,13 @@ static int xennet_set_skb_gso(struct sk_buff *skb,
struct xen_netif_extra_info *gso)
{
if (!gso->u.gso.size) {
- if (net_ratelimit())
- pr_warn("GSO size must not be zero\n");
+ net_warn_ratelimited("GSO size must not be zero\n");
return -EINVAL;
}
/* Currently only TCPv4 S.O. is supported. */
if (gso->u.gso.type != XEN_NETIF_GSO_TYPE_TCPV4) {
- if (net_ratelimit())
- pr_warn("Bad GSO type %d\n", gso->u.gso.type);
+ net_warn_ratelimited("Bad GSO type %d\n", gso->u.gso.type);
return -EINVAL;
}
@@ -910,8 +902,7 @@ static int checksum_setup(struct net_device *dev, struct sk_buff *skb)
}
break;
default:
- if (net_ratelimit())
- pr_err("Attempting to checksum a non-TCP/UDP packet, dropping a protocol %d packet\n",
+ net_err_ratelimited("Attempting to checksum a non-TCP/UDP packet, dropping a protocol %d packet\n",
iph->protocol);
goto out;
}
--
1.8.2.1
next prev parent reply other threads:[~2013-10-15 11:45 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-10-15 11:44 [PATCH 00/18] cleanup: wrapper functions of net_ratelimit() called to simplify code Kefeng Wang
2013-10-15 11:44 ` [PATCH 01/18] netfilter: cleanup: delete Macro PRINTR Kefeng Wang
2013-10-15 11:44 ` [PATCH 02/18] net: use wrapper functions of net_ratelimit() to simplify code Kefeng Wang
2013-10-15 16:24 ` Joe Perches
2013-10-16 3:24 ` Kefeng Wang
2013-10-15 11:44 ` [PATCH 03/18] rt18187se: " Kefeng Wang
2013-10-15 11:45 ` [PATCH 04/18] rt18192e: " Kefeng Wang
2013-10-15 11:45 ` [PATCH 05/18] rt18192u: " Kefeng Wang
2013-10-15 11:45 ` [PATCH 06/18] net: wireless: " Kefeng Wang
2013-10-15 11:45 ` [PATCH 07/18] net: ethernet: " Kefeng Wang
2013-10-15 11:45 ` [PATCH 08/18] atm: " Kefeng Wang
2013-10-15 11:45 ` [PATCH 09/18] block: aoe: " Kefeng Wang
2013-10-15 11:45 ` [PATCH 10/18] net: peak_usb: " Kefeng Wang
2013-10-15 11:45 ` [PATCH 11/18] net: hamradio: " Kefeng Wang
2013-10-15 11:45 ` [PATCH 12/18] net: irda: " Kefeng Wang
2013-10-15 11:45 ` [PATCH 13/18] net: ppp: " Kefeng Wang
2013-10-15 11:45 ` [PATCH 14/18] net: usb: " Kefeng Wang
2013-10-15 19:06 ` Sergei Shtylyov
2013-10-16 3:27 ` Kefeng Wang
2013-10-15 11:45 ` Kefeng Wang [this message]
2013-10-15 11:45 ` [PATCH 16/18] net: virtio: " Kefeng Wang
2013-10-15 11:45 ` [PATCH 17/18] net: vxlan: " Kefeng Wang
2013-10-15 11:45 ` [PATCH 18/18] net: wimax: " Kefeng Wang
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1381837514-50660-16-git-send-email-wangkefeng.wang@huawei.com \
--to=wangkefeng.wang@huawei.com \
--cc=bhutchings@solarflare.com \
--cc=boris.ostrovsky@oracle.com \
--cc=chas@cmf.nrl.navy.mil \
--cc=davem@davemloft.net \
--cc=david.vrabel@citrix.com \
--cc=gregkh@linuxfoundation.org \
--cc=johannes.berg@intel.com \
--cc=johannes@sipsolutions.net \
--cc=konrad.wilk@oracle.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linville@tuxdriver.com \
--cc=mkl@pengutronix.de \
--cc=mst@redhat.com \
--cc=netdev@vger.ker \
--cc=netfilter@vger.kernel.org \
--cc=oneukum@suse.de \
--cc=pablo@netfilter.org \
--cc=paulus@samba.org \
--cc=romieu@fr.zoreil.com \
--cc=rusty@rustcorp.com.au \
--cc=samuel@sortiz.org \
--cc=sgruszka@redhat.com \
--cc=stephen@networkplumber.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).