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 X-Spam-Level: X-Spam-Status: No, score=-15.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9ADF7C4338F for ; Fri, 20 Aug 2021 15:36:23 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 715976023E for ; Fri, 20 Aug 2021 15:36:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241056AbhHTPhA (ORCPT ); Fri, 20 Aug 2021 11:37:00 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50426 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240952AbhHTPg6 (ORCPT ); Fri, 20 Aug 2021 11:36:58 -0400 Received: from mail-pg1-x52f.google.com (mail-pg1-x52f.google.com [IPv6:2607:f8b0:4864:20::52f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7DF66C061575 for ; Fri, 20 Aug 2021 08:36:20 -0700 (PDT) Received: by mail-pg1-x52f.google.com with SMTP id x4so9530708pgh.1 for ; Fri, 20 Aug 2021 08:36:20 -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:mime-version :content-transfer-encoding; bh=EVaM21zboKi9bHEQ0ttFpVnASIsPfjTlp97ppLGTj1U=; b=Sojg/FHkKWx5wUVjCacavd+y6ZfzcktO5t3SV5aDArCmtppXNu/zhRNw43x79Vb/dL BAxy4fkdbNL1WJcQ+PN+/md+CQbQJh3QC9TuCKFtG0SAZN+pVKuzBIV4ZID/TfpCL9co +DulgMA2PlokWE3+Q2VOE8jbQ+3nazlsB7+HlPuGRSkc0cjdtrTYlubveGVGvlS54zmR QdFrCukummdFJN0jWJM/t/GvJ70rJh0iNCaCzIkWXLfwMnEHPVD9MFtyKfXsOnpy7I5/ K0OOmTufWPY+OfWKjLbPBOVMUvm0Mk66HfL4sAhCKLIyfAAUJgvQ4kZWdS0nFH3tLzYS 59ug== 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:mime-version :content-transfer-encoding; bh=EVaM21zboKi9bHEQ0ttFpVnASIsPfjTlp97ppLGTj1U=; b=m1l5dz5jj8+Pd83LD5kcBE42dLzIzO4Fk4UN1qpT0gjvg/bKpTBMOv/Uq8NWVQemu1 3Jp5RQtqvyTRu1OVEgZZGHDx9dpopmRzRGpj4L1zC3vG94joyjwp/oRayl0bDkS+7X+X +v9e858LXDvsK8fIF9Iv6BFWFVRMc8Xva1LIpBoC+7WKb46huU9NalWhtJp5GXl6v2tl KCWLu8lpxLarppa8kJLxaJYVHsEKrz6TDFAfDrL3Vs5SLuO+KXq60O8Vv1sO3F6HucY/ VeKPilBarvEiLx3tCTFU/CcgNcP2Frl7gki2BYtC7kydUp+TgkMs0vsD6brxdGNOY6k6 TcWw== X-Gm-Message-State: AOAM530KCKHxUROzyeNMPdgWRZ2EXfbTeVexlFpVHEktnKgMxtK4Dibc GDtrVup0+wq+gxyhuNwEudVVm5iYXt8= X-Google-Smtp-Source: ABdhPJwcdA24G6Cd01HsD0eemjnvTy4qFsaRW6JSBJ3Zhbi7SEB0630kvaIfGiynoPsRWd5pIP9biw== X-Received: by 2002:a63:5f88:: with SMTP id t130mr19367782pgb.6.1629473779239; Fri, 20 Aug 2021 08:36:19 -0700 (PDT) Received: from daehojeong-desktop.mtv.corp.google.com ([2620:15c:211:201:ab38:89b9:1824:6a27]) by smtp.gmail.com with ESMTPSA id h24sm6684821pjv.3.2021.08.20.08.36.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 20 Aug 2021 08:36:18 -0700 (PDT) From: Daeho Jeong To: linux-kernel@vger.kernel.org, linux-f2fs-devel@lists.sourceforge.net, kernel-team@android.com Cc: Daeho Jeong Subject: [PATCH v2] f2fs-tools: change fiemap print out format Date: Fri, 20 Aug 2021 08:36:14 -0700 Message-Id: <20210820153615.275030-1-daeho43@gmail.com> X-Mailer: git-send-email 2.33.0.rc2.250.ged5fa647cd-goog MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Daeho Jeong Given fiemap way to print out extents in the kernel, we can correctly print the layout of each file in a unit of extent, not block. So, I changed fiemap print out way like below. Fiemap: offset = 0 len = 60 logical addr. physical addr. length flags 0 0000000000000000 00000020032df000 0000000000004000 00001008 1 0000000000004000 00000020032e0000 0000000000004000 00001008 2 0000000000008000 00000020032e1000 0000000000004000 00001008 3 000000000000c000 00000020032e2000 0000000000004000 00001008 Signed-off-by: Daeho Jeong --- v2: merged two separate memset into one --- tools/f2fs_io/f2fs_io.c | 52 ++++++++++++++++++++++++++--------------- 1 file changed, 33 insertions(+), 19 deletions(-) diff --git a/tools/f2fs_io/f2fs_io.c b/tools/f2fs_io/f2fs_io.c index 42dbd60..ae4d405 100644 --- a/tools/f2fs_io/f2fs_io.c +++ b/tools/f2fs_io/f2fs_io.c @@ -731,11 +731,11 @@ static void do_randread(int argc, char **argv, const struct cmd_desc *cmd) #if defined(HAVE_LINUX_FIEMAP_H) && defined(HAVE_LINUX_FS_H) static void do_fiemap(int argc, char **argv, const struct cmd_desc *cmd) { - unsigned count, i; - int fd; - __u64 phy_addr; - struct fiemap *fm = xmalloc(sizeof(struct fiemap) + - sizeof(struct fiemap_extent)); + unsigned int i; + int fd, extents_mem_size; + u64 start, length; + u32 mapped_extents; + struct fiemap *fm = xmalloc(sizeof(struct fiemap)); if (argc != 4) { fputs("Excess arguments\n\n", stderr); @@ -743,26 +743,40 @@ static void do_fiemap(int argc, char **argv, const struct cmd_desc *cmd) exit(1); } - fm->fm_start = atoi(argv[1]) * F2FS_BLKSIZE; - fm->fm_length = F2FS_BLKSIZE; - fm->fm_extent_count = 1; - count = atoi(argv[2]); + memset(fm, 0, sizeof(struct fiemap)); + start = atoi(argv[1]) * F2FS_BLKSIZE; + length = atoi(argv[2]) * F2FS_BLKSIZE; + fm->fm_start = start; + fm->fm_length = length; fd = xopen(argv[3], O_RDONLY | O_LARGEFILE, 0); - printf("Fiemap: offset = %08"PRIx64" len = %d\n", - (u64)fm->fm_start / F2FS_BLKSIZE, count); - for (i = 0; i < count; i++) { - if (ioctl(fd, FS_IOC_FIEMAP, fm) < 0) - die_errno("FIEMAP failed"); + printf("Fiemap: offset = %"PRIu64" len = %"PRIu64"\n", + start / F2FS_BLKSIZE, length / F2FS_BLKSIZE); + if (ioctl(fd, FS_IOC_FIEMAP, fm) < 0) + die_errno("FIEMAP failed"); + + mapped_extents = fm->fm_mapped_extents; + extents_mem_size = sizeof(struct fiemap_extent) * mapped_extents; + free(fm); + fm = xmalloc(sizeof(struct fiemap) + extents_mem_size); - phy_addr = fm->fm_extents[0].fe_physical / F2FS_BLKSIZE; - printf("%llu: %llu\n", fm->fm_start / F2FS_BLKSIZE, phy_addr); + memset(fm, 0, sizeof(struct fiemap) + extents_mem_size); + fm->fm_start = start; + fm->fm_length = length; + fm->fm_extent_count = mapped_extents; - if (fm->fm_extents[0].fe_flags & FIEMAP_EXTENT_LAST) - break; + if (ioctl(fd, FS_IOC_FIEMAP, fm) < 0) + die_errno("FIEMAP failed"); - fm->fm_start += F2FS_BLKSIZE; + printf("\t%-17s%-17s%-17s%s\n", "logical addr.", "physical addr.", "length", "flags"); + for (i = 0; i < fm->fm_mapped_extents; i++) { + printf("%d\t%.16llx %.16llx %.16llx %.8x\n", i, + fm->fm_extents[i].fe_logical, fm->fm_extents[i].fe_physical, + fm->fm_extents[i].fe_length, fm->fm_extents[i].fe_flags); + + if (fm->fm_extents[i].fe_flags & FIEMAP_EXTENT_LAST) + break; } printf("\n"); free(fm); -- 2.33.0.rc2.250.ged5fa647cd-goog 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 X-Spam-Level: X-Spam-Status: No, score=-13.5 required=3.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED,DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FORGED_FROMDOMAIN, FREEMAIL_FROM,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id A227CC4338F for ; Fri, 20 Aug 2021 15:36:31 +0000 (UTC) Received: from lists.sourceforge.net (lists.sourceforge.net [216.105.38.7]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 53F0B60F44; Fri, 20 Aug 2021 15:36:31 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 53F0B60F44 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=lists.sourceforge.net Received: from [127.0.0.1] (helo=sfs-ml-1.v29.lw.sourceforge.com) by sfs-ml-1.v29.lw.sourceforge.com with esmtp (Exim 4.90_1) (envelope-from ) id 1mH6ZK-0001Gg-BD; Fri, 20 Aug 2021 15:36:30 +0000 Received: from [172.30.20.202] (helo=mx.sourceforge.net) by sfs-ml-1.v29.lw.sourceforge.com with esmtps (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mH6ZJ-0001GQ-9G for linux-f2fs-devel@lists.sourceforge.net; Fri, 20 Aug 2021 15:36:29 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sourceforge.net; s=x; h=Content-Transfer-Encoding:MIME-Version:Message-Id: Date:Subject:Cc:To:From:Sender:Reply-To:Content-Type:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=EVaM21zboKi9bHEQ0ttFpVnASIsPfjTlp97ppLGTj1U=; b=VwxMmf3FawE7Si76LwAW0im2ec yRuSVA89pZ27ATd2Wp8uPK9xn13irIqVMAm+C1+04Jo+6L6LF/ajRUPYpAtnETYjYN2RnN3J4tx1+ 0X/dYMS2PC06OImbvVJEJ48bWZSehg18841ISRzfTCKaYJFs7nj0p2gyYQKPhfFOrotM=; DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sf.net; s=x ; h=Content-Transfer-Encoding:MIME-Version:Message-Id:Date:Subject:Cc:To:From :Sender:Reply-To:Content-Type:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To: References:List-Id:List-Help:List-Unsubscribe:List-Subscribe:List-Post: List-Owner:List-Archive; bh=EVaM21zboKi9bHEQ0ttFpVnASIsPfjTlp97ppLGTj1U=; b=k Lf7TjN26Bdjq4DxyVOKs38ntc3PGdaV3Hc+qsONE7UeFxsVi/aF6kis9il0NwJwDwa+231MH1u1HX P6X83kVvgtty9ps6C/xQxGeo9M+mm9LNnkKiYVhni4iYuxtbVYhE6UrAEQg+lgYxW1mJOdzEJm6Gp NZ7QVgxyata2DZyk=; Received: from mail-pg1-f181.google.com ([209.85.215.181]) by sfi-mx-2.v28.lw.sourceforge.com with esmtps (TLSv1.2:ECDHE-RSA-AES128-GCM-SHA256:128) (Exim 4.92.3) id 1mH6ZE-0005aS-RH for linux-f2fs-devel@lists.sourceforge.net; Fri, 20 Aug 2021 15:36:29 +0000 Received: by mail-pg1-f181.google.com with SMTP id k14so9544154pga.13 for ; Fri, 20 Aug 2021 08:36:24 -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:mime-version :content-transfer-encoding; bh=EVaM21zboKi9bHEQ0ttFpVnASIsPfjTlp97ppLGTj1U=; b=Sojg/FHkKWx5wUVjCacavd+y6ZfzcktO5t3SV5aDArCmtppXNu/zhRNw43x79Vb/dL BAxy4fkdbNL1WJcQ+PN+/md+CQbQJh3QC9TuCKFtG0SAZN+pVKuzBIV4ZID/TfpCL9co +DulgMA2PlokWE3+Q2VOE8jbQ+3nazlsB7+HlPuGRSkc0cjdtrTYlubveGVGvlS54zmR QdFrCukummdFJN0jWJM/t/GvJ70rJh0iNCaCzIkWXLfwMnEHPVD9MFtyKfXsOnpy7I5/ K0OOmTufWPY+OfWKjLbPBOVMUvm0Mk66HfL4sAhCKLIyfAAUJgvQ4kZWdS0nFH3tLzYS 59ug== 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:mime-version :content-transfer-encoding; bh=EVaM21zboKi9bHEQ0ttFpVnASIsPfjTlp97ppLGTj1U=; b=ubGQYHaVl/I+onh6rY9WojwJTbH938BFlPO4FcPPlkODiwSZs6fb7YFokaHxoCEcnO U6zuoNmXoV1wxICPRk0k3jI5FiD3GXubS1K6le4oH2KhmSTQ+gDpSwGF1hWg0sKVLL36 CX2e1q4YEPYJ/oP4jNNLQHVlPk4BsBqnlSUE2/EZ/BBZSw9t+vo1R22qU5k7iulvyf2I mY//yQfCx5tPq7PUIc0E0k4UPHBSy8aC6w+C2u33nHaJVCPwqaJggxHfrYo1SN5xsuYC yrxRuWb+bsCg9JTi3X71+cEA0p+7Uw6c9gW1kQfsFUFcEj7Nc+FysJ5GATO2GrjvrSOl vAag== X-Gm-Message-State: AOAM532u34NCPXrut4YVm7S9kwMXqbdW1FvVovX4NVSUPRQEonzAuyzD eS9S7f4xKTR1TOW6iN2pgMc= X-Google-Smtp-Source: ABdhPJwcdA24G6Cd01HsD0eemjnvTy4qFsaRW6JSBJ3Zhbi7SEB0630kvaIfGiynoPsRWd5pIP9biw== X-Received: by 2002:a63:5f88:: with SMTP id t130mr19367782pgb.6.1629473779239; Fri, 20 Aug 2021 08:36:19 -0700 (PDT) Received: from daehojeong-desktop.mtv.corp.google.com ([2620:15c:211:201:ab38:89b9:1824:6a27]) by smtp.gmail.com with ESMTPSA id h24sm6684821pjv.3.2021.08.20.08.36.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 20 Aug 2021 08:36:18 -0700 (PDT) From: Daeho Jeong To: linux-kernel@vger.kernel.org, linux-f2fs-devel@lists.sourceforge.net, kernel-team@android.com Date: Fri, 20 Aug 2021 08:36:14 -0700 Message-Id: <20210820153615.275030-1-daeho43@gmail.com> X-Mailer: git-send-email 2.33.0.rc2.250.ged5fa647cd-goog MIME-Version: 1.0 X-Headers-End: 1mH6ZE-0005aS-RH Subject: [f2fs-dev] [PATCH v2] f2fs-tools: change fiemap print out format X-BeenThere: linux-f2fs-devel@lists.sourceforge.net X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Daeho Jeong Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: linux-f2fs-devel-bounces@lists.sourceforge.net From: Daeho Jeong Given fiemap way to print out extents in the kernel, we can correctly print the layout of each file in a unit of extent, not block. So, I changed fiemap print out way like below. Fiemap: offset = 0 len = 60 logical addr. physical addr. length flags 0 0000000000000000 00000020032df000 0000000000004000 00001008 1 0000000000004000 00000020032e0000 0000000000004000 00001008 2 0000000000008000 00000020032e1000 0000000000004000 00001008 3 000000000000c000 00000020032e2000 0000000000004000 00001008 Signed-off-by: Daeho Jeong --- v2: merged two separate memset into one --- tools/f2fs_io/f2fs_io.c | 52 ++++++++++++++++++++++++++--------------- 1 file changed, 33 insertions(+), 19 deletions(-) diff --git a/tools/f2fs_io/f2fs_io.c b/tools/f2fs_io/f2fs_io.c index 42dbd60..ae4d405 100644 --- a/tools/f2fs_io/f2fs_io.c +++ b/tools/f2fs_io/f2fs_io.c @@ -731,11 +731,11 @@ static void do_randread(int argc, char **argv, const struct cmd_desc *cmd) #if defined(HAVE_LINUX_FIEMAP_H) && defined(HAVE_LINUX_FS_H) static void do_fiemap(int argc, char **argv, const struct cmd_desc *cmd) { - unsigned count, i; - int fd; - __u64 phy_addr; - struct fiemap *fm = xmalloc(sizeof(struct fiemap) + - sizeof(struct fiemap_extent)); + unsigned int i; + int fd, extents_mem_size; + u64 start, length; + u32 mapped_extents; + struct fiemap *fm = xmalloc(sizeof(struct fiemap)); if (argc != 4) { fputs("Excess arguments\n\n", stderr); @@ -743,26 +743,40 @@ static void do_fiemap(int argc, char **argv, const struct cmd_desc *cmd) exit(1); } - fm->fm_start = atoi(argv[1]) * F2FS_BLKSIZE; - fm->fm_length = F2FS_BLKSIZE; - fm->fm_extent_count = 1; - count = atoi(argv[2]); + memset(fm, 0, sizeof(struct fiemap)); + start = atoi(argv[1]) * F2FS_BLKSIZE; + length = atoi(argv[2]) * F2FS_BLKSIZE; + fm->fm_start = start; + fm->fm_length = length; fd = xopen(argv[3], O_RDONLY | O_LARGEFILE, 0); - printf("Fiemap: offset = %08"PRIx64" len = %d\n", - (u64)fm->fm_start / F2FS_BLKSIZE, count); - for (i = 0; i < count; i++) { - if (ioctl(fd, FS_IOC_FIEMAP, fm) < 0) - die_errno("FIEMAP failed"); + printf("Fiemap: offset = %"PRIu64" len = %"PRIu64"\n", + start / F2FS_BLKSIZE, length / F2FS_BLKSIZE); + if (ioctl(fd, FS_IOC_FIEMAP, fm) < 0) + die_errno("FIEMAP failed"); + + mapped_extents = fm->fm_mapped_extents; + extents_mem_size = sizeof(struct fiemap_extent) * mapped_extents; + free(fm); + fm = xmalloc(sizeof(struct fiemap) + extents_mem_size); - phy_addr = fm->fm_extents[0].fe_physical / F2FS_BLKSIZE; - printf("%llu: %llu\n", fm->fm_start / F2FS_BLKSIZE, phy_addr); + memset(fm, 0, sizeof(struct fiemap) + extents_mem_size); + fm->fm_start = start; + fm->fm_length = length; + fm->fm_extent_count = mapped_extents; - if (fm->fm_extents[0].fe_flags & FIEMAP_EXTENT_LAST) - break; + if (ioctl(fd, FS_IOC_FIEMAP, fm) < 0) + die_errno("FIEMAP failed"); - fm->fm_start += F2FS_BLKSIZE; + printf("\t%-17s%-17s%-17s%s\n", "logical addr.", "physical addr.", "length", "flags"); + for (i = 0; i < fm->fm_mapped_extents; i++) { + printf("%d\t%.16llx %.16llx %.16llx %.8x\n", i, + fm->fm_extents[i].fe_logical, fm->fm_extents[i].fe_physical, + fm->fm_extents[i].fe_length, fm->fm_extents[i].fe_flags); + + if (fm->fm_extents[i].fe_flags & FIEMAP_EXTENT_LAST) + break; } printf("\n"); free(fm); -- 2.33.0.rc2.250.ged5fa647cd-goog _______________________________________________ Linux-f2fs-devel mailing list Linux-f2fs-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel