From: Stefan Hajnoczi Date: Fri, 1 May 2020 15:06:43 +0100 Message-Id: <20200501140644.220940-2-stefanha@redhat.com> In-Reply-To: <20200501140644.220940-1-stefanha@redhat.com> References: <20200501140644.220940-1-stefanha@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: base64 Subject: [Virtio-fs] [PATCH v2 1/2] virtiofsd: add --rlimit-nofile=NUM option List-Id: Development discussions about virtio-fs List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: virtio-fs@redhat.com, vgoyal@redhat.com, pjp@redhat.com TWFrZSBpdCBwb3NzaWJsZSB0byBzcGVjaWZ5IHRoZSBSTElNSVRfTk9GSUxFIG9uIHRoZSBjb21t YW5kLWxpbmUuClVzZXJzIHJ1bm5pbmcgbXVsdGlwbGUgdmlydGlvZnNkIHByb2Nlc3NlcyBzaG91 bGQgYWxsb2NhdGUgYSBjZXJ0YWluCm51bWJlciB0byBlYWNoIHByb2Nlc3Mgc28gdGhhdCB0aGUg c3lzdGVtLXdpZGUgbGltaXQgY2FuIG5ldmVyIGJlCmV4aGF1c3RlZC4KCldoZW4gdGhpcyBvcHRp b24gaXMgc2V0IHRvIDAgdGhlIHJsaW1pdCBpcyBsZWZ0IGF0IGl0cyBjdXJyZW50IHZhbHVlLgpU aGlzIGlzIHVzZWZ1bCB3aGVuIGEgbWFuYWdlbWVudCB0b29sIHdhbnRzIHRvIGNvbmZpZ3VyZSB0 aGUgcmxpbWl0Cml0c2VsZi4KClRoZSBkZWZhdWx0IGJlaGF2aW9yIHJlbWFpbnMgdW5jaGFuZ2Vk OiB0cnkgdG8gc2V0IHRoZSBsaW1pdCB0bwoxLDAwMCwwMDAgZmlsZSBkZXNjcmlwdG9ycyBpZiB0 aGUgY3VycmVudCBybGltaXQgaXMgbG93ZXIuCgpTaWduZWQtb2ZmLWJ5OiBTdGVmYW4gSGFqbm9j emkgPHN0ZWZhbmhhQHJlZGhhdC5jb20+ClJldmlld2VkLWJ5OiBEci4gRGF2aWQgQWxhbiBHaWxi ZXJ0IDxkZ2lsYmVydEByZWRoYXQuY29tPgotLS0KIHRvb2xzL3ZpcnRpb2ZzZC9mdXNlX2xvd2xl dmVsLmggIHwgIDEgKwogdG9vbHMvdmlydGlvZnNkL2hlbHBlci5jICAgICAgICAgfCAyMyArKysr KysrKysrKysrKysrKysrKysrKwogdG9vbHMvdmlydGlvZnNkL3Bhc3N0aHJvdWdoX2xsLmMgfCAy MiArKysrKysrKy0tLS0tLS0tLS0tLS0tCiAzIGZpbGVzIGNoYW5nZWQsIDMyIGluc2VydGlvbnMo KyksIDE0IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL3Rvb2xzL3ZpcnRpb2ZzZC9mdXNlX2xv d2xldmVsLmggYi90b29scy92aXJ0aW9mc2QvZnVzZV9sb3dsZXZlbC5oCmluZGV4IDhmNmQ3MDVi NWMuLjU2MmZkNTI0MWUgMTAwNjQ0Ci0tLSBhL3Rvb2xzL3ZpcnRpb2ZzZC9mdXNlX2xvd2xldmVs LmgKKysrIGIvdG9vbHMvdmlydGlvZnNkL2Z1c2VfbG93bGV2ZWwuaApAQCAtMTc3Nyw2ICsxNzc3 LDcgQEAgc3RydWN0IGZ1c2VfY21kbGluZV9vcHRzIHsKICAgICBpbnQgc3lzbG9nOwogICAgIGlu dCBsb2dfbGV2ZWw7CiAgICAgdW5zaWduZWQgaW50IG1heF9pZGxlX3RocmVhZHM7CisgICAgdW5z aWduZWQgbG9uZyBybGltaXRfbm9maWxlOwogfTsKIAogLyoqCmRpZmYgLS1naXQgYS90b29scy92 aXJ0aW9mc2QvaGVscGVyLmMgYi90b29scy92aXJ0aW9mc2QvaGVscGVyLmMKaW5kZXggODE5YzJi YzEzYy4uZGM1OWYzOGFmMCAxMDA2NDQKLS0tIGEvdG9vbHMvdmlydGlvZnNkL2hlbHBlci5jCisr KyBiL3Rvb2xzL3ZpcnRpb2ZzZC9oZWxwZXIuYwpAQCAtMjMsNiArMjMsOCBAQAogI2luY2x1ZGUg PHN0ZGxpYi5oPgogI2luY2x1ZGUgPHN0cmluZy5oPgogI2luY2x1ZGUgPHN5cy9wYXJhbS5oPgor I2luY2x1ZGUgPHN5cy90aW1lLmg+CisjaW5jbHVkZSA8c3lzL3Jlc291cmNlLmg+CiAjaW5jbHVk ZSA8dW5pc3RkLmg+CiAKICNkZWZpbmUgRlVTRV9IRUxQRVJfT1BUKHQsIHApICAgICAgICAgICAg ICAgICAgICAgICBcCkBAIC01Myw2ICs1NSw3IEBAIHN0YXRpYyBjb25zdCBzdHJ1Y3QgZnVzZV9v cHQgZnVzZV9oZWxwZXJfb3B0c1tdID0gewogICAgIEZVU0VfSEVMUEVSX09QVCgic3VidHlwZT0i LCBub2RlZmF1bHRfc3VidHlwZSksCiAgICAgRlVTRV9PUFRfS0VZKCJzdWJ0eXBlPSIsIEZVU0Vf T1BUX0tFWV9LRUVQKSwKICAgICBGVVNFX0hFTFBFUl9PUFQoIm1heF9pZGxlX3RocmVhZHM9JXUi LCBtYXhfaWRsZV90aHJlYWRzKSwKKyAgICBGVVNFX0hFTFBFUl9PUFQoIi0tcmxpbWl0LW5vZmls ZT0lbHUiLCBybGltaXRfbm9maWxlKSwKICAgICBGVVNFX0hFTFBFUl9PUFQoIi0tc3lzbG9nIiwg c3lzbG9nKSwKICAgICBGVVNFX0hFTFBFUl9PUFRfVkFMVUUoImxvZ19sZXZlbD1kZWJ1ZyIsIGxv Z19sZXZlbCwgRlVTRV9MT0dfREVCVUcpLAogICAgIEZVU0VfSEVMUEVSX09QVF9WQUxVRSgibG9n X2xldmVsPWluZm8iLCBsb2dfbGV2ZWwsIEZVU0VfTE9HX0lORk8pLApAQCAtMTcxLDYgKzE3NCw5 IEBAIHZvaWQgZnVzZV9jbWRsaW5lX2hlbHAodm9pZCkKICAgICAgICAgICAgIiAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICBkZWZhdWx0OiBub193cml0ZWJhY2tcbiIKICAgICAgICAgICAg IiAgICAtbyB4YXR0cnxub194YXR0ciAgICAgICAgICBlbmFibGUvZGlzYWJsZSB4YXR0clxuIgog ICAgICAgICAgICAiICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGRlZmF1bHQ6IG5vX3hh dHRyXG4iCisgICAgICAgICAgICIgICAgLS1ybGltaXQtbm9maWxlPTxudW0+ICAgICAgc2V0IG1h eGltdW0gbnVtYmVyIG9mIGZpbGUgZGVzY3JpcHRvcnNcbiIKKyAgICAgICAgICAgIiAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAoMCBsZWF2ZXMgcmxpbWl0IHVuY2hhbmdlZClcbiIKKyAg ICAgICAgICAgIiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBkZWZhdWx0OiAxLDAwMCww MDAgaWYgdGhlIGN1cnJlbnQgcmxpbWl0IGlzIGxvd2VyXG4iCiAgICAgICAgICAgICk7CiB9CiAK QEAgLTE5MSwxMSArMTk3LDI4IEBAIHN0YXRpYyBpbnQgZnVzZV9oZWxwZXJfb3B0X3Byb2Modm9p ZCAqZGF0YSwgY29uc3QgY2hhciAqYXJnLCBpbnQga2V5LAogICAgIH0KIH0KIAorc3RhdGljIHVu c2lnbmVkIGxvbmcgZ2V0X2RlZmF1bHRfcmxpbWl0X25vZmlsZSh2b2lkKQoreworICAgIHJsaW1f dCBtYXhfZmRzID0gMTAwMDAwMDsgLyogb3VyIGRlZmF1bHQgUkxJTUlUX05PRklMRSB0YXJnZXQg Ki8KKyAgICBzdHJ1Y3QgcmxpbWl0IHJsaW07CisKKyAgICBpZiAoZ2V0cmxpbWl0KFJMSU1JVF9O T0ZJTEUsICZybGltKSA8IDApIHsKKyAgICAgICAgZnVzZV9sb2coRlVTRV9MT0dfRVJSLCAiZ2V0 cmxpbWl0KFJMSU1JVF9OT0ZJTEUpOiAlbVxuIik7CisgICAgICAgIGV4aXQoMSk7CisgICAgfQor CisgICAgaWYgKHJsaW0ucmxpbV9jdXIgPj0gbWF4X2ZkcykgeworICAgICAgICByZXR1cm4gMDsg Lyogd2UgaGF2ZSBtb3JlIGZkcyBhdmFpbGFibGUgdGhhbiByZXF1aXJlZCEgKi8KKyAgICB9Cisg ICAgcmV0dXJuIG1heF9mZHM7Cit9CisKIGludCBmdXNlX3BhcnNlX2NtZGxpbmUoc3RydWN0IGZ1 c2VfYXJncyAqYXJncywgc3RydWN0IGZ1c2VfY21kbGluZV9vcHRzICpvcHRzKQogewogICAgIG1l bXNldChvcHRzLCAwLCBzaXplb2Yoc3RydWN0IGZ1c2VfY21kbGluZV9vcHRzKSk7CiAKICAgICBv cHRzLT5tYXhfaWRsZV90aHJlYWRzID0gMTA7CisgICAgb3B0cy0+cmxpbWl0X25vZmlsZSA9IGdl dF9kZWZhdWx0X3JsaW1pdF9ub2ZpbGUoKTsKICAgICBvcHRzLT5mb3JlZ3JvdW5kID0gMTsKIAog ICAgIGlmIChmdXNlX29wdF9wYXJzZShhcmdzLCBvcHRzLCBmdXNlX2hlbHBlcl9vcHRzLCBmdXNl X2hlbHBlcl9vcHRfcHJvYykgPT0KZGlmZiAtLWdpdCBhL3Rvb2xzL3ZpcnRpb2ZzZC9wYXNzdGhy b3VnaF9sbC5jIGIvdG9vbHMvdmlydGlvZnNkL3Bhc3N0aHJvdWdoX2xsLmMKaW5kZXggNGMzNWM5 NWIyNS4uZjdiOWMxZDIwYyAxMDA2NDQKLS0tIGEvdG9vbHMvdmlydGlvZnNkL3Bhc3N0aHJvdWdo X2xsLmMKKysrIGIvdG9vbHMvdmlydGlvZnNkL3Bhc3N0aHJvdWdoX2xsLmMKQEAgLTI3MDcsMjQg KzI3MDcsMTggQEAgc3RhdGljIHZvaWQgc2V0dXBfc2FuZGJveChzdHJ1Y3QgbG9fZGF0YSAqbG8s IHN0cnVjdCBmdXNlX3Nlc3Npb24gKnNlLAogICAgIHNldHVwX3NlY2NvbXAoZW5hYmxlX3N5c2xv Zyk7CiB9CiAKLS8qIFJhaXNlIHRoZSBtYXhpbXVtIG51bWJlciBvZiBvcGVuIGZpbGUgZGVzY3Jp cHRvcnMgKi8KLXN0YXRpYyB2b2lkIHNldHVwX25vZmlsZV9ybGltaXQodm9pZCkKKy8qIFNldCB0 aGUgbWF4aW11bSBudW1iZXIgb2Ygb3BlbiBmaWxlIGRlc2NyaXB0b3JzICovCitzdGF0aWMgdm9p ZCBzZXR1cF9ub2ZpbGVfcmxpbWl0KHVuc2lnbmVkIGxvbmcgcmxpbWl0X25vZmlsZSkKIHsKLSAg ICBjb25zdCBybGltX3QgbWF4X2ZkcyA9IDEwMDAwMDA7Ci0gICAgc3RydWN0IHJsaW1pdCBybGlt OworICAgIHN0cnVjdCBybGltaXQgcmxpbSA9IHsKKyAgICAgICAgLnJsaW1fY3VyID0gcmxpbWl0 X25vZmlsZSwKKyAgICAgICAgLnJsaW1fbWF4ID0gcmxpbWl0X25vZmlsZSwKKyAgICB9OwogCi0g ICAgaWYgKGdldHJsaW1pdChSTElNSVRfTk9GSUxFLCAmcmxpbSkgPCAwKSB7Ci0gICAgICAgIGZ1 c2VfbG9nKEZVU0VfTE9HX0VSUiwgImdldHJsaW1pdChSTElNSVRfTk9GSUxFKTogJW1cbiIpOwot ICAgICAgICBleGl0KDEpOwotICAgIH0KLQotICAgIGlmIChybGltLnJsaW1fY3VyID49IG1heF9m ZHMpIHsKKyAgICBpZiAocmxpbWl0X25vZmlsZSA9PSAwKSB7CiAgICAgICAgIHJldHVybjsgLyog bm90aGluZyB0byBkbyAqLwogICAgIH0KIAotICAgIHJsaW0ucmxpbV9jdXIgPSBtYXhfZmRzOwot ICAgIHJsaW0ucmxpbV9tYXggPSBtYXhfZmRzOwotCiAgICAgaWYgKHNldHJsaW1pdChSTElNSVRf Tk9GSUxFLCAmcmxpbSkgPCAwKSB7CiAgICAgICAgIC8qIElnbm9yZSBTRUxpbnV4IGRlbmlhbHMg Ki8KICAgICAgICAgaWYgKGVycm5vID09IEVQRVJNKSB7CkBAIC0yOTc3LDcgKzI5NzEsNyBAQCBp bnQgbWFpbihpbnQgYXJnYywgY2hhciAqYXJndltdKQogCiAgICAgZnVzZV9kYWVtb25pemUob3B0 cy5mb3JlZ3JvdW5kKTsKIAotICAgIHNldHVwX25vZmlsZV9ybGltaXQoKTsKKyAgICBzZXR1cF9u b2ZpbGVfcmxpbWl0KG9wdHMucmxpbWl0X25vZmlsZSk7CiAKICAgICAvKiBNdXN0IGJlIGJlZm9y ZSBzYW5kYm94IHNpbmNlIGl0IHdhbnRzIC9wcm9jICovCiAgICAgc2V0dXBfY2FwbmcoKTsKLS0g CjIuMjUuMwoK