Date: Tue, 7 Jun 2016 04:52:10 +0000 From: Phabricator <phabric-noreply@FreeBSD.org> To: freebsd-net@freebsd.org Subject: [Differential] D6688: net: Use M_HASHTYPE_OPAQUE_HASH if the mbuf flowid has hash properties Message-ID: <13c301ad4f2573b4a89a66923335b8a3@localhost.localdomain> In-Reply-To: <differential-rev-PHID-DREV-v6plyu4q2zxdlctwe6wn-req@FreeBSD.org> References: <differential-rev-PHID-DREV-v6plyu4q2zxdlctwe6wn-req@FreeBSD.org>
next in thread | previous in thread | raw e-mail | index | archive | help
--b1_13c301ad4f2573b4a89a66923335b8a3 Content-Type: text/plain; charset = "utf-8" Content-Transfer-Encoding: 8bit This revision was automatically updated to reflect the committed changes. Closed by commit rS301538: net: Use M_HASHTYPE_OPAQUE_HASH if the mbuf flowid has hash properties (authored by sephe). CHANGED PRIOR TO COMMIT https://reviews.freebsd.org/D6688?vs=17213&id=17373#toc REPOSITORY rS FreeBSD src repository CHANGES SINCE LAST UPDATE https://reviews.freebsd.org/D6688?vs=17213&id=17373 REVISION DETAIL https://reviews.freebsd.org/D6688 AFFECTED FILES head/sys/dev/cxgb/cxgb_sge.c head/sys/dev/e1000/if_igb.c head/sys/dev/hyperv/netvsc/hv_netvsc_drv_freebsd.c head/sys/dev/ixgbe/ix_txrx.c head/sys/dev/ixl/ixl_txrx.c head/sys/dev/mlx5/mlx5_en/mlx5_en_rx.c head/sys/dev/qlxgbe/ql_isr.c head/sys/dev/qlxge/qls_isr.c head/sys/net/flowtable.c head/sys/net/if_vxlan.c head/sys/netinet/sctp_input.c head/sys/netinet/sctp_pcb.c head/sys/ofed/drivers/net/mlx4/en_rx.c EMAIL PREFERENCES https://reviews.freebsd.org/settings/panel/emailpreferences/ To: sepherosa_gmail.com, rrs, gallatin, glebius, rwatson, gnn, adrian, delphij, bryanv, kmacy, davidcs, bz, np, sbruno, hselasky, tuexen, #intel_networking, erj Cc: freebsd-net-list --b1_13c301ad4f2573b4a89a66923335b8a3 Content-Type: text/x-patch; charset=utf-8; name="D6688.17373.patch" Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="D6688.17373.patch" ZGlmZiAtLWdpdCBhL2hlYWQvc3lzL29mZWQvZHJpdmVycy9uZXQvbWx4NC9lbl9yeC5jIGIvaGVh ZC9zeXMvb2ZlZC9kcml2ZXJzL25ldC9tbHg0L2VuX3J4LmMKLS0tIGEvaGVhZC9zeXMvb2ZlZC9k cml2ZXJzL25ldC9tbHg0L2VuX3J4LmMKKysrIGIvaGVhZC9zeXMvb2ZlZC9kcml2ZXJzL25ldC9t bHg0L2VuX3J4LmMKQEAgLTYxOSw3ICs2MTksNyBAQAogCiAJCS8qIGZvcndhcmQgVG9lcGxpdHog Y29tcGF0aWJsZSBoYXNoIHZhbHVlICovCiAJCW1iLT5tX3BrdGhkci5mbG93aWQgPSBiZTMyX3Rv X2NwdShjcWUtPmltbWVkX3Jzc19pbnZhbGlkKTsKLQkJTV9IQVNIVFlQRV9TRVQobWIsIE1fSEFT SFRZUEVfT1BBUVVFKTsKKwkJTV9IQVNIVFlQRV9TRVQobWIsIE1fSEFTSFRZUEVfT1BBUVVFX0hB U0gpOwogCQltYi0+bV9wa3RoZHIucmN2aWYgPSBkZXY7CiAJCWlmIChiZTMyX3RvX2NwdShjcWUt PnZsYW5fbXlfcXBuKSAmCiAJCSAgICBNTFg0X0NRRV9WTEFOX1BSRVNFTlRfTUFTSykgewpkaWZm IC0tZ2l0IGEvaGVhZC9zeXMvbmV0aW5ldC9zY3RwX3BjYi5jIGIvaGVhZC9zeXMvbmV0aW5ldC9z Y3RwX3BjYi5jCi0tLSBhL2hlYWQvc3lzL25ldGluZXQvc2N0cF9wY2IuYworKysgYi9oZWFkL3N5 cy9uZXRpbmV0L3NjdHBfcGNiLmMKQEAgLTQwNzAsNyArNDA3MCw3IEBACiAJbmV0LT5mbG93aWQg PSBzdGNiLT5hc29jLm15X3Z0YWcgXgogCSAgICBudG9ocyhzdGNiLT5ycG9ydCkgXgogCSAgICBu dG9ocyhzdGNiLT5zY3RwX2VwLT5zY3RwX2xwb3J0KTsKLQluZXQtPmZsb3d0eXBlID0gTV9IQVNI VFlQRV9PUEFRVUU7CisJbmV0LT5mbG93dHlwZSA9IE1fSEFTSFRZUEVfT1BBUVVFX0hBU0g7CiAJ aWYgKG5ldHApIHsKIAkJKm5ldHAgPSBuZXQ7CiAJfQpkaWZmIC0tZ2l0IGEvaGVhZC9zeXMvbmV0 aW5ldC9zY3RwX2lucHV0LmMgYi9oZWFkL3N5cy9uZXRpbmV0L3NjdHBfaW5wdXQuYwotLS0gYS9o ZWFkL3N5cy9uZXRpbmV0L3NjdHBfaW5wdXQuYworKysgYi9oZWFkL3N5cy9uZXRpbmV0L3NjdHBf aW5wdXQuYwpAQCAtNjIzNiw3ICs2MjM2LDcgQEAKIAkJCXRhZyA9IGh0b25sKHNoLT52X3RhZyk7 CiAJCQlmbG93aWQgPSB0YWcgXiBudG9ocyhzaC0+ZGVzdF9wb3J0KSBeIG50b2hzKHNoLT5zcmNf cG9ydCk7CiAJCQltLT5tX3BrdGhkci5mbG93aWQgPSBmbG93aWQ7Ci0JCQlNX0hBU0hUWVBFX1NF VChtLCBNX0hBU0hUWVBFX09QQVFVRSk7CisJCQlNX0hBU0hUWVBFX1NFVChtLCBNX0hBU0hUWVBF X09QQVFVRV9IQVNIKTsKIAkJfQogCQljcHVfdG9fdXNlID0gc2N0cF9jcHVhcnJ5W2Zsb3dpZCAl IG1wX25jcHVzXTsKIAkJc2N0cF9xdWV1ZV90b19tY29yZShtLCBvZmYsIGNwdV90b191c2UpOwpk aWZmIC0tZ2l0IGEvaGVhZC9zeXMvbmV0L2lmX3Z4bGFuLmMgYi9oZWFkL3N5cy9uZXQvaWZfdnhs YW4uYwotLS0gYS9oZWFkL3N5cy9uZXQvaWZfdnhsYW4uYworKysgYi9oZWFkL3N5cy9uZXQvaWZf dnhsYW4uYwpAQCAtMjIzNyw4ICsyMjM3LDcgQEAKIAlyYW5nZSA9IHNjLT52eGxfbWF4X3BvcnQg LSBzYy0+dnhsX21pbl9wb3J0ICsgMTsKIAogCS8qIGNoZWNrIGlmIGZsb3dpZCBpcyBzZXQgYW5k IG5vdCBvcGFxdWUgKi8KLQlpZiAoTV9IQVNIVFlQRV9HRVQobSkgIT0gTV9IQVNIVFlQRV9OT05F ICYmCi0JICAgIE1fSEFTSFRZUEVfR0VUKG0pICE9IE1fSEFTSFRZUEVfT1BBUVVFKQorCWlmIChN X0hBU0hUWVBFX0lTSEFTSChtKSkKIAkJaGFzaCA9IG0tPm1fcGt0aGRyLmZsb3dpZDsKIAllbHNl CiAJCWhhc2ggPSBqZW5raW5zX2hhc2gobS0+bV9kYXRhLCBFVEhFUl9IRFJfTEVOLApkaWZmIC0t Z2l0IGEvaGVhZC9zeXMvbmV0L2Zsb3d0YWJsZS5jIGIvaGVhZC9zeXMvbmV0L2Zsb3d0YWJsZS5j Ci0tLSBhL2hlYWQvc3lzL25ldC9mbG93dGFibGUuYworKysgYi9oZWFkL3N5cy9uZXQvZmxvd3Rh YmxlLmMKQEAgLTY4OSw3ICs2ODksNyBAQAogCQlyZXR1cm4gKEVIT1NUVU5SRUFDSCk7CiAKIAlp ZiAoTV9IQVNIVFlQRV9HRVQobSkgPT0gTV9IQVNIVFlQRV9OT05FKSB7Ci0JCU1fSEFTSFRZUEVf U0VUKG0sIE1fSEFTSFRZUEVfT1BBUVVFKTsKKwkJTV9IQVNIVFlQRV9TRVQobSwgTV9IQVNIVFlQ RV9PUEFRVUVfSEFTSCk7CiAJCW0tPm1fcGt0aGRyLmZsb3dpZCA9IGZsZS0+Zl9oYXNoOwogCX0K IApkaWZmIC0tZ2l0IGEvaGVhZC9zeXMvZGV2L3FseGdlL3Fsc19pc3IuYyBiL2hlYWQvc3lzL2Rl di9xbHhnZS9xbHNfaXNyLmMKLS0tIGEvaGVhZC9zeXMvZGV2L3FseGdlL3Fsc19pc3IuYworKysg Yi9oZWFkL3N5cy9kZXYvcWx4Z2UvcWxzX2lzci5jCkBAIC0xOTAsNyArMTkwLDcgQEAKIAkJCWlm ICgoY3FfZS0+ZmxhZ3MxICYgUTgxX1JYX0ZMQUdTMV9SU1NfTUFUQ0hfTUFTSykpIHsKIAkJCQly eHItPnJzc19pbnQrKzsKIAkJCQltcC0+bV9wa3RoZHIuZmxvd2lkID0gY3FfZS0+cnNzOwotCQkJ CU1fSEFTSFRZUEVfU0VUKG1wLCBNX0hBU0hUWVBFX09QQVFVRSk7CisJCQkJTV9IQVNIVFlQRV9T RVQobXAsIE1fSEFTSFRZUEVfT1BBUVVFX0hBU0gpOwogCQkJfQogCQkJaWYgKGNxX2UtPmZsYWdz MCAmIChRODFfUlhfRkxBR1MwX1RFIHwKIAkJCQlRODFfUlhfRkxBR1MwX05VIHwgUTgxX1JYX0ZM QUdTMF9JRSkpIHsKZGlmZiAtLWdpdCBhL2hlYWQvc3lzL2Rldi9xbHhnYmUvcWxfaXNyLmMgYi9o ZWFkL3N5cy9kZXYvcWx4Z2JlL3FsX2lzci5jCi0tLSBhL2hlYWQvc3lzL2Rldi9xbHhnYmUvcWxf aXNyLmMKKysrIGIvaGVhZC9zeXMvZGV2L3FseGdiZS9xbF9pc3IuYwpAQCAtMTU5LDcgKzE1OSw3 IEBACiAJaWZfaW5jX2NvdW50ZXIoaWZwLCBJRkNPVU5URVJfSVBBQ0tFVFMsIDEpOwogCiAJbXBm LT5tX3BrdGhkci5mbG93aWQgPSBzZ2MtPnJzc19oYXNoOwotCU1fSEFTSFRZUEVfU0VUKG1wZiwg TV9IQVNIVFlQRV9PUEFRVUUpOworCU1fSEFTSFRZUEVfU0VUKG1wZiwgTV9IQVNIVFlQRV9PUEFR VUVfSEFTSCk7CiAKIAkoKmlmcC0+aWZfaW5wdXQpKGlmcCwgbXBmKTsKIApAQCAtMzI0LDcgKzMy NCw3IEBACiAJbXBmLT5tX3BrdGhkci5jc3VtX2RhdGEgPSAweEZGRkY7CiAKIAltcGYtPm1fcGt0 aGRyLmZsb3dpZCA9IHNnYy0+cnNzX2hhc2g7Ci0JTV9IQVNIVFlQRV9TRVQobXBmLCBNX0hBU0hU WVBFX09QQVFVRSk7CisJTV9IQVNIVFlQRV9TRVQobXBmLCBNX0hBU0hUWVBFX09QQVFVRV9IQVNI KTsKIAogCWlmX2luY19jb3VudGVyKGlmcCwgSUZDT1VOVEVSX0lQQUNLRVRTLCAxKTsKIApkaWZm IC0tZ2l0IGEvaGVhZC9zeXMvZGV2L21seDUvbWx4NV9lbi9tbHg1X2VuX3J4LmMgYi9oZWFkL3N5 cy9kZXYvbWx4NS9tbHg1X2VuL21seDVfZW5fcnguYwotLS0gYS9oZWFkL3N5cy9kZXYvbWx4NS9t bHg1X2VuL21seDVfZW5fcnguYworKysgYi9oZWFkL3N5cy9kZXYvbWx4NS9tbHg1X2VuL21seDVf ZW5fcnguYwpAQCAtMjIyLDExICsyMjIsMTEgQEAKIAkJCU1fSEFTSFRZUEVfU0VUKG1iLCBNX0hB U0hUWVBFX1JTU19JUFY2KTsKIAkJCWJyZWFrOwogCQlkZWZhdWx0OgkvKiBPdGhlciAqLwotCQkJ TV9IQVNIVFlQRV9TRVQobWIsIE1fSEFTSFRZUEVfT1BBUVVFKTsKKwkJCU1fSEFTSFRZUEVfU0VU KG1iLCBNX0hBU0hUWVBFX09QQVFVRV9IQVNIKTsKIAkJCWJyZWFrOwogCQl9CiAjZWxzZQotCQlN X0hBU0hUWVBFX1NFVChtYiwgTV9IQVNIVFlQRV9PUEFRVUUpOworCQlNX0hBU0hUWVBFX1NFVCht YiwgTV9IQVNIVFlQRV9PUEFRVUVfSEFTSCk7CiAjZW5kaWYKIAl9IGVsc2UgewogCQltYi0+bV9w a3RoZHIuZmxvd2lkID0gcnEtPml4OwpkaWZmIC0tZ2l0IGEvaGVhZC9zeXMvZGV2L2l4bC9peGxf dHhyeC5jIGIvaGVhZC9zeXMvZGV2L2l4bC9peGxfdHhyeC5jCi0tLSBhL2hlYWQvc3lzL2Rldi9p eGwvaXhsX3R4cnguYworKysgYi9oZWFkL3N5cy9kZXYvaXhsL2l4bF90eHJ4LmMKQEAgLTE0NTMs MTAgKzE0NTMsMTAgQEAKIAlleCA9IGRlY29kZWQub3V0ZXJfZnJhZzsKIAogCWlmICghZGVjb2Rl ZC5rbm93bikKLQkJcmV0dXJuIE1fSEFTSFRZUEVfT1BBUVVFOworCQlyZXR1cm4gTV9IQVNIVFlQ RV9PUEFRVUVfSEFTSDsKIAogCWlmIChkZWNvZGVkLm91dGVyX2lwID09IEk0MEVfUlhfUFRZUEVf T1VURVJfTDIpIAotCQlyZXR1cm4gTV9IQVNIVFlQRV9PUEFRVUU7CisJCXJldHVybiBNX0hBU0hU WVBFX09QQVFVRV9IQVNIOwogCiAJLyogTm90ZTogYW55dGhpbmcgdGhhdCBnZXRzIHRvIHRoaXMg cG9pbnQgaXMgSVAgKi8KICAgICAgICAgaWYgKGRlY29kZWQub3V0ZXJfaXBfdmVyID09IEk0MEVf UlhfUFRZUEVfT1VURVJfSVBWNikgeyAKQEAgLTE0OTIsNyArMTQ5Miw3IEBACiAJCX0KIAl9CiAJ LyogV2Ugc2hvdWxkIG5ldmVyIGdldCBoZXJlISEgKi8KLQlyZXR1cm4gTV9IQVNIVFlQRV9PUEFR VUU7CisJcmV0dXJuIE1fSEFTSFRZUEVfT1BBUVVFX0hBU0g7CiB9CiAjZW5kaWYgLyogUlNTICov CiAKZGlmZiAtLWdpdCBhL2hlYWQvc3lzL2Rldi9peGdiZS9peF90eHJ4LmMgYi9oZWFkL3N5cy9k ZXYvaXhnYmUvaXhfdHhyeC5jCi0tLSBhL2hlYWQvc3lzL2Rldi9peGdiZS9peF90eHJ4LmMKKysr IGIvaGVhZC9zeXMvZGV2L2l4Z2JlL2l4X3R4cnguYwpAQCAtMTk2NCw3ICsxOTY0LDcgQEAKICNl bmRpZgogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgZGVmYXVsdDoKICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBNX0hBU0hUWVBFX1NFVChzZW5kbXAs Ci0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIE1fSEFTSFRZUEVf T1BBUVVFKTsKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgTV9I QVNIVFlQRV9PUEFRVUVfSEFTSCk7CiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIH0K ICAgICAgICAgICAgICAgICAgICAgICAgIH0gZWxzZSB7CiAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgIHNlbmRtcC0+bV9wa3RoZHIuZmxvd2lkID0gcXVlLT5tc2l4OwpkaWZmIC0tZ2l0 IGEvaGVhZC9zeXMvZGV2L2h5cGVydi9uZXR2c2MvaHZfbmV0dnNjX2Rydl9mcmVlYnNkLmMgYi9o ZWFkL3N5cy9kZXYvaHlwZXJ2L25ldHZzYy9odl9uZXR2c2NfZHJ2X2ZyZWVic2QuYwotLS0gYS9o ZWFkL3N5cy9kZXYvaHlwZXJ2L25ldHZzYy9odl9uZXR2c2NfZHJ2X2ZyZWVic2QuYworKysgYi9o ZWFkL3N5cy9kZXYvaHlwZXJ2L25ldHZzYy9odl9uZXR2c2NfZHJ2X2ZyZWVic2QuYwpAQCAtMTMw MCw2ICsxMzAwLDcgQEAKIAlzdHJ1Y3QgaWZuZXQgKmlmcCA9IHJ4ci0+aG5faWZwOwogCXN0cnVj dCBtYnVmICptX25ldzsKIAlpbnQgc2l6ZSwgZG9fbHJvID0gMCwgZG9fY3N1bSA9IDE7CisJaW50 IGhhc2hfdHlwZSA9IE1fSEFTSFRZUEVfT1BBUVVFX0hBU0g7CiAKIAlpZiAoIShpZnAtPmlmX2Ry dl9mbGFncyAmIElGRl9EUlZfUlVOTklORykpCiAJCXJldHVybiAoMCk7CkBAIC0xNDMwLDggKzE0 MzEsNiBAQAogCX0KIAogCWlmIChoYXNoX2luZm8gIT0gTlVMTCAmJiBoYXNoX3ZhbHVlICE9IE5V TEwpIHsKLQkJaW50IGhhc2hfdHlwZSA9IE1fSEFTSFRZUEVfT1BBUVVFOwotCiAJCXJ4ci0+aG5f cnNzX3BrdHMrKzsKIAkJbV9uZXctPm1fcGt0aGRyLmZsb3dpZCA9IGhhc2hfdmFsdWUtPmhhc2hf dmFsdWU7CiAJCWlmICgoaGFzaF9pbmZvLT5oYXNoX2luZm8gJiBORElTX0hBU0hfRlVOQ1RJT05f TUFTSykgPT0KQEAgLTE0NjUsMTQgKzE0NjQsMTUgQEAKIAkJCQlicmVhazsKIAkJCX0KIAkJfQot CQlNX0hBU0hUWVBFX1NFVChtX25ldywgaGFzaF90eXBlKTsKIAl9IGVsc2UgewotCQlpZiAoaGFz aF92YWx1ZSAhPSBOVUxMKQorCQlpZiAoaGFzaF92YWx1ZSAhPSBOVUxMKSB7CiAJCQltX25ldy0+ bV9wa3RoZHIuZmxvd2lkID0gaGFzaF92YWx1ZS0+aGFzaF92YWx1ZTsKLQkJZWxzZQorCQl9IGVs c2UgewogCQkJbV9uZXctPm1fcGt0aGRyLmZsb3dpZCA9IHJ4ci0+aG5fcnhfaWR4OwotCQlNX0hB U0hUWVBFX1NFVChtX25ldywgTV9IQVNIVFlQRV9PUEFRVUUpOworCQkJaGFzaF90eXBlID0gTV9I QVNIVFlQRV9PUEFRVUU7CisJCX0KIAl9CisJTV9IQVNIVFlQRV9TRVQobV9uZXcsIGhhc2hfdHlw ZSk7CiAKIAkvKgogCSAqIE5vdGU6ICBNb3ZlZCBSWCBjb21wbGV0aW9uIGJhY2sgdG8gaHZfbnZf b25fcmVjZWl2ZSgpIHNvIGFsbApkaWZmIC0tZ2l0IGEvaGVhZC9zeXMvZGV2L2UxMDAwL2lmX2ln Yi5jIGIvaGVhZC9zeXMvZGV2L2UxMDAwL2lmX2lnYi5jCi0tLSBhL2hlYWQvc3lzL2Rldi9lMTAw MC9pZl9pZ2IuYworKysgYi9oZWFkL3N5cy9kZXYvZTEwMDAvaWZfaWdiLmMKQEAgLTUxNTQsNyAr NTE1NCw3IEBACiAJCQkJCWRlZmF1bHQ6CiAJCQkJCQkvKiBYWFggZmFsbHRocm91Z2ggKi8KIAkJ CQkJCU1fSEFTSFRZUEVfU0VUKHJ4ci0+Zm1wLAotCQkJCQkJICAgIE1fSEFTSFRZUEVfT1BBUVVF KTsKKwkJCQkJCSAgICBNX0hBU0hUWVBFX09QQVFVRV9IQVNIKTsKIAkJCQl9CiAJCQl9IGVsc2Ug ewogI2lmbmRlZiBJR0JfTEVHQUNZX1RYCmRpZmYgLS1naXQgYS9oZWFkL3N5cy9kZXYvY3hnYi9j eGdiX3NnZS5jIGIvaGVhZC9zeXMvZGV2L2N4Z2IvY3hnYl9zZ2UuYwotLS0gYS9oZWFkL3N5cy9k ZXYvY3hnYi9jeGdiX3NnZS5jCisrKyBiL2hlYWQvc3lzL2Rldi9jeGdiL2N4Z2Jfc2dlLmMKQEAg LTI5MDAsNyArMjkwMCw4IEBACiAJCQllb3AgPSBnZXRfcGFja2V0KGFkYXAsIGRyb3BfdGhyZXNo LCBxcywgbWgsIHIpOwogCQkJaWYgKGVvcCkgewogCQkJCWlmIChyLT5yc3NfaGRyLmhhc2hfdHlw ZSAmJiAhYWRhcC0+dGltZXN0YW1wKSB7Ci0JCQkJCU1fSEFTSFRZUEVfU0VUKG1oLT5taF9oZWFk LCBNX0hBU0hUWVBFX09QQVFVRSk7CisJCQkJCU1fSEFTSFRZUEVfU0VUKG1oLT5taF9oZWFkLAor CQkJCQkgICAgTV9IQVNIVFlQRV9PUEFRVUVfSEFTSCk7CiAJCQkJCW1oLT5taF9oZWFkLT5tX3Br dGhkci5mbG93aWQgPSByc3NfaGFzaDsKIAkJCQl9CiAJCQl9Cgo= --b1_13c301ad4f2573b4a89a66923335b8a3--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?13c301ad4f2573b4a89a66923335b8a3>