- Kernel - mailweb.openeuler.org

openEuler Kernel SIG双周例会
by openEuler conference 20 Nov '24

20 Nov '24

您好！ Kernel 邀请您参加 2024-11-22 14:00 召开的WeLink会议(自动录制) 会议主题：openEuler Kernel SIG双周例会会议内容： 1. 进展update 2. 内容征集中（可回复本邮件申请，也可直接填写至会议纪要看板）会议链接：https://meeting.huaweicloud.com:36443/#/j/961483852 会议纪要：https://etherpad.openeuler.org/p/Kernel-meetings 更多资讯尽在：https://www.openeuler.org/zh/ Hello! Kernel invites you to attend the WeLink conference(auto recording) will be held at 2024-11-22 14:00, The subject of the conference is openEuler Kernel SIG双周例会, Summary: 1. 进展update 2. 内容征集中（可回复本邮件申请，也可直接填写至会议纪要看板） You can join the meeting at https://meeting.huaweicloud.com:36443/#/j/961483852. Add topics at https://etherpad.openeuler.org/p/Kernel-meetings. More information: https://www.openeuler.org/en/

1 0

[openeuler:OLK-5.10 2430/2430] kernel/sched/topology.c:2385:39: sparse: sparse: incorrect type in assignment (different address spaces)
by kernel test robot 20 Nov '24

20 Nov '24

tree: https://gitee.com/openeuler/kernel.git OLK-5.10 head: 88a9bf0245509a724bfce4cef1d4dc86f0a117a0 commit: edd5e1effd36972e2b1910661daef5e4249fc3fd [2430/2430] sched/fair: Adjust the allowed NUMA imbalance when SD_NUMA spans multiple LLCs config: x86_64-randconfig-121-20241114 (https://download.01.org/0day-ci/archive/20241120/202411201411.gmJgGdOo-lkp@…) compiler: gcc-12 (Debian 12.2.0-14) 12.2.0 reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20241120/202411201411.gmJgGdOo-lkp@…) If you fix the issue in a separate patch/commit (i.e. not just a new version of the same patch/commit), kindly add following tags | Reported-by: kernel test robot <lkp(a)intel.com> | Closes: https://lore.kernel.org/oe-kbuild-all/202411201411.gmJgGdOo-lkp@intel.com/ sparse warnings: (new ones prefixed by >>) kernel/sched/topology.c:2086:32: sparse: sparse: incorrect type in initializer (different base types) @@ expected int flags @@ got restricted gfp_t @@ kernel/sched/topology.c:2086:32: sparse: expected int flags kernel/sched/topology.c:2086:32: sparse: got restricted gfp_t kernel/sched/topology.c:2094:61: sparse: sparse: incorrect type in argument 3 (different base types) @@ expected restricted gfp_t [usertype] flags @@ got int flags @@ kernel/sched/topology.c:2094:61: sparse: expected restricted gfp_t [usertype] flags kernel/sched/topology.c:2094:61: sparse: got int flags kernel/sched/topology.c:2122:58: sparse: sparse: incorrect type in assignment (different address spaces) @@ expected struct sched_domain *[assigned] sd @@ got struct sched_domain [noderef] __rcu *parent @@ kernel/sched/topology.c:2122:58: sparse: expected struct sched_domain *[assigned] sd kernel/sched/topology.c:2122:58: sparse: got struct sched_domain [noderef] __rcu *parent kernel/sched/topology.c:121:56: sparse: sparse: incorrect type in argument 1 (different address spaces) @@ expected struct sched_domain *sd @@ got struct sched_domain [noderef] __rcu *child @@ kernel/sched/topology.c:121:56: sparse: expected struct sched_domain *sd kernel/sched/topology.c:121:56: sparse: got struct sched_domain [noderef] __rcu *child kernel/sched/topology.c:140:60: sparse: sparse: incorrect type in argument 1 (different address spaces) @@ expected struct sched_domain *sd @@ got struct sched_domain [noderef] __rcu *parent @@ kernel/sched/topology.c:140:60: sparse: expected struct sched_domain *sd kernel/sched/topology.c:140:60: sparse: got struct sched_domain [noderef] __rcu *parent kernel/sched/topology.c:163:20: sparse: sparse: incorrect type in assignment (different address spaces) @@ expected struct sched_domain *sd @@ got struct sched_domain [noderef] __rcu *parent @@ kernel/sched/topology.c:163:20: sparse: expected struct sched_domain *sd kernel/sched/topology.c:163:20: sparse: got struct sched_domain [noderef] __rcu *parent kernel/sched/topology.c:463:19: sparse: sparse: incorrect type in argument 1 (different address spaces) @@ expected struct perf_domain *pd @@ got struct perf_domain [noderef] __rcu *pd @@ kernel/sched/topology.c:463:19: sparse: expected struct perf_domain *pd kernel/sched/topology.c:463:19: sparse: got struct perf_domain [noderef] __rcu *pd kernel/sched/topology.c:626:49: sparse: sparse: incorrect type in initializer (different address spaces) @@ expected struct sched_domain *parent @@ got struct sched_domain [noderef] __rcu *parent @@ kernel/sched/topology.c:626:49: sparse: expected struct sched_domain *parent kernel/sched/topology.c:626:49: sparse: got struct sched_domain [noderef] __rcu *parent kernel/sched/topology.c:682:9: sparse: sparse: incompatible types in comparison expression (different address spaces): kernel/sched/topology.c:682:9: sparse: struct sparsemask [noderef] __rcu * kernel/sched/topology.c:682:9: sparse: struct sparsemask * kernel/sched/topology.c:724:50: sparse: sparse: incorrect type in initializer (different address spaces) @@ expected struct sched_domain *parent @@ got struct sched_domain [noderef] __rcu *parent @@ kernel/sched/topology.c:731:55: sparse: sparse: incorrect type in assignment (different address spaces) @@ expected struct sched_domain [noderef] __rcu *[noderef] __rcu child @@ got struct sched_domain *[assigned] tmp @@ kernel/sched/topology.c:741:29: sparse: sparse: incorrect type in assignment (different address spaces) @@ expected struct sched_domain *[assigned] tmp @@ got struct sched_domain [noderef] __rcu *parent @@ kernel/sched/topology.c:746:20: sparse: sparse: incorrect type in assignment (different address spaces) @@ expected struct sched_domain *sd @@ got struct sched_domain [noderef] __rcu *parent @@ kernel/sched/topology.c:752:33: sparse: sparse: incorrect type in assignment (different address spaces) @@ expected struct sched_domain *[assigned] tmp @@ got struct sched_domain [noderef] __rcu *parent @@ kernel/sched/topology.c:758:13: sparse: sparse: incorrect type in assignment (different address spaces) @@ expected struct sched_domain *[assigned] tmp @@ got struct sched_domain [noderef] __rcu *sd @@ kernel/sched/topology.c:920:70: sparse: sparse: incorrect type in argument 1 (different address spaces) @@ expected struct sched_domain *sd @@ got struct sched_domain [noderef] __rcu *child @@ kernel/sched/topology.c:949:59: sparse: sparse: incorrect type in argument 1 (different address spaces) @@ expected struct sched_domain *sd @@ got struct sched_domain [noderef] __rcu *child @@ kernel/sched/topology.c:993:57: sparse: sparse: incorrect type in argument 1 (different address spaces) @@ expected struct sched_domain *sd @@ got struct sched_domain [noderef] __rcu *child @@ kernel/sched/topology.c:995:25: sparse: sparse: incorrect type in assignment (different address spaces) @@ expected struct sched_domain *sibling @@ got struct sched_domain [noderef] __rcu *child @@ kernel/sched/topology.c:1003:55: sparse: sparse: incorrect type in argument 1 (different address spaces) @@ expected struct sched_domain *sd @@ got struct sched_domain [noderef] __rcu *child @@ kernel/sched/topology.c:1005:25: sparse: sparse: incorrect type in assignment (different address spaces) @@ expected struct sched_domain *sibling @@ got struct sched_domain [noderef] __rcu *child @@ kernel/sched/topology.c:1075:62: sparse: sparse: incorrect type in argument 1 (different address spaces) @@ expected struct sched_domain *sd @@ got struct sched_domain [noderef] __rcu *child @@ kernel/sched/topology.c:1179:40: sparse: sparse: incorrect type in initializer (different address spaces) @@ expected struct sched_domain *child @@ got struct sched_domain [noderef] __rcu *child @@ kernel/sched/topology.c:1482:43: sparse: sparse: incorrect type in initializer (different address spaces) @@ expected struct sched_domain [noderef] __rcu *child @@ got struct sched_domain *child @@ kernel/sched/topology.c:2163:31: sparse: sparse: incorrect type in assignment (different address spaces) @@ expected struct sched_domain [noderef] __rcu *parent @@ got struct sched_domain *sd @@ kernel/sched/topology.c:2334:57: sparse: sparse: incorrect type in assignment (different address spaces) @@ expected struct sched_domain *[assigned] sd @@ got struct sched_domain [noderef] __rcu *parent @@ kernel/sched/topology.c:2355:56: sparse: sparse: incorrect type in initializer (different address spaces) @@ expected struct sched_domain *child @@ got struct sched_domain [noderef] __rcu *child @@ >> kernel/sched/topology.c:2385:39: sparse: sparse: incorrect type in assignment (different address spaces) @@ expected struct sched_domain *top_p @@ got struct sched_domain [noderef] __rcu *parent @@ >> kernel/sched/topology.c:2387:45: sparse: sparse: incorrect type in assignment (different address spaces) @@ expected struct sched_domain *[assigned] top @@ got struct sched_domain [noderef] __rcu *parent @@ kernel/sched/topology.c:2388:47: sparse: sparse: incorrect type in assignment (different address spaces) @@ expected struct sched_domain *top_p @@ got struct sched_domain [noderef] __rcu *parent @@ kernel/sched/topology.c:2354:57: sparse: sparse: incorrect type in assignment (different address spaces) @@ expected struct sched_domain *[assigned] sd @@ got struct sched_domain [noderef] __rcu *parent @@ kernel/sched/topology.c:2404:57: sparse: sparse: incorrect type in assignment (different address spaces) @@ expected struct sched_domain *[assigned] sd @@ got struct sched_domain [noderef] __rcu *parent @@ kernel/sched/topology.c:74:25: sparse: sparse: dereference of noderef expression kernel/sched/topology.c:79:25: sparse: sparse: dereference of noderef expression kernel/sched/topology.c: note: in included file: kernel/sched/sched.h:1792:9: sparse: sparse: incorrect type in assignment (different address spaces) @@ expected struct sched_domain *[assigned] sd @@ got struct sched_domain [noderef] __rcu *parent @@ kernel/sched/sched.h:1805:9: sparse: sparse: incorrect type in assignment (different address spaces) @@ expected struct sched_domain *[assigned] sd @@ got struct sched_domain [noderef] __rcu *parent @@ kernel/sched/sched.h:1805:9: sparse: sparse: incorrect type in assignment (different address spaces) @@ expected struct sched_domain *[assigned] sd @@ got struct sched_domain [noderef] __rcu *parent @@ kernel/sched/sched.h:1792:9: sparse: sparse: incorrect type in assignment (different address spaces) @@ expected struct sched_domain *[assigned] sd @@ got struct sched_domain [noderef] __rcu *parent @@ kernel/sched/sched.h:1805:9: sparse: sparse: incorrect type in assignment (different address spaces) @@ expected struct sched_domain *[assigned] sd @@ got struct sched_domain [noderef] __rcu *parent @@ kernel/sched/topology.c:1497:19: sparse: sparse: dereference of noderef expression vim +2385 kernel/sched/topology.c 2277 2278 2279 /* 2280 * Build sched domains for a given set of CPUs and attach the sched domains 2281 * to the individual CPUs 2282 */ 2283 static int 2284 build_sched_domains(const struct cpumask *cpu_map, struct sched_domain_attr *attr) 2285 { 2286 enum s_alloc alloc_state = sa_none; 2287 struct sched_domain *sd; 2288 struct s_data d; 2289 struct rq *rq = NULL; 2290 int i, ret = -ENOMEM; 2291 struct sched_domain_topology_level *tl_asym; 2292 bool has_asym = false; 2293 bool has_cluster = false; 2294 2295 if (WARN_ON(cpumask_empty(cpu_map))) 2296 goto error; 2297 2298 alloc_state = __visit_domain_allocation_hell(&d, cpu_map); 2299 if (alloc_state != sa_rootdomain) 2300 goto error; 2301 2302 tl_asym = asym_cpu_capacity_level(cpu_map); 2303 2304 /* Set up domains for CPUs specified by the cpu_map: */ 2305 for_each_cpu(i, cpu_map) { 2306 struct sched_domain_topology_level *tl; 2307 int dflags = 0; 2308 2309 sd = NULL; 2310 for_each_sd_topology(tl) { 2311 if (tl == tl_asym) { 2312 dflags |= SD_ASYM_CPUCAPACITY; 2313 has_asym = true; 2314 } 2315 2316 if (WARN_ON(!topology_span_sane(tl, cpu_map, i))) 2317 goto error; 2318 2319 sd = build_sched_domain(tl, cpu_map, attr, sd, dflags, i); 2320 2321 has_cluster |= sd->flags & SD_CLUSTER; 2322 2323 if (tl == sched_domain_topology) 2324 *per_cpu_ptr(d.sd, i) = sd; 2325 if (tl->flags & SDTL_OVERLAP) 2326 sd->flags |= SD_OVERLAP; 2327 if (cpumask_equal(cpu_map, sched_domain_span(sd))) 2328 break; 2329 } 2330 } 2331 2332 /* Build the groups for the domains */ 2333 for_each_cpu(i, cpu_map) { 2334 for (sd = *per_cpu_ptr(d.sd, i); sd; sd = sd->parent) { 2335 sd->span_weight = cpumask_weight(sched_domain_span(sd)); 2336 if (sd->flags & SD_OVERLAP) { 2337 if (build_overlap_sched_groups(sd, i)) 2338 goto error; 2339 } else { 2340 if (build_sched_groups(sd, i)) 2341 goto error; 2342 } 2343 } 2344 } 2345 2346 /* 2347 * Calculate an allowed NUMA imbalance such that LLCs do not get 2348 * imbalanced. 2349 */ 2350 for_each_cpu(i, cpu_map) { 2351 unsigned int imb = 0; 2352 unsigned int imb_span = 1; 2353 2354 for (sd = *per_cpu_ptr(d.sd, i); sd; sd = sd->parent) { 2355 struct sched_domain *child = sd->child; 2356 2357 if (!(sd->flags & SD_SHARE_PKG_RESOURCES) && child && 2358 (child->flags & SD_SHARE_PKG_RESOURCES)) { 2359 struct sched_domain *top, *top_p; 2360 unsigned int nr_llcs; 2361 2362 /* 2363 * For a single LLC per node, allow an 2364 * imbalance up to 25% of the node. This is an 2365 * arbitrary cutoff based on SMT-2 to balance 2366 * between memory bandwidth and avoiding 2367 * premature sharing of HT resources and SMT-4 2368 * or SMT-8 *may* benefit from a different 2369 * cutoff. 2370 * 2371 * For multiple LLCs, allow an imbalance 2372 * until multiple tasks would share an LLC 2373 * on one node while LLCs on another node 2374 * remain idle. 2375 */ 2376 nr_llcs = sd->span_weight / child->span_weight; 2377 if (nr_llcs == 1) 2378 imb = sd->span_weight >> 2; 2379 else 2380 imb = nr_llcs; 2381 sd->imb_numa_nr = imb; 2382 2383 /* Set span based on the first NUMA domain. */ 2384 top = sd; > 2385 top_p = top->parent; 2386 while (top_p && !(top_p->flags & SD_NUMA)) { > 2387 top = top->parent; 2388 top_p = top->parent; 2389 } 2390 imb_span = top_p ? top_p->span_weight : sd->span_weight; 2391 } else { 2392 int factor = max(1U, (sd->span_weight / imb_span)); 2393 2394 sd->imb_numa_nr = imb * factor; 2395 } 2396 } 2397 } 2398 2399 /* Calculate CPU capacity for physical packages and nodes */ 2400 for (i = nr_cpumask_bits-1; i >= 0; i--) { 2401 if (!cpumask_test_cpu(i, cpu_map)) 2402 continue; 2403 2404 for (sd = *per_cpu_ptr(d.sd, i); sd; sd = sd->parent) { 2405 claim_allocations(i, sd); 2406 init_sched_groups_capacity(i, sd); 2407 } 2408 } 2409 2410 /* 2411 * Allocate shared sd data at last level cache. Must be done after 2412 * domains are built above, but before the data is used in 2413 * cpu_attach_domain and descendants below. 2414 */ 2415 if (sd_llc_alloc_all(cpu_map, &d)) 2416 goto error; 2417 2418 /* Attach the domains */ 2419 rcu_read_lock(); 2420 for_each_cpu(i, cpu_map) { 2421 rq = cpu_rq(i); 2422 sd = *per_cpu_ptr(d.sd, i); 2423 2424 /* Use READ_ONCE()/WRITE_ONCE() to avoid load/store tearing: */ 2425 if (rq->cpu_capacity_orig > READ_ONCE(d.rd->max_cpu_capacity)) 2426 WRITE_ONCE(d.rd->max_cpu_capacity, rq->cpu_capacity_orig); 2427 2428 cpu_attach_domain(sd, d.rd, i); 2429 } 2430 rcu_read_unlock(); 2431 2432 if (has_asym) 2433 static_branch_inc_cpuslocked(&sched_asym_cpucapacity); 2434 2435 if (has_cluster) 2436 static_branch_inc_cpuslocked(&sched_cluster_active); 2437 2438 if (rq && sched_debug_enabled) { 2439 pr_info("root domain span: %*pbl (max cpu_capacity = %lu)\n", 2440 cpumask_pr_args(cpu_map), rq->rd->max_cpu_capacity); 2441 } 2442 2443 ret = 0; 2444 error: 2445 __free_domain_allocs(&d, alloc_state, cpu_map); 2446 2447 return ret; 2448 } 2449 -- 0-DAY CI Kernel Test Service https://github.com/intel/lkp-tests/wiki

1 0

[openeuler:OLK-6.6 1474/1474] fs/ext4/inode.c:3585:24: sparse: sparse: symbol 'ext4_iomap_buffered_read_ops' was not declared. Should it be static?
by kernel test robot 20 Nov '24

20 Nov '24

tree: https://gitee.com/openeuler/kernel.git OLK-6.6 head: 76e29fd0dc6d0f5cf1dd449e526e6dba2d726379 commit: a38e9381cf2ba6f3300c716b1cff4551bec0fbdf [1474/1474] ext4: implement buffered read iomap path config: x86_64-randconfig-121-20241118 (https://download.01.org/0day-ci/archive/20241120/202411201344.6SAp7KFy-lkp@…) compiler: gcc-12 (Debian 12.2.0-14) 12.2.0 reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20241120/202411201344.6SAp7KFy-lkp@…) If you fix the issue in a separate patch/commit (i.e. not just a new version of the same patch/commit), kindly add following tags | Reported-by: kernel test robot <lkp(a)intel.com> | Closes: https://lore.kernel.org/oe-kbuild-all/202411201344.6SAp7KFy-lkp@intel.com/ sparse warnings: (new ones prefixed by >>) >> fs/ext4/inode.c:3585:24: sparse: sparse: symbol 'ext4_iomap_buffered_read_ops' was not declared. Should it be static? vim +/ext4_iomap_buffered_read_ops +3585 fs/ext4/inode.c 3584 > 3585 const struct iomap_ops ext4_iomap_buffered_read_ops = { 3586 .iomap_begin = ext4_iomap_buffered_io_begin, 3587 }; 3588 -- 0-DAY CI Kernel Test Service https://github.com/intel/lkp-tests/wiki

1 0

[PATCH openEuler-1.0-LTS 0/1] lts backport 11
by Yuntao Liu 20 Nov '24

20 Nov '24

lts backport 11 Marc Zyngier (1): irqchip/gic-v3: Force propagation of the active state with a read-back drivers/irqchip/irq-gic-v3.c | 7 +++++++ 1 file changed, 7 insertions(+) -- 2.34.1

2 2

[openeuler:OLK-5.10 2451/2451] arch/x86/kernel/paravirt.c:65:9: error: implicit declaration of function '__text_gen_insn'
by kernel test robot 20 Nov '24

20 Nov '24

Hi Peter, FYI, the error/warning still remains. tree: https://gitee.com/openeuler/kernel.git OLK-5.10 head: e74aedc9df70f84e50a280478b93d98b3a622bc3 commit: 822da186955cbcd69b4715b8a307053e6c756f30 [2451/2451] x86/ibt,paravirt: Use text_gen_insn() for paravirt_patch() config: x86_64-buildonly-randconfig-005-20241119 (https://download.01.org/0day-ci/archive/20241120/202411201154.x6DQX3dV-lkp@…) compiler: gcc-12 (Debian 12.2.0-14) 12.2.0 reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20241120/202411201154.x6DQX3dV-lkp@…) If you fix the issue in a separate patch/commit (i.e. not just a new version of the same patch/commit), kindly add following tags | Reported-by: kernel test robot <lkp(a)intel.com> | Closes: https://lore.kernel.org/oe-kbuild-all/202411201154.x6DQX3dV-lkp@intel.com/ All errors (new ones prefixed by >>): arch/x86/kernel/paravirt.c: In function 'paravirt_patch_call': >> arch/x86/kernel/paravirt.c:65:9: error: implicit declaration of function '__text_gen_insn' [-Werror=implicit-function-declaration] 65 | __text_gen_insn(insn_buff, CALL_INSN_OPCODE, | ^~~~~~~~~~~~~~~ >> arch/x86/kernel/paravirt.c:65:36: error: 'CALL_INSN_OPCODE' undeclared (first use in this function) 65 | __text_gen_insn(insn_buff, CALL_INSN_OPCODE, | ^~~~~~~~~~~~~~~~ arch/x86/kernel/paravirt.c:65:36: note: each undeclared identifier is reported only once for each function it appears in arch/x86/kernel/paravirt.c:66:47: error: 'CALL_INSN_SIZE' undeclared (first use in this function) 66 | (void *)addr, target, CALL_INSN_SIZE); | ^~~~~~~~~~~~~~ arch/x86/kernel/paravirt.c:68:1: warning: control reaches end of non-void function [-Wreturn-type] 68 | } | ^ cc1: some warnings being treated as errors vim +/__text_gen_insn +65 arch/x86/kernel/paravirt.c 61 62 static unsigned paravirt_patch_call(void *insn_buff, const void *target, 63 unsigned long addr, unsigned len) 64 { > 65 __text_gen_insn(insn_buff, CALL_INSN_OPCODE, 66 (void *)addr, target, CALL_INSN_SIZE); 67 return CALL_INSN_SIZE; 68 } 69 -- 0-DAY CI Kernel Test Service https://github.com/intel/lkp-tests/wiki

1 0

[openeuler:OLK-5.10 2451/2451] arch/x86/kernel/paravirt.c:66:26: error: use of undeclared identifier 'CALL_INSN_SIZE'
by kernel test robot 20 Nov '24

20 Nov '24

Hi Peter, FYI, the error/warning still remains. tree: https://gitee.com/openeuler/kernel.git OLK-5.10 head: e74aedc9df70f84e50a280478b93d98b3a622bc3 commit: 822da186955cbcd69b4715b8a307053e6c756f30 [2451/2451] x86/ibt,paravirt: Use text_gen_insn() for paravirt_patch() config: x86_64-buildonly-randconfig-001-20241119 (https://download.01.org/0day-ci/archive/20241120/202411201117.TvJc5RO0-lkp@…) compiler: clang version 19.1.3 (https://github.com/llvm/llvm-project ab51eccf88f5321e7c60591c5546b254b6afab99) reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20241120/202411201117.TvJc5RO0-lkp@…) If you fix the issue in a separate patch/commit (i.e. not just a new version of the same patch/commit), kindly add following tags | Reported-by: kernel test robot <lkp(a)intel.com> | Closes: https://lore.kernel.org/oe-kbuild-all/202411201117.TvJc5RO0-lkp@intel.com/ All errors (new ones prefixed by >>): In file included from arch/x86/kernel/paravirt.c:14: In file included from include/linux/highmem.h:8: In file included from include/linux/mm.h:1581: include/linux/vmstat.h:417:43: warning: arithmetic between different enumeration types ('enum zone_stat_item' and 'enum numa_stat_item') [-Wenum-enum-conversion] 417 | return vmstat_text[NR_VM_ZONE_STAT_ITEMS + | ~~~~~~~~~~~~~~~~~~~~~ ^ 418 | item]; | ~~~~ include/linux/vmstat.h:424:43: warning: arithmetic between different enumeration types ('enum zone_stat_item' and 'enum numa_stat_item') [-Wenum-enum-conversion] 424 | return vmstat_text[NR_VM_ZONE_STAT_ITEMS + | ~~~~~~~~~~~~~~~~~~~~~ ^ 425 | NR_VM_NUMA_STAT_ITEMS + | ~~~~~~~~~~~~~~~~~~~~~ include/linux/vmstat.h:431:36: warning: arithmetic between different enumeration types ('enum node_stat_item' and 'enum lru_list') [-Wenum-enum-conversion] 431 | return node_stat_name(NR_LRU_BASE + lru) + 3; // skip "nr_" | ~~~~~~~~~~~ ^ ~~~ include/linux/vmstat.h:436:43: warning: arithmetic between different enumeration types ('enum zone_stat_item' and 'enum numa_stat_item') [-Wenum-enum-conversion] 436 | return vmstat_text[NR_VM_ZONE_STAT_ITEMS + | ~~~~~~~~~~~~~~~~~~~~~ ^ 437 | NR_VM_NUMA_STAT_ITEMS + | ~~~~~~~~~~~~~~~~~~~~~ include/linux/vmstat.h:445:43: warning: arithmetic between different enumeration types ('enum zone_stat_item' and 'enum numa_stat_item') [-Wenum-enum-conversion] 445 | return vmstat_text[NR_VM_ZONE_STAT_ITEMS + | ~~~~~~~~~~~~~~~~~~~~~ ^ 446 | NR_VM_NUMA_STAT_ITEMS + | ~~~~~~~~~~~~~~~~~~~~~ arch/x86/kernel/paravirt.c:65:2: error: implicit declaration of function '__text_gen_insn' [-Werror,-Wimplicit-function-declaration] 65 | __text_gen_insn(insn_buff, CALL_INSN_OPCODE, | ^ arch/x86/kernel/paravirt.c:65:29: error: use of undeclared identifier 'CALL_INSN_OPCODE' 65 | __text_gen_insn(insn_buff, CALL_INSN_OPCODE, | ^ >> arch/x86/kernel/paravirt.c:66:26: error: use of undeclared identifier 'CALL_INSN_SIZE' 66 | (void *)addr, target, CALL_INSN_SIZE); | ^ arch/x86/kernel/paravirt.c:67:9: error: use of undeclared identifier 'CALL_INSN_SIZE' 67 | return CALL_INSN_SIZE; | ^ arch/x86/kernel/paravirt.c:327:4: warning: cast from 'void (*)(struct mmu_gather *, struct page *)' to 'void (*)(struct mmu_gather *, void *)' converts to incompatible function type [-Wcast-function-type-strict] 327 | (void (*)(struct mmu_gather *, void *))tlb_remove_page, | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 6 warnings and 4 errors generated. vim +/CALL_INSN_SIZE +66 arch/x86/kernel/paravirt.c 61 62 static unsigned paravirt_patch_call(void *insn_buff, const void *target, 63 unsigned long addr, unsigned len) 64 { > 65 __text_gen_insn(insn_buff, CALL_INSN_OPCODE, > 66 (void *)addr, target, CALL_INSN_SIZE); 67 return CALL_INSN_SIZE; 68 } 69 -- 0-DAY CI Kernel Test Service https://github.com/intel/lkp-tests/wiki

1 0

[openeuler:OLK-5.10 2430/2430] kernel/sys_ni.c:271:1: sparse: sparse: symbol '__x32_compat_sys_fadvise64_64' was not declared. Should it be static?
by kernel test robot 20 Nov '24

20 Nov '24

tree: https://gitee.com/openeuler/kernel.git OLK-5.10 head: e74aedc9df70f84e50a280478b93d98b3a622bc3 commit: 57d1e11f97da27878e7c1f810a5f10257a043e10 [2430/2430] kernel/sys_ni: add compat entry for fadvise64_64 config: x86_64-randconfig-121-20241114 (https://download.01.org/0day-ci/archive/20241120/202411201047.0almZYd0-lkp@…) compiler: gcc-12 (Debian 12.2.0-14) 12.2.0 reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20241120/202411201047.0almZYd0-lkp@…) If you fix the issue in a separate patch/commit (i.e. not just a new version of the same patch/commit), kindly add following tags | Reported-by: kernel test robot <lkp(a)intel.com> | Closes: https://lore.kernel.org/oe-kbuild-all/202411201047.0almZYd0-lkp@intel.com/ sparse warnings: (new ones prefixed by >>) kernel/sys_ni.c:205:1: sparse: sparse: symbol '__ia32_sys_old_msgctl' was not declared. Should it be static? kernel/sys_ni.c:206:1: sparse: sparse: symbol '__ia32_sys_msgctl' was not declared. Should it be static? kernel/sys_ni.c:207:1: sparse: sparse: symbol '__ia32_compat_sys_msgctl' was not declared. Should it be static? kernel/sys_ni.c:207:1: sparse: sparse: symbol '__x32_compat_sys_msgctl' was not declared. Should it be static? kernel/sys_ni.c:208:1: sparse: sparse: symbol '__ia32_compat_sys_old_msgctl' was not declared. Should it be static? kernel/sys_ni.c:208:1: sparse: sparse: symbol '__x32_compat_sys_old_msgctl' was not declared. Should it be static? kernel/sys_ni.c:209:1: sparse: sparse: symbol '__ia32_sys_msgrcv' was not declared. Should it be static? kernel/sys_ni.c:210:1: sparse: sparse: symbol '__ia32_compat_sys_msgrcv' was not declared. Should it be static? kernel/sys_ni.c:210:1: sparse: sparse: symbol '__x32_compat_sys_msgrcv' was not declared. Should it be static? kernel/sys_ni.c:211:1: sparse: sparse: symbol '__ia32_sys_msgsnd' was not declared. Should it be static? kernel/sys_ni.c:212:1: sparse: sparse: symbol '__ia32_compat_sys_msgsnd' was not declared. Should it be static? kernel/sys_ni.c:212:1: sparse: sparse: symbol '__x32_compat_sys_msgsnd' was not declared. Should it be static? kernel/sys_ni.c:216:1: sparse: sparse: symbol '__x64_sys_old_semctl' was not declared. Should it be static? kernel/sys_ni.c:216:1: sparse: sparse: symbol '__ia32_sys_old_semctl' was not declared. Should it be static? kernel/sys_ni.c:217:1: sparse: sparse: symbol '__ia32_sys_semctl' was not declared. Should it be static? kernel/sys_ni.c:218:1: sparse: sparse: symbol '__ia32_compat_sys_semctl' was not declared. Should it be static? kernel/sys_ni.c:218:1: sparse: sparse: symbol '__x32_compat_sys_semctl' was not declared. Should it be static? kernel/sys_ni.c:219:1: sparse: sparse: symbol '__ia32_compat_sys_old_semctl' was not declared. Should it be static? kernel/sys_ni.c:219:1: sparse: sparse: symbol '__x32_compat_sys_old_semctl' was not declared. Should it be static? kernel/sys_ni.c:221:1: sparse: sparse: symbol '__x64_sys_semtimedop_time32' was not declared. Should it be static? kernel/sys_ni.c:221:1: sparse: sparse: symbol '__ia32_sys_semtimedop_time32' was not declared. Should it be static? kernel/sys_ni.c:222:1: sparse: sparse: symbol '__ia32_sys_semop' was not declared. Should it be static? kernel/sys_ni.c:226:1: sparse: sparse: symbol '__x64_sys_old_shmctl' was not declared. Should it be static? kernel/sys_ni.c:226:1: sparse: sparse: symbol '__ia32_sys_old_shmctl' was not declared. Should it be static? kernel/sys_ni.c:227:1: sparse: sparse: symbol '__ia32_sys_shmctl' was not declared. Should it be static? kernel/sys_ni.c:228:1: sparse: sparse: symbol '__ia32_compat_sys_shmctl' was not declared. Should it be static? kernel/sys_ni.c:228:1: sparse: sparse: symbol '__x32_compat_sys_shmctl' was not declared. Should it be static? kernel/sys_ni.c:229:1: sparse: sparse: symbol '__ia32_compat_sys_old_shmctl' was not declared. Should it be static? kernel/sys_ni.c:229:1: sparse: sparse: symbol '__x32_compat_sys_old_shmctl' was not declared. Should it be static? kernel/sys_ni.c:230:1: sparse: sparse: symbol '__ia32_sys_shmat' was not declared. Should it be static? kernel/sys_ni.c:231:1: sparse: sparse: symbol '__ia32_compat_sys_shmat' was not declared. Should it be static? kernel/sys_ni.c:231:1: sparse: sparse: symbol '__x32_compat_sys_shmat' was not declared. Should it be static? kernel/sys_ni.c:243:1: sparse: sparse: symbol '__ia32_sys_setsockopt' was not declared. Should it be static? kernel/sys_ni.c:244:1: sparse: sparse: symbol '__ia32_compat_sys_setsockopt' was not declared. Should it be static? kernel/sys_ni.c:244:1: sparse: sparse: symbol '__x32_compat_sys_setsockopt' was not declared. Should it be static? kernel/sys_ni.c:245:1: sparse: sparse: symbol '__ia32_sys_getsockopt' was not declared. Should it be static? kernel/sys_ni.c:246:1: sparse: sparse: symbol '__ia32_compat_sys_getsockopt' was not declared. Should it be static? kernel/sys_ni.c:246:1: sparse: sparse: symbol '__x32_compat_sys_getsockopt' was not declared. Should it be static? kernel/sys_ni.c:249:1: sparse: sparse: symbol '__ia32_sys_recvfrom' was not declared. Should it be static? kernel/sys_ni.c:250:1: sparse: sparse: symbol '__ia32_compat_sys_recvfrom' was not declared. Should it be static? kernel/sys_ni.c:250:1: sparse: sparse: symbol '__x32_compat_sys_recvfrom' was not declared. Should it be static? kernel/sys_ni.c:251:1: sparse: sparse: symbol '__ia32_sys_sendmsg' was not declared. Should it be static? kernel/sys_ni.c:252:1: sparse: sparse: symbol '__ia32_compat_sys_sendmsg' was not declared. Should it be static? kernel/sys_ni.c:252:1: sparse: sparse: symbol '__x32_compat_sys_sendmsg' was not declared. Should it be static? kernel/sys_ni.c:253:1: sparse: sparse: symbol '__ia32_sys_recvmsg' was not declared. Should it be static? kernel/sys_ni.c:254:1: sparse: sparse: symbol '__ia32_compat_sys_recvmsg' was not declared. Should it be static? kernel/sys_ni.c:254:1: sparse: sparse: symbol '__x32_compat_sys_recvmsg' was not declared. Should it be static? kernel/sys_ni.c:264:1: sparse: sparse: symbol '__ia32_sys_keyctl' was not declared. Should it be static? kernel/sys_ni.c:265:1: sparse: sparse: symbol '__ia32_compat_sys_keyctl' was not declared. Should it be static? kernel/sys_ni.c:265:1: sparse: sparse: symbol '__x32_compat_sys_keyctl' was not declared. Should it be static? kernel/sys_ni.c:270:1: sparse: sparse: symbol '__x64_sys_fadvise64_64' was not declared. Should it be static? kernel/sys_ni.c:270:1: sparse: sparse: symbol '__ia32_sys_fadvise64_64' was not declared. Should it be static? kernel/sys_ni.c:271:1: sparse: sparse: symbol '__ia32_compat_sys_fadvise64_64' was not declared. Should it be static? >> kernel/sys_ni.c:271:1: sparse: sparse: symbol '__x32_compat_sys_fadvise64_64' was not declared. Should it be static? kernel/sys_ni.c:287:1: sparse: sparse: symbol '__ia32_compat_sys_mbind' was not declared. Should it be static? kernel/sys_ni.c:287:1: sparse: sparse: symbol '__x32_compat_sys_mbind' was not declared. Should it be static? kernel/sys_ni.c:288:1: sparse: sparse: symbol '__ia32_sys_get_mempolicy' was not declared. Should it be static? kernel/sys_ni.c:289:1: sparse: sparse: symbol '__ia32_compat_sys_get_mempolicy' was not declared. Should it be static? kernel/sys_ni.c:289:1: sparse: sparse: symbol '__x32_compat_sys_get_mempolicy' was not declared. Should it be static? kernel/sys_ni.c:291:1: sparse: sparse: symbol '__ia32_compat_sys_set_mempolicy' was not declared. Should it be static? kernel/sys_ni.c:291:1: sparse: sparse: symbol '__x32_compat_sys_set_mempolicy' was not declared. Should it be static? kernel/sys_ni.c:293:1: sparse: sparse: symbol '__ia32_compat_sys_migrate_pages' was not declared. Should it be static? kernel/sys_ni.c:293:1: sparse: sparse: symbol '__x32_compat_sys_migrate_pages' was not declared. Should it be static? kernel/sys_ni.c:294:1: sparse: sparse: symbol '__ia32_sys_move_pages' was not declared. Should it be static? kernel/sys_ni.c:295:1: sparse: sparse: symbol '__ia32_compat_sys_move_pages' was not declared. Should it be static? kernel/sys_ni.c:295:1: sparse: sparse: symbol '__x32_compat_sys_move_pages' was not declared. Should it be static? kernel/sys_ni.c:299:1: sparse: sparse: symbol '__ia32_sys_recvmmsg' was not declared. Should it be static? kernel/sys_ni.c:300:1: sparse: sparse: symbol '__x64_sys_recvmmsg_time32' was not declared. Should it be static? kernel/sys_ni.c:300:1: sparse: sparse: symbol '__ia32_sys_recvmmsg_time32' was not declared. Should it be static? kernel/sys_ni.c:301:1: sparse: sparse: symbol '__ia32_compat_sys_recvmmsg_time32' was not declared. Should it be static? kernel/sys_ni.c:301:1: sparse: sparse: symbol '__x32_compat_sys_recvmmsg_time32' was not declared. Should it be static? kernel/sys_ni.c:302:1: sparse: sparse: symbol '__ia32_compat_sys_recvmmsg_time64' was not declared. Should it be static? kernel/sys_ni.c:302:1: sparse: sparse: symbol '__x32_compat_sys_recvmmsg_time64' was not declared. Should it be static? kernel/sys_ni.c:310:1: sparse: sparse: symbol '__ia32_sys_fanotify_mark' was not declared. Should it be static? kernel/sys_ni.c:314:1: sparse: sparse: symbol '__ia32_sys_open_by_handle_at' was not declared. Should it be static? kernel/sys_ni.c:315:1: sparse: sparse: symbol '__ia32_compat_sys_open_by_handle_at' was not declared. Should it be static? kernel/sys_ni.c:315:1: sparse: sparse: symbol '__x32_compat_sys_open_by_handle_at' was not declared. Should it be static? kernel/sys_ni.c:317:1: sparse: sparse: symbol '__ia32_sys_sendmmsg' was not declared. Should it be static? kernel/sys_ni.c:318:1: sparse: sparse: symbol '__ia32_compat_sys_sendmmsg' was not declared. Should it be static? kernel/sys_ni.c:318:1: sparse: sparse: symbol '__x32_compat_sys_sendmmsg' was not declared. Should it be static? kernel/sys_ni.c:319:1: sparse: sparse: symbol '__ia32_sys_process_vm_readv' was not declared. Should it be static? kernel/sys_ni.c:320:1: sparse: sparse: symbol '__ia32_compat_sys_process_vm_readv' was not declared. Should it be static? kernel/sys_ni.c:320:1: sparse: sparse: symbol '__x32_compat_sys_process_vm_readv' was not declared. Should it be static? kernel/sys_ni.c:321:1: sparse: sparse: symbol '__ia32_sys_process_vm_writev' was not declared. Should it be static? kernel/sys_ni.c:322:1: sparse: sparse: symbol '__ia32_compat_sys_process_vm_writev' was not declared. Should it be static? kernel/sys_ni.c:322:1: sparse: sparse: symbol '__x32_compat_sys_process_vm_writev' was not declared. Should it be static? kernel/sys_ni.c:338:1: sparse: sparse: symbol '__ia32_sys_execveat' was not declared. Should it be static? vim +/__x32_compat_sys_fadvise64_64 +271 kernel/sys_ni.c 268 269 /* mm/fadvise.c */ 270 COND_SYSCALL(fadvise64_64); > 271 COND_SYSCALL_COMPAT(fadvise64_64); 272 -- 0-DAY CI Kernel Test Service https://github.com/intel/lkp-tests/wiki

1 0

[PATCH openEuler-1.0-LTS] ceph: remove the incorrect Fw reference check when dirtying pages
by Baokun Li 20 Nov '24

20 Nov '24

From: Xiubo Li <xiubli(a)redhat.com> stable inclusion from stable-v4.19.323 commit c26c5ec832dd9e9dcd0a0a892a485c99889b68f0 category: bugfix bugzilla: https://gitee.com/src-openeuler/kernel/issues/IB2YU2 CVE: CVE-2024-50179 Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id… -------------------------------- [ Upstream commit c08dfb1b49492c09cf13838c71897493ea3b424e ] When doing the direct-io reads it will also try to mark pages dirty, but for the read path it won't hold the Fw caps and there is case will it get the Fw reference. Fixes: 5dda377cf0a6 ("ceph: set i_head_snapc when getting CEPH_CAP_FILE_WR reference") Signed-off-by: Xiubo Li <xiubli(a)redhat.com> Reviewed-by: Patrick Donnelly <pdonnell(a)redhat.com> Signed-off-by: Ilya Dryomov <idryomov(a)gmail.com> Signed-off-by: Sasha Levin <sashal(a)kernel.org> Signed-off-by: Baokun Li <libaokun1(a)huawei.com> --- fs/ceph/addr.c | 1 - 1 file changed, 1 deletion(-) diff --git a/fs/ceph/addr.c b/fs/ceph/addr.c index 476728bdae8c..7e4561d7fea1 100644 --- a/fs/ceph/addr.c +++ b/fs/ceph/addr.c @@ -92,7 +92,6 @@ static int ceph_set_page_dirty(struct page *page) /* dirty the head */ spin_lock(&ci->i_ceph_lock); - BUG_ON(ci->i_wr_ref == 0); // caller should hold Fw reference if (__ceph_have_pending_cap_snap(ci)) { struct ceph_cap_snap *capsnap = list_last_entry(&ci->i_cap_snaps, -- 2.46.1

2 1

[PATCH openEuler-22.03-LTS-SP1] ceph: remove the incorrect Fw reference check when dirtying pages
by Baokun Li 20 Nov '24

20 Nov '24

From: Xiubo Li <xiubli(a)redhat.com> stable inclusion from stable-v5.10.227 commit f55e003d261baa7c57d51ae5c8ec1f5c26a35c89 category: bugfix bugzilla: https://gitee.com/src-openeuler/kernel/issues/IB2YU2 CVE: CVE-2024-50179 Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id… -------------------------------- [ Upstream commit c08dfb1b49492c09cf13838c71897493ea3b424e ] When doing the direct-io reads it will also try to mark pages dirty, but for the read path it won't hold the Fw caps and there is case will it get the Fw reference. Fixes: 5dda377cf0a6 ("ceph: set i_head_snapc when getting CEPH_CAP_FILE_WR reference") Signed-off-by: Xiubo Li <xiubli(a)redhat.com> Reviewed-by: Patrick Donnelly <pdonnell(a)redhat.com> Signed-off-by: Ilya Dryomov <idryomov(a)gmail.com> Signed-off-by: Sasha Levin <sashal(a)kernel.org> Signed-off-by: Baokun Li <libaokun1(a)huawei.com> --- fs/ceph/addr.c | 1 - 1 file changed, 1 deletion(-) diff --git a/fs/ceph/addr.c b/fs/ceph/addr.c index 7402001e4c15..122b4129d1cd 100644 --- a/fs/ceph/addr.c +++ b/fs/ceph/addr.c @@ -91,7 +91,6 @@ static int ceph_set_page_dirty(struct page *page) /* dirty the head */ spin_lock(&ci->i_ceph_lock); - BUG_ON(ci->i_wr_ref == 0); // caller should hold Fw reference if (__ceph_have_pending_cap_snap(ci)) { struct ceph_cap_snap *capsnap = list_last_entry(&ci->i_cap_snaps, -- 2.46.1

2 1

[PATCH openEuler-22.03-LTS-SP1] nilfs2: propagate directory read errors from nilfs_find_entry()
by Baokun Li 20 Nov '24

20 Nov '24

From: Ryusuke Konishi <konishi.ryusuke(a)gmail.com> stable inclusion from stable-v5.10.228 commit c1d0476885d708a932980b0f28cd90d9bd71db39 category: bugfix bugzilla: https://gitee.com/src-openeuler/kernel/issues/IB2YWL CVE: CVE-2024-50202 Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id… -------------------------------- commit 08cfa12adf888db98879dbd735bc741360a34168 upstream. Syzbot reported that a task hang occurs in vcs_open() during a fuzzing test for nilfs2. The root cause of this problem is that in nilfs_find_entry(), which searches for directory entries, ignores errors when loading a directory page/folio via nilfs_get_folio() fails. If the filesystem images is corrupted, and the i_size of the directory inode is large, and the directory page/folio is successfully read but fails the sanity check, for example when it is zero-filled, nilfs_check_folio() may continue to spit out error messages in bursts. Fix this issue by propagating the error to the callers when loading a page/folio fails in nilfs_find_entry(). The current interface of nilfs_find_entry() and its callers is outdated and cannot propagate error codes such as -EIO and -ENOMEM returned via nilfs_find_entry(), so fix it together. Link: https://lkml.kernel.org/r/20241004033640.6841-1-konishi.ryusuke@gmail.com Fixes: 2ba466d74ed7 ("nilfs2: directory entry operations") Signed-off-by: Ryusuke Konishi <konishi.ryusuke(a)gmail.com> Reported-by: Lizhi Xu <lizhi.xu(a)windriver.com> Closes: https://lkml.kernel.org/r/20240927013806.3577931-1-lizhi.xu@windriver.com Reported-by: syzbot+8a192e8d090fa9a31135(a)syzkaller.appspotmail.com Closes: https://syzkaller.appspot.com/bug?extid=8a192e8d090fa9a31135 Cc: <stable(a)vger.kernel.org> Signed-off-by: Andrew Morton <akpm(a)linux-foundation.org> Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> Signed-off-by: Baokun Li <libaokun1(a)huawei.com> --- fs/nilfs2/dir.c | 50 +++++++++++++++++++++++++---------------------- fs/nilfs2/namei.c | 39 ++++++++++++++++++++++++------------ fs/nilfs2/nilfs.h | 2 +- 3 files changed, 54 insertions(+), 37 deletions(-) diff --git a/fs/nilfs2/dir.c b/fs/nilfs2/dir.c index a2ba94f00b71..740fa1906077 100644 --- a/fs/nilfs2/dir.c +++ b/fs/nilfs2/dir.c @@ -331,6 +331,8 @@ static int nilfs_readdir(struct file *file, struct dir_context *ctx) * returns the page in which the entry was found, and the entry itself * (as a parameter - res_dir). Page is returned mapped and unlocked. * Entry is guaranteed to be valid. + * + * On failure, returns an error pointer and the caller should ignore res_page. */ struct nilfs_dir_entry * nilfs_find_entry(struct inode *dir, const struct qstr *qstr, @@ -358,22 +360,24 @@ nilfs_find_entry(struct inode *dir, const struct qstr *qstr, do { char *kaddr = nilfs_get_page(dir, n, &page); - if (!IS_ERR(kaddr)) { - de = (struct nilfs_dir_entry *)kaddr; - kaddr += nilfs_last_byte(dir, n) - reclen; - while ((char *) de <= kaddr) { - if (de->rec_len == 0) { - nilfs_error(dir->i_sb, - "zero-length directory entry"); - nilfs_put_page(page); - goto out; - } - if (nilfs_match(namelen, name, de)) - goto found; - de = nilfs_next_entry(de); + if (IS_ERR(kaddr)) + return ERR_CAST(kaddr); + + de = (struct nilfs_dir_entry *)kaddr; + kaddr += nilfs_last_byte(dir, n) - reclen; + while ((char *)de <= kaddr) { + if (de->rec_len == 0) { + nilfs_error(dir->i_sb, + "zero-length directory entry"); + nilfs_put_page(page); + goto out; } - nilfs_put_page(page); + if (nilfs_match(namelen, name, de)) + goto found; + de = nilfs_next_entry(de); } + nilfs_put_page(page); + if (++n >= npages) n = 0; /* next page is past the blocks we've got */ @@ -386,7 +390,7 @@ nilfs_find_entry(struct inode *dir, const struct qstr *qstr, } } while (n != start); out: - return NULL; + return ERR_PTR(-ENOENT); found: *res_page = page; @@ -431,19 +435,19 @@ struct nilfs_dir_entry *nilfs_dotdot(struct inode *dir, struct page **p) return NULL; } -ino_t nilfs_inode_by_name(struct inode *dir, const struct qstr *qstr) +int nilfs_inode_by_name(struct inode *dir, const struct qstr *qstr, ino_t *ino) { - ino_t res = 0; struct nilfs_dir_entry *de; struct page *page; de = nilfs_find_entry(dir, qstr, &page); - if (de) { - res = le64_to_cpu(de->inode); - kunmap(page); - put_page(page); - } - return res; + if (IS_ERR(de)) + return PTR_ERR(de); + + *ino = le64_to_cpu(de->inode); + kunmap(page); + put_page(page); + return 0; } /* Releases the page */ diff --git a/fs/nilfs2/namei.c b/fs/nilfs2/namei.c index a6ec7961d4f5..08c6d985edeb 100644 --- a/fs/nilfs2/namei.c +++ b/fs/nilfs2/namei.c @@ -55,12 +55,20 @@ nilfs_lookup(struct inode *dir, struct dentry *dentry, unsigned int flags) { struct inode *inode; ino_t ino; + int res; if (dentry->d_name.len > NILFS_NAME_LEN) return ERR_PTR(-ENAMETOOLONG); - ino = nilfs_inode_by_name(dir, &dentry->d_name); - inode = ino ? nilfs_iget(dir->i_sb, NILFS_I(dir)->i_root, ino) : NULL; + res = nilfs_inode_by_name(dir, &dentry->d_name, &ino); + if (res) { + if (res != -ENOENT) + return ERR_PTR(res); + inode = NULL; + } else { + inode = nilfs_iget(dir->i_sb, NILFS_I(dir)->i_root, ino); + } + return d_splice_alias(inode, dentry); } @@ -261,10 +269,11 @@ static int nilfs_do_unlink(struct inode *dir, struct dentry *dentry) struct page *page; int err; - err = -ENOENT; de = nilfs_find_entry(dir, &dentry->d_name, &page); - if (!de) + if (IS_ERR(de)) { + err = PTR_ERR(de); goto out; + } inode = d_inode(dentry); err = -EIO; @@ -358,10 +367,11 @@ static int nilfs_rename(struct inode *old_dir, struct dentry *old_dentry, if (unlikely(err)) return err; - err = -ENOENT; old_de = nilfs_find_entry(old_dir, &old_dentry->d_name, &old_page); - if (!old_de) + if (IS_ERR(old_de)) { + err = PTR_ERR(old_de); goto out; + } if (S_ISDIR(old_inode->i_mode)) { err = -EIO; @@ -378,10 +388,12 @@ static int nilfs_rename(struct inode *old_dir, struct dentry *old_dentry, if (dir_de && !nilfs_empty_dir(new_inode)) goto out_dir; - err = -ENOENT; - new_de = nilfs_find_entry(new_dir, &new_dentry->d_name, &new_page); - if (!new_de) + new_de = nilfs_find_entry(new_dir, &new_dentry->d_name, + &new_page); + if (IS_ERR(new_de)) { + err = PTR_ERR(new_de); goto out_dir; + } nilfs_set_link(new_dir, new_de, new_page, old_inode); nilfs_mark_inode_dirty(new_dir); new_inode->i_ctime = current_time(new_inode); @@ -435,14 +447,15 @@ static int nilfs_rename(struct inode *old_dir, struct dentry *old_dentry, */ static struct dentry *nilfs_get_parent(struct dentry *child) { - unsigned long ino; + ino_t ino; + int res; struct inode *inode; struct qstr dotdot = QSTR_INIT("..", 2); struct nilfs_root *root; - ino = nilfs_inode_by_name(d_inode(child), &dotdot); - if (!ino) - return ERR_PTR(-ENOENT); + res = nilfs_inode_by_name(d_inode(child), &dotdot, &ino); + if (res) + return ERR_PTR(res); root = NILFS_I(d_inode(child))->i_root; diff --git a/fs/nilfs2/nilfs.h b/fs/nilfs2/nilfs.h index 3f3971e0292d..e1b230a5011a 100644 --- a/fs/nilfs2/nilfs.h +++ b/fs/nilfs2/nilfs.h @@ -233,7 +233,7 @@ static inline __u32 nilfs_mask_flags(umode_t mode, __u32 flags) /* dir.c */ extern int nilfs_add_link(struct dentry *, struct inode *); -extern ino_t nilfs_inode_by_name(struct inode *, const struct qstr *); +int nilfs_inode_by_name(struct inode *dir, const struct qstr *qstr, ino_t *ino); extern int nilfs_make_empty(struct inode *, struct inode *); extern struct nilfs_dir_entry * nilfs_find_entry(struct inode *, const struct qstr *, struct page **); -- 2.46.1

2 1