From mboxrd@z Thu Jan 1 00:00:00 1970 From: Fan Li Subject: [f2fs-dev] [PATCH] f2fs: change the method of calculating the number summary blocks Date: Mon, 28 Oct 2013 08:54:28 +0000 (GMT) Message-ID: <21040538.71861382950468176.JavaMail.weblogic@epv6ml09> Reply-To: fanofcode.li@samsung.com Mime-Version: 1.0 Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: base64 Return-path: MIME-version: 1.0 Sender: linux-fsdevel-owner@vger.kernel.org To: Jaegeuk Kim Cc: "linux-fsdevel@vger.kernel.org" , "linux-kernel@vger.kernel.org" , "linux-f2fs-devel@lists.sourceforge.net" List-Id: linux-f2fs-devel.lists.sourceforge.net IlRoZXJlIGlzIGEgSFRNTCBlcnJvciBpbiB0aGUgcHJldmlvdXMgZW1haWwsIHNvIEkgc2VuZCB0 aGlzIG9uZS5JZiB5b3UgYWxyZWFkeSByZWNlaXZlZCB0aGlzIGJlZm9yZSwgcGxlYXNlIGlnbm9y ZSBpdC5Tb3JyeSBmb3IgdGhlIGluY29udmVuaWVuY2UiDQoNClRoaXMgcGF0Y2ggY2hhbmdlIHRo ZSBtZXRob2Qgb2YgY2FsY3VsYXRpbmcgdGhlIG51bWJlciBvZiBzdW1tYXJ5IGJsb2NrcyBpbiBm dW5jdGlvbiAgbnBhZ2VzX2Zvcl9zdW1tYXJ5X2ZsdXNoLg0KbnBhZ2VzX2Zvcl9zdW1tYXJ5X2Zs dXNoIHVzZXMgKFNVTU1BUllfU0laRSArIDEpIGFzIHRoZSBzaXplIG9mIGEgZjJmc19zdW1tYXJ5 IHdoaWxlIHRoZSBhY3R1YWwgc2l6ZSBpcyBqdXN0IFNVTU1BUllfU0laRS4NCkFzIGEgcmVzdWx0 LCBvY2Nhc2lvbmFsbHkgdGhlIHJldHVybiB2YWx1ZSBvZiBucGFnZXNfZm9yX3N1bW1hcnlfZmx1 c2ggd2lsbCBiZSBiaWdnZXIgdGhhbiB0aGUgYWN0dWFsIG51bWJlciBieSBvbmUsIGFuZCB0aGUg Y2hlY2twb2ludCB3b24ndCBiZSB3cml0dGVuIGNvbnRpZ3VvdXNseSAgaW50byBkaXNrLg0KQmVz aWRlcywgc3RydWN0IGYyZnNfc3VtbWFyeSBjYW4ndCBiZSBzcGxpdCB0byB0d28gcGFnZXMsIHNv IGl0IGNvdWxkIHRha2UgbW9yZSBzcGFjZSB0aGFuIHRoZSBzdW0gb2YgaXRzIHNpemUsIHRoZSBj dXJyZW50IHZlcnNpb24gc2VlbXMgbm90IHRvIHRha2UgaXQgaW50byBhY2NvdW50Lg0KDQpTaWdu ZWQtb2ZmLWJ5OiBGYW4gTGkgPGZhbm9mY29kZS5saUBzYW1zdW5nLmNvbT4NCi0tLQ0KIGZzL2Yy ZnMvc2VnbWVudC5jIHwgICAxNCArKysrKystLS0tLS0tLQ0KIDEgZmlsZSBjaGFuZ2VkLCA2IGlu c2VydGlvbnMoKyksIDggZGVsZXRpb25zKC0pDQoNCmRpZmYgLS1naXQgYS9mcy9mMmZzL3NlZ21l bnQuYyBiL2ZzL2YyZnMvc2VnbWVudC5jIGluZGV4IDQ4N2FmNjEuLmJhMjkzMGYgMTAwNjQ0DQot LS0gYS9mcy9mMmZzL3NlZ21lbnQuYw0KKysrIGIvZnMvZjJmcy9zZWdtZW50LmMNCkBAIC0yNzks OSArMjc5LDggQEAgc3RhdGljIHZvaWQgX19hZGRfc3VtX2VudHJ5KHN0cnVjdCBmMmZzX3NiX2lu Zm8gKnNiaSwgaW50IHR5cGUsDQogICovDQogaW50IG5wYWdlc19mb3Jfc3VtbWFyeV9mbHVzaChz dHJ1Y3QgZjJmc19zYl9pbmZvICpzYmkpICB7DQotCWludCB0b3RhbF9zaXplX2J5dGVzID0gMDsN CiAJaW50IHZhbGlkX3N1bV9jb3VudCA9IDA7DQotCWludCBpLCBzdW1fc3BhY2U7DQorCWludCBp LCBzdW1faW5fcGFnZTsNCiANCiAJZm9yIChpID0gQ1VSU0VHX0hPVF9EQVRBOyBpIDw9IENVUlNF R19DT0xEX0RBVEE7IGkrKykgew0KIAkJaWYgKHNiaS0+Y2twdC0+YWxsb2NfdHlwZVtpXSA9PSBT U1IpDQpAQCAtMjkwLDEzICsyODksMTIgQEAgaW50IG5wYWdlc19mb3Jfc3VtbWFyeV9mbHVzaChz dHJ1Y3QgZjJmc19zYl9pbmZvICpzYmkpDQogCQkJdmFsaWRfc3VtX2NvdW50ICs9IGN1cnNlZ19i bGtvZmYoc2JpLCBpKTsNCiAJfQ0KIA0KLQl0b3RhbF9zaXplX2J5dGVzID0gdmFsaWRfc3VtX2Nv dW50ICogKFNVTU1BUllfU0laRSArIDEpDQotCQkJKyBzaXplb2Yoc3RydWN0IG5hdF9qb3VybmFs KSArIDINCi0JCQkrIHNpemVvZihzdHJ1Y3Qgc2l0X2pvdXJuYWwpICsgMjsNCi0Jc3VtX3NwYWNl ID0gUEFHRV9DQUNIRV9TSVpFIC0gU1VNX0ZPT1RFUl9TSVpFOw0KLQlpZiAodG90YWxfc2l6ZV9i eXRlcyA8IHN1bV9zcGFjZSkNCisJc3VtX2luX3BhZ2UgPSAoUEFHRV9DQUNIRV9TSVpFIC0gMipT VU1fSk9VUk5BTF9TSVpFIC0gU1VNX0ZPT1RFUl9TSVpFKS8NCisJCQlTVU1NQVJZX1NJWkU7DQor CWlmICh2YWxpZF9zdW1fY291bnQgPD0gc3VtX2luX3BhZ2UpDQogCQlyZXR1cm4gMTsNCi0JZWxz ZSBpZiAodG90YWxfc2l6ZV9ieXRlcyA8IDIgKiBzdW1fc3BhY2UpDQorCWVsc2UgaWYgKHZhbGlk X3N1bV9jb3VudC1zdW1faW5fcGFnZSA8PQ0KKwkJCShQQUdFX0NBQ0hFX1NJWkUtU1VNX0ZPT1RF Ul9TSVpFKS9TVU1NQVJZX1NJWkUpDQogCQlyZXR1cm4gMjsNCiAJcmV0dXJuIDM7DQogfQ0KLS0N CjEuNy45LjUNCg== From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755721Ab3J1Iyd (ORCPT ); Mon, 28 Oct 2013 04:54:33 -0400 Received: from mailout4.samsung.com ([203.254.224.34]:52019 "EHLO mailout4.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755350Ab3J1Iya (ORCPT ); Mon, 28 Oct 2013 04:54:30 -0400 X-AuditID: cbfee6a3-b7ff36d000001162-ef-526e264486c3 Date: Mon, 28 Oct 2013 08:54:28 +0000 (GMT) From: Fan Li Subject: [f2fs-dev] [PATCH] f2fs: change the method of calculating the number summary blocks To: Jaegeuk Kim Cc: "linux-fsdevel@vger.kernel.org" , "linux-kernel@vger.kernel.org" , "linux-f2fs-devel@lists.sourceforge.net" Reply-to: fanofcode.li@samsung.com MIME-version: 1.0 X-MTR: 20131028084447562@fanofcode.li Msgkey: 20131028084447562@fanofcode.li X-EPLocale: en_US.windows-1252 X-Priority: 3 X-EPWebmail-Msg-Type: personal X-EPWebmail-Reply-Demand: 0 X-EPApproval-Locale: X-EPHeader: ML X-EPTrCode: X-EPTrName: X-MLAttribute: X-RootMTR: 20131028084447562@fanofcode.li X-ParentMTR: X-ArchiveUser: X-CPGSPASS: N Content-type: text/plain; charset=windows-1252 MIME-version: 1.0 Message-id: <21040538.71861382950468176.JavaMail.weblogic@epv6ml09> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFrrDIsWRmVeSWpSXmKPExsVy+t/t6bouanlBBl++mVhc3jWHzYHR4/Mm uQDGKC6blNSczLLUIn27BK6M74sECvrEKt5PecbYwHhAtIuRk0NIQF3iz4u9jCC2hICJxPbl 35khbDGJC/fWs3UxcgHVzGeU+Pr/HytIgkVAVWLln/dsIDabgIbEjcnTmUBsYYEYictfpoLZ IgLaEu17D7KDNDML3GSU+DVhLSvENiWJF5+Wgtm8AoISJ2c+YYHYpipxZNJCNoi4msTp3RD1 EgJyEkumXmaCsHklZrQ/ZYGJT/u6BupSaYnzszYwwly9+PtjqDi/xLHbO4B6OcB6n9wPhhmz e/MXNghbQGLqmYNQrVoSHy+/h1rFJ7Fm4VsWmDG7Ti1nhum9v2UuWA2zgKLElO6H7BC2gcSR RXMwvMUr4Cyxtm0t2wRGuVlIUrOQtM9C0o6sZgEjyypG0dSC5ILipPQKY73ixNzi0rx0veT8 3E2M4Dh/tngH4//z1ocYBTgYlXh4N6zNDRJiTSwrrsw9xCjBwawkwtt3CyjEm5JYWZValB9f VJqTWnyIUZqDRUmcN/5WUpCQQHpiSWp2ampBahFMlomDU6qB0Tf8nTpXUcrbT5JL2RdFrY3n mDf3h8pez79v3z9KNNOdPefEvcKqsy7n9xWvcZl6KdtTI/Z+sakry1Wes/vmBZX3GIhse5Qw m7vyq+tlBZ49HScrrzg+YZh017I3Jk5ss+O+r05JS0znRUhfifC4X/DWSdF96sryE8osgZ5x F+Udoyd4PhF6q8RSnJFoqMVcVJwIAJnry+vvAgAA Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: 8bit X-MIME-Autoconverted: from base64 to 8bit by mail.home.local id r9S8sc8I003451 "There is a HTML error in the previous email, so I send this one.If you already received this before, please ignore it.Sorry for the inconvenience" This patch change the method of calculating the number of summary blocks in function npages_for_summary_flush. npages_for_summary_flush uses (SUMMARY_SIZE + 1) as the size of a f2fs_summary while the actual size is just SUMMARY_SIZE. As a result, occasionally the return value of npages_for_summary_flush will be bigger than the actual number by one, and the checkpoint won't be written contiguously into disk. Besides, struct f2fs_summary can't be split to two pages, so it could take more space than the sum of its size, the current version seems not to take it into account. Signed-off-by: Fan Li --- fs/f2fs/segment.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/fs/f2fs/segment.c b/fs/f2fs/segment.c index 487af61..ba2930f 100644 --- a/fs/f2fs/segment.c +++ b/fs/f2fs/segment.c @@ -279,9 +279,8 @@ static void __add_sum_entry(struct f2fs_sb_info *sbi, int type, */ int npages_for_summary_flush(struct f2fs_sb_info *sbi) { - int total_size_bytes = 0; int valid_sum_count = 0; - int i, sum_space; + int i, sum_in_page; for (i = CURSEG_HOT_DATA; i <= CURSEG_COLD_DATA; i++) { if (sbi->ckpt->alloc_type[i] == SSR) @@ -290,13 +289,12 @@ int npages_for_summary_flush(struct f2fs_sb_info *sbi) valid_sum_count += curseg_blkoff(sbi, i); } - total_size_bytes = valid_sum_count * (SUMMARY_SIZE + 1) - + sizeof(struct nat_journal) + 2 - + sizeof(struct sit_journal) + 2; - sum_space = PAGE_CACHE_SIZE - SUM_FOOTER_SIZE; - if (total_size_bytes < sum_space) + sum_in_page = (PAGE_CACHE_SIZE - 2*SUM_JOURNAL_SIZE - SUM_FOOTER_SIZE)/ + SUMMARY_SIZE; + if (valid_sum_count <= sum_in_page) return 1; - else if (total_size_bytes < 2 * sum_space) + else if (valid_sum_count-sum_in_page <= + (PAGE_CACHE_SIZE-SUM_FOOTER_SIZE)/SUMMARY_SIZE) return 2; return 3; } -- 1.7.9.5 ÿôèº{.nÇ+‰·Ÿ®‰­†+%ŠËÿ±éݶ¥Šwÿº{.nÇ+‰·¥Š{±þG«éÿŠ{ayºʇڙë,j­¢f£¢·hšïêÿ‘êçz_è®(­éšŽŠÝ¢j"ú¶m§ÿÿ¾«þG«éÿ¢¸?™¨è­Ú&£ø§~á¶iO•æ¬z·švØ^¶m§ÿÿà ÿ¶ìÿ¢¸?–I¥