* [PATCH 00/24] net: Remove unnecessary OOM logging messages
@ 2011-08-29 21:17 Joe Perches
2011-08-29 21:17 ` [PATCH 04/24] ax25: " Joe Perches
` (2 more replies)
0 siblings, 3 replies; 5+ messages in thread
From: Joe Perches @ 2011-08-29 21:17 UTC (permalink / raw)
To: linux-hams, b.a.t.m.a.n, netfilter-devel, netfilter, coreteam,
netdev, ceph-devel
Cc: linux-kernel, bridge
Remove all the site-specific OOM messages because they duplicate
the MM subsystem generic OOM message.
Saves ~.2% (~2.5kb) of code/text in an x86 defconfig
$ size net/built-in.o*defconfig
text data bss dec hex filename
1506772 58652 34928 1600352 186b60 net/built-in.o.new.defconfig
1509144 58652 34928 1602724 1874a4 net/built-in.o.old.defconfig
$ size net/built-in.o*allyesconfig
text data bss dec hex filename
7655361 275361 2062352 9993074 987b72 net/built-in.o.new.allyesconfig
7667400 275649 2064024 10007073 98b221 net/built-in.o.old.allyesconfig
Joe Perches (24):
802: Remove unnecessary OOM logging messages
9p: Remove unnecessary OOM logging messages
atm: Remove unnecessary OOM logging messages
ax25: Remove unnecessary OOM logging messages
batman-adv: Remove unnecessary OOM logging messages
netfilter: Remove unnecessary OOM logging messages
net: Remove unnecessary OOM logging messages
ceph: Remove unnecessary OOM logging messages
decnet: Remove unnecessary OOM logging messages
econet: Remove unnecessary OOM logging messages
iucv: Remove unnecessary OOM logging messages
mac80211: Remove unnecessary OOM logging messages
netrom: Remove unnecessary OOM logging messages
rds: Remove unnecessary OOM logging messages
rfkill: Remove unnecessary OOM logging messages
rose: Remove unnecessary OOM logging messages
sched: Remove unnecessary OOM logging messages
sctp: Remove unnecessary OOM logging messages
sunrpc: Remove unnecessary OOM logging messages
tipc: Remove unnecessary OOM logging messages
wanrouter: Remove unnecessary OOM logging messages
wireless: Remove unnecessary OOM logging messages
x25: Remove unnecessary OOM logging messages
net: Remove unnecessary OOM logging messages
net/802/tr.c | 1 -
net/9p/client.c | 7 +----
net/9p/trans_virtio.c | 6 +----
net/atm/lec.c | 4 +--
net/atm/mpc.c | 17 ++++----------
net/atm/mpoa_caches.c | 8 +-----
net/ax25/ax25_dev.c | 5 +--
net/ax25/ax25_out.c | 8 +++---
net/ax25/ax25_route.c | 5 +--
net/batman-adv/hard-interface.c | 5 +---
net/batman-adv/main.c | 2 -
net/batman-adv/originator.c | 16 +++----------
net/batman-adv/soft-interface.c | 4 +--
net/batman-adv/vis.c | 4 +--
net/bridge/netfilter/ebt_ulog.c | 7 ++---
net/can/af_can.c | 6 +---
net/ceph/messenger.c | 5 +---
net/ceph/msgpool.c | 6 +----
net/core/dev.c | 25 ++++++----------------
net/core/flow.c | 4 +--
net/core/pktgen.c | 5 +---
net/decnet/dn_neigh.c | 6 -----
net/econet/af_econet.c | 4 +--
net/ipv4/netfilter/ipt_CLUSTERIP.c | 1 -
net/ipv4/netfilter/ipt_ULOG.c | 4 +--
net/ipv4/netfilter/nf_nat_snmp_basic.c | 22 +-----------------
net/ipv6/netfilter/nf_conntrack_reasm.c | 7 ++---
net/iucv/iucv.c | 5 +--
net/mac80211/agg-rx.c | 19 +---------------
net/mac80211/agg-tx.c | 35 +++++++-----------------------
net/mac80211/debugfs.c | 3 ++
net/mac80211/ht.c | 6 +----
net/mac80211/mesh.c | 5 +--
net/mac80211/mlme.c | 17 ++++----------
net/mac80211/spectmgmt.c | 6 +----
net/mac80211/tx.c | 17 ++++----------
net/mac80211/util.c | 11 ++-------
net/mac80211/work.c | 6 +---
net/netfilter/ipset/ip_set_core.c | 4 +--
net/netfilter/ipvs/ip_vs_core.c | 5 +--
net/netfilter/ipvs/ip_vs_ctl.c | 18 +++++----------
net/netfilter/ipvs/ip_vs_dh.c | 5 +--
net/netfilter/ipvs/ip_vs_lblc.c | 9 ++-----
net/netfilter/ipvs/ip_vs_lblcr.c | 13 +++--------
net/netfilter/ipvs/ip_vs_proto.c | 5 +--
net/netfilter/ipvs/ip_vs_sh.c | 5 +--
net/netfilter/ipvs/ip_vs_wrr.c | 5 +--
net/netfilter/nf_conntrack_core.c | 5 +---
net/netfilter/nfnetlink_log.c | 7 +----
net/netfilter/xt_IDLETIMER.c | 2 -
net/netfilter/xt_hashlimit.c | 5 +---
net/netrom/af_netrom.c | 8 +-----
net/rds/ib_rdma.c | 1 -
net/rds/iw_rdma.c | 8 +------
net/rds/iw_send.c | 8 +-----
net/rfkill/rfkill-regulator.c | 1 -
net/rose/af_rose.c | 1 -
net/sched/act_api.c | 6 +---
net/sched/sch_atm.c | 1 -
net/sctp/protocol.c | 3 --
net/socket.c | 5 +---
net/sunrpc/auth_gss/gss_krb5_crypto.c | 10 +-------
net/sunrpc/auth_gss/gss_krb5_mech.c | 2 -
net/sunrpc/backchannel_rqst.c | 9 ++-----
net/sunrpc/clnt.c | 3 --
net/sunrpc/rpc_pipe.c | 3 +-
net/sunrpc/rpcb_clnt.c | 2 -
net/sunrpc/xprtrdma/svc_rdma.c | 8 +-----
net/sunrpc/xprtrdma/transport.c | 5 +---
net/sunrpc/xprtrdma/verbs.c | 14 ------------
net/sunrpc/xprtsock.c | 5 +---
net/tipc/link.c | 4 +--
net/wanrouter/wanmain.c | 8 +------
net/wireless/lib80211_crypt_ccmp.c | 2 -
net/wireless/lib80211_crypt_tkip.c | 4 ---
net/wireless/lib80211_crypt_wep.c | 4 ---
net/wireless/util.c | 5 +--
net/x25/x25_dev.c | 10 +++-----
78 files changed, 137 insertions(+), 415 deletions(-)
--
1.7.6.405.gc1be0
^ permalink raw reply [flat|nested] 5+ messages in thread* [PATCH 04/24] ax25: Remove unnecessary OOM logging messages 2011-08-29 21:17 [PATCH 00/24] net: Remove unnecessary OOM logging messages Joe Perches @ 2011-08-29 21:17 ` Joe Perches 2011-08-29 22:42 ` Joerg Reuter 2011-08-29 21:17 ` [PATCH 13/24] netrom: " Joe Perches 2011-08-29 21:17 ` [PATCH 16/24] rose: " Joe Perches 2 siblings, 1 reply; 5+ messages in thread From: Joe Perches @ 2011-08-29 21:17 UTC (permalink / raw) To: Joerg Reuter, Ralf Baechle Cc: David S. Miller, linux-hams, netdev, linux-kernel Removing unnecessary messages saves code and text. Site specific OOM messages are duplications of a generic MM out of memory message and aren't really useful, so just delete them. Signed-off-by: Joe Perches <joe@perches.com> --- net/ax25/ax25_dev.c | 5 ++--- net/ax25/ax25_out.c | 8 ++++---- net/ax25/ax25_route.c | 5 ++--- 3 files changed, 8 insertions(+), 10 deletions(-) diff --git a/net/ax25/ax25_dev.c b/net/ax25/ax25_dev.c index c1cb982..986908a 100644 --- a/net/ax25/ax25_dev.c +++ b/net/ax25/ax25_dev.c @@ -55,10 +55,9 @@ void ax25_dev_device_up(struct net_device *dev) { ax25_dev *ax25_dev; - if ((ax25_dev = kzalloc(sizeof(*ax25_dev), GFP_ATOMIC)) == NULL) { - printk(KERN_ERR "AX.25: ax25_dev_device_up - out of memory\n"); + ax25_dev = kzalloc(sizeof(*ax25_dev), GFP_ATOMIC); + if (ax25_dev == NULL) return; - } ax25_unregister_sysctl(); diff --git a/net/ax25/ax25_out.c b/net/ax25/ax25_out.c index 37507d8..a27046d 100644 --- a/net/ax25/ax25_out.c +++ b/net/ax25/ax25_out.c @@ -146,9 +146,9 @@ void ax25_output(ax25_cb *ax25, int paclen, struct sk_buff *skb) while (skb->len > 0) { spin_lock_bh(&ax25_frag_lock); - if ((skbn = alloc_skb(paclen + 2 + frontlen, GFP_ATOMIC)) == NULL) { + skbn = alloc_skb(paclen + 2 + frontlen, GFP_ATOMIC); + if (skbn == NULL) { spin_unlock_bh(&ax25_frag_lock); - printk(KERN_CRIT "AX.25: ax25_output - out of memory\n"); return; } @@ -342,8 +342,8 @@ void ax25_transmit_buffer(ax25_cb *ax25, struct sk_buff *skb, int type) headroom = ax25_addr_size(ax25->digipeat); if (skb_headroom(skb) < headroom) { - if ((skbn = skb_realloc_headroom(skb, headroom)) == NULL) { - printk(KERN_CRIT "AX.25: ax25_transmit_buffer - out of memory\n"); + skbn = skb_realloc_headroom(skb, headroom); + if (skbn == NULL) { kfree_skb(skb); return; } diff --git a/net/ax25/ax25_route.c b/net/ax25/ax25_route.c index a169084..75e67c0 100644 --- a/net/ax25/ax25_route.c +++ b/net/ax25/ax25_route.c @@ -466,10 +466,9 @@ struct sk_buff *ax25_rt_build_path(struct sk_buff *skb, ax25_address *src, len = digi->ndigi * AX25_ADDR_LEN; if (skb_headroom(skb) < len) { - if ((skbn = skb_realloc_headroom(skb, len)) == NULL) { - printk(KERN_CRIT "AX.25: ax25_dg_build_path - out of memory\n"); + skbn = skb_realloc_headroom(skb, len); + if (skbn == NULL) return NULL; - } if (skb->sk != NULL) skb_set_owner_w(skbn, skb->sk); -- 1.7.6.405.gc1be0 ^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH 04/24] ax25: Remove unnecessary OOM logging messages 2011-08-29 21:17 ` [PATCH 04/24] ax25: " Joe Perches @ 2011-08-29 22:42 ` Joerg Reuter 0 siblings, 0 replies; 5+ messages in thread From: Joerg Reuter @ 2011-08-29 22:42 UTC (permalink / raw) To: Joe Perches Cc: Ralf Baechle, David S. Miller, linux-hams, netdev, linux-kernel On Mon, Aug 29, 2011 at 02:17:23PM -0700, Joe Perches wrote: > Removing unnecessary messages saves code and text. Not really that much of an impact, but yes, I agree it just swamps syslog with duplicate messages... It was more debug code than anything else originally. Beats me why it is logged as KERN_ERR or KERN_CRIT, being out of buffers is not really fatal or even unusual. Still alive with just not enough time for hamradio stuff nowadays, Joerg DL1BKE -- Joerg Reuter http://yaina.de/jreuter And I make my way to where the warm scent of soil fills the evening air. Everything is waiting quietly out there.... (Anne Clark) ^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH 13/24] netrom: Remove unnecessary OOM logging messages 2011-08-29 21:17 [PATCH 00/24] net: Remove unnecessary OOM logging messages Joe Perches 2011-08-29 21:17 ` [PATCH 04/24] ax25: " Joe Perches @ 2011-08-29 21:17 ` Joe Perches 2011-08-29 21:17 ` [PATCH 16/24] rose: " Joe Perches 2 siblings, 0 replies; 5+ messages in thread From: Joe Perches @ 2011-08-29 21:17 UTC (permalink / raw) To: Ralf Baechle; +Cc: David S. Miller, linux-hams, netdev, linux-kernel Removing unnecessary messages saves code and text. Site specific OOM messages are duplications of a generic MM out of memory message and aren't really useful, so just delete them. Signed-off-by: Joe Perches <joe@perches.com> --- net/netrom/af_netrom.c | 8 ++------ 1 files changed, 2 insertions(+), 6 deletions(-) diff --git a/net/netrom/af_netrom.c b/net/netrom/af_netrom.c index 732152f..72801b28 100644 --- a/net/netrom/af_netrom.c +++ b/net/netrom/af_netrom.c @@ -1405,10 +1405,8 @@ static int __init nr_proto_init(void) } dev_nr = kzalloc(nr_ndevs * sizeof(struct net_device *), GFP_KERNEL); - if (dev_nr == NULL) { - printk(KERN_ERR "NET/ROM: nr_proto_init - unable to allocate device array\n"); + if (dev_nr == NULL) return -1; - } for (i = 0; i < nr_ndevs; i++) { char name[IFNAMSIZ]; @@ -1416,10 +1414,8 @@ static int __init nr_proto_init(void) sprintf(name, "nr%d", i); dev = alloc_netdev(0, name, nr_setup); - if (!dev) { - printk(KERN_ERR "NET/ROM: nr_proto_init - unable to allocate device structure\n"); + if (!dev) goto fail; - } dev->base_addr = i; if (register_netdev(dev)) { -- 1.7.6.405.gc1be0 ^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH 16/24] rose: Remove unnecessary OOM logging messages 2011-08-29 21:17 [PATCH 00/24] net: Remove unnecessary OOM logging messages Joe Perches 2011-08-29 21:17 ` [PATCH 04/24] ax25: " Joe Perches 2011-08-29 21:17 ` [PATCH 13/24] netrom: " Joe Perches @ 2011-08-29 21:17 ` Joe Perches 2 siblings, 0 replies; 5+ messages in thread From: Joe Perches @ 2011-08-29 21:17 UTC (permalink / raw) To: Ralf Baechle; +Cc: David S. Miller, linux-hams, netdev, linux-kernel Removing unnecessary messages saves code and text. Site specific OOM messages are duplications of a generic MM out of memory message and aren't really useful, so just delete them. Signed-off-by: Joe Perches <joe@perches.com> --- net/rose/af_rose.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/net/rose/af_rose.c b/net/rose/af_rose.c index f9ea925..63ab96b 100644 --- a/net/rose/af_rose.c +++ b/net/rose/af_rose.c @@ -1537,7 +1537,6 @@ static int __init rose_proto_init(void) dev_rose = kzalloc(rose_ndevs * sizeof(struct net_device *), GFP_KERNEL); if (dev_rose == NULL) { - printk(KERN_ERR "ROSE: rose_proto_init - unable to allocate device structure\n"); rc = -ENOMEM; goto out_proto_unregister; } -- 1.7.6.405.gc1be0 ^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2011-08-29 22:42 UTC | newest] Thread overview: 5+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2011-08-29 21:17 [PATCH 00/24] net: Remove unnecessary OOM logging messages Joe Perches 2011-08-29 21:17 ` [PATCH 04/24] ax25: " Joe Perches 2011-08-29 22:42 ` Joerg Reuter 2011-08-29 21:17 ` [PATCH 13/24] netrom: " Joe Perches 2011-08-29 21:17 ` [PATCH 16/24] rose: " Joe Perches
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox