hc
2024-10-22 8ac6c7a54ed1b98d142dce24b11c6de6a1e239a5
kernel/net/sched/em_meta.c
....@@ -1,10 +1,6 @@
1
+// SPDX-License-Identifier: GPL-2.0-or-later
12 /*
23 * net/sched/em_meta.c Metadata ematch
3
- *
4
- * This program is free software; you can redistribute it and/or
5
- * modify it under the terms of the GNU General Public License
6
- * as published by the Free Software Foundation; either version
7
- * 2 of the License, or (at your option) any later version.
84 *
95 * Authors: Thomas Graf <tgraf@suug.ch>
106 *
....@@ -450,7 +446,7 @@
450446 *err = -1;
451447 return;
452448 }
453
- dst->value = sk->sk_wmem_queued;
449
+ dst->value = READ_ONCE(sk->sk_wmem_queued);
454450 }
455451
456452 META_COLLECTOR(int_sk_fwd_alloc)
....@@ -525,7 +521,7 @@
525521 *err = -1;
526522 return;
527523 }
528
- dst->value = sk->sk_ack_backlog;
524
+ dst->value = READ_ONCE(sk->sk_ack_backlog);
529525 }
530526
531527 META_COLLECTOR(int_sk_max_ack_bl)
....@@ -536,7 +532,7 @@
536532 *err = -1;
537533 return;
538534 }
539
- dst->value = sk->sk_max_ack_backlog;
535
+ dst->value = READ_ONCE(sk->sk_max_ack_backlog);
540536 }
541537
542538 META_COLLECTOR(int_sk_prio)
....@@ -558,7 +554,7 @@
558554 *err = -1;
559555 return;
560556 }
561
- dst->value = sk->sk_rcvlowat;
557
+ dst->value = READ_ONCE(sk->sk_rcvlowat);
562558 }
563559
564560 META_COLLECTOR(int_sk_rcvtimeo)
....@@ -912,7 +908,8 @@
912908 struct tcf_meta_hdr *hdr;
913909 struct meta_match *meta = NULL;
914910
915
- err = nla_parse(tb, TCA_EM_META_MAX, data, len, meta_policy, NULL);
911
+ err = nla_parse_deprecated(tb, TCA_EM_META_MAX, data, len,
912
+ meta_policy, NULL);
916913 if (err < 0)
917914 goto errout;
918915