From nobody Tue Apr 7 06:14:31 2026 Received: from mail-wm1-f50.google.com (mail-wm1-f50.google.com [209.85.128.50]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B5F6A371872 for ; Sun, 15 Mar 2026 22:24:35 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.50 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773613477; cv=none; b=YyL1vwSOPomQvz8CGQyGsWceiU6ByvZKEbGCIDAO86mnUHVFqbQXfHG5wiNUQcMaTJ7VvSthJMOZ3vNOXWHcQS35qmNTz3UovKGNyLcgJM23lnB7FOh7mx1HBL8sspo5UGyN8MgRd56AIIuXt8diTHnQVzJXNWSm5JFsBy4gqOc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773613477; c=relaxed/simple; bh=NsJMQID6qqogQVnxgZCQtINqrARQFbNXb9N/GcKUa1g=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=gtpd1/BYs+CYoBAUl4QAeXHEuT7flzQnb7jbt7AZzZkN0MX6B2aqClpspeAJ2/VMVmrr4crxl+F+sw5OajTWRU6tszk3LjV9e5IkeTLolqUwG150JL2Y02mmNqLI2xqysikguE8Q8BiUoFMlDHlXPHSA+8ULV/BIdAk/0ptEwYg= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=DKVXSZy3; arc=none smtp.client-ip=209.85.128.50 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="DKVXSZy3" Received: by mail-wm1-f50.google.com with SMTP id 5b1f17b1804b1-48535a0ef86so32926765e9.1 for ; Sun, 15 Mar 2026 15:24:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1773613474; x=1774218274; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=L68uZTGfVB2TCb/++jTRmnIEU6CaQMoxuI7io1Gv5bo=; b=DKVXSZy3uBjodRnxjNQja0WTKQ8hI1YfSn7UQIjeYfU6CI+Wi6fYAkgWQVxPPJ/eYT YqjJIqZKAxJWQY5zh+o6C0Fddlt4nZNyMYz5xDjWA0v0EKfaav8zPyyKxChHZgpF6e3s 4+SlPUBq/r7d8fyWjRCtA4YISU2i3iXFvOGZ6NVz3oSrTGj7IQCUNtURIoeaECVL4e2t rkrMP0mkGQcOrMvOTJiIqogMtfelaVETw34tshTI7le2zn/pzO/pVIBQvfKEUA1+3mce 145q0ufGrcRTyjzSWk5689ajx4mwc4phBsUcHk6/NqKiFeuT3zv5W28AZDBP6Hav+c/j cfpw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1773613474; x=1774218274; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=L68uZTGfVB2TCb/++jTRmnIEU6CaQMoxuI7io1Gv5bo=; b=A8hnrxb+s80UcFpFMsJuiWk0yoZQbNn0klSScDL2lW+g9nzRNX39CQhP6cu3HbEJXO j2sEt1G20YK/BURwIpVKlpqUYqoXTQ0c8tg0pDoIHNGpOrj/Yh9EjkvZgdcTzNn+C0hm TW0eVNZGUIh3srOlv+De+28+nNWGUlsip4lhqEaUIMvT19yrsisoy12If3mNs3nXAXa1 iWroEVMTgcHwxA2Ic8f80Gn22YzS+ZG0C1hLA0ue4ZHkkm2hVkVZPll50+YkFzOpSmLM 0Aqw72BrSAWI4opQDxPe2xGnrAHQcuoAIm0tFaJpv93qLVXJ4Pb+nQ2MRoNsdSHTXRJF 6bXQ== X-Gm-Message-State: AOJu0Yy2KKM0+7n+xbV8r6IvG83kymT7qXRWBP2RUJy2LYzVdKj2aJGL wSmQm2bikrn1C/n+B+YAADjm3wmJ+L+bDvzwRJQm1JO9iTzgUflV1bzx X-Gm-Gg: ATEYQzyut4SeNwRZOd7bAr850Ap7TcJPQycvPtLy8tdmiWujeFaGmNvGjCPN/9sQxiY H/Fqo0oV4p8wxKhYsUt3fOTs9fuHpBnRmxeVhN9fopMDI/cc7PceLHusHj8YbBJX5yPYzQI79cG A7mBA64JOEZIUzWzAbCpF3wo0AJ6hPMW1cA4eywS6Hv32Ea4SJAvl9SzMZL/Zd3dTyBmBmi+VdF KKIyQPhiD97oBCavK7liJ0yzalaMhhgk6lJY2B0kTMYN/96WKRYAEZ6HO801BHdIcDPqluIIGAh TNQjr24PJ7mcPxOP1a09zpYz+WS/cQ6PrglApkmq84l9+EpwmMz7Yrz+j0bhgyA7U1Cl5UpMdef 759nacaOD3huKtPXJPQxVCL8bbPNH8XDs23fJJaYmt4k1uDHSPZr2snAjwANroAbNVf4sl1N/uC 2d5MpwohMNxy9XoI4QHpSCPNQljryb2rJVjKw= X-Received: by 2002:a05:600c:4ed1:b0:485:3d43:7c9a with SMTP id 5b1f17b1804b1-4855670e6dcmr196346325e9.25.1773613473760; Sun, 15 Mar 2026 15:24:33 -0700 (PDT) Received: from localhost.localdomain ([147.235.207.31]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4854b5f6bb4sm367291745e9.4.2026.03.15.15.24.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 15 Mar 2026 15:24:33 -0700 (PDT) From: aviv.daum@gmail.com To: OGAWA Hirofumi Cc: linux-kernel@vger.kernel.org, avivdaum Subject: [PATCH v2] fat: add KUnit tests for timestamp conversion helpers Date: Mon, 16 Mar 2026 00:24:04 +0200 Message-Id: <20260315222404.9678-1-aviv.daum@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20260315144212.24325-1-aviv.daum@gmail.com> References: <20260315144212.24325-1-aviv.daum@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: avivdaum Extend fat_test with coverage for FAT timestamp edge cases that are not currently exercised. Add tests for fat_time_unix2fat() clamping at the UTC boundaries and when time_offset pushes an otherwise valid timestamp outside the FAT date range. Also cover the NULL time_cs path used by existing callers, and verify fat_truncate_atime() truncation across timezone offsets. Signed-off-by: avivdaum v2: - Compare __le16 values directly in unix2fat tests Acked-by: OGAWA Hirofumi --- fs/fat/fat_test.c | 181 ++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 173 insertions(+), 8 deletions(-) diff --git a/fs/fat/fat_test.c b/fs/fat/fat_test.c index 1f0062659..5c97a7fcc 100644 --- a/fs/fat/fat_test.c +++ b/fs/fat/fat_test.c @@ -29,6 +29,22 @@ struct fat_timestamp_testcase { int time_offset; }; =20 +struct fat_unix2fat_clamp_testcase { + const char *name; + struct timespec64 ts; + __le16 time; + __le16 date; + u8 cs; + int time_offset; +}; + +struct fat_truncate_atime_testcase { + const char *name; + struct timespec64 ts; + struct timespec64 expected; + int time_offset; +}; + static struct fat_timestamp_testcase time_test_cases[] =3D { { .name =3D "Earliest possible UTC (1980-01-01 00:00:00)", @@ -120,13 +136,92 @@ static struct fat_timestamp_testcase time_test_cases[= ] =3D { }, }; =20 +static struct fat_unix2fat_clamp_testcase unix2fat_clamp_test_cases[] =3D { + { + .name =3D "Clamp to earliest FAT date for 1979-12-31 23:59:59 UTC", + .ts =3D {.tv_sec =3D 315532799LL, .tv_nsec =3D 0L}, + .time =3D cpu_to_le16(0), + .date =3D cpu_to_le16(33), + .cs =3D 0, + .time_offset =3D 0, + }, + { + .name =3D "Clamp after time_offset=3D-60 pushes 1980-01-01 00:30 UTC bel= ow 1980", + .ts =3D {.tv_sec =3D 315534600LL, .tv_nsec =3D 0L}, + .time =3D cpu_to_le16(0), + .date =3D cpu_to_le16(33), + .cs =3D 0, + .time_offset =3D -60, + }, + { + .name =3D "Clamp to latest FAT date for 2108-01-01 00:00:00 UTC", + .ts =3D {.tv_sec =3D 4354819200LL, .tv_nsec =3D 0L}, + .time =3D cpu_to_le16(49021), + .date =3D cpu_to_le16(65439), + .cs =3D 199, + .time_offset =3D 0, + }, + { + .name =3D "Clamp after time_offset=3D60 pushes 2107-12-31 23:30 UTC beyo= nd 2107", + .ts =3D {.tv_sec =3D 4354817400LL, .tv_nsec =3D 0L}, + .time =3D cpu_to_le16(49021), + .date =3D cpu_to_le16(65439), + .cs =3D 199, + .time_offset =3D 60, + }, +}; + +static struct fat_truncate_atime_testcase truncate_atime_test_cases[] =3D { + { + .name =3D "UTC atime truncates to 2004-02-29 00:00:00", + .ts =3D {.tv_sec =3D 1078058096LL, .tv_nsec =3D 789000000L}, + .expected =3D {.tv_sec =3D 1078012800LL, .tv_nsec =3D 0L}, + .time_offset =3D 0, + }, + { + .name =3D "time_offset=3D-60 truncates 2004-02-29 00:30 UTC to previous = local midnight", + .ts =3D {.tv_sec =3D 1078014645LL, .tv_nsec =3D 123000000L}, + .expected =3D {.tv_sec =3D 1077930000LL, .tv_nsec =3D 0L}, + .time_offset =3D -60, + }, + { + .name =3D "time_offset=3D60 truncates 2004-02-29 23:30 UTC to next local= midnight", + .ts =3D {.tv_sec =3D 1078097445LL, .tv_nsec =3D 123000000L}, + .expected =3D {.tv_sec =3D 1078095600LL, .tv_nsec =3D 0L}, + .time_offset =3D 60, + }, +}; + static void time_testcase_desc(struct fat_timestamp_testcase *t, char *desc) { strscpy(desc, t->name, KUNIT_PARAM_DESC_SIZE); } =20 +static void unix2fat_clamp_testcase_desc(struct fat_unix2fat_clamp_testcas= e *t, + char *desc) +{ + strscpy(desc, t->name, KUNIT_PARAM_DESC_SIZE); +} + +static void truncate_atime_testcase_desc(struct fat_truncate_atime_testcas= e *t, + char *desc) +{ + strscpy(desc, t->name, KUNIT_PARAM_DESC_SIZE); +} + KUNIT_ARRAY_PARAM(fat_time, time_test_cases, time_testcase_desc); +KUNIT_ARRAY_PARAM(fat_unix2fat_clamp, unix2fat_clamp_test_cases, + unix2fat_clamp_testcase_desc); +KUNIT_ARRAY_PARAM(fat_truncate_atime, truncate_atime_test_cases, + truncate_atime_testcase_desc); + +static void fat_test_set_time_offset(struct msdos_sb_info *sbi, int time_o= ffset) +{ + *sbi =3D (struct msdos_sb_info){}; + sbi->options.tz_set =3D 1; + sbi->options.time_offset =3D time_offset; +} =20 static void fat_time_fat2unix_test(struct kunit *test) { @@ -135,8 +230,7 @@ static void fat_time_fat2unix_test(struct kunit *test) struct fat_timestamp_testcase *testcase =3D (struct fat_timestamp_testcase *)test->param_value; =20 - fake_sb.options.tz_set =3D 1; - fake_sb.options.time_offset =3D testcase->time_offset; + fat_test_set_time_offset(&fake_sb, testcase->time_offset); =20 fat_time_fat2unix(&fake_sb, &ts, testcase->time, @@ -160,18 +254,17 @@ static void fat_time_unix2fat_test(struct kunit *test) struct fat_timestamp_testcase *testcase =3D (struct fat_timestamp_testcase *)test->param_value; =20 - fake_sb.options.tz_set =3D 1; - fake_sb.options.time_offset =3D testcase->time_offset; + fat_test_set_time_offset(&fake_sb, testcase->time_offset); =20 fat_time_unix2fat(&fake_sb, &testcase->ts, &time, &date, &cs); KUNIT_EXPECT_EQ_MSG(test, - le16_to_cpu(testcase->time), - le16_to_cpu(time), + testcase->time, + time, "Time mismatch\n"); KUNIT_EXPECT_EQ_MSG(test, - le16_to_cpu(testcase->date), - le16_to_cpu(date), + testcase->date, + date, "Date mismatch\n"); KUNIT_EXPECT_EQ_MSG(test, testcase->cs, @@ -179,10 +272,82 @@ static void fat_time_unix2fat_test(struct kunit *test) "Centisecond mismatch\n"); } =20 +static void fat_time_unix2fat_clamp_test(struct kunit *test) +{ + static struct msdos_sb_info fake_sb; + __le16 date, time; + u8 cs; + struct fat_unix2fat_clamp_testcase *testcase =3D + (struct fat_unix2fat_clamp_testcase *)test->param_value; + + fat_test_set_time_offset(&fake_sb, testcase->time_offset); + + fat_time_unix2fat(&fake_sb, &testcase->ts, &time, &date, &cs); + KUNIT_EXPECT_EQ_MSG(test, + testcase->time, + time, + "Clamped time mismatch\n"); + KUNIT_EXPECT_EQ_MSG(test, + testcase->date, + date, + "Clamped date mismatch\n"); + KUNIT_EXPECT_EQ_MSG(test, + testcase->cs, + cs, + "Clamped centisecond mismatch\n"); +} + +static void fat_time_unix2fat_no_csec_test(struct kunit *test) +{ + static struct msdos_sb_info fake_sb; + struct timespec64 ts =3D { + .tv_sec =3D 946684799LL, + .tv_nsec =3D 0L, + }; + __le16 date, time; + + fat_test_set_time_offset(&fake_sb, 0); + + fat_time_unix2fat(&fake_sb, &ts, &time, &date, NULL); + KUNIT_EXPECT_EQ_MSG(test, + 49021, + le16_to_cpu(time), + "Time mismatch without centiseconds\n"); + KUNIT_EXPECT_EQ_MSG(test, + 10143, + le16_to_cpu(date), + "Date mismatch without centiseconds\n"); +} + +static void fat_truncate_atime_test(struct kunit *test) +{ + static struct msdos_sb_info fake_sb; + struct timespec64 actual; + struct fat_truncate_atime_testcase *testcase =3D + (struct fat_truncate_atime_testcase *)test->param_value; + + fat_test_set_time_offset(&fake_sb, testcase->time_offset); + + actual =3D fat_truncate_atime(&fake_sb, &testcase->ts); + KUNIT_EXPECT_EQ_MSG(test, + testcase->expected.tv_sec, + actual.tv_sec, + "Atime truncation seconds mismatch\n"); + KUNIT_EXPECT_EQ_MSG(test, + testcase->expected.tv_nsec, + actual.tv_nsec, + "Atime truncation nanoseconds mismatch\n"); +} + static struct kunit_case fat_test_cases[] =3D { KUNIT_CASE(fat_checksum_test), KUNIT_CASE_PARAM(fat_time_fat2unix_test, fat_time_gen_params), KUNIT_CASE_PARAM(fat_time_unix2fat_test, fat_time_gen_params), + KUNIT_CASE_PARAM(fat_time_unix2fat_clamp_test, + fat_unix2fat_clamp_gen_params), + KUNIT_CASE(fat_time_unix2fat_no_csec_test), + KUNIT_CASE_PARAM(fat_truncate_atime_test, + fat_truncate_atime_gen_params), {}, }; =20 --=20 2.34.1