From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from picard.linux.it (picard.linux.it [213.254.12.146]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id BB9F8C54EBE for ; Mon, 16 Jan 2023 12:54:25 +0000 (UTC) Received: from picard.linux.it (localhost [IPv6:::1]) by picard.linux.it (Postfix) with ESMTP id CC7E53CC8E8 for ; Mon, 16 Jan 2023 13:54:22 +0100 (CET) Received: from in-6.smtp.seeweb.it (in-6.smtp.seeweb.it [IPv6:2001:4b78:1:20::6]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (No client certificate requested) by picard.linux.it (Postfix) with ESMTPS id 049BB3CB4B8 for ; Mon, 16 Jan 2023 13:54:11 +0100 (CET) Received: from smtp-out1.suse.de (smtp-out1.suse.de [IPv6:2001:67c:2178:6::1c]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by in-6.smtp.seeweb.it (Postfix) with ESMTPS id 0699B1400988 for ; Mon, 16 Jan 2023 13:54:10 +0100 (CET) Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id E6283227E7; Mon, 16 Jan 2023 12:54:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_rsa; t=1673873649; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=WNK7FNHJKYbwsUG1kZB0IywN3Hx7rTFYUrsuBZO+SZg=; b=RFzs74UBk9OSirfkDhODxryUOhBR9cfD/Y5xbW3GaYK9gLGJBni2q42nnvZapP/yY2K84q 0E4WPmn71eSwjBkMRiZt9/RsgSdIJtKSs0oJeYg3uNkYT4aXk9TZpKjVklzj+szWxnoAcE Aww0KpPFuNw42pY92IA4h4MvVu+zO7w= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_ed25519; t=1673873649; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=WNK7FNHJKYbwsUG1kZB0IywN3Hx7rTFYUrsuBZO+SZg=; b=DfAT3gLM2sIaZPX0tAxBUUNAc6mm/QtswetjVPfuaWSCkRCHhl11H5yJcRFc67P8CA/4Cl 7obpKid3TchHtADQ== Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap2.suse-dmz.suse.de (Postfix) with ESMTPS id CBCDD138FA; Mon, 16 Jan 2023 12:54:09 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id opXvMPFIxWP1KgAAMHmgww (envelope-from ); Mon, 16 Jan 2023 12:54:09 +0000 Date: Mon, 16 Jan 2023 13:55:43 +0100 From: Cyril Hrubis To: Wei Gao Message-ID: References: <20230115234708.12802-1-wegao@suse.com> <20230116084802.6510-1-wegao@suse.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20230116084802.6510-1-wegao@suse.com> X-Virus-Scanned: clamav-milter 0.102.4 at in-6.smtp.seeweb.it X-Virus-Status: Clean Subject: Re: [LTP] [PATCH v3] readahead02.c: Fix check input fsize X-BeenThere: ltp@lists.linux.it X-Mailman-Version: 2.1.29 Precedence: list List-Id: Linux Test Project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Richard Palethorpe , ltp@lists.linux.it Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ltp-bounces+ltp=archiver.kernel.org@lists.linux.it Sender: "ltp" Hi! > We run the test with a loop device it will fail with ENOSPC if we > pass -s bigger than the loop device, we should at least check if > the device is large enough in the test setup.The test should make > use of use tst_parse_filesize() so that we can pass sizes with > units e.g. -s 128M. > > Signed-off-by: Wei Gao > Suggested-by: Petr Vorel > Suggested-by: Richard Palethorpe > Suggested-by: PCyril Hrubis > --- > include/tst_device.h | 4 +++- > lib/tst_device.c | 2 +- > .../kernel/syscalls/readahead/readahead02.c | 22 +++++++++++++++---- > 3 files changed, 22 insertions(+), 6 deletions(-) > > diff --git a/include/tst_device.h b/include/tst_device.h > index 977427f1c..f03f17f7d 100644 > --- a/include/tst_device.h > +++ b/include/tst_device.h > @@ -6,6 +6,8 @@ > #ifndef TST_DEVICE_H__ > #define TST_DEVICE_H__ > > +#define DEV_SIZE_MB 300u > + > #include > #include > #include > @@ -49,7 +51,7 @@ int tst_clear_device(const char *dev); > * free loopdev). If path is non-NULL, it will be filled with free loopdev path. > * > */ > -int tst_find_free_loopdev(const char *path, size_t path_len); > +int tst_find_free_loopdev(char *path, size_t path_len); > > /* > * Attaches a file to a loop device. > diff --git a/lib/tst_device.c b/lib/tst_device.c > index 48d7e3ab6..b098fc80b 100644 > --- a/lib/tst_device.c > +++ b/lib/tst_device.c > @@ -38,6 +38,7 @@ > #include "lapi/syscalls.h" > #include "test.h" > #include "safe_macros.h" > +#include "tst_device.h" > > #ifndef LOOP_CTL_GET_FREE > # define LOOP_CTL_GET_FREE 0x4C82 > @@ -46,7 +47,6 @@ > #define LOOP_CONTROL_FILE "/dev/loop-control" > > #define DEV_FILE "test_dev.img" > -#define DEV_SIZE_MB 300u > #define UUID_STR_SZ 37 > #define UUID_FMT "%02x%02x%02x%02x-%02x%02x-%02x%02x-%02x%02x-%02x%02x%02x%02x%02x%02x" > > diff --git a/testcases/kernel/syscalls/readahead/readahead02.c b/testcases/kernel/syscalls/readahead/readahead02.c > index 7acf4bb18..7cf6b5032 100644 > --- a/testcases/kernel/syscalls/readahead/readahead02.c > +++ b/testcases/kernel/syscalls/readahead/readahead02.c > @@ -33,6 +33,7 @@ > #include "tst_test.h" > #include "tst_timer.h" > #include "lapi/syscalls.h" > +#include "tst_device.h" > > static char testfile[PATH_MAX] = "testfile"; > #define DROP_CACHES_FNAME "/proc/sys/vm/drop_caches" > @@ -366,11 +367,25 @@ static void setup_readahead_length(void) > > static void setup(void) > { > - if (opt_fsizestr) { > - testfile_size = SAFE_STRTOL(opt_fsizestr, 1, INT_MAX); > - tst_set_max_runtime(1 + testfile_size / (DEFAULT_FILESIZE/32)); > + /* > + * Acutaly dev size will reduced after create filesystem, > + * so use dev_szie * 0.8 as dev real usage size, test case will > + * create two files within dev so we need div 2 get max file size > + */ > + size_t dev_size = (tst_device->size ? tst_device->size : DEV_SIZE_MB) * 1024 * 1024; Sigh, there is absolutelly no reason to use anything else than tst_device->size. The tst_device->size _IS_ the actual device size under all circumstances. > + size_t fsize_max = dev_size * 0.8 / 2; > + > + /* At least two pagesize for test case */ > + pagesize = getpagesize(); > + size_t fsize_min = pagesize * 2; > + > + if (tst_parse_filesize(opt_fsizestr, (long long *)&testfile_size, fsize_min, fsize_max)) { > + tst_set_max_runtime(1 + DEFAULT_FILESIZE / (DEFAULT_FILESIZE/32)); > + tst_brk(TBROK, "invalid initial filesize '%s'", opt_fsizestr); > } > > + tst_set_max_runtime(1 + testfile_size / (DEFAULT_FILESIZE/32)); > + > if (access(PROC_IO_FNAME, F_OK)) > tst_brk(TCONF, "Requires " PROC_IO_FNAME); > > @@ -380,7 +395,6 @@ static void setup(void) > /* check if readahead is supported */ > tst_syscall(__NR_readahead, 0, 0, 0); > > - pagesize = getpagesize(); > > setup_readahead_length(); > tst_res(TINFO, "readahead length: %d", readahead_length); > -- > 2.35.3 > -- Cyril Hrubis chrubis@suse.cz -- Mailing list info: https://lists.linux.it/listinfo/ltp