{"id":2215836,"url":"http://patchwork.ozlabs.org/api/patches/2215836/?format=json","web_url":"http://patchwork.ozlabs.org/project/ltp/patch/20260325124428.6497-1-wegao@suse.com/","project":{"id":59,"url":"http://patchwork.ozlabs.org/api/projects/59/?format=json","name":"Linux Test Project development","link_name":"ltp","list_id":"ltp.lists.linux.it","list_email":"ltp@lists.linux.it","web_url":"","scm_url":"","webscm_url":"","list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<20260325124428.6497-1-wegao@suse.com>","list_archive_url":null,"date":"2026-03-25T12:43:57","name":"[v4] fanotify22.c: handle multiple asynchronous error events","commit_ref":null,"pull_url":null,"state":"changes-requested","archived":false,"hash":"f1c3206839bcb01bba5c0e1bd19bfebc46715475","submitter":{"id":85577,"url":"http://patchwork.ozlabs.org/api/people/85577/?format=json","name":"Wei Gao","email":"wegao@suse.com"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/ltp/patch/20260325124428.6497-1-wegao@suse.com/mbox/","series":[{"id":497435,"url":"http://patchwork.ozlabs.org/api/series/497435/?format=json","web_url":"http://patchwork.ozlabs.org/project/ltp/list/?series=497435","date":"2026-03-25T12:43:57","name":"[v4] fanotify22.c: handle multiple asynchronous error events","version":4,"mbox":"http://patchwork.ozlabs.org/series/497435/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/2215836/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/2215836/checks/","tags":{},"related":[],"headers":{"Return-Path":"","X-Original-To":["incoming@patchwork.ozlabs.org","ltp@lists.linux.it"],"Delivered-To":["patchwork-incoming@legolas.ozlabs.org","ltp@picard.linux.it"],"Authentication-Results":["legolas.ozlabs.org;\n\tdkim=pass (1024-bit key;\n unprotected) header.d=lists.linux.it header.i=@lists.linux.it\n header.a=rsa-sha256 header.s=picard header.b=NYNWCFh3;\n\tdkim=fail reason=\"signature verification failed\" (2048-bit key;\n unprotected) header.d=suse.com header.i=@suse.com header.a=rsa-sha256\n header.s=google header.b=YUe3zhqG;\n\tdkim-atps=neutral","legolas.ozlabs.org;\n spf=pass (sender SPF authorized) smtp.mailfrom=lists.linux.it\n (client-ip=213.254.12.146; helo=picard.linux.it;\n envelope-from=ltp-bounces+incoming=patchwork.ozlabs.org@lists.linux.it;\n receiver=patchwork.ozlabs.org)"],"Received":["from picard.linux.it (picard.linux.it [213.254.12.146])\n\t(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)\n\t key-exchange x25519)\n\t(No client certificate requested)\n\tby legolas.ozlabs.org (Postfix) with ESMTPS id 4fgmnp0t80z1xy3\n\tfor ; Wed, 25 Mar 2026 23:44:46 +1100 (AEDT)","from picard.linux.it (localhost [IPv6:::1])\n\tby picard.linux.it (Postfix) with ESMTP id 6CA323E2FF6\n\tfor ; Wed, 25 Mar 2026 13:44:43 +0100 (CET)","from in-6.smtp.seeweb.it (in-6.smtp.seeweb.it\n [IPv6:2001:4b78:1:20::6])\n (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)\n key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384)\n (No client certificate requested)\n by picard.linux.it (Postfix) with ESMTPS id C0ADE3E2245\n for ; Wed, 25 Mar 2026 13:44:38 +0100 (CET)","from mail-wm1-x32f.google.com (mail-wm1-x32f.google.com\n [IPv6:2a00:1450:4864:20::32f])\n (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)\n key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest\n SHA256)\n (No client certificate requested)\n by in-6.smtp.seeweb.it (Postfix) with ESMTPS id B7EEC1400968\n for ; Wed, 25 Mar 2026 13:44:32 +0100 (CET)","by mail-wm1-x32f.google.com with SMTP id\n 5b1f17b1804b1-48541edecf9so21606095e9.1\n for ; Wed, 25 Mar 2026 05:44:32 -0700 (PDT)","from localhost ([2a07:de40:b240:0:2ad6:ed42:2ad6:ed42])\n by smtp.gmail.com with UTF8SMTPSA id\n 5b1f17b1804b1-48716658352sm20364495e9.13.2026.03.25.05.44.31\n (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n Wed, 25 Mar 2026 05:44:31 -0700 (PDT)"],"DKIM-Signature":["v=1; a=rsa-sha256; c=relaxed/simple; d=lists.linux.it;\n i=@lists.linux.it; q=dns/txt; s=picard; t=1774442683; h=to : date :\n message-id : in-reply-to : references : mime-version : subject :\n list-id : list-unsubscribe : list-archive : list-post : list-help :\n list-subscribe : from : reply-to : cc : content-type :\n content-transfer-encoding : sender : from;\n bh=aE8cRbAykek8OXRT8zwjJCb1Qld6mrq5HpuS2gB6sTs=;\n b=NYNWCFh3xV9daAeiNmLU3HwlldOJU9ZLJFbf0JER3YMF7olo3TbXBrZcRbDVVUSNJPoMf\n Sg0rozF2L9/u+Fw9y2/uzFiUs8Yd61uA3UIgnjk3TB1h5+5Gl6MzzK3e8dbJJ06Ageymuro\n WCVURQu5IAG2SdTknf3Vq3s4Y42M6Qw=","v=1; a=rsa-sha256; c=relaxed/relaxed;\n d=suse.com; s=google; t=1774442672; x=1775047472; darn=lists.linux.it;\n h=content-transfer-encoding:mime-version:references:in-reply-to\n :message-id:date:subject:cc:to:from:from:to:cc:subject:date\n :message-id:reply-to;\n bh=pi3nTzIItIxRnRlBJGYfsacbcryq1u5p5Qwn4ZnHTa0=;\n b=YUe3zhqGsubd3YwSwRu8J/yyXLeU40PMzg6BJIA2Vw07pcirEyVNFnfNUK49jUNtyB\n nYBtgCwSMid4rntFoY85g/K3f8JnNxJdR27RrBbEnevUCNtduj2T5/zV6nqvekmeXyGH\n oh+VThu1PorwUiDgI9Av8KGv1WY6MG+cz/iC8WqHjh3cs2I6W1i3msF9pRP/jB4SXqEZ\n vliPWxOoLbQT7fkP71NlVUSFfQbW5+/O9uWQAJvqE9EnUZx4IQjPBfQRAYPDFp+Y1z2L\n mPAzgdLUK5mEaryOr+cL/Rzf9GsscwG9U/EQ8tAYFOGi4TdY5uOllQvNcWZy432KyGC6\n A29g=="],"X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n d=1e100.net; s=20251104; t=1774442672; x=1775047472;\n h=content-transfer-encoding:mime-version:references:in-reply-to\n :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from\n :to:cc:subject:date:message-id:reply-to;\n bh=pi3nTzIItIxRnRlBJGYfsacbcryq1u5p5Qwn4ZnHTa0=;\n b=DTJ92fycABDKpCmQApns2DMMH6YAZ+kvmvYiN1zrVoD5tzuYns/6i7f7drnumzK4so\n 2LIAolJ6iGotLApPaffX0rvAK9KlwXukoU52lYgwuAzNFStasf1Hzsnl9BqCuP2IY8Na\n gU6EjpsCkK1gz0lCr20JsamG6HnGLO4CtmmEqVT6UoEWn++Y0gnBzg4uwOHzsAAqoou0\n INqI8mw/tFOHl5Czaat5kF9Jzsx43PuXhZOOJpwSEgXLq8k661jx3bqzkgSOyYUreXU3\n NLgUpbVcY4Pw8WQ2M9BnewQK+TNIm1VVImyom1I/fGbid97jAS2favvHmu3eIVUT97xM\n mYFQ==","X-Gm-Message-State":"AOJu0Yw8/LMxhQqM45dwhcm1NoRH3EjpLpNqRat2SxYiVJZr6nS03Cd9\n wZcNj/qVZHD+KYj0BDFSn9OUpmtHDq7ypTPkgwueV32aOMdRXBAy+4FT1GGErPyxWrX3Abpos6G\n /QwM=","X-Gm-Gg":"ATEYQzwhAqO8/R0PzdJXSptQMr29YinQVLlQBonLpnOlSh88V3T05ww1B//UpyJB1NS\n giSr8hMfVw7WgcdfwMolz7G0DdJIajaq62sY0Iz3Jdr0l7bboqP9WdV8Nue6cnzI/nGdnztcbbL\n CfTBeHJj6AIdPO5hM5J9ig7aEqomTjzUar6Uo/bRWTy+Bni8kCI35JaHtB5VzuihTLxbOhl2DDx\n rXre4xmQUzjvIwHP2o2aViulfSbnBMmXIB3RCDZzET3z6go2sGzAWTqkuSP/ylI5sPt6iTst1jV\n 3jyThbSqs3Khe+z0DgbSCEGX+rx+1LmfTT395ovJtOlfbReG9dEZyldmT3qw2Ok8dpiVgJl/SJd\n xCcYvwoA3BoOknOcroaBY+e/Aca/v828EhVhV5vyPOAOPGIyKt5/0UvL1OixE/rd/mhHVMaDFpR\n mVoxcA4BetYtM=","X-Received":"by 2002:a05:600c:190e:b0:483:7903:c3b1 with SMTP id\n 5b1f17b1804b1-4871604c856mr50378265e9.20.1774442671708;\n Wed, 25 Mar 2026 05:44:31 -0700 (PDT)","To":"ltp@lists.linux.it","Date":"Wed, 25 Mar 2026 12:43:57 +0000","Message-ID":"<20260325124428.6497-1-wegao@suse.com>","X-Mailer":"git-send-email 2.43.0","In-Reply-To":"<20260318064630.1604-1-wegao@suse.com>","References":"<20260318064630.1604-1-wegao@suse.com>","MIME-Version":"1.0","X-Spam-Status":"No, score=0.1 required=7.0 tests=DKIM_SIGNED,DKIM_VALID,\n DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS shortcircuit=no\n autolearn=disabled version=4.0.1","X-Spam-Checker-Version":"SpamAssassin 4.0.1 (2024-03-25) on in-6.smtp.seeweb.it","X-Virus-Scanned":"clamav-milter 1.0.9 at in-6.smtp.seeweb.it","X-Virus-Status":"Clean","Subject":"[LTP] [PATCH v4] fanotify22.c: handle multiple asynchronous error\n events","X-BeenThere":"ltp@lists.linux.it","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"Linux Test Project ","List-Unsubscribe":",\n ","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n ","From":"Wei Gao via ltp ","Reply-To":"Wei Gao ","Cc":"Jan Kara , kernel test robot ","Content-Type":"text/plain; charset=\"us-ascii\"","Content-Transfer-Encoding":"7bit","Errors-To":"ltp-bounces+incoming=patchwork.ozlabs.org@lists.linux.it","Sender":"\"ltp\" "},"content":"Since the introduction of the asynchronous fserror reporting framework\n(kernel commit 81d2e13a57c9), fanotify22 has encountered sporadic failures\ndue to the non-deterministic nature of event delivery and merging:\n\n1) tcase3 failure: A race condition occurs when the test reads the\n notification fd between two events. uses a poll() and read() loop to wait\n until the expected.\n\n2) tcase4 failure: The kernel may deliver errors as independent events\n instead of a single merged event, since different worker kthread can\n end up generating each event so they won't be merged. As suggested by\n Jan Kara, this patch introduces a consolidate_events() helper. It iterates\n through the event buffer, accumulates the error_count from all independent\n events, and updates the first event's count in-place.\n\nReported-by: kernel test robot \nCloses: https://lore.kernel.org/oe-lkp/202602042124.87bd00e3-lkp@intel.com\nSuggested-by: Jan Kara \nSigned-off-by: Wei Gao \n---\nv3->v4:\n1)Fixed read_len logic by using m->event_len inside the loop to avoid overcounting.\n2)Removed redundant if (info) check in consolidate_events.\n\n .../kernel/syscalls/fanotify/fanotify22.c | 86 ++++++++++++++++++-\n 1 file changed, 82 insertions(+), 4 deletions(-)","diff":"diff --git a/testcases/kernel/syscalls/fanotify/fanotify22.c b/testcases/kernel/syscalls/fanotify/fanotify22.c\nindex e8002b160..e79213b40 100644\n--- a/testcases/kernel/syscalls/fanotify/fanotify22.c\n+++ b/testcases/kernel/syscalls/fanotify/fanotify22.c\n@@ -28,6 +28,7 @@\n #include \"tst_test.h\"\n #include \n #include \n+#include \n \n #ifdef HAVE_SYS_FANOTIFY_H\n #include \"fanotify.h\"\n@@ -88,7 +89,6 @@ static void trigger_bad_link_lookup(void)\n \t\t\tret, BAD_LINK, errno, EUCLEAN);\n }\n \n-\n static void tcase3_trigger(void)\n {\n \ttrigger_bad_link_lookup();\n@@ -104,6 +104,7 @@ static void tcase4_trigger(void)\n static struct test_case {\n \tchar *name;\n \tint error;\n+\tint error2;\n \tunsigned int error_count;\n \tstruct fanotify_fid_t *fid;\n \tvoid (*trigger_error)(void);\n@@ -134,10 +135,52 @@ static struct test_case {\n \t\t.trigger_error = &tcase4_trigger,\n \t\t.error_count = 2,\n \t\t.error = EFSCORRUPTED,\n+\t\t.error2 = ESHUTDOWN,\n \t\t.fid = &bad_file_fid,\n \t}\n };\n \n+static size_t consolidate_events(char *buf, size_t len, const struct test_case *ex)\n+{\n+\tstruct fanotify_event_metadata *metadata, *first = NULL;\n+\tstruct fanotify_event_info_error *first_info = NULL;\n+\tunsigned int total_count = 0;\n+\tint event_num = 0;\n+\n+\tfor (metadata = (struct fanotify_event_metadata *)buf;\n+\t\t\tFAN_EVENT_OK(metadata, len);\n+\t\t\tmetadata = FAN_EVENT_NEXT(metadata, len)) {\n+\n+\t\tevent_num++;\n+\t\tstruct fanotify_event_info_error *info = get_event_info_error(metadata);\n+\n+\t\tif (!info) {\n+\t\t\ttst_res(TFAIL, \"%s: Event [%d] missing error info\",\n+\t\t\t\t\tex->name, event_num);\n+\t\t\tcontinue;\n+\t\t}\n+\n+\t\tif (info->error != ex->error && (ex->error2 == 0 || info->error != ex->error2)) {\n+\t\t\ttst_res(TFAIL, \"%s: Event [%d] unexpected errno (%d)\",\n+\t\t\t\t\tex->name, event_num, info->error);\n+\t\t}\n+\n+\t\tif (!first) {\n+\t\t\tfirst = metadata;\n+\t\t\tfirst_info = info;\n+\t\t}\n+\t\ttotal_count += info->error_count;\n+\n+\t\ttst_res(TINFO, \"Event [%d]: errno=%d, error_count=%d\",\n+\t\t\t\tevent_num, info->error, info->error_count);\n+\t}\n+\n+\tif (first_info)\n+\t\tfirst_info->error_count = total_count;\n+\n+\treturn (first) ? first->event_len : 0;\n+}\n+\n static int check_error_event_info_fid(struct fanotify_event_info_fid *fid,\n \t\t\t\t const struct test_case *ex)\n {\n@@ -248,19 +291,54 @@ static void check_event(char *buf, size_t len, const struct test_case *ex)\n static void do_test(unsigned int i)\n {\n \tconst struct test_case *tcase = &testcases[i];\n-\tsize_t read_len;\n+\tsize_t read_len = 0;\n+\tstruct pollfd pfd;\n+\tunsigned int accumulated_count = 0;\n \n \tSAFE_FANOTIFY_MARK(fd_notify, FAN_MARK_ADD|FAN_MARK_FILESYSTEM,\n \t\t\t FAN_FS_ERROR, AT_FDCWD, MOUNT_PATH);\n \n \ttcase->trigger_error();\n \n-\tread_len = SAFE_READ(0, fd_notify, event_buf, BUF_SIZE);\n+\tpfd.fd = fd_notify;\n+\tpfd.events = POLLIN;\n+\n+\twhile (accumulated_count < tcase->error_count) {\n+\t\tif (poll(&pfd, 1, 5000) <= 0) {\n+\t\t\ttst_res(TFAIL, \"%s: Timeout waiting for events\", tcase->name);\n+\t\t\tgoto out;\n+\t\t}\n+\n+\t\tchar *current_pos = event_buf + read_len;\n+\t\tint ret = read(fd_notify, current_pos, BUF_SIZE - read_len);\n+\n+\t\tif (ret < 0) {\n+\t\t\ttst_res(TFAIL, \"%s: read failed: %s\", tcase->name, strerror(errno));\n+\t\t\tgoto out;\n+\t\t}\n+\n+\t\tstruct fanotify_event_metadata *m =\n+\t\t\t(struct fanotify_event_metadata *)current_pos;\n+\t\twhile (FAN_EVENT_OK(m, ret)) {\n+\t\t\tstruct fanotify_event_info_error *e = get_event_info_error(m);\n+\n+\t\t\tif (e)\n+\t\t\t\taccumulated_count += e->error_count;\n+\n+\t\t\tread_len += m->event_len;\n+\t\t\tm = FAN_EVENT_NEXT(m, ret);\n+\t\t}\n+\t}\n+\n+\tread_len = consolidate_events(event_buf, read_len, tcase);\n+\n+\tcheck_event(event_buf, read_len, tcase);\n+\n+out:\n \n \tSAFE_FANOTIFY_MARK(fd_notify, FAN_MARK_REMOVE|FAN_MARK_FILESYSTEM,\n \t\t\t FAN_FS_ERROR, AT_FDCWD, MOUNT_PATH);\n \n-\tcheck_event(event_buf, read_len, tcase);\n \t/* Unmount and mount the filesystem to get it out of the error state */\n \tSAFE_UMOUNT(MOUNT_PATH);\n \tSAFE_MOUNT(tst_device->dev, MOUNT_PATH, tst_device->fs_type, 0, NULL);\n","prefixes":["v4"]}