From owner-freebsd-toolchain@freebsd.org Mon Jun 29 13:14:12 2015 Return-Path: Delivered-To: freebsd-toolchain@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 98AA998F664 for ; Mon, 29 Jun 2015 13:14:12 +0000 (UTC) (envelope-from daemon-user@freebsd.org) Received: from phabric-backend.isc.freebsd.org (phabric-backend.isc.freebsd.org [IPv6:2001:4f8:3:ffe0:406a:0:50:2]) by mx1.freebsd.org (Postfix) with ESMTP id 78DD11892 for ; Mon, 29 Jun 2015 13:14:12 +0000 (UTC) (envelope-from daemon-user@freebsd.org) Received: by phabric-backend.isc.freebsd.org (Postfix, from userid 1346) id 73CB4BEDB; Mon, 29 Jun 2015 13:14:12 +0000 (UTC) Date: Mon, 29 Jun 2015 13:14:12 +0000 To: freebsd-toolchain@freebsd.org From: "emaste (Ed Maste)" Reply-to: D2933+334+e35df629633d6443@FreeBSD.org Subject: [Differential] [Updated, 26 lines] D2933: Significantly speed up ar(1) on UFS file systems Message-ID: X-Priority: 3 Thread-Topic: D2933: Significantly speed up ar(1) on UFS file systems X-Herald-Rules: none X-Phabricator-To: X-Phabricator-To: X-Phabricator-To: X-Phabricator-Cc: X-Phabricator-Cc: X-Phabricator-Cc: X-Phabricator-Cc: In-Reply-To: References: Thread-Index: OTY3MzA4YjIwYTMzODRmYTQ0NTRmMTdjYzJlIFWRRKQ= Precedence: bulk X-Phabricator-Sent-This-Message: Yes X-Mail-Transport-Agent: MetaMTA X-Auto-Response-Suppress: All X-Phabricator-Mail-Tags: , , , MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="b1_a222931c107847e855b5d47d28ef7204" X-BeenThere: freebsd-toolchain@freebsd.org X-Mailman-Version: 2.1.20 List-Id: Maintenance of FreeBSD's integrated toolchain List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 29 Jun 2015 13:14:12 -0000 --b1_a222931c107847e855b5d47d28ef7204 Content-Type: text/plain; charset = "utf-8" Content-Transfer-Encoding: 8bit emaste updated this revision to Diff 6543. emaste added a comment. This revision now requires review to proceed. - give full path to file with comment explaining the deadlock avoidance - avoid confusing page mask manipulation and just touch the last byte explicitly CHANGES SINCE LAST UPDATE https://reviews.freebsd.org/D2933?vs=6524&id=6543 REVISION DETAIL https://reviews.freebsd.org/D2933 AFFECTED FILES usr.bin/ar/write.c CHANGE DETAILS diff --git a/usr.bin/ar/write.c b/usr.bin/ar/write.c --- a/usr.bin/ar/write.c +++ b/usr.bin/ar/write.c @@ -41,6 +41,7 @@ #include #include #include +#include #include "ar.h" @@ -61,6 +62,7 @@ static void free_obj(struct bsdar *bsdar, struct ar_obj *obj); static void insert_obj(struct bsdar *bsdar, struct ar_obj *obj, struct ar_obj *pos); +static void prefault_buffer(const char *buf, size_t s); static void read_objs(struct bsdar *bsdar, const char *archive, int checkargv); static void write_archive(struct bsdar *bsdar, char mode); @@ -551,11 +553,35 @@ } /* + * Fault in the buffer prior to writing as a workaround for poor performance + * due to interaction with kernel fs deadlock avoidance code. See the comment + * above vn_io_fault_doio() in sys/kern/vfs_vnops.c for details of the issue. + */ +static void +prefault_buffer(const char *buf, size_t s) +{ + volatile const char *p; + size_t page_size; + + if (s == 0) + return; + page_size = sysconf(_SC_PAGESIZE); + for (p = buf; p < buf + s; p += page_size) + *p; + /* + * Ensure we touch the last page as well, in case the buffer is not + * page-aligned. + */ + *(volatile const char *)(buf + s - 1); +} + +/* * Wrapper for archive_write_data(). */ static void write_data(struct bsdar *bsdar, struct archive *a, const void *buf, size_t s) { + prefault_buffer(buf, s); if (archive_write_data(a, buf, s) != (ssize_t)s) bsdar_errc(bsdar, EX_SOFTWARE, 0, "%s", archive_error_string(a)); EMAIL PREFERENCES https://reviews.freebsd.org/settings/panel/emailpreferences/ To: emaste, kib, eadler Cc: kib, freebsd-toolchain-list, dim, davide --b1_a222931c107847e855b5d47d28ef7204 Content-Type: text/x-patch; charset=utf-8; name="D2933.6543.patch" Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="D2933.6543.patch" ZGlmZiAtLWdpdCBhL3Vzci5iaW4vYXIvd3JpdGUuYyBiL3Vzci5iaW4vYXIvd3JpdGUuYwotLS0g YS91c3IuYmluL2FyL3dyaXRlLmMKKysrIGIvdXNyLmJpbi9hci93cml0ZS5jCkBAIC00MSw2ICs0 MSw3IEBACiAjaW5jbHVkZSA8c3RkbGliLmg+CiAjaW5jbHVkZSA8c3RyaW5nLmg+CiAjaW5jbHVk ZSA8c3lzZXhpdHMuaD4KKyNpbmNsdWRlIDx1bmlzdGQuaD4KIAogI2luY2x1ZGUgImFyLmgiCiAK QEAgLTYxLDYgKzYyLDcgQEAKIHN0YXRpYyB2b2lkCWZyZWVfb2JqKHN0cnVjdCBic2RhciAqYnNk YXIsIHN0cnVjdCBhcl9vYmogKm9iaik7CiBzdGF0aWMgdm9pZAlpbnNlcnRfb2JqKHN0cnVjdCBi c2RhciAqYnNkYXIsIHN0cnVjdCBhcl9vYmogKm9iaiwKIAkJICAgIHN0cnVjdCBhcl9vYmogKnBv cyk7CitzdGF0aWMgdm9pZAlwcmVmYXVsdF9idWZmZXIoY29uc3QgY2hhciAqYnVmLCBzaXplX3Qg cyk7CiBzdGF0aWMgdm9pZAlyZWFkX29ianMoc3RydWN0IGJzZGFyICpic2RhciwgY29uc3QgY2hh ciAqYXJjaGl2ZSwKIAkJICAgIGludCBjaGVja2FyZ3YpOwogc3RhdGljIHZvaWQJd3JpdGVfYXJj aGl2ZShzdHJ1Y3QgYnNkYXIgKmJzZGFyLCBjaGFyIG1vZGUpOwpAQCAtNTUxLDExICs1NTMsMzUg QEAKIH0KIAogLyoKKyAqIEZhdWx0IGluIHRoZSBidWZmZXIgcHJpb3IgdG8gd3JpdGluZyBhcyBh IHdvcmthcm91bmQgZm9yIHBvb3IgcGVyZm9ybWFuY2UKKyAqIGR1ZSB0byBpbnRlcmFjdGlvbiB3 aXRoIGtlcm5lbCBmcyBkZWFkbG9jayBhdm9pZGFuY2UgY29kZS4gU2VlIHRoZSBjb21tZW50Cisg KiBhYm92ZSB2bl9pb19mYXVsdF9kb2lvKCkgaW4gc3lzL2tlcm4vdmZzX3Zub3BzLmMgZm9yIGRl dGFpbHMgb2YgdGhlIGlzc3VlLgorICovCitzdGF0aWMgdm9pZAorcHJlZmF1bHRfYnVmZmVyKGNv bnN0IGNoYXIgKmJ1Ziwgc2l6ZV90IHMpCit7CisJdm9sYXRpbGUgY29uc3QgY2hhciAqcDsKKwlz aXplX3QgcGFnZV9zaXplOworCisJaWYgKHMgPT0gMCkKKwkJcmV0dXJuOworCXBhZ2Vfc2l6ZSA9 IHN5c2NvbmYoX1NDX1BBR0VTSVpFKTsKKwlmb3IgKHAgPSBidWY7IHAgPCBidWYgKyBzOyBwICs9 IHBhZ2Vfc2l6ZSkKKwkJKnA7CisJLyoKKwkgKiBFbnN1cmUgd2UgdG91Y2ggdGhlIGxhc3QgcGFn ZSBhcyB3ZWxsLCBpbiBjYXNlIHRoZSBidWZmZXIgaXMgbm90CisJICogcGFnZS1hbGlnbmVkLgor CSAqLworCSoodm9sYXRpbGUgY29uc3QgY2hhciAqKShidWYgKyBzIC0gMSk7Cit9CisKKy8qCiAg KiBXcmFwcGVyIGZvciBhcmNoaXZlX3dyaXRlX2RhdGEoKS4KICAqLwogc3RhdGljIHZvaWQKIHdy aXRlX2RhdGEoc3RydWN0IGJzZGFyICpic2Rhciwgc3RydWN0IGFyY2hpdmUgKmEsIGNvbnN0IHZv aWQgKmJ1Ziwgc2l6ZV90IHMpCiB7CisJcHJlZmF1bHRfYnVmZmVyKGJ1Ziwgcyk7CiAJaWYgKGFy Y2hpdmVfd3JpdGVfZGF0YShhLCBidWYsIHMpICE9IChzc2l6ZV90KXMpCiAJCWJzZGFyX2VycmMo YnNkYXIsIEVYX1NPRlRXQVJFLCAwLCAiJXMiLAogCQkgICAgYXJjaGl2ZV9lcnJvcl9zdHJpbmco YSkpOwoK --b1_a222931c107847e855b5d47d28ef7204--