Add {un,}likely() annotations

1 files changed, 22 insertions, 21 deletions

diff --git a/cryptodev_main.c b/cryptodev_main.c
index 73e2586..dd6ce31 100644
--- a/cryptodev_main.c
+++ b/cryptodev_main.c
@@ -334,17 +334,17 @@ static int do_data_sendmsg(struct kiocb *iocb, struct alg_sock *ask,
 		// FIXME: limit size, or use socket buffer, or refer to
 		// userspace pages directly
 		buf = kmalloc(total_len, GFP_KERNEL);
-		if (!buf)
+		if (unlikely(buf == NULL))
 			return -ENOMEM;
 
 		res = memcpy_fromiovec(buf, m->msg_iov, total_len);
-		if (res != 0)
+		if (unlikely(res != 0))
 			goto err;
 
 		mutex_lock(&ask->mutex);
 		res = _cryptodev_hash_update(&ask->hash, buf, total_len);
 		mutex_unlock(&ask->mutex);
-		if (res < 0)
+		if (unlikely(res < 0))
 			goto err;
 
 		res = total_len;
@@ -384,20 +384,20 @@ static int do_data_recvmsg(struct kiocb *iocb, struct alg_sock *ask,
 		BUG_ON(index != 0);
 		BUG_ON(ask->hash.init == 0);
 
-		if (total_len < ask->hash.digestsize)
+		if (unlikely(total_len < ask->hash.digestsize))
 			return -EINVAL;
 
 		BUG_ON(ask->hash.digestsize > sizeof(digest));
 		mutex_lock(&ask->mutex);
 		res = cryptodev_hash_final(&ask->hash, digest);
-		if (res >= 0)
+		if (likely(res >= 0))
 			res = cryptodev_hash_reset(&ask->hash);
 		mutex_unlock(&ask->mutex);
-		if (res < 0)
+		if (unlikely(res < 0))
 			return res;
 
 		res = memcpy_toiovec(m->msg_iov, digest, ask->hash.digestsize);
-		if (res != 0)
+		if (unlikely(res != 0))
 			return res;
 
 		return ask->hash.digestsize;
@@ -520,19 +520,20 @@ static int alg_bind(struct socket *sock, struct sockaddr *myaddr,
 	struct alg_sock *ask;
 	int res;
 
-	if (myaddr->sa_family != AF_ALG)
+	if (unlikely(myaddr->sa_family != AF_ALG))
 		return -EAFNOSUPPORT;
-	if (sockaddr_len < sizeof(*addr))
+	if (unlikely(sockaddr_len < sizeof(*addr)))
 		return -EINVAL;
 	addr = (struct sockaddr_alg *)myaddr;
-	if (memchr(addr->salg_type, '\0', sizeof(addr->salg_type)) == NULL)
+	if (unlikely(memchr(addr->salg_type, '\0', sizeof(addr->salg_type))
+		     == NULL))
 		return -EINVAL;
 
 	ask = alg_sk(sock->sk);
 	DUMP_ASK(ask);
 
 	mutex_lock(&ask->mutex);
-	if (ask_op_type(ask) != OP_NONE) {
+	if (unlikely(ask_op_type(ask) != OP_NONE)) {
 		res = -EINVAL;
 		goto out_unlock;
 	}
@@ -540,7 +541,7 @@ static int alg_bind(struct socket *sock, struct sockaddr *myaddr,
 	if (strncmp(addr->salg_type, "hash", sizeof(addr->salg_type)) == 0) {
 		BUG_ON(ask->hash.init != 0);
 		res = cryptodev_hash_init(&ask->hash, addr->salg_tfm, NULL, 0);
-		if (res != 0)
+		if (unlikely(res != 0))
 			goto out_unlock;
 		atomic_set(&ask->op_type, OP_HASH);
 	} else {
@@ -564,7 +565,7 @@ static int alg_accept(struct socket *sock, struct socket *newsock, int flags)
 	DUMP_ASK(ask);
 
 	mutex_lock(&ask->mutex);
-	if (ask->accept_idx >= ask->num_slaves) {
+	if (unlikely(ask->accept_idx >= ask->num_slaves)) {
 		mutex_unlock(&ask->mutex);
 		return -EINVAL;
 	}
@@ -604,7 +605,7 @@ static int alg_listen(struct socket *sock, int len)
 		return -EDESTADDRREQ;
 
 	case OP_HASH:
-		if (len != 1)
+		if (unlikely(len != 1))
 			return -EINVAL;
 		break;
 
@@ -615,7 +616,7 @@ static int alg_listen(struct socket *sock, int len)
 
 	mutex_lock(&ask->mutex);
 
-	if (ask->num_slaves != 0) {
+	if (unlikely(ask->num_slaves != 0)) {
 		res = -EINVAL;
 		goto out_unlock;
 	}
@@ -625,7 +626,7 @@ static int alg_listen(struct socket *sock, int len)
 		struct sock *newsk;
 
 		newsk = sk_alloc(net, PF_ALG, GFP_KERNEL, &data_proto);
-		if (newsk == NULL)
+		if (unlikely(newsk == NULL))
 			goto err_partial;
 		sock_init_data(NULL, newsk);
 
@@ -674,7 +675,7 @@ static int alg_sendmsg(struct kiocb *iocb, struct socket *sock,
 	ask = alg_sk(sock->sk);
 	DUMP_ASK(ask);
 
-	if (ask_op_type(ask) == OP_NONE)
+	if (unlikely(ask_op_type(ask) == OP_NONE))
 		return -ENOTCONN;
 
 	return do_data_sendmsg(iocb, ask, 0, m, total_len);
@@ -688,7 +689,7 @@ static int alg_recvmsg(struct kiocb *iocb, struct socket *sock,
 	ask = alg_sk(sock->sk);
 	DUMP_ASK(ask);
 
-	if (ask_op_type(ask) == OP_NONE)
+	if (unlikely(ask_op_type(ask) == OP_NONE))
 		return -ENOTCONN;
 
 	return do_data_recvmsg(iocb, ask, 0, m, total_len, flags);
@@ -725,15 +726,15 @@ static int alg_create(struct net *net, struct socket *sock, int protocol,
 	struct sock *sk;
 	struct alg_sock *ask;
 
-	if (sock->type != SOCK_STREAM)
+	if (unlikely(sock->type != SOCK_STREAM))
 		return -ESOCKTNOSUPPORT;
-	if (protocol != 0)
+	if (unlikely(protocol != 0))
 		return -EPROTONOSUPPORT;
 
 	sock->ops = &alg_proto_ops;
 
 	sk = sk_alloc(net, PF_ALG, GFP_KERNEL, &alg_proto);
-	if (sk == NULL)
+	if (unlikely(sk == NULL))
 		return -ENOMEM;
 
 	sock_init_data(sock, sk);