LinuxLists.cc - [PATCH] net: xfrm: Add '_rcu' tag for rcu protected pointer in netns

2019-03-04 05:48:04

Subject: [PATCH] net: xfrm: Add '_rcu' tag for rcu protected pointer in netns_xfrm

For rcu protected pointers, we'd bettter add '__rcu' for them.

No functional change.

Signed-off-by: Su Yanjun <[email protected]>
---
include/net/netns/xfrm.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/net/netns/xfrm.h b/include/net/netns/xfrm.h
index 59f45b1..d2a36fb 100644
--- a/include/net/netns/xfrm.h
+++ b/include/net/netns/xfrm.h
@@ -57,7 +57,7 @@ struct netns_xfrm {
struct list_head inexact_bins;

- struct sock *nlsk;
+ struct sock __rcu *nlsk;
struct sock *nlsk_stash;

u32 sysctl_aevent_etime;
--
2.7.4

2019-03-04 07:50:31

by kernel test robot

[permalink] [raw]

Subject: Re: [PATCH] net: xfrm: Add '_rcu' tag for rcu protected pointer in netns_xfrm

Hi Su,

Thank you for the
[auto build test [also build test [if your patch is
url: WARNING on net-next/master]
WARNING on v5.0 next-20190301]
applied to the wrong git tree, please drop us a note to help improve the system]
/github.com/0day-ci/linux/commits/Su-Yanjun/net-xfrm-Add-_rcu-tag-for-rcu-protected-pointer-in-netns_xfrm/20190304-135248">https://github.com/0day-ci/linux/commits/Su-Yanjun/net-xfrm-Add-_rcu-tag-for-rcu-protected-pointer-in-netns_xfrm/20190304-135248
allmodconfig
CF='-fdiagnostic-prefix -D__CHECK_ENDIAN__'
ones prefixed by >>):
sparse: warning: incorrect type in argument 1 (different address spaces)
sparse: expected struct sock *sk
sparse: got struct sock [noderef] <asn:4> *nlsk
sparse: warning: incorrect type in argument 1 (different address spaces)
sparse: expected struct sock *sk
sparse: got struct sock [noderef] <asn:4> *nlsk
sparse: warning: incorrect type in argument 1 (different address spaces)
sparse: expected struct sock *sk
sparse: got struct sock [noderef] <asn:4> *nlsk
sparse: warning: incorrect type in argument 1 (different address spaces)
sparse: expected struct sock *sk
sparse: got struct sock [noderef] <asn:4> *nlsk
sparse: warning: incorrect type in argument 1 (different address spaces)
sparse: expected struct sock *sk
sparse: got struct sock [noderef] <asn:4> *nlsk
sparse: warning: incorrect type in argument 1 (different address spaces)
sparse: expected struct sock *sk
sparse: got struct sock [noderef] <asn:4> *nlsk
sparse: warning: incorrect type in argument 1 (different address spaces)
sparse: expected struct sock *ssk
sparse: got struct sock [noderef] <asn:4> *nlsk
(new ones prefixed by >>)
sparse: warning: incorrect type in argument 1 (different address spaces)
sparse: expected struct sock *sk
sparse: got struct sock [noderef] <asn:4> *nlsk
sparse: warning: incorrect type in argument 1 (different address spaces)
sparse: expected struct sock *sk
sparse: got struct sock [noderef] <asn:4> *nlsk
sparse: warning: incorrect type in argument 1 (different address spaces)
sparse: expected struct sock *sk
sparse: got struct sock [noderef] <asn:4> *nlsk
sparse: warning: incorrect type in argument 1 (different address spaces)
sparse: expected struct sock *sk
sparse: got struct sock [noderef] <asn:4> *nlsk
sparse: warning: incorrect type in argument 1 (different address spaces)
sparse: expected struct sock *sk
sparse: got struct sock [noderef] <asn:4> *nlsk
sparse: warning: incorrect type in argument 1 (different address spaces)
sparse: expected struct sock *sk
sparse: got struct sock [noderef] <asn:4> *nlsk
sparse: warning: incorrect type in argument 1 (different address spaces)
sparse: expected struct sock *ssk
sparse: got struct sock [noderef] <asn:4> *nlsk
2014-08-29 1180
2007-04-28 1181 static int xfrm_get_spdinfo(struct sk_buff *skb, struct nlmsghdr *nlh,
2007-08-22 1182 struct nlattr **attrs)
2007-04-28 1183 {
2008-11-25 1184 struct net *net = sock_net(skb->sk);
2007-04-28 1185 struct sk_buff *r_skb;
2007-08-22 1186 u32 *flags = nlmsg_data(nlh);
2012-09-07 1187 u32 sportid = NETLINK_CB(skb).portid;
2007-04-28 1188 u32 seq = nlh->nlmsg_seq;
2017-10-26 1189 int err;
2007-04-28 1190
2007-08-22 1191 r_skb = nlmsg_new(xfrm_spdinfo_msgsize(), GFP_ATOMIC);
2007-04-28 1192 if (r_skb == NULL)
2007-04-28 1193 return -ENOMEM;
2007-04-28 1194
2017-10-26 1195 err = build_spdinfo(r_skb, net, sportid, seq, *flags);
2017-10-26 1196 BUG_ON(err < 0);
2007-04-28 1197
2012-09-07 @1198 return nlmsg_unicast(net->xfrm.nlsk, r_skb, sportid);
2007-04-28 1199 }
2007-04-28 1200
2017-09-21 1201 static inline unsigned int xfrm_sadinfo_msgsize(void)
2007-08-22 1202 {
2007-08-22 1203 return NLMSG_ALIGN(4)
2007-08-22 1204 + nla_total_size(sizeof(struct xfrmu_sadhinfo))
2007-08-22 1205 + nla_total_size(4); /* XFRMA_SAD_CNT */
2007-08-22 1206 }
2007-08-22 1207
2010-01-23 1208 static int build_sadinfo(struct sk_buff *skb, struct net *net,
2012-09-07 1209 u32 portid, u32 seq, u32 flags)
2007-04-26 1210 {
2007-05-04 1211 struct xfrmk_sadinfo si;
2007-05-04 1212 struct xfrmu_sadhinfo sh;
2007-04-26 1213 struct nlmsghdr *nlh;
2012-06-27 1214 int err;
2007-04-26 1215 u32 *f;
2007-04-26 1216
2012-09-07 1217 nlh = nlmsg_put(skb, portid, seq, XFRM_MSG_NEWSADINFO, sizeof(u32), 0);
2011-03-30 1218 if (nlh == NULL) /* shouldn't really happen ... */
2007-04-26 1219 return -EMSGSIZE;
2007-04-26 1220
2007-04-26 1221 f = nlmsg_data(nlh);
2007-04-26 1222 *f = flags;
2010-01-23 1223 xfrm_sad_getinfo(net, &si);
2007-04-26 1224
2007-05-04 1225 sh.sadhmcnt = si.sadhmcnt;
2007-05-04 1226 sh.sadhcnt = si.sadhcnt;
2007-05-04 1227
2012-06-27 1228 err = nla_put_u32(skb, XFRMA_SAD_CNT, si.sadcnt);
2012-06-27 1229 if (!err)
2012-06-27 1230 err = nla_put(skb, XFRMA_SAD_HINFO, sizeof(sh), &sh);
2012-06-27 1231 if (err) {
2012-06-27 1232 nlmsg_cancel(skb, nlh);
2012-06-27 1233 return err;
2012-06-27 1234 }
2007-04-26 1235
2015-01-16 1236 nlmsg_end(skb, nlh);
2015-01-16 1237 return 0;
2007-04-26 1238 }
2007-04-26 1239
2007-04-26 1240 static int xfrm_get_sadinfo(struct sk_buff *skb, struct nlmsghdr *nlh,
2007-08-22 1241 struct nlattr **attrs)
2007-04-26 1242 {
2008-11-25 1243 struct net *net = sock_net(skb->sk);
2007-04-26 1244 struct sk_buff *r_skb;
2007-08-22 1245 u32 *flags = nlmsg_data(nlh);
2012-09-07 1246 u32 sportid = NETLINK_CB(skb).portid;
2007-04-26 1247 u32 seq = nlh->nlmsg_seq;
2017-10-26 1248 int err;
2007-04-26 1249
2007-08-22 1250 r_skb = nlmsg_new(xfrm_sadinfo_msgsize(), GFP_ATOMIC);
2007-04-26 1251 if (r_skb == NULL)
2007-04-26 1252 return -ENOMEM;
2007-04-26 1253
2017-10-26 1254 err = build_sadinfo(r_skb, net, sportid, seq, *flags);
2017-10-26 1255 BUG_ON(err < 0);
2007-04-26 1256
2012-09-07 1257 return nlmsg_unicast(net->xfrm.nlsk, r_skb, sportid);
2007-04-26 1258 }
2007-04-26 1259
2007-01-02 1260 static int xfrm_get_sa(struct sk_buff *skb, struct nlmsghdr *nlh,
2007-08-22 1261 struct nlattr **attrs)
2005-04-16 1262 {
2008-11-25 1263 struct net *net = sock_net(skb->sk);
2007-08-22 1264 struct xfrm_usersa_id *p = nlmsg_data(nlh);
2005-04-16 1265 struct xfrm_state *x;
2005-04-16 1266 struct sk_buff *resp_skb;
2006-08-23 1267 int err = -ESRCH;
2005-04-16 1268
2008-11-25 1269 x = xfrm_user_state_lookup(net, p, attrs, &err);
2005-04-16 1270 if (x == NULL)
2005-04-16 1271 goto out_noput;
2005-04-16 1272
2005-04-16 1273 resp_skb = xfrm_state_netlink(skb, x, nlh->nlmsg_seq);
2005-04-16 1274 if (IS_ERR(resp_skb)) {
2005-04-16 1275 err = PTR_ERR(resp_skb);
2005-04-16 1276 } else {
2012-09-07 1277 err = nlmsg_unicast(net->xfrm.nlsk, resp_skb, NETLINK_CB(skb).portid);
2005-04-16 1278 }
2005-04-16 1279 xfrm_state_put(x);
2005-04-16 1280 out_noput:
2005-04-16 1281 return err;
2005-04-16 1282 }
2005-04-16 1283
2007-01-02 1284 static int xfrm_alloc_userspi(struct sk_buff *skb, struct nlmsghdr *nlh,
2007-08-22 1285 struct nlattr **attrs)
2005-04-16 1286 {
2008-11-25 1287 struct net *net = sock_net(skb->sk);
2005-04-16 1288 struct xfrm_state *x;
2005-04-16 1289 struct xfrm_userspi_info *p;
2005-04-16 1290 struct sk_buff *resp_skb;
2005-04-16 1291 xfrm_address_t *daddr;
2005-04-16 1292 int family;
2005-04-16 1293 int err;
2010-02-22 1294 u32 mark;
2010-02-22 1295 struct xfrm_mark m;
2018-06-12 1296 u32 if_id = 0;
2005-04-16 1297
2007-08-22 1298 p = nlmsg_data(nlh);
2013-12-16 1299 err = verify_spi_info(p->info.id.proto, p->min, p->max);
2005-04-16 1300 if (err)
2005-04-16 1301 goto out_noput;
2005-04-16 1302
2005-04-16 1303 family = p->info.family;
2005-04-16 1304 daddr = &p->info.id.daddr;
2005-04-16 1305
2005-04-16 1306 x = NULL;
2010-02-22 1307
2010-02-22 1308 mark = xfrm_mark_get(attrs, &m);
2018-06-12 1309
2018-06-12 1310 if (attrs[XFRMA_IF_ID])
2018-06-12 1311 if_id = nla_get_u32(attrs[XFRMA_IF_ID]);
2018-06-12 1312
2005-04-16 1313 if (p->info.seq) {
2010-02-22 1314 x = xfrm_find_acq_byseq(net, mark, p->info.seq);
Hideaki / 吉藤英明 2013-01-29 1315 if (x && !xfrm_addr_equal(&x->id.daddr, daddr, family)) {
2005-04-16 1316 xfrm_state_put(x);
2005-04-16 1317 x = NULL;
2005-04-16 1318 }
2005-04-16 1319 }
2005-04-16 1320
2005-04-16 1321 if (!x)
2010-02-22 1322 x = xfrm_find_acq(net, &m, p->info.mode, p->info.reqid,
2018-06-12 1323 if_id, p->info.id.proto, daddr,
2005-04-16 1324 &p->info.saddr, 1,
2005-04-16 1325 family);
2005-04-16 1326 err = -ENOENT;
2005-04-16 1327 if (x == NULL)
2005-04-16 1328 goto out_noput;
2005-04-16 1329
2007-10-09 1330 err = xfrm_alloc_spi(x, p->min, p->max);
2007-10-09 1331 if (err)
2007-10-09 1332 goto out;
2005-04-16 1333
2005-04-16 1334 resp_skb = xfrm_state_netlink(skb, x, nlh->nlmsg_seq);
2005-04-16 1335 if (IS_ERR(resp_skb)) {
2005-04-16 1336 err = PTR_ERR(resp_skb);
2005-04-16 1337 goto out;
2005-04-16 1338 }
2005-04-16 1339
2012-09-07 @1340 err = nlmsg_unicast(net->xfrm.nlsk, resp_skb, NETLINK_CB(skb).portid);
2005-04-16 1341
2005-04-16 1342 out:
2005-04-16 1343 xfrm_state_put(x);
2005-04-16 1344 out_noput:
2005-04-16 1345 return err;
2005-04-16 1346 }
2005-04-16 1347
at line 1198 was first introduced by commit
4d0057e61d76315230382b netlink: Rename pid to portid to avoid confusion
W. Biederman <[email protected]>
S. Miller <[email protected]>
Open Source Technology Center
1.org/pipermail/kbuild-all">https://lists.01.org/pipermail/kbuild-all Intel Corporation

Attachments:

(No filename) (17.64 kB)
.config.gz (65.68 kB)
Download all attachments

2019-03-04 08:56:23

by Sergei Shtylyov

[permalink] [raw]

Subject: Re: [PATCH] net: xfrm: Add '_rcu' tag for rcu protected pointer in netns_xfrm

Hello!

On 04.03.2019 8:46, Su Yanjun wrote:

> For rcu protected pointers, we'd bettter add '__rcu' for them.

2 t's were enough. :-)

> No functional change.
>
> Signed-off-by: Su Yanjun <[email protected]>
[...]

MBR, Sergei