From patchwork Thu Sep 7 10:03:08 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Amir Goldstein X-Patchwork-Id: 9941979 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id D4A3D602CC for ; Thu, 7 Sep 2017 10:03:06 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E326328600 for ; Thu, 7 Sep 2017 10:03:06 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D837A28608; Thu, 7 Sep 2017 10:03:06 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.3 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5C44028600 for ; Thu, 7 Sep 2017 10:03:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754518AbdIGKDF (ORCPT ); Thu, 7 Sep 2017 06:03:05 -0400 Received: from mail-wm0-f67.google.com ([74.125.82.67]:35315 "EHLO mail-wm0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754450AbdIGKCx (ORCPT ); Thu, 7 Sep 2017 06:02:53 -0400 Received: by mail-wm0-f67.google.com with SMTP id e64so1031347wmi.2; Thu, 07 Sep 2017 03:02:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=OhuiW0FXSpuYeYXDYiZUV1Vu8zn1aI3Nvcq+6/HEFDw=; b=ShyDA3Ll9WPBxIEVqrxEO0rNIMH0vkEURM2La+cmRNJLr64KvqqhahaN5QX6n3o9E/ pyjcMzlesOBjOYgqbAYJ5oZrPVFA86yrmurEbmBw94mwqbgbHH7sxpH/dFgvORH8NW4C iT9/46I8Xai6HQEFh92DcHSjujPN9hE0Zy7v21RRsrwspQ02h/nMH9KB5QOfZ2hk52k4 JV1BpkJt3HdsUeSUg6H0lJWe9N2praIXGjuc7lpUFyuIS2e8YpFS9hoJrGt/XgudUztf zPysFhIPWDBk7kHxXHVaNmEaFpwXENiIXmpT/wGnYuB5Xt8EUVvthrJPEbpQSyVERHL/ lMiA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=OhuiW0FXSpuYeYXDYiZUV1Vu8zn1aI3Nvcq+6/HEFDw=; b=mKtwQVG5onSTCRp/MKKZG6fl2uXTvAnbW6Ga+JOGTj5HZ1qS6DzypQI4Yxdbeecn5w psXZI5onEj5vJRSk/f4WlDHwrFk/W/whzC2PHaNfW5WO+zgejMEUonKcx6h5LcFNQzJe ukDjBf5l66wuq3miWSnLFfNoesMjo3Ee3lemk9ixIrCW7GoF/FWu2tU8Bm+Nt99DO7gh TJ8HuKzwaXiEzgwf6rMxgWCJoSLb0E4GAmDjzMxWiszYQETyZZyM4Ah0yJNK/FEDqGAr ZNWIw9Su9Pt3/JI9pu1NnVLZjXzfwTDok5GYt+VKoxqW0QBS6vud81lBPggCAkPB1RhJ oUGQ== X-Gm-Message-State: AHPjjUifagzb1mf4j+Krs2UMZzCYPz6EJaMpcEIHatdZ0p9oYu1lsdT0 11DolozhNIcqMA== X-Google-Smtp-Source: ADKCNb7bO+FSK1PY1689VI2W3SZ1UDpKvDmk4obrn01rQJpKVtCgCoHMS9IQ6tnQd8VTOydNsATx3g== X-Received: by 10.28.99.69 with SMTP id x66mr307010wmb.30.1504778571819; Thu, 07 Sep 2017 03:02:51 -0700 (PDT) Received: from localhost.localdomain (bzq-166-168-31-246.red.bezeqint.net. [31.168.166.246]) by smtp.gmail.com with ESMTPSA id z108sm2190403wrc.49.2017.09.07.03.02.50 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 07 Sep 2017 03:02:51 -0700 (PDT) From: Amir Goldstein To: Eryu Guan Cc: Josef Bacik , fstests@vger.kernel.org, linux-fsdevel@vger.kernel.org Subject: [PATCH v4 3/8] replay-log: add support for replaying ops in target device sector range Date: Thu, 7 Sep 2017 13:03:08 +0300 Message-Id: <1504778593-12071-4-git-send-email-amir73il@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1504778593-12071-1-git-send-email-amir73il@gmail.com> References: <1504778593-12071-1-git-send-email-amir73il@gmail.com> Sender: fstests-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: fstests@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Using command line options --start-sector and --end-sector, only operations acting on the specified target device range will be replayed. Single vebbose mode (-v) prints out only replayed operations. Double verbose mode (-vv) prints out also skipped operations. Signed-off-by: Amir Goldstein --- src/log-writes/log-writes.c | 37 +++++++++++++++++++++++++++++++++++-- src/log-writes/log-writes.h | 2 ++ src/log-writes/replay-log.c | 31 +++++++++++++++++++++++++++++++ 3 files changed, 68 insertions(+), 2 deletions(-) diff --git a/src/log-writes/log-writes.c b/src/log-writes/log-writes.c index dbfeef7..fab447a 100644 --- a/src/log-writes/log-writes.c +++ b/src/log-writes/log-writes.c @@ -118,6 +118,27 @@ int log_discard(struct log *log, struct log_write_entry *entry) } /* + * @log: the log we are replaying. + * @entry: entry to be replayed. + * + * @return: 0 if we should replay the entry, > 0 if we should skip it. + * + * Should we skip the entry in our log or replay onto the replay device. + */ +int log_should_skip(struct log *log, struct log_write_entry *entry) +{ + u64 sector = le64_to_cpu(entry->sector); + u64 nr_sectors = le64_to_cpu(entry->nr_sectors); + + if (!nr_sectors) + return 0; + if (sector + nr_sectors <= log->start_sector || + sector > log->end_sector) + return 1; + return 0; +} + +/* * @entry: entry to be replayed. * * @return: 1 if the entry is sane, 0 if it is invalid. @@ -157,6 +178,7 @@ int log_replay_next_entry(struct log *log, struct log_write_entry *entry, char *buf; ssize_t ret; off_t offset; + int skip = 0; if (log->cur_entry >= log->nr_entries) return 1; @@ -185,8 +207,10 @@ int log_replay_next_entry(struct log *log, struct log_write_entry *entry, log->cur_pos += read_size; } - if (log_writes_verbose) { - printf("replaying %d@%llu: sector %llu, size %llu, flags %llu\n", + skip = log_should_skip(log, entry); + if (log_writes_verbose > 1 || (log_writes_verbose && !skip)) { + printf("%s %d@%llu: sector %llu, size %llu, flags %llu\n", + skip ? "skipping" : "replaying", (int)log->cur_entry - 1, log->cur_pos / log->sectorsize, (unsigned long long)le64_to_cpu(entry->sector), (unsigned long long)size, @@ -199,6 +223,15 @@ int log_replay_next_entry(struct log *log, struct log_write_entry *entry, if (flags & LOG_DISCARD_FLAG) return log_discard(log, entry); + if (skip) { + log->cur_pos = lseek(log->logfd, size, SEEK_CUR); + if (log->cur_pos == (off_t)-1) { + fprintf(stderr, "Error seeking in log: %d\n", errno); + return -1; + } + return 0; + } + buf = malloc(size); if (!buf) { fprintf(stderr, "Error allocating buffer %llu entry %llu\n", (unsigned long long)size, (unsigned long long)log->cur_entry - 1); diff --git a/src/log-writes/log-writes.h b/src/log-writes/log-writes.h index c89b119..14242ee 100644 --- a/src/log-writes/log-writes.h +++ b/src/log-writes/log-writes.h @@ -62,6 +62,8 @@ struct log { int replayfd; unsigned long flags; u64 sectorsize; + u64 start_sector; + u64 end_sector; u64 nr_entries; u64 cur_entry; u64 max_zero_size; diff --git a/src/log-writes/replay-log.c b/src/log-writes/replay-log.c index cf67931..8457937 100644 --- a/src/log-writes/replay-log.c +++ b/src/log-writes/replay-log.c @@ -20,6 +20,8 @@ enum option_indexes { FSCK, CHECK, START_MARK, + START_SECTOR, + END_SECTOR, }; static struct option long_options[] = { @@ -37,6 +39,8 @@ static struct option long_options[] = { {"fsck", required_argument, NULL, 0}, {"check", required_argument, NULL, 0}, {"start-mark", required_argument, NULL, 0}, + {"start-sector", required_argument, NULL, 0}, + {"end-sector", required_argument, NULL, 0}, { NULL, 0, NULL, 0 }, }; @@ -61,6 +65,12 @@ static void usage(void) "--check\n"); fprintf(stderr, "\t--check [|flush|fua] when to check the " "file system, mush specify --fsck\n"); + fprintf(stderr, "\t--start-sector - replay ops on region " + "from onto \n"); + fprintf(stderr, "\t--end-sector - replay ops on region " + "to onto \n"); + fprintf(stderr, "\t-v or --verbose - print replayed ops\n"); + fprintf(stderr, "\t-vv - print also skipped ops\n"); exit(1); } @@ -129,6 +139,8 @@ int main(int argc, char **argv) struct log_write_entry *entry; u64 stop_flags = 0; u64 start_entry = 0; + u64 start_sector = 0; + u64 end_sector = -1ULL; u64 run_limit = 0; u64 num_entries = 0; u64 check_number = 0; @@ -249,6 +261,22 @@ int main(int argc, char **argv) tmp = NULL; } break; + case START_SECTOR: + start_sector = strtoull(optarg, &tmp, 0); + if (tmp && *tmp != '\0') { + fprintf(stderr, "Invalid sector number\n"); + exit(1); + } + tmp = NULL; + break; + case END_SECTOR: + end_sector = strtoull(optarg, &tmp, 0); + if (tmp && *tmp != '\0') { + fprintf(stderr, "Invalid sector number\n"); + exit(1); + } + tmp = NULL; + break; default: usage(); } @@ -266,6 +294,9 @@ int main(int argc, char **argv) if (!discard) log->flags |= LOG_IGNORE_DISCARD; + log->start_sector = start_sector; + log->end_sector = end_sector; + entry = malloc(log->sectorsize); if (!entry) { fprintf(stderr, "Couldn't allocate buffer\n");