Changeset 234 for ksyslog/trunk

Timestamp:

09/29/13 18:34:39 (11 years ago)

Author:

atzm

Message:

tune branches those are called many times

File:

• ksyslog/trunk/ksyslog.c (modified) (18 diffs)

ksyslog/trunk/ksyslog.c

@@ -55 +55 @@
         set_fs(get_ds());
 
-        if (path_lookup(path, LOOKUP_OPEN|LOOKUP_FOLLOW, &nd))
+        if (unlikely(path_lookup(path, LOOKUP_OPEN|LOOKUP_FOLLOW, &nd)))
                 file = filp_open(path, O_CREAT|O_WRONLY|O_APPEND|O_LARGEFILE, 0600);
         else
                 file = filp_open(path, O_WRONLY|O_APPEND|O_LARGEFILE, 0);
 
-        if (IS_ERR(file))
-                goto out;
-
-        if (S_ISDIR(file->f_path.dentry->d_inode->i_mode)) {
+        if (unlikely(IS_ERR(file)))
+                goto out;
+
+        if (unlikely(S_ISDIR(file->f_path.dentry->d_inode->i_mode))) {
                 ksyslog_close(file);
                 file = ERR_PTR(-EISDIR);
@@ -69 +69 @@
         }
 
-        if (file->f_pos < 0) {
+        if (unlikely(file->f_pos < 0)) {
                 ksyslog_close(file);
                 file = ERR_PTR(-EIO);
@@ -96 +96 @@
 
 static void
-ksyslog_drop_warning(struct ksyslog_entry *entry)
+ksyslog_drop_warning(const struct ksyslog_entry *entry)
 {
         pr_warn("dropped: %llu %s.%s %u.%u.%u.%u %.*s\n",
@@ -108 +108 @@
 
 static int
-ksyslog_format(char **buf, struct ksyslog_entry *entry)
+ksyslog_format(char **buf, const struct ksyslog_entry *entry)
 {
         *buf = kzalloc(54 + entry->length + 2, GFP_ATOMIC);
-        if (*buf == NULL)
+        if (unlikely(*buf == NULL))
                 return -ENOMEM;
 
@@ -124 +124 @@
 
 static struct ksyslog_entry *
-ksyslog_entry_create(struct sk_buff *skb, struct iphdr *iph, struct udphdr *udph)
+ksyslog_entry_create(const struct sk_buff *skb,
+                     const struct iphdr *iph, const struct udphdr *udph)
 {
         struct ksyslog_entry *entry;
@@ -148 +149 @@
 
         entry = kzalloc(sizeof(*entry), GFP_ATOMIC);
-        if (entry == NULL)
+        if (unlikely(entry == NULL))
                 return ERR_PTR(-ENOMEM);
 
         length = skb->len - (start - skb->data);
         entry->data = kzalloc(length, GFP_ATOMIC);
-        if (entry->data == NULL) {
+        if (unlikely(entry->data == NULL)) {
                 kfree(entry);
                 return ERR_PTR(-ENOMEM);
         }
-
-        entry->facility = facility;
-        entry->severity = severity;
 
         if (skb->tstamp.tv64)
@@ -166 +164 @@
                 do_gettimeofday(&entry->tv);
 
+        entry->facility = facility;
+        entry->severity = severity;
+
         entry->daddr.addr32 = iph->daddr;
         entry->saddr.addr32 = iph->saddr;
@@ -176 +177 @@
 
         for (i = 0; i < length; i++)
-                if (entry->data[i] == '\n')
+                if (unlikely(entry->data[i] == '\n'))
                         entry->data[i] = ' ';
 
@@ -193 +194 @@
 ksyslog_entry_add(struct ksyslog_queue *queue, struct ksyslog_entry *entry)
 {
-        if (queue->length >= ksyslog_queue_max)
+        if (unlikely(queue->length >= ksyslog_queue_max))
                 return -ENOBUFS;
         list_add_tail_rcu(&entry->list, &queue->head);
@@ -225 +226 @@
         list_for_each_entry_safe(entry, next, &from->head, list) {
                 ksyslog_entry_del(from, entry, false);
-                if (ksyslog_entry_add(to, entry)) {
+                if (unlikely(ksyslog_entry_add(to, entry))) {
                         ksyslog_drop_warning(entry);
                         call_rcu(&entry->rcu, ksyslog_entry_free);
@@ -264 +265 @@
 
         file = ksyslog_open(ksyslog_path);
-        if (IS_ERR(file)) {
+        if (unlikely(IS_ERR(file))) {
                 spin_unlock(&ksyslog_vfs_lock);
 
@@ -281 +282 @@
 
                 length = ksyslog_format(&buf, entry);
-                if (length < 0)
+                if (unlikely(length < 0))
                         goto restore;
 
-                if (ksyslog_write(file, buf, length) < 0) {
+                if (unlikely(ksyslog_write(file, buf, length) < 0)) {
                         kfree(buf);
                         goto restore;
@@ -295 +296 @@
 restore:
                 spin_lock_bh(&ksyslog_queue_lock);
-                if (ksyslog_entry_add(&ksyslog_queue, entry)) {
+                if (unlikely(ksyslog_entry_add(&ksyslog_queue, entry))) {
                         ksyslog_drop_warning(entry);
                         call_rcu(&entry->rcu, ksyslog_entry_free);
@@ -301 +302 @@
                 spin_unlock_bh(&ksyslog_queue_lock);
         }
+
         ksyslog_close(file);
         spin_unlock(&ksyslog_vfs_lock);
@@ -317 +319 @@
 
         err = skb_linearize(skb);
-        if (err)
+        if (unlikely(err))
                 goto out;
 
@@ -323 +325 @@
         udph = udp_hdr(skb);
 
-        if (!skb_pull(skb, sizeof(*udph))) {
+        if (unlikely(!skb_pull(skb, sizeof(*udph)))) {
                 err = -EINVAL;
                 goto out;
@@ -329 +331 @@
 
         entry = ksyslog_entry_create(skb, iph, udph);
-        if (IS_ERR(entry)) {
+        if (unlikely(IS_ERR(entry))) {
                 err = PTR_ERR(entry);
                 goto out;
@@ -338 +340 @@
         spin_unlock_bh(&ksyslog_queue_lock);
 
-        if (err)
+        if (unlikely(err))
                 ksyslog_entry_free(&entry->rcu);
 
 out:
-        if (err)
+        if (unlikely(err))
                 UDP_INC_STATS_BH(sock_net(sk), UDP_MIB_INERRORS, IS_UDPLITE(sk));