Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit f2c449320d547bd5c281649eb1d99afb20765144

Authored by Andy Grover
Committed by David S. Miller
1 parent 335776bd69
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

RDS: Add a debug message suggesting to load transport modules 

Now that RDS transports are no longer compiled-in to RDS core,
there is now the possibility that they will not be loaded. This
adds a helpful suggestion when rds_bind() fails to find a transport.

Signed-off-by: Andy Grover <andy.grover@oracle.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

Showing 1 changed file with 3 additions and 0 deletions Inline Diff

1 /* 1 /*
2 * Copyright (c) 2006 Oracle. All rights reserved. 2 * Copyright (c) 2006 Oracle. All rights reserved.
3 * 3 *
4 * This software is available to you under a choice of one of two 4 * This software is available to you under a choice of one of two
5 * licenses. You may choose to be licensed under the terms of the GNU 5 * licenses. You may choose to be licensed under the terms of the GNU
6 * General Public License (GPL) Version 2, available from the file 6 * General Public License (GPL) Version 2, available from the file
7 * COPYING in the main directory of this source tree, or the 7 * COPYING in the main directory of this source tree, or the
8 * OpenIB.org BSD license below: 8 * OpenIB.org BSD license below:
9 * 9 *
10 * Redistribution and use in source and binary forms, with or 10 * Redistribution and use in source and binary forms, with or
11 * without modification, are permitted provided that the following 11 * without modification, are permitted provided that the following
12 * conditions are met: 12 * conditions are met:
13 * 13 *
14 * - Redistributions of source code must retain the above 14 * - Redistributions of source code must retain the above
15 * copyright notice, this list of conditions and the following 15 * copyright notice, this list of conditions and the following
16 * disclaimer. 16 * disclaimer.
17 * 17 *
18 * - Redistributions in binary form must reproduce the above 18 * - Redistributions in binary form must reproduce the above
19 * copyright notice, this list of conditions and the following 19 * copyright notice, this list of conditions and the following
20 * disclaimer in the documentation and/or other materials 20 * disclaimer in the documentation and/or other materials
21 * provided with the distribution. 21 * provided with the distribution.
22 * 22 *
23 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, 23 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
24 * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF 24 * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
25 * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND 25 * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
26 * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS 26 * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
27 * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN 27 * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
28 * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN 28 * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
29 * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE 29 * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
30 * SOFTWARE. 30 * SOFTWARE.
31 * 31 *
32 */ 32 */
33 #include <linux/kernel.h> 33 #include <linux/kernel.h>
34 #include <net/sock.h> 34 #include <net/sock.h>
35 #include <linux/in.h> 35 #include <linux/in.h>
36 #include <linux/if_arp.h> 36 #include <linux/if_arp.h>
37 #include "rds.h" 37 #include "rds.h"
38 38
39 /* 39 /*
40 * XXX this probably still needs more work.. no INADDR_ANY, and rbtrees aren't 40 * XXX this probably still needs more work.. no INADDR_ANY, and rbtrees aren't
41 * particularly zippy. 41 * particularly zippy.
42 * 42 *
43 * This is now called for every incoming frame so we arguably care much more 43 * This is now called for every incoming frame so we arguably care much more
44 * about it than we used to. 44 * about it than we used to.
45 */ 45 */
46 static DEFINE_SPINLOCK(rds_bind_lock); 46 static DEFINE_SPINLOCK(rds_bind_lock);
47 static struct rb_root rds_bind_tree = RB_ROOT; 47 static struct rb_root rds_bind_tree = RB_ROOT;
48 48
49 static struct rds_sock *rds_bind_tree_walk(__be32 addr, __be16 port, 49 static struct rds_sock *rds_bind_tree_walk(__be32 addr, __be16 port,
50 struct rds_sock *insert) 50 struct rds_sock *insert)
51 { 51 {
52 struct rb_node **p = &rds_bind_tree.rb_node; 52 struct rb_node **p = &rds_bind_tree.rb_node;
53 struct rb_node *parent = NULL; 53 struct rb_node *parent = NULL;
54 struct rds_sock *rs; 54 struct rds_sock *rs;
55 u64 cmp; 55 u64 cmp;
56 u64 needle = ((u64)be32_to_cpu(addr) << 32) | be16_to_cpu(port); 56 u64 needle = ((u64)be32_to_cpu(addr) << 32) | be16_to_cpu(port);
57 57
58 while (*p) { 58 while (*p) {
59 parent = *p; 59 parent = *p;
60 rs = rb_entry(parent, struct rds_sock, rs_bound_node); 60 rs = rb_entry(parent, struct rds_sock, rs_bound_node);
61 61
62 cmp = ((u64)be32_to_cpu(rs->rs_bound_addr) << 32) | 62 cmp = ((u64)be32_to_cpu(rs->rs_bound_addr) << 32) |
63 be16_to_cpu(rs->rs_bound_port); 63 be16_to_cpu(rs->rs_bound_port);
64 64
65 if (needle < cmp) 65 if (needle < cmp)
66 p = &(*p)->rb_left; 66 p = &(*p)->rb_left;
67 else if (needle > cmp) 67 else if (needle > cmp)
68 p = &(*p)->rb_right; 68 p = &(*p)->rb_right;
69 else 69 else
70 return rs; 70 return rs;
71 } 71 }
72 72
73 if (insert) { 73 if (insert) {
74 rb_link_node(&insert->rs_bound_node, parent, p); 74 rb_link_node(&insert->rs_bound_node, parent, p);
75 rb_insert_color(&insert->rs_bound_node, &rds_bind_tree); 75 rb_insert_color(&insert->rs_bound_node, &rds_bind_tree);
76 } 76 }
77 return NULL; 77 return NULL;
78 } 78 }
79 79
80 /* 80 /*
81 * Return the rds_sock bound at the given local address. 81 * Return the rds_sock bound at the given local address.
82 * 82 *
83 * The rx path can race with rds_release. We notice if rds_release() has 83 * The rx path can race with rds_release. We notice if rds_release() has
84 * marked this socket and don't return a rs ref to the rx path. 84 * marked this socket and don't return a rs ref to the rx path.
85 */ 85 */
86 struct rds_sock *rds_find_bound(__be32 addr, __be16 port) 86 struct rds_sock *rds_find_bound(__be32 addr, __be16 port)
87 { 87 {
88 struct rds_sock *rs; 88 struct rds_sock *rs;
89 unsigned long flags; 89 unsigned long flags;
90 90
91 spin_lock_irqsave(&rds_bind_lock, flags); 91 spin_lock_irqsave(&rds_bind_lock, flags);
92 rs = rds_bind_tree_walk(addr, port, NULL); 92 rs = rds_bind_tree_walk(addr, port, NULL);
93 if (rs && !sock_flag(rds_rs_to_sk(rs), SOCK_DEAD)) 93 if (rs && !sock_flag(rds_rs_to_sk(rs), SOCK_DEAD))
94 rds_sock_addref(rs); 94 rds_sock_addref(rs);
95 else 95 else
96 rs = NULL; 96 rs = NULL;
97 spin_unlock_irqrestore(&rds_bind_lock, flags); 97 spin_unlock_irqrestore(&rds_bind_lock, flags);
98 98
99 rdsdebug("returning rs %p for %pI4:%u\n", rs, &addr, 99 rdsdebug("returning rs %p for %pI4:%u\n", rs, &addr,
100 ntohs(port)); 100 ntohs(port));
101 return rs; 101 return rs;
102 } 102 }
103 103
104 /* returns -ve errno or +ve port */ 104 /* returns -ve errno or +ve port */
105 static int rds_add_bound(struct rds_sock *rs, __be32 addr, __be16 *port) 105 static int rds_add_bound(struct rds_sock *rs, __be32 addr, __be16 *port)
106 { 106 {
107 unsigned long flags; 107 unsigned long flags;
108 int ret = -EADDRINUSE; 108 int ret = -EADDRINUSE;
109 u16 rover, last; 109 u16 rover, last;
110 110
111 if (*port != 0) { 111 if (*port != 0) {
112 rover = be16_to_cpu(*port); 112 rover = be16_to_cpu(*port);
113 last = rover; 113 last = rover;
114 } else { 114 } else {
115 rover = max_t(u16, net_random(), 2); 115 rover = max_t(u16, net_random(), 2);
116 last = rover - 1; 116 last = rover - 1;
117 } 117 }
118 118
119 spin_lock_irqsave(&rds_bind_lock, flags); 119 spin_lock_irqsave(&rds_bind_lock, flags);
120 120
121 do { 121 do {
122 if (rover == 0) 122 if (rover == 0)
123 rover++; 123 rover++;
124 if (rds_bind_tree_walk(addr, cpu_to_be16(rover), rs) == NULL) { 124 if (rds_bind_tree_walk(addr, cpu_to_be16(rover), rs) == NULL) {
125 *port = cpu_to_be16(rover); 125 *port = cpu_to_be16(rover);
126 ret = 0; 126 ret = 0;
127 break; 127 break;
128 } 128 }
129 } while (rover++ != last); 129 } while (rover++ != last);
130 130
131 if (ret == 0) { 131 if (ret == 0) {
132 rs->rs_bound_addr = addr; 132 rs->rs_bound_addr = addr;
133 rs->rs_bound_port = *port; 133 rs->rs_bound_port = *port;
134 rds_sock_addref(rs); 134 rds_sock_addref(rs);
135 135
136 rdsdebug("rs %p binding to %pI4:%d\n", 136 rdsdebug("rs %p binding to %pI4:%d\n",
137 rs, &addr, (int)ntohs(*port)); 137 rs, &addr, (int)ntohs(*port));
138 } 138 }
139 139
140 spin_unlock_irqrestore(&rds_bind_lock, flags); 140 spin_unlock_irqrestore(&rds_bind_lock, flags);
141 141
142 return ret; 142 return ret;
143 } 143 }
144 144
145 void rds_remove_bound(struct rds_sock *rs) 145 void rds_remove_bound(struct rds_sock *rs)
146 { 146 {
147 unsigned long flags; 147 unsigned long flags;
148 148
149 spin_lock_irqsave(&rds_bind_lock, flags); 149 spin_lock_irqsave(&rds_bind_lock, flags);
150 150
151 if (rs->rs_bound_addr) { 151 if (rs->rs_bound_addr) {
152 rdsdebug("rs %p unbinding from %pI4:%d\n", 152 rdsdebug("rs %p unbinding from %pI4:%d\n",
153 rs, &rs->rs_bound_addr, 153 rs, &rs->rs_bound_addr,
154 ntohs(rs->rs_bound_port)); 154 ntohs(rs->rs_bound_port));
155 155
156 rb_erase(&rs->rs_bound_node, &rds_bind_tree); 156 rb_erase(&rs->rs_bound_node, &rds_bind_tree);
157 rds_sock_put(rs); 157 rds_sock_put(rs);
158 rs->rs_bound_addr = 0; 158 rs->rs_bound_addr = 0;
159 } 159 }
160 160
161 spin_unlock_irqrestore(&rds_bind_lock, flags); 161 spin_unlock_irqrestore(&rds_bind_lock, flags);
162 } 162 }
163 163
164 int rds_bind(struct socket *sock, struct sockaddr *uaddr, int addr_len) 164 int rds_bind(struct socket *sock, struct sockaddr *uaddr, int addr_len)
165 { 165 {
166 struct sock *sk = sock->sk; 166 struct sock *sk = sock->sk;
167 struct sockaddr_in *sin = (struct sockaddr_in *)uaddr; 167 struct sockaddr_in *sin = (struct sockaddr_in *)uaddr;
168 struct rds_sock *rs = rds_sk_to_rs(sk); 168 struct rds_sock *rs = rds_sk_to_rs(sk);
169 struct rds_transport *trans; 169 struct rds_transport *trans;
170 int ret = 0; 170 int ret = 0;
171 171
172 lock_sock(sk); 172 lock_sock(sk);
173 173
174 if (addr_len != sizeof(struct sockaddr_in) || 174 if (addr_len != sizeof(struct sockaddr_in) ||
175 sin->sin_family != AF_INET || 175 sin->sin_family != AF_INET ||
176 rs->rs_bound_addr || 176 rs->rs_bound_addr ||
177 sin->sin_addr.s_addr == htonl(INADDR_ANY)) { 177 sin->sin_addr.s_addr == htonl(INADDR_ANY)) {
178 ret = -EINVAL; 178 ret = -EINVAL;
179 goto out; 179 goto out;
180 } 180 }
181 181
182 ret = rds_add_bound(rs, sin->sin_addr.s_addr, &sin->sin_port); 182 ret = rds_add_bound(rs, sin->sin_addr.s_addr, &sin->sin_port);
183 if (ret) 183 if (ret)
184 goto out; 184 goto out;
185 185
186 trans = rds_trans_get_preferred(sin->sin_addr.s_addr); 186 trans = rds_trans_get_preferred(sin->sin_addr.s_addr);
187 if (trans == NULL) { 187 if (trans == NULL) {
188 ret = -EADDRNOTAVAIL; 188 ret = -EADDRNOTAVAIL;
189 rds_remove_bound(rs); 189 rds_remove_bound(rs);
190 if (printk_ratelimit())
191 printk(KERN_INFO "RDS: rds_bind() could not find a transport, "
192 "load rds_tcp or rds_rdma?\n");
190 goto out; 193 goto out;
191 } 194 }
192 195
193 rs->rs_transport = trans; 196 rs->rs_transport = trans;
194 ret = 0; 197 ret = 0;
195 198
196 out: 199 out:
197 release_sock(sk); 200 release_sock(sk);
198 return ret; 201 return ret;
199 } 202 }
200 203