X-Git-Url: http://p2p-next.cs.pub.ro/gitweb/?a=blobdiff_plain;f=src%2Fkernel%2Fswift.c;h=270b43b78a44ccb357040ec477f2af8083db9299;hb=ade3730ffddebf5ecb6505a718d36d7d6f543db3;hp=c54567f2297d0663d3bd62c40a5bbf9507052222;hpb=701f353a43a9f9b663ebf857ad2f4619687be6cc;p=swifty.git diff --git a/src/kernel/swift.c b/src/kernel/swift.c index c54567f..270b43b 100644 --- a/src/kernel/swift.c +++ b/src/kernel/swift.c @@ -1,4 +1,5 @@ #include +#include #include #include #include @@ -14,8 +15,8 @@ MODULE_LICENSE("GPL"); struct swift_sock { struct inet_sock sock; /* swift socket speciffic data */ - __be16 src; - __be16 dst; + uint8_t src; + uint8_t dst; }; static struct swift_sock * sock_port_map[MAX_SWIFT_PORT]; @@ -30,7 +31,7 @@ static inline struct swifthdr * swift_hdr(const struct sk_buff * skb) return (struct swifthdr *) skb_transport_header(skb); } -static inline __be16 get_next_free_port(void) +static inline uint8_t get_next_free_port(void) { int i; for (i = MIN_SWIFT_PORT; i < MAX_SWIFT_PORT; i ++) @@ -39,17 +40,17 @@ static inline __be16 get_next_free_port(void) return 0; } -static inline void swift_unhash(__be16 port) +static inline void swift_unhash(uint8_t port) { sock_port_map[port] = NULL; } -static inline void swift_hash(__be16 port, struct swift_sock *ssh) +static inline void swift_hash(uint8_t port, struct swift_sock *ssh) { sock_port_map[port] = ssh; } -static inline struct swift_sock * swift_lookup(__be16 port) +static inline struct swift_sock * swift_lookup(uint8_t port) { return sock_port_map[port]; } @@ -84,7 +85,7 @@ static int swift_bind(struct socket *sock, struct sockaddr *addr, int addr_len) struct sockaddr_swift *swift_addr; struct swift_sock *ssk; int err; - __be16 port; + uint8_t port; if (unlikely(addr_len < sizeof(struct sockaddr_swift))) { log_error("Invalid size for sockaddr\n"); @@ -94,13 +95,7 @@ static int swift_bind(struct socket *sock, struct sockaddr *addr, int addr_len) swift_addr = (struct sockaddr_swift *) addr; - 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); + port = swift_addr->dests[0].port; if (unlikely(port == 0 || port >= MAX_SWIFT_PORT)) { log_error("Invalid value for sockaddr port (%u)\n", port); @@ -115,6 +110,7 @@ static int swift_bind(struct socket *sock, struct sockaddr *addr, int addr_len) } ssk = swift_sk(sock->sk); + sock->sk->sk_rcvbuf = 10 * 1024 * 1024; ssk->src = port; swift_hash(port, ssk); @@ -161,19 +157,21 @@ static int swift_connect(struct socket *sock, struct sockaddr *addr, int addr_le if (likely(addr)) { struct sockaddr_swift * swift_addr = (struct sockaddr_swift *) addr; - if (unlikely(addr_len < sizeof(*swift_addr) || swift_addr->sin_family != AF_INET)) { + if (unlikely(addr_len < sizeof(*swift_addr) || + addr_len < swift_addr->count * sizeof(struct swift_dest) || + swift_addr->count <= 0)) { log_error("Invalid size or address family\n"); err = -EINVAL; goto out; } - ssk->dst = ntohs(swift_addr->sin_port); + ssk->dst = swift_addr->dests[0].port; 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; + isk->inet_daddr = swift_addr->dests[0].addr; log_debug("Received from user space destination port=%u and address=%u\n", ssk->dst, isk->inet_daddr); } else { log_error("Invalid swift_addr (NULL)\n"); @@ -199,125 +197,149 @@ out: static int swift_sendmsg(struct kiocb *iocb, struct socket *sock, struct msghdr *msg, size_t len) { int err; - __be16 dport; - __be32 daddr; - __be16 sport; - struct sk_buff * skb; - struct sock * sk; - struct inet_sock * isk; - struct swift_sock * ssk; - struct swifthdr * shdr; - int connected = 0; - int totlen; - struct rtable * rt = NULL; - - if (unlikely(sock == NULL)) { - log_error("Sock is NULL\n"); - err = -EINVAL; - goto out; - } - sk = sock->sk; - - if (unlikely(sk == NULL)) { - log_error("Sock->sk is NULL\n"); - err = -EINVAL; - goto out; - } - - isk = inet_sk(sk); - ssk = swift_sk(sk); - - sport = ssk->src; - if (sport == 0) { - sport = get_next_free_port(); - if (unlikely(sport == 0)) { - log_error("No free ports\n"); - err = -ENOMEM; - goto out; - } - } - - if (msg->msg_name) { - struct sockaddr_swift * swift_addr = (struct sockaddr_swift *) msg->msg_name; - - 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); - 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; - log_debug("Received from user space destination port=%u and address=%u\n", dport, daddr); - } else { - 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; - - 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); - if (unlikely(!skb)) { - log_error("sock_alloc_send_skb failed\n"); - goto out; - } - log_debug("Allocated %u bytes for skb (payload size=%u)\n", totlen, len); - - skb_reset_network_header(skb); - skb_reserve(skb, sizeof(struct iphdr)); - log_debug("Reseted network header\n"); - skb_reset_transport_header(skb); - skb_put(skb, sizeof(struct swifthdr)); - 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)); - - log_debug("payload=%p\n", skb_put(skb, len)); - - err = skb_copy_datagram_from_iovec(skb, sizeof(struct swifthdr), msg->msg_iov, 0, len); - if (unlikely(err)) { - log_error("skb_copy_datagram_from_iovec failed\n"); - goto out_free; - } - log_debug("Copied %u bytes into the skb\n", len); - - if (connected) - rt = (struct rtable *) __sk_dst_check(sk, 0); - - if (rt == NULL) { - struct flowi fl = { .fl4_dst = daddr, - .proto = sk->sk_protocol, - .flags = inet_sk_flowi_flags(sk), - }; - err = ip_route_output_flow(sock_net(sk), &rt, &fl, sk, 0); - 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); - if (likely(!err)) - log_debug("Sent %u bytes on wire\n", len); - else - log_error("ip_queue_xmit failed\n"); + uint8_t dport; + __be32 daddr; + uint8_t sport; + struct sk_buff * skb; + struct sock * sk; + struct inet_sock * isk; + struct swift_sock * ssk; + struct swifthdr * shdr; + int connected = 0; + int totlen; + struct rtable * rt = NULL; + int dests = 0; + int i; + struct sockaddr_swift * swift_addr = NULL; + + if (unlikely(sock == NULL)) { + log_error("Sock is NULL\n"); + err = -EINVAL; + goto out; + } + sk = sock->sk; + + if (unlikely(sk == NULL)) { + log_error("Sock->sk is NULL\n"); + err = -EINVAL; + goto out; + } + + isk = inet_sk(sk); + ssk = swift_sk(sk); + + sport = ssk->src; + if (sport == 0) { + sport = get_next_free_port(); + if (unlikely(sport == 0)) { + log_error("No free ports\n"); + err = -ENOMEM; + goto out; + } + } + + if (msg->msg_name) { + swift_addr = (struct sockaddr_swift *) msg->msg_name; + + if (unlikely(msg->msg_namelen < sizeof(*swift_addr) || + msg->msg_namelen < swift_addr->count * sizeof(struct swift_dest) || + swift_addr->count <= 0)) { + log_error("Invalid size for msg_name\n"); + err = -EINVAL; + goto out; + } + + dests = swift_addr->count; + } else { + BUG(); + 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; + + log_debug("Got from socket destination port=%u and address=%u\n", dport, daddr); + connected = 1; + } + + if (msg->msg_iovlen < dests) + dests = msg->msg_iovlen; + + for (i = 0; i < dests; i++) { + struct swift_dest *dest = &swift_addr->dests[i]; + struct iovec *iov = &msg->msg_iov[i]; + char *payload; + + dport = dest->port; + if (unlikely(dport == 0 || dport >= MAX_SWIFT_PORT)) { + log_error("Invalid value for destination port(%u)\n", dport); + err = -EINVAL; + goto out; + } + + daddr = dest->addr; + log_debug("Received from user space destination port=%u and address=%u\n", dport, daddr); + + len = iov->iov_len; + totlen = len + sizeof(struct swifthdr) + sizeof(struct iphdr); + skb = sock_alloc_send_skb(sk, totlen, msg->msg_flags & MSG_DONTWAIT, &err); + if (unlikely(!skb)) { + log_error("sock_alloc_send_skb failed\n"); + goto out; + } + log_debug("Allocated %u bytes for skb (payload size=%u)\n", totlen, len); + + skb_reset_network_header(skb); + skb_reserve(skb, sizeof(struct iphdr)); + log_debug("Reseted network header\n"); + skb_reset_transport_header(skb); + skb_put(skb, sizeof(struct swifthdr)); + log_debug("Reseted transport header\n"); + + shdr = (struct swifthdr *) skb_transport_header(skb); + shdr->dst = dport; + shdr->src = sport; + shdr->len = ntohs(len + sizeof(struct swifthdr)); + + payload = skb_put(skb, len); + log_debug("payload=%p\n", payload); + + err = skb_copy_datagram_from_iovec(skb, sizeof(struct swifthdr), iov, 0, len); + if (unlikely(err)) { + log_error("skb_copy_datagram_from_iovec failed\n"); + goto out_free; + } + log_debug("Copied %u bytes into the skb\n", len); + + if (connected) + rt = (struct rtable *) __sk_dst_check(sk, 0); + + if (rt == NULL) { + struct flowi fl = { .fl4_dst = daddr, + .proto = sk->sk_protocol, + .flags = inet_sk_flowi_flags(sk), + }; + err = ip_route_output_flow(sock_net(sk), &rt, &fl, sk, 0); + if (unlikely(err)) { + log_error("Route lookup failed\n"); + goto out_free; + } +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 36) + sk_dst_set(sk, dst_clone(&rt->u.dst)); +#else + sk_dst_set(sk, dst_clone(&rt->dst)); +#endif + } + + skb->local_df = 1; + err = ip_queue_xmit(skb); + if (likely(!err)) + log_debug("Sent %u bytes on wire\n", len); + else + log_error("ip_queue_xmit failed\n"); + } return err; @@ -334,39 +356,60 @@ static int swift_recvmsg(struct kiocb *iocb, struct socket *sock, struct msghdr struct sockaddr_swift *swift_addr; struct sock * sk = sock->sk; int err, copied; + int i; + struct sockaddr_swift *ret_addr = (struct sockaddr_swift *) msg->msg_name; + + log_debug("Trying to receive sock=%p sk=%p flags=%d\n", sock, sk, flags); skb = skb_recv_datagram(sk, flags, flags & MSG_DONTWAIT, &err); if (unlikely(!skb)) { - log_error("skb_recv_datagram\n"); + log_error("skb_recv_datagram failed with %d\n", err); goto out; } - log_debug("Received skb %p\n", skb); + for (i = 0; i < msg->msg_iovlen; i++) { + 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; - copied = skb->len; - if (copied > len) { - copied = len; - msg->msg_flags |= MSG_TRUNC; - } + copied = skb->len; + if (copied > msg->msg_iov[i].iov_len) { + copied = msg->msg_iov[i].iov_len; + msg->msg_flags |= MSG_TRUNC; + } - err = skb_copy_datagram_iovec(skb, 0, msg->msg_iov, copied); - if (unlikely(err)) { - log_error("skb_copy_datagram_iovec\n"); - goto out_free; - } + err = skb_copy_datagram_iovec(skb, 0, &msg->msg_iov[i], copied); + if (unlikely(err)) { + log_error("skb_copy_datagram_iovec\n"); + goto out_free; + } + log_debug("Received %d bytes\n", copied); - sock_recv_ts_and_drops(msg, sk, skb); + sock_recv_ts_and_drops(msg, sk, skb); - if (msg->msg_name) - memcpy(msg->msg_name, swift_addr, msg->msg_namelen); - - err = copied; + if (ret_addr) { + memcpy(&ret_addr->dests[i], &mptp_addr->dests[0], sizeof(ret_addr->dests[i])); + ret_addr->dests[i].bytes = copied; + } + + err = copied; out_free: - skb_free_datagram(sk, skb); + skb_free_datagram(sk, skb); + + if (i == msg->msg_iovlen - 1) + break; + + skb = skb_recv_datagram(sk, flags, 1, &err); + if (likely(err == -EAGAIN)) { + log_debug("No more skbs in the queue, returning...\n"); + err = copied; + break; + } + } + + ret_addr->count = i + 1; + msg->msg_namelen = sizeof(struct sockaddr_swift) + (i + 1) * sizeof(struct swift_dest); out: return err; @@ -377,9 +420,10 @@ static int swift_rcv(struct sk_buff *skb) struct swifthdr *shdr; struct swift_sock *ssk; __be16 len; - __be16 src, dst; + uint8_t src, dst; struct sockaddr_swift * swift_addr; int err; + int addr_size = sizeof(struct sockaddr_swift) + sizeof(struct swift_dest); if (unlikely(!pskb_may_pull(skb, sizeof(struct swifthdr)))) { log_error("Insufficient space for header\n"); @@ -399,8 +443,8 @@ static int swift_rcv(struct sk_buff *skb) goto drop; } - src = ntohs(shdr->src); - dst = ntohs(shdr->dst); + src = shdr->src; + dst = 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; @@ -419,18 +463,17 @@ static int swift_rcv(struct sk_buff *skb) goto drop; } - BUILD_BUG_ON(sizeof(struct sockaddr_swift) > sizeof(skb->cb)); + BUG_ON(addr_size > sizeof(skb->cb)); swift_addr = (struct sockaddr_swift *) skb->cb; - swift_addr->sin_family = AF_INET; - swift_addr->sin_port = shdr->src; - swift_addr->sin_addr.s_addr = ip_hdr(skb)->saddr; + swift_addr->dests[0].port = shdr->src; + swift_addr->dests[0].addr = ip_hdr(skb)->saddr; - log_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->dests[0].addr); err = ip_queue_rcv_skb((struct sock *) &ssk->sock, skb); if (unlikely(err)) { - log_error("ip_queu_rcv_skb\n"); + log_error("ip_queue_rcv_skb failed with %d\n", err); consume_skb(skb); } return NET_RX_SUCCESS;