projects
/
swifty.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Added likely/unlikely logic
[swifty.git]
/
src
/
kernel
/
swift.c
diff --git
a/src/kernel/swift.c
b/src/kernel/swift.c
index
e32d657
..
c54567f
100644
(file)
--- a/
src/kernel/swift.c
+++ b/
src/kernel/swift.c
@@
-5,6
+5,7
@@
#include <net/route.h>
#include "swift.h"
#include <net/route.h>
#include "swift.h"
+#include "debug.h"
MODULE_DESCRIPTION("Swift Transport Protocol");
MODULE_AUTHOR("Adrian Bondrescu/Cornel Mercan");
MODULE_DESCRIPTION("Swift Transport Protocol");
MODULE_AUTHOR("Adrian Bondrescu/Cornel Mercan");
@@
-58,7
+59,7
@@
static int swift_release(struct socket *sock)
struct sock *sk = sock->sk;
struct swift_sock * ssk = swift_sk(sk);
struct sock *sk = sock->sk;
struct swift_sock * ssk = swift_sk(sk);
- if (
!sk
)
+ if (
unlikely(!sk)
)
return 0;
swift_unhash(ssk->src);
return 0;
swift_unhash(ssk->src);
@@
-72,7
+73,7
@@
static int swift_release(struct socket *sock)
skb_queue_purge(&sk->sk_receive_queue);
skb_queue_purge(&sk->sk_receive_queue);
-
printk(KERN_DEBUG
"swift_release sock=%p\n", sk);
+
log_debug(
"swift_release sock=%p\n", sk);
sock_put(sk);
return 0;
sock_put(sk);
return 0;
@@
-85,31
+86,31
@@
static int swift_bind(struct socket *sock, struct sockaddr *addr, int addr_len)
int err;
__be16 port;
int err;
__be16 port;
- err = -EINVAL;
- if (addr_len < sizeof(struct sockaddr_swift)) {
-
printk(KERN_ERR "Invalid size for sockaddr\n")
;
+ if (unlikely(addr_len < sizeof(struct sockaddr_swift))) {
+ log_error("Invalid size for sockaddr\n");
+
err = -EINVAL
;
goto out;
}
swift_addr = (struct sockaddr_swift *) addr;
goto out;
}
swift_addr = (struct sockaddr_swift *) addr;
- err = -EINVAL;
- if (swift_addr->sin_family != AF_INET) {
-
printk(KERN_ERR "Invalid family for sockaddr\n")
;
+ if (unlikely(swift_addr->sin_family != AF_INET)) {
+ log_error("Invalid family for sockaddr\n");
+
err = -EINVAL
;
goto out;
}
port = ntohs(swift_addr->sin_port);
goto out;
}
port = ntohs(swift_addr->sin_port);
- err = -EINVAL;
- if (port == 0 || port >= MAX_SWIFT_PORT) {
-
printk(KERN_ERR "Invalid value for sockaddr port (%u)\n", port)
;
+ if (unlikely(port == 0 || port >= MAX_SWIFT_PORT)) {
+ log_error("Invalid value for sockaddr port (%u)\n", port);
+
err = -EINVAL
;
goto out;
}
goto out;
}
- err = -EADDRINUSE;
- if (swift_lookup(port) != NULL) {
-
printk(KERN_ERR "Port %u already in use\n", port)
;
+ if (unlikely(swift_lookup(port) != NULL)) {
+ log_error("Port %u already in use\n", port);
+
err = -EADDRINUSE
;
goto out;
}
goto out;
}
@@
-118,12
+119,12
@@
static int swift_bind(struct socket *sock, struct sockaddr *addr, int addr_len)
swift_hash(port, ssk);
swift_hash(port, ssk);
-
printk(KERN_DEBUG
"Socket %p bound to port %u\n", ssk, port);
+
log_debug(
"Socket %p bound to port %u\n", ssk, port);
return 0;
out:
return 0;
out:
- return
-EINVAL
;
+ return
err
;
}
static int swift_connect(struct socket *sock, struct sockaddr *addr, int addr_len, int flags)
}
static int swift_connect(struct socket *sock, struct sockaddr *addr, int addr_len, int flags)
@@
-133,55
+134,57
@@
static int swift_connect(struct socket *sock, struct sockaddr *addr, int addr_le
struct inet_sock * isk;
struct swift_sock * ssk;
struct inet_sock * isk;
struct swift_sock * ssk;
-
printk(KERN_DEBUG
"swift_connect\n");
+
log_debug(
"swift_connect\n");
- err = -EINVAL;
- if (sock == NULL) {
-
printk(KERN_ERR "Sock is NULL\n")
;
+ if (unlikely(sock == NULL)) {
+ log_error("Sock is NULL\n");
+
err = -EINVAL
;
goto out;
}
sk = sock->sk;
goto out;
}
sk = sock->sk;
- err = -EINVAL;
- if (sk == NULL) {
-
printk(KERN_ERR "Sock->sk is NULL\n")
;
+ if (unlikely(sk == NULL)) {
+ log_error("Sock->sk is NULL\n");
+
err = -EINVAL
;
goto out;
}
goto out;
}
-
+
isk = inet_sk(sk);
ssk = swift_sk(sk);
isk = inet_sk(sk);
ssk = swift_sk(sk);
- if (ssk->src != 0) {
- printk(KERN_ERR "ssk->src is not NULL\n");
+ if (unlikely(ssk->src != 0)) {
+ log_error("ssk->src is not NULL\n");
+ err = -EINVAL;
goto out;
}
goto out;
}
- err = -EINVAL;
- if (addr) {
+ if (likely(addr)) {
struct sockaddr_swift * swift_addr = (struct sockaddr_swift *) addr;
struct sockaddr_swift * swift_addr = (struct sockaddr_swift *) addr;
- err = -EINVAL;
- if (addr_len < sizeof(*swift_addr) || swift_addr->sin_family != AF_INET) {
-
printk(KERN_ERR "Invalid size or address family\n")
;
+ if (unlikely(addr_len < sizeof(*swift_addr) || swift_addr->sin_family != AF_INET)) {
+ log_error("Invalid size or address family\n");
+
err = -EINVAL
;
goto out;
}
ssk->dst = ntohs(swift_addr->sin_port);
goto out;
}
ssk->dst = ntohs(swift_addr->sin_port);
- if (ssk->dst == 0 || ssk->dst >= MAX_SWIFT_PORT) {
- printk(KERN_ERR "Invalid value for destination port(%u)\n", ssk->dst);
+ if (unlikely(ssk->dst == 0 || ssk->dst >= MAX_SWIFT_PORT)) {
+ log_error("Invalid value for destination port(%u)\n", ssk->dst);
+ err = -EINVAL;
goto out;
}
isk->inet_daddr = swift_addr->sin_addr.s_addr;
goto out;
}
isk->inet_daddr = swift_addr->sin_addr.s_addr;
-
printk(KERN_DEBUG
"Received from user space destination port=%u and address=%u\n", ssk->dst, isk->inet_daddr);
+
log_debug(
"Received from user space destination port=%u and address=%u\n", ssk->dst, isk->inet_daddr);
} else {
} else {
- printk(KERN_ERR "Invalid swift_addr (NULL)\n");
+ log_error("Invalid swift_addr (NULL)\n");
+ err = -EINVAL;
goto out;
}
goto out;
}
- err = -ENOMEM;
ssk->src = get_next_free_port();
ssk->src = get_next_free_port();
- if (ssk->src == 0) {
- printk(KERN_ERR "No free ports\n");
+ if (unlikely(ssk->src == 0)) {
+ log_error("No free ports\n");
+ err = -ENOMEM;
goto out;
}
goto out;
}
@@
-191,7
+194,6
@@
static int swift_connect(struct socket *sock, struct sockaddr *addr, int addr_le
out:
return err;
out:
return err;
-
}
static int swift_sendmsg(struct kiocb *iocb, struct socket *sock, struct msghdr *msg, size_t len)
}
static int swift_sendmsg(struct kiocb *iocb, struct socket *sock, struct msghdr *msg, size_t len)
@@
-209,16
+211,16
@@
static int swift_sendmsg(struct kiocb *iocb, struct socket *sock, struct msghdr
int totlen;
struct rtable * rt = NULL;
int totlen;
struct rtable * rt = NULL;
- err = -EINVAL;
- if (sock == NULL) {
-
printk(KERN_ERR "Sock is NULL\n")
;
+ if (unlikely(sock == NULL)) {
+ log_error("Sock is NULL\n");
+
err = -EINVAL
;
goto out;
}
sk = sock->sk;
goto out;
}
sk = sock->sk;
- err = -EINVAL;
- if (sk == NULL) {
-
printk(KERN_ERR "Sock->sk is NULL\n")
;
+ if (unlikely(sk == NULL)) {
+ log_error("Sock->sk is NULL\n");
+
err = -EINVAL
;
goto out;
}
goto out;
}
@@
-227,10
+229,10
@@
static int swift_sendmsg(struct kiocb *iocb, struct socket *sock, struct msghdr
sport = ssk->src;
if (sport == 0) {
sport = ssk->src;
if (sport == 0) {
- err = -ENOMEM;
sport = get_next_free_port();
sport = get_next_free_port();
- if (sport == 0) {
- printk(KERN_ERR "No free ports\n");
+ if (unlikely(sport == 0)) {
+ log_error("No free ports\n");
+ err = -ENOMEM;
goto out;
}
}
goto out;
}
}
@@
-238,61
+240,62
@@
static int swift_sendmsg(struct kiocb *iocb, struct socket *sock, struct msghdr
if (msg->msg_name) {
struct sockaddr_swift * swift_addr = (struct sockaddr_swift *) msg->msg_name;
if (msg->msg_name) {
struct sockaddr_swift * swift_addr = (struct sockaddr_swift *) msg->msg_name;
- err = -EINVAL;
- if (msg->msg_namelen < sizeof(*swift_addr) || swift_addr->sin_family != AF_INET) {
-
printk(KERN_ERR "Invalid size or address family\n")
;
+ if (unlikely(msg->msg_namelen < sizeof(*swift_addr) || swift_addr->sin_family != AF_INET)) {
+ log_error("Invalid size or address family\n");
+
err = -EINVAL
;
goto out;
}
dport = ntohs(swift_addr->sin_port);
goto out;
}
dport = ntohs(swift_addr->sin_port);
- if (dport == 0 || dport >= MAX_SWIFT_PORT) {
- printk(KERN_ERR "Invalid value for destination port(%u)\n", dport);
+ if (unlikely(dport == 0 || dport >= MAX_SWIFT_PORT)) {
+ log_error("Invalid value for destination port(%u)\n", dport);
+ err = -EINVAL;
goto out;
}
daddr = swift_addr->sin_addr.s_addr;
goto out;
}
daddr = swift_addr->sin_addr.s_addr;
-
printk(KERN_DEBUG
"Received from user space destination port=%u and address=%u\n", dport, daddr);
+
log_debug(
"Received from user space destination port=%u and address=%u\n", dport, daddr);
} else {
} else {
- err = -EDESTADDRREQ;
- if (!ssk->dst || !isk->inet_daddr) {
-
printk(KERN_ERR "No destination port/address\n")
;
+ if (unlikely(!ssk->dst || !isk->inet_daddr)) {
+ log_error("No destination port/address\n");
+
err = -EDESTADDRREQ
;
goto out;
}
dport = ssk->dst;
daddr = isk->inet_daddr;
goto out;
}
dport = ssk->dst;
daddr = isk->inet_daddr;
-
printk(KERN_DEBUG
"Got from socket destination port=%u and address=%u\n", dport, daddr);
+
log_debug(
"Got from socket destination port=%u and address=%u\n", dport, daddr);
connected = 1;
}
totlen = len + sizeof(struct swifthdr) + sizeof(struct iphdr);
skb = sock_alloc_send_skb(sk, totlen, msg->msg_flags & MSG_DONTWAIT, &err);
connected = 1;
}
totlen = len + sizeof(struct swifthdr) + sizeof(struct iphdr);
skb = sock_alloc_send_skb(sk, totlen, msg->msg_flags & MSG_DONTWAIT, &err);
- if (
!skb
) {
-
printk(KERN_ERR
"sock_alloc_send_skb failed\n");
+ if (
unlikely(!skb)
) {
+
log_error(
"sock_alloc_send_skb failed\n");
goto out;
}
goto out;
}
-
printk(KERN_DEBUG
"Allocated %u bytes for skb (payload size=%u)\n", totlen, len);
+
log_debug(
"Allocated %u bytes for skb (payload size=%u)\n", totlen, len);
skb_reset_network_header(skb);
skb_reserve(skb, sizeof(struct iphdr));
skb_reset_network_header(skb);
skb_reserve(skb, sizeof(struct iphdr));
-
printk(KERN_DEBUG
"Reseted network header\n");
+
log_debug(
"Reseted network header\n");
skb_reset_transport_header(skb);
skb_put(skb, sizeof(struct swifthdr));
skb_reset_transport_header(skb);
skb_put(skb, sizeof(struct swifthdr));
-
printk(KERN_DEBUG
"Reseted transport header\n");
+
log_debug(
"Reseted transport header\n");
shdr = (struct swifthdr *) skb_transport_header(skb);
shdr->dst = ntohs(dport);
shdr->src = ntohs(sport);
shdr->len = ntohs(len + sizeof(struct swifthdr));
shdr = (struct swifthdr *) skb_transport_header(skb);
shdr->dst = ntohs(dport);
shdr->src = ntohs(sport);
shdr->len = ntohs(len + sizeof(struct swifthdr));
-
printk(KERN_DEBUG
"payload=%p\n", skb_put(skb, len));
+
log_debug(
"payload=%p\n", skb_put(skb, len));
err = skb_copy_datagram_from_iovec(skb, sizeof(struct swifthdr), msg->msg_iov, 0, len);
err = skb_copy_datagram_from_iovec(skb, sizeof(struct swifthdr), msg->msg_iov, 0, len);
- if (
err
) {
-
printk(KERN_ERR
"skb_copy_datagram_from_iovec failed\n");
+ if (
unlikely(err)
) {
+
log_error(
"skb_copy_datagram_from_iovec failed\n");
goto out_free;
}
goto out_free;
}
-
printk(KERN_DEBUG
"Copied %u bytes into the skb\n", len);
+
log_debug(
"Copied %u bytes into the skb\n", len);
if (connected)
rt = (struct rtable *) __sk_dst_check(sk, 0);
if (connected)
rt = (struct rtable *) __sk_dst_check(sk, 0);
@@
-303,18
+306,18
@@
static int swift_sendmsg(struct kiocb *iocb, struct socket *sock, struct msghdr
.flags = inet_sk_flowi_flags(sk),
};
err = ip_route_output_flow(sock_net(sk), &rt, &fl, sk, 0);
.flags = inet_sk_flowi_flags(sk),
};
err = ip_route_output_flow(sock_net(sk), &rt, &fl, sk, 0);
- if (
err
) {
-
printk(KERN_ERR
"Route lookup failed\n");
+ if (
unlikely(err)
) {
+
log_error(
"Route lookup failed\n");
goto out_free;
}
sk_dst_set(sk, dst_clone(&rt->dst));
}
err = ip_queue_xmit(skb);
goto out_free;
}
sk_dst_set(sk, dst_clone(&rt->dst));
}
err = ip_queue_xmit(skb);
- if (
!err
)
-
printk(KERN_DEBUG
"Sent %u bytes on wire\n", len);
+ if (
likely(!err)
)
+
log_debug(
"Sent %u bytes on wire\n", len);
else
else
-
printk(KERN_ERR
"ip_queue_xmit failed\n");
+
log_error(
"ip_queue_xmit failed\n");
return err;
return err;
@@
-333,12
+336,12
@@
static int swift_recvmsg(struct kiocb *iocb, struct socket *sock, struct msghdr
int err, copied;
skb = skb_recv_datagram(sk, flags, flags & MSG_DONTWAIT, &err);
int err, copied;
skb = skb_recv_datagram(sk, flags, flags & MSG_DONTWAIT, &err);
- if (
!skb
) {
-
printk(KERN_ERR
"skb_recv_datagram\n");
+ if (
unlikely(!skb)
) {
+
log_error(
"skb_recv_datagram\n");
goto out;
}
goto out;
}
-
printk(KERN_DEBUG
"Received skb %p\n", skb);
+
log_debug(
"Received skb %p\n", skb);
swift_addr = (struct sockaddr_swift *) skb->cb;
msg->msg_namelen = sizeof(struct sockaddr_swift);
swift_addr = (struct sockaddr_swift *) skb->cb;
msg->msg_namelen = sizeof(struct sockaddr_swift);
@@
-350,8
+353,8
@@
static int swift_recvmsg(struct kiocb *iocb, struct socket *sock, struct msghdr
}
err = skb_copy_datagram_iovec(skb, 0, msg->msg_iov, copied);
}
err = skb_copy_datagram_iovec(skb, 0, msg->msg_iov, copied);
- if (
err
) {
-
printk(KERN_ERR
"skb_copy_datagram_iovec\n");
+ if (
unlikely(err)
) {
+
log_error(
"skb_copy_datagram_iovec\n");
goto out_free;
}
goto out_free;
}
@@
-378,28
+381,28
@@
static int swift_rcv(struct sk_buff *skb)
struct sockaddr_swift * swift_addr;
int err;
struct sockaddr_swift * swift_addr;
int err;
- if (
!pskb_may_pull(skb, sizeof(struct swifthdr
))) {
-
printk(KERN_ERR
"Insufficient space for header\n");
+ if (
unlikely(!pskb_may_pull(skb, sizeof(struct swifthdr)
))) {
+
log_error(
"Insufficient space for header\n");
goto drop;
}
shdr = (struct swifthdr *) skb->data;
len = ntohs(shdr->len);
goto drop;
}
shdr = (struct swifthdr *) skb->data;
len = ntohs(shdr->len);
- if (
skb->len < len
) {
-
printk(KERN_ERR
"Malformed packet (packet_len=%u, skb_len=%u)\n", len, skb->len);
+ if (
unlikely(skb->len < len)
) {
+
log_error(
"Malformed packet (packet_len=%u, skb_len=%u)\n", len, skb->len);
goto drop;
}
goto drop;
}
- if (
len < sizeof(struct swifthdr
)) {
-
printk(KERN_ERR
"Malformed packet (packet_len=%u sizeof(swifthdr)=%u\n", len, sizeof(struct swifthdr));
+ if (
unlikely(len < sizeof(struct swifthdr)
)) {
+
log_error(
"Malformed packet (packet_len=%u sizeof(swifthdr)=%u\n", len, sizeof(struct swifthdr));
goto drop;
}
src = ntohs(shdr->src);
dst = ntohs(shdr->dst);
goto drop;
}
src = ntohs(shdr->src);
dst = ntohs(shdr->dst);
- if (
src == 0 || dst == 0 || src >= MAX_SWIFT_PORT || dst >= MAX_SWIFT_PORT
) {
-
printk(KERN_ERR
"Malformed packet (src=%u, dst=%u)\n", shdr->src, shdr->dst);
+ if (
unlikely(src == 0 || dst == 0 || src >= MAX_SWIFT_PORT || dst >= MAX_SWIFT_PORT)
) {
+
log_error(
"Malformed packet (src=%u, dst=%u)\n", shdr->src, shdr->dst);
goto drop;
}
goto drop;
}
@@
-408,11
+411,11
@@
static int swift_rcv(struct sk_buff *skb)
pskb_trim(skb, len);
pskb_trim(skb, len);
-
printk(KERN_DEBUG
"Received %u bytes from from port=%u to port=%u\n", len - sizeof(struct swifthdr), src, dst);
+
log_debug(
"Received %u bytes from from port=%u to port=%u\n", len - sizeof(struct swifthdr), src, dst);
ssk = swift_lookup(dst);
if (ssk == NULL) {
ssk = swift_lookup(dst);
if (ssk == NULL) {
-
printk(KERN_ERR
"Swift lookup failed for port %u\n", dst);
+
log_error(
"Swift lookup failed for port %u\n", dst);
goto drop;
}
goto drop;
}
@@
-423,11
+426,11
@@
static int swift_rcv(struct sk_buff *skb)
swift_addr->sin_port = shdr->src;
swift_addr->sin_addr.s_addr = ip_hdr(skb)->saddr;
swift_addr->sin_port = shdr->src;
swift_addr->sin_addr.s_addr = ip_hdr(skb)->saddr;
-
printk(KERN_DEBUG
"Setting sin_port=%u, sin_addr=%u\n", ntohs(shdr->src), swift_addr->sin_addr.s_addr);
+
log_debug(
"Setting sin_port=%u, sin_addr=%u\n", ntohs(shdr->src), swift_addr->sin_addr.s_addr);
err = ip_queue_rcv_skb((struct sock *) &ssk->sock, skb);
err = ip_queue_rcv_skb((struct sock *) &ssk->sock, skb);
- if (
err
) {
-
printk(KERN_ERR
"ip_queu_rcv_skb\n");
+ if (
unlikely(err)
) {
+
log_error(
"ip_queu_rcv_skb\n");
consume_skb(skb);
}
return NET_RX_SUCCESS;
consume_skb(skb);
}
return NET_RX_SUCCESS;
@@
-483,19
+486,19
@@
static int __init swift_init(void)
int rc;
rc = proto_register(&swift_prot, 1);
int rc;
rc = proto_register(&swift_prot, 1);
- if (
rc
) {
-
printk(KERN_ERR
"Error registering swift protocol\n");
+ if (
unlikely(rc)
) {
+
log_error(
"Error registering swift protocol\n");
goto out;
}
rc = inet_add_protocol(&swift_protocol, IPPROTO_SWIFT);
goto out;
}
rc = inet_add_protocol(&swift_protocol, IPPROTO_SWIFT);
- if (
rc
) {
-
printk(KERN_ERR
"Error adding swift protocol\n");
+ if (
unlikely(rc)
) {
+
log_error(
"Error adding swift protocol\n");
goto out_unregister;
}
inet_register_protosw(&swift_protosw);
goto out_unregister;
}
inet_register_protosw(&swift_protosw);
-
printk(KERN_DEBUG
"Swift entered\n");
+
log_debug(
"Swift entered\n");
return 0;
return 0;
@@
-514,7
+517,7
@@
static void __exit swift_exit(void)
proto_unregister(&swift_prot);
proto_unregister(&swift_prot);
-
printk(KERN_DEBUG
"Swift exited\n");
+
log_debug(
"Swift exited\n");
}
module_init(swift_init);
}
module_init(swift_init);