Date: Sat, 9 Mar 2013 13:14:16 +0100 From: =?ISO-8859-1?Q?Ermal_Lu=E7i?= <eri@freebsd.org> To: Kajetan Staszkiewicz <vegeta@tuxpowered.net> Cc: "freebsd-net@freebsd.org" <freebsd-net@freebsd.org>, "freebsd-pf@freebsd.org" <freebsd-pf@freebsd.org> Subject: Re: [patch] Source entries removing is awfully slow. Message-ID: <CAPBZQG0Jj_c-XvVJNV2S02xcitr%2Bnhs%2BmV=GjJm3YeM6iPUX7g@mail.gmail.com> In-Reply-To: <201303082151.00895.vegeta@tuxpowered.net> References: <201303081419.17743.vegeta@tuxpowered.net> <CAPBZQG2bb2xzPB2UoPUDx-ifyBdmjac6b8kV76DTPBUzLCDmJw@mail.gmail.com> <201303082151.00895.vegeta@tuxpowered.net>
next in thread | previous in thread | raw e-mail | index | archive | help
--047d7bea40f00ef2e504d77ce15b Content-Type: text/plain; charset=ISO-8859-2 Content-Transfer-Encoding: quoted-printable On Fri, Mar 8, 2013 at 9:51 PM, Kajetan Staszkiewicz <vegeta@tuxpowered.net>wrote: > Dnia pi=B1tek, 8 marca 2013 o 21:11:43 Ermal Lu=E7i napisa=B3(a): > > Is this FreeBSD 9.x or HEAD? > > I found the problem and developed the patch on 9.1. > > Can you please test this more 'beautiful' patch. Its similar to yours but also delays src state removal to the proper purge thread. Though the src node removal option through pfctl -K does a lot of job to cleanup things Still need to undertand why it takes so much time for you to loop through 500K states. The purge thread does that every tick by partitioning it to a few per time slot but still minutes is way loong. Can you please try to give a top -SH view of the time when this happens and a pfctl -vvsa output? > -- > | pozdrawiam / greetings | powered by Debian, CentOS and FreeBSD | > | Kajetan Staszkiewicz | jabber,email: vegeta()tuxpowered net | > | Vegeta | www: http://vegeta.tuxpowered.net | > `------------------------^---------------------------------------' > --=20 Ermal --047d7bea40f00ef2e504d77ce15b Content-Type: application/octet-stream; name="state_unlink_optimization2.diff" Content-Disposition: attachment; filename="state_unlink_optimization2.diff" Content-Transfer-Encoding: base64 X-Attachment-Id: f_he2q1w430 ZGlmZiAtLWdpdCBhL3N5cy9jb250cmliL3BmL25ldC9wZi5jIGIvc3lzL2NvbnRyaWIvcGYvbmV0 L3BmLmMKaW5kZXggOWZiMDVhZS4uNGRmNDBjYyAxMDA2NDQKLS0tIGEvc3lzL2NvbnRyaWIvcGYv bmV0L3BmLmMKKysrIGIvc3lzL2NvbnRyaWIvcGYvbmV0L3BmLmMKQEAgLTcyMCw2ICs3MjAsOSBA QCBwZl9pbnNlcnRfc3JjX25vZGUoc3RydWN0IHBmX3NyY19ub2RlICoqc24sIHN0cnVjdCBwZl9y dWxlICpydWxlLAogCQkgICAgcnVsZS0+bWF4X3NyY19jb25uX3JhdGUubGltaXQsCiAJCSAgICBy dWxlLT5tYXhfc3JjX2Nvbm5fcmF0ZS5zZWNvbmRzKTsKIAorI2lmZGVmIF9fRnJlZUJTRF9fCisJ CVRBSUxRX0lOSVQoJigqc24pLT5zdGF0ZV9saXN0KTsKKyNlbmRpZgogCQkoKnNuKS0+YWYgPSBh ZjsKIAkJaWYgKHJ1bGUtPnJ1bGVfZmxhZyAmIFBGUlVMRV9SVUxFU1JDVFJBQ0sgfHwKIAkJICAg IHJ1bGUtPnJwb29sLm9wdHMgJiBQRl9QT09MX1NUSUNLWUFERFIpCkBAIC0xNDUzLDYgKzE0NTYs OSBAQCBwZl9wdXJnZV9leHBpcmVkX3NyY19ub2RlcyhpbnQgd2FzbG9ja2VkKQogI2VuZGlmCiB7 CiAJc3RydWN0IHBmX3NyY19ub2RlCQkqY3VyLCAqbmV4dDsKKyNpZmRlZiBfX0ZyZWVCU0RfXwor CXN0cnVjdCBwZl9zdGF0ZQkJCSpzOworI2VuZGlmCiAJaW50CQkJCSBsb2NrZWQgPSB3YXNsb2Nr ZWQ7CiAKICNpZmRlZiBfX0ZyZWVCU0RfXwpAQCAtMTQ4Niw2ICsxNDkyLDEyIEBAIHBmX3B1cmdl X2V4cGlyZWRfc3JjX25vZGVzKGludCB3YXNsb2NrZWQpCiAJCQkJCXBmX3JtX3J1bGUoTlVMTCwg Y3VyLT5ydWxlLnB0cik7CiAJCQl9CiAjaWZkZWYgX19GcmVlQlNEX18KKwkJCXdoaWxlICghVEFJ TFFfRU1QVFkoJmN1ci0+c3RhdGVfbGlzdCkpIHsKKwkJCQlzID0gVEFJTFFfRklSU1QoJmN1ci0+ c3RhdGVfbGlzdCk7CisJCQkJVEFJTFFfUkVNT1ZFKCZjdXItPnN0YXRlX2xpc3QsIHMsIHNyY25v ZGVfbGluayk7CisJCQkJcy0+c3JjX25vZGUgPSBOVUxMOworCQkJCXMtPm5hdF9zcmNfbm9kZSA9 IE5VTEw7CisJCQl9CiAJCQlSQl9SRU1PVkUocGZfc3JjX3RyZWUsICZWX3RyZWVfc3JjX3RyYWNr aW5nLCBjdXIpOwogCQkJVl9wZl9zdGF0dXMuc2NvdW50ZXJzW1NDTlRfU1JDX05PREVfUkVNT1ZB TFNdKys7CiAJCQlWX3BmX3N0YXR1cy5zcmNfbm9kZXMtLTsKQEAgLTE1MjksNiArMTU0MSwxMCBA QCBwZl9zcmNfdHJlZV9yZW1vdmVfc3RhdGUoc3RydWN0IHBmX3N0YXRlICpzKQogI2VuZGlmCiAJ CQlzLT5zcmNfbm9kZS0+ZXhwaXJlID0gdGltZV9zZWNvbmQgKyB0aW1lb3V0OwogCQl9CisjaWZk ZWYgX19GcmVlQlNEX18KKwkJaWYgKCFUQUlMUV9FTVBUWSgmcy0+c3JjX25vZGUtPnN0YXRlX2xp c3QpKQorCQkJVEFJTFFfUkVNT1ZFKCZzLT5zcmNfbm9kZS0+c3RhdGVfbGlzdCwgcywgc3Jjbm9k ZV9saW5rKTsKKyNlbmRpZgogCX0KIAlpZiAocy0+bmF0X3NyY19ub2RlICE9IHMtPnNyY19ub2Rl ICYmIHMtPm5hdF9zcmNfbm9kZSAhPSBOVUxMKSB7CiAJCWlmICgtLXMtPm5hdF9zcmNfbm9kZS0+ c3RhdGVzIDw9IDApIHsKQEAgLTE1NDIsNiArMTU1OCwxMCBAQCBwZl9zcmNfdHJlZV9yZW1vdmVf c3RhdGUoc3RydWN0IHBmX3N0YXRlICpzKQogI2VuZGlmCiAJCQlzLT5uYXRfc3JjX25vZGUtPmV4 cGlyZSA9IHRpbWVfc2Vjb25kICsgdGltZW91dDsKIAkJfQorI2lmZGVmIF9fRnJlZUJTRF9fCisJ CWlmICghVEFJTFFfRU1QVFkoJnMtPm5hdF9zcmNfbm9kZS0+c3RhdGVfbGlzdCkpCisJCQlUQUlM UV9SRU1PVkUoJnMtPm5hdF9zcmNfbm9kZS0+c3RhdGVfbGlzdCwgcywgc3Jjbm9kZV9saW5rKTsK KyNlbmRpZgogCX0KIAlzLT5zcmNfbm9kZSA9IHMtPm5hdF9zcmNfbm9kZSA9IE5VTEw7CiB9CkBA IC0zOTQ5LDggKzM5NjksMTggQEAgcGZfY3JlYXRlX3N0YXRlKHN0cnVjdCBwZl9ydWxlICpyLCBz dHJ1Y3QgcGZfcnVsZSAqbnIsIHN0cnVjdCBwZl9ydWxlICphLAogCQlwb29sX3B1dCgmcGZfc3Rh dGVfcGwsIHMpOwogI2VuZGlmCiAJCXJldHVybiAoUEZfRFJPUCk7CisjaWZkZWYgX19GcmVlQlNE X18KKwl9IGVsc2UgeworCQlpZiAoc24gIT0gTlVMTCkKKwkJCVRBSUxRX0lOU0VSVF9IRUFEKCZz bi0+c3RhdGVfbGlzdCwgcywgc3Jjbm9kZV9saW5rKTsKKwkJaWYgKG5zbiAhPSBOVUxMKQorCQkJ VEFJTFFfSU5TRVJUX0hFQUQoJm5zbi0+c3RhdGVfbGlzdCwgcywgc3Jjbm9kZV9saW5rKTsKKwkJ KnNtID0gczsKKwl9CisjZWxzZQogCX0gZWxzZQogCQkqc20gPSBzOworI2VuZGlmCiAKIAlwZl9z ZXRfcnRfaWZwKHMsIHBkLT5zcmMpOwkvKiBuZWVkcyBzLT5zdGF0ZV9rZXkgc2V0ICovCiAJaWYg KHRhZyA+IDApIHsKZGlmZiAtLWdpdCBhL3N5cy9jb250cmliL3BmL25ldC9wZl9pb2N0bC5jIGIv c3lzL2NvbnRyaWIvcGYvbmV0L3BmX2lvY3RsLmMKaW5kZXggM2IxMzBlNS4uMjg2NGU5YSAxMDA2 NDQKLS0tIGEvc3lzL2NvbnRyaWIvcGYvbmV0L3BmX2lvY3RsLmMKKysrIGIvc3lzL2NvbnRyaWIv cGYvbmV0L3BmX2lvY3RsLmMKQEAgLTM3ODksNyArMzc4OSw5IEBAIHBmaW9jdGwoZGV2X3QgZGV2 LCB1X2xvbmcgY21kLCBjYWRkcl90IGFkZHIsIGludCBmbGFncywgc3RydWN0IHByb2MgKnApCiAK IAljYXNlIERJT0NLSUxMU1JDTk9ERVM6IHsKIAkJc3RydWN0IHBmX3NyY19ub2RlCSpzbjsKKyNp Zm5kZWYgX19GcmVlQlNEX18KIAkJc3RydWN0IHBmX3N0YXRlCQkqczsKKyNlbmRpZgogCQlzdHJ1 Y3QgcGZpb2Nfc3JjX25vZGVfa2lsbCAqcHNuayA9CiAJCSAgICAoc3RydWN0IHBmaW9jX3NyY19u b2RlX2tpbGwgKilhZGRyOwogCQl1X2ludAkJCWtpbGxlZCA9IDA7CkBAIC0zODA4LDYgKzM4MTAs NyBAQCBwZmlvY3RsKGRldl90IGRldiwgdV9sb25nIGNtZCwgY2FkZHJfdCBhZGRyLCBpbnQgZmxh Z3MsIHN0cnVjdCBwcm9jICpwKQogCQkJCSZwc25rLT5wc25rX2RzdC5hZGRyLnYuYS5tYXNrLAog CQkJCSZzbi0+cmFkZHIsIHNuLT5hZikpIHsKIAkJCQkvKiBIYW5kbGUgc3RhdGUgdG8gc3JjX25v ZGUgbGlua2FnZSAqLworI2lmbmRlZiBfX0ZyZWVCU0RfXyAKIAkJCQlpZiAoc24tPnN0YXRlcyAh PSAwKSB7CiAJCQkJCVJCX0ZPUkVBQ0gocywgcGZfc3RhdGVfdHJlZV9pZCwKICNpZmRlZiBfX0Zy ZWVCU0RfXwpAQCAtMzgyMiwxMyArMzgyNSwxNiBAQCBwZmlvY3RsKGRldl90IGRldiwgdV9sb25n IGNtZCwgY2FkZHJfdCBhZGRyLCBpbnQgZmxhZ3MsIHN0cnVjdCBwcm9jICpwKQogCQkJCQl9CiAJ CQkJCXNuLT5zdGF0ZXMgPSAwOwogCQkJCX0KKyNlbmRpZgogCQkJCXNuLT5leHBpcmUgPSAxOwog CQkJCWtpbGxlZCsrOwogCQkJfQogCQl9CiAKKyNpZiAwCiAJCWlmIChraWxsZWQgPiAwKQogCQkJ cGZfcHVyZ2VfZXhwaXJlZF9zcmNfbm9kZXMoMSk7CisjZW5kaWYKIAogCQlwc25rLT5wc25rX2tp bGxlZCA9IGtpbGxlZDsKIAkJYnJlYWs7CmRpZmYgLS1naXQgYS9zeXMvY29udHJpYi9wZi9uZXQv cGZ2YXIuaCBiL3N5cy9jb250cmliL3BmL25ldC9wZnZhci5oCmluZGV4IGRhYjcwYzUuLmUzMWQz OWQgMTAwNjQ0Ci0tLSBhL3N5cy9jb250cmliL3BmL25ldC9wZnZhci5oCisrKyBiL3N5cy9jb250 cmliL3BmL25ldC9wZnZhci5oCkBAIC03MzksNiArNzM5LDkgQEAgc3RydWN0IHBmX3NyY19ub2Rl IHsKIAlzdHJ1Y3QgcGZfYWRkcgkgcmFkZHI7CiAJdW5pb24gcGZfcnVsZV9wdHIgcnVsZTsKIAlz dHJ1Y3QgcGZpX2tpZgkqa2lmOworI2lmZGVmIF9fRnJlZUJTRF9fCisJVEFJTFFfSEVBRCgsIHBm X3N0YXRlKQlzdGF0ZV9saXN0OworI2VuZGlmCiAJdV9pbnQ2NF90CSBieXRlc1syXTsKIAl1X2lu dDY0X3QJIHBhY2tldHNbMl07CiAJdV9pbnQzMl90CSBzdGF0ZXM7CkBAIC04NDAsNiArODQzLDkg QEAgc3RydWN0IHBmX3N0YXRlIHsKIAogCVRBSUxRX0VOVFJZKHBmX3N0YXRlKQkgc3luY19saXN0 OwogCVRBSUxRX0VOVFJZKHBmX3N0YXRlKQkgZW50cnlfbGlzdDsKKyNpZmRlZiBfX0ZyZWVCU0Rf XworCVRBSUxRX0VOVFJZKHBmX3N0YXRlKQkgc3Jjbm9kZV9saW5rOworI2VuZGlmCiAJUkJfRU5U UlkocGZfc3RhdGUpCSBlbnRyeV9pZDsKIAlzdHJ1Y3QgcGZfc3RhdGVfcGVlcgkgc3JjOwogCXN0 cnVjdCBwZl9zdGF0ZV9wZWVyCSBkc3Q7Cg== --047d7bea40f00ef2e504d77ce15b--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CAPBZQG0Jj_c-XvVJNV2S02xcitr%2Bnhs%2BmV=GjJm3YeM6iPUX7g>