Date: Wed, 6 Jan 2010 14:10:28 -0800 From: Matt Reimer <mattjreimer@gmail.com> To: freebsd-fs <freebsd-fs@freebsd.org>, Doug Rabson <dfr@rabson.org>, Pawel Jakub Dawidek <pjd@freebsd.org> Subject: PATCH: more efficient raidz memory usage for (gpt)zfsboot, zfsloader Message-ID: <f383264b1001061410i12008220t82dc53d68d643688@mail.gmail.com>
next in thread | raw e-mail | index | archive | help
--000e0cd7040ae20e63047c86387f Content-Type: text/plain; charset=ISO-8859-1 Would one of you be able to review this patch and commit it if it's acceptable? This is the same patch I submitted last month. Matt ---- Teach the (gpt)zfsboot and zfsloader raidz code to use its buffers more efficiently. Before this patch, in the worst case memory use would increase exponentially on the number of drives in the raidz vdev. Sponsored by: VPOP Technologies, Inc. Matt Reimer --000e0cd7040ae20e63047c86387f Content-Type: application/octet-stream; name="raidz-mem.patch" Content-Disposition: attachment; filename="raidz-mem.patch" Content-Transfer-Encoding: base64 X-Attachment-Id: f_g37tvwgu0 LS0tIC9zeXMvY2RkbC9ib290L3pmcy96ZnNzdWJyLmMuT1JJRwkyMDA5LTExLTE0IDA4OjE0OjUx LjAwMDAwMDAwMCAtMDgwMAorKysgL3N5cy9jZGRsL2Jvb3QvemZzL3pmc3N1YnIuYwkyMDA5LTEy LTA3IDE1OjI3OjQ5LjAwMDAwMDAwMCAtMDgwMApAQCAtNDU0LDcgKzQ1NCw3IEBACiAKIHN0YXRp YyB2b2lkCiB2ZGV2X3JhaWR6X3JlY29uc3RydWN0X3BxKHJhaWR6X2NvbF90ICpjb2xzLCBpbnQg bnBhcml0eSwgaW50IGFjb2xzLAotICAgIGludCB4LCBpbnQgeSkKKyAgICBpbnQgeCwgaW50IHks IHZvaWQgKnRlbXBfcCwgdm9pZCAqdGVtcF9xKQogewogCXVpbnQ4X3QgKnAsICpxLCAqcHh5LCAq cXh5LCAqeGQsICp5ZCwgdG1wLCBhLCBiLCBhZXhwLCBiZXhwOwogCXZvaWQgKnBkYXRhLCAqcWRh dGE7CkBAIC00NzgsMTAgKzQ3OCw4IEBACiAJeHNpemUgPSBjb2xzW3hdLnJjX3NpemU7CiAJeXNp emUgPSBjb2xzW3ldLnJjX3NpemU7CiAKLQljb2xzW1ZERVZfUkFJRFpfUF0ucmNfZGF0YSA9Ci0J CXpmc19hbGxvY190ZW1wKGNvbHNbVkRFVl9SQUlEWl9QXS5yY19zaXplKTsKLQljb2xzW1ZERVZf UkFJRFpfUV0ucmNfZGF0YSA9Ci0JCXpmc19hbGxvY190ZW1wKGNvbHNbVkRFVl9SQUlEWl9RXS5y Y19zaXplKTsKKwljb2xzW1ZERVZfUkFJRFpfUF0ucmNfZGF0YSA9IHRlbXBfcDsKKwljb2xzW1ZE RVZfUkFJRFpfUV0ucmNfZGF0YSA9IHRlbXBfcTsKIAljb2xzW3hdLnJjX3NpemUgPSAwOwogCWNv bHNbeV0ucmNfc2l6ZSA9IDA7CiAKQEAgLTU1MSw5ICs1NDksMTIgQEAKIAl1aW50NjRfdCBmID0g YiAlIGRjb2xzOwogCXVpbnQ2NF90IG8gPSAoYiAvIGRjb2xzKSA8PCB1bml0X3NoaWZ0OwogCXVp bnQ2NF90IHEsIHIsIGNvZmY7Ci0JaW50IGMsIGMxLCBiYywgY29sLCBhY29scywgZGV2aWR4LCBh c2l6ZSwgbjsKKwlpbnQgYywgYzEsIGJjLCBjb2wsIGFjb2xzLCBkZXZpZHgsIGFzaXplLCBuLCBt YXhfcmNfc2l6ZTsKIAlzdGF0aWMgcmFpZHpfY29sX3QgY29sc1sxNl07CiAJcmFpZHpfY29sX3Qg KnJjLCAqcmMxOworCXZvaWQgKm9yaWcsICpvcmlnMSwgKnRlbXBfcCwgKnRlbXBfcTsKKworCW9y aWcgPSBvcmlnMSA9IHRlbXBfcCA9IHRlbXBfcSA9IE5VTEw7CiAKIAlxID0gcyAvIChkY29scyAt IG5wYXJpdHkpOwogCXIgPSBzIC0gcSAqIChkY29scyAtIG5wYXJpdHkpOwpAQCAtNTYxLDYgKzU2 Miw3IEBACiAKIAlhY29scyA9IChxID09IDAgPyBiYyA6IGRjb2xzKTsKIAlhc2l6ZSA9IDA7CisJ bWF4X3JjX3NpemUgPSAwOwogCQogCWZvciAoYyA9IDA7IGMgPCBhY29sczsgYysrKSB7CiAJCWNv bCA9IGYgKyBjOwpAQCAtNTc3LDYgKzU3OSw4IEBACiAJCWNvbHNbY10ucmNfdHJpZWQgPSAwOwog CQljb2xzW2NdLnJjX3NraXBwZWQgPSAwOwogCQlhc2l6ZSArPSBjb2xzW2NdLnJjX3NpemU7CisJ CWlmIChjb2xzW2NdLnJjX3NpemUgPiBtYXhfcmNfc2l6ZSkKKwkJCW1heF9yY19zaXplID0gY29s c1tjXS5yY19zaXplOwogCX0KIAogCWFzaXplID0gcm91bmR1cChhc2l6ZSwgKG5wYXJpdHkgKyAx KSA8PCB1bml0X3NoaWZ0KTsKQEAgLTc3Nyw4ICs3ODEsMTMgQEAKIAkJCS8vQVNTRVJUKGMgIT0g YWNvbHMpOwogCQkJLy9BU1NFUlQoIXJjLT5yY19za2lwcGVkIHx8IHJjLT5yY19lcnJvciA9PSBF TlhJTyB8fCByYy0+cmNfZXJyb3IgPT0gRVNUQUxFKTsKIAorCQkJaWYgKCF0ZW1wX3ApCisJCQkJ dGVtcF9wID0gemZzX2FsbG9jX3RlbXAobWF4X3JjX3NpemUpOworCQkJaWYgKCF0ZW1wX3EpCisJ CQkJdGVtcF9xID0gemZzX2FsbG9jX3RlbXAobWF4X3JjX3NpemUpOworCiAJCQl2ZGV2X3JhaWR6 X3JlY29uc3RydWN0X3BxKGNvbHMsIG5wYXJpdHksIGFjb2xzLAotCQkJICAgIGMxLCBjKTsKKwkJ CSAgICBjMSwgYywgdGVtcF9wLCB0ZW1wX3EpOwogCiAJCQlpZiAoemlvX2NoZWNrc3VtX2Vycm9y KGJwLCBidWYpID09IDApCiAJCQkJcmV0dXJuICgwKTsKQEAgLTg0NSwxOCArODU0LDEyIEBACiAJ CXJldHVybiAoRUlPKTsKIAl9CiAKLQlhc2l6ZSA9IDA7Ci0JZm9yIChjID0gMDsgYyA8IGFjb2xz OyBjKyspIHsKLQkJcmMgPSAmY29sc1tjXTsKLQkJaWYgKHJjLT5yY19zaXplID4gYXNpemUpCi0J CQlhc2l6ZSA9IHJjLT5yY19zaXplOwotCX0KIAlpZiAoY29sc1tWREVWX1JBSURaX1BdLnJjX2Vy cm9yID09IDApIHsKIAkJLyoKIAkJICogQXR0ZW1wdCB0byByZWNvbnN0cnVjdCB0aGUgZGF0YSBm cm9tIHBhcml0eSBQLgogCQkgKi8KLQkJdm9pZCAqb3JpZzsKLQkJb3JpZyA9IHpmc19hbGxvY190 ZW1wKGFzaXplKTsKKwkJaWYgKCFvcmlnKQorCQkJb3JpZyA9IHpmc19hbGxvY190ZW1wKG1heF9y Y19zaXplKTsKIAkJZm9yIChjID0gbnBhcml0eTsgYyA8IGFjb2xzOyBjKyspIHsKIAkJCXJjID0g JmNvbHNbY107CiAKQEAgLTg3NCw4ICs4NzcsOCBAQAogCQkvKgogCQkgKiBBdHRlbXB0IHRvIHJl Y29uc3RydWN0IHRoZSBkYXRhIGZyb20gcGFyaXR5IFEuCiAJCSAqLwotCQl2b2lkICpvcmlnOwot CQlvcmlnID0gemZzX2FsbG9jX3RlbXAoYXNpemUpOworCQlpZiAoIW9yaWcpCisJCQlvcmlnID0g emZzX2FsbG9jX3RlbXAobWF4X3JjX3NpemUpOwogCQlmb3IgKGMgPSBucGFyaXR5OyBjIDwgYWNv bHM7IGMrKykgewogCQkJcmMgPSAmY29sc1tjXTsKIApAQCAtODk1LDkgKzg5OCwxNCBAQAogCQkv KgogCQkgKiBBdHRlbXB0IHRvIHJlY29uc3RydWN0IHRoZSBkYXRhIGZyb20gYm90aCBQIGFuZCBR LgogCQkgKi8KLQkJdm9pZCAqb3JpZywgKm9yaWcxOwotCQlvcmlnID0gemZzX2FsbG9jX3RlbXAo YXNpemUpOwotCQlvcmlnMSA9IHpmc19hbGxvY190ZW1wKGFzaXplKTsKKwkJaWYgKCFvcmlnKQor CQkJb3JpZyA9IHpmc19hbGxvY190ZW1wKG1heF9yY19zaXplKTsKKwkJaWYgKCFvcmlnMSkKKwkJ CW9yaWcxID0gemZzX2FsbG9jX3RlbXAobWF4X3JjX3NpemUpOworCQlpZiAoIXRlbXBfcCkKKwkJ CXRlbXBfcCA9IHpmc19hbGxvY190ZW1wKG1heF9yY19zaXplKTsKKwkJaWYgKCF0ZW1wX3EpCisJ CQl0ZW1wX3EgPSB6ZnNfYWxsb2NfdGVtcChtYXhfcmNfc2l6ZSk7CiAJCWZvciAoYyA9IG5wYXJp dHk7IGMgPCBhY29scyAtIDE7IGMrKykgewogCQkJcmMgPSAmY29sc1tjXTsKIApAQCAtOTA5LDcg KzkxNyw3IEBACiAJCQkJbWVtY3B5KG9yaWcxLCByYzEtPnJjX2RhdGEsIHJjMS0+cmNfc2l6ZSk7 CiAKIAkJCQl2ZGV2X3JhaWR6X3JlY29uc3RydWN0X3BxKGNvbHMsIG5wYXJpdHksCi0JCQkJICAg IGFjb2xzLCBjLCBjMSk7CisJCQkJICAgIGFjb2xzLCBjLCBjMSwgdGVtcF9wLCB0ZW1wX3EpOwog CiAJCQkJaWYgKHppb19jaGVja3N1bV9lcnJvcihicCwgYnVmKSA9PSAwKQogCQkJCQlyZXR1cm4g KDApOwo= --000e0cd7040ae20e63047c86387f--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?f383264b1001061410i12008220t82dc53d68d643688>