Date: Fri, 10 Dec 2004 12:00:21 +0900 From: Shunsuke SHINOMIYA <shino@fornext.org> To: Jeremie Le Hen <jeremie@le-hen.org> Cc: freebsd-stable@freebsd.org Subject: if_em int_throttle_ceil patch Message-ID: <20041210113318.BBF3.SHINO@fornext.org>
next in thread | raw e-mail | index | archive | help
--------_41B90AE6BC9B03DC2588_MULTIPART_MIXED_ Content-Type: text/plain; charset="US-ASCII" Content-Transfer-Encoding: 7bit Hi, Jeremie and Lists. The previous patch to change if_em's int_throttle_ceil into sysctl-able cause a kernel panic. If you set em's int_throttle_ceil=0 and then reconfigure the em, it cause a diveded by zero panic. This patch for original if_em.[ch] which is attached to this mail is corrected this problem. -- Shunsuke SHINOMIYA <shino@fornext.org> --------_41B90AE6BC9B03DC2588_MULTIPART_MIXED_ Content-Type: application/octet-stream; name="if_em.diff" Content-Disposition: attachment; filename="if_em.diff" Content-Transfer-Encoding: base64 LS0tIGlmX2VtLmMtMS40NC4yLjMub3JpZwlUdWUgTm92ICA5IDA1OjA2OjE0IDIwMDQKKysrIGlm X2VtLmMJRnJpIERlYyAxMCAxMToyMjowNSAyMDA0CkBAIC0zMiw2ICszMiw3IEBACiAqKioqKioq KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq KioqKioqKioqKiovCiAKIC8qJEZyZWVCU0Q6IHNyYy9zeXMvZGV2L2VtL2lmX2VtLmMsdiAxLjQ0 LjIuMyAyMDA0LzExLzA4IDIwOjA2OjE0IHNjb3R0bCBFeHAgJCovCiAKICNpbmNsdWRlIDxkZXYv ZW0vaWZfZW0uaD4KIApAQCAtMTgyLDYgKzE4Myw5IEBACiBzdGF0aWMgdm9pZCBlbV9hZGRfaW50 X2RlbGF5X3N5c2N0bChzdHJ1Y3QgYWRhcHRlciAqLCBjb25zdCBjaGFyICosCiAJCQkJICAgIGNv bnN0IGNoYXIgKiwgc3RydWN0IGVtX2ludF9kZWxheV9pbmZvICosCiAJCQkJICAgIGludCwgaW50 KTsKKyNpZmRlZiAxCitzdGF0aWMgaW50IGVtX3N5c2N0bF90aHJvdHRsZV9jZWlsKFNZU0NUTF9I QU5ETEVSX0FSR1MpOworI2VuZGlmCiAKIC8qKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioKICAqICBGcmVlQlNEIERldmlj ZSBJbnRlcmZhY2UgRW50cnkgUG9pbnRzICAgICAgICAgICAgICAgICAgICAKQEAgLTIwNSw2ICsy MDksMTMgQEAKIE1PRFVMRV9ERVBFTkQoZW0sIHBjaSwgMSwgMSwgMSk7CiBNT0RVTEVfREVQRU5E KGVtLCBldGhlciwgMSwgMSwgMSk7CiAKKyNpZmRlZiAxCisvKiBTZXQgdGhlIGludGVycnVwdCB0 aHJvdHRsaW5nIHJhdGUuICBWYWx1ZSBpcyBjYWxjdWxhdGVkCisgKiBhcyBJVFIgPSAxLyhJTlRT X1BFUl9TRUMgKiAyNTZucykgKi8KKyNkZWZpbmUgSVRSX1ZBTFVFKGlwcykJCSgoaXBzKSA+IDAg PyAxMDAwMDAwMDAwIC8gKChpcHMpICogMjU2KSA6IDApCisjZGVmaW5lIE1BWF9JTlRTX1BFUl9T RUMgICAgICAgIDgwMDAKKyNlbmRpZgorCiAvKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqCiAgKiAgVHVuYWJsZSBkZWZh dWx0IHZhbHVlcy4KICAqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq KioqKioqKioqKioqKioqKioqKioqKioqKiovCkBAIC0zNTgsNiArMzY5LDEzIEBACiAJCSAgICAm YWRhcHRlci0+dHhfYWJzX2ludF9kZWxheSwKIAkJICAgIEUxMDAwX1JFR19PRkZTRVQoJmFkYXB0 ZXItPmh3LCBUQURWKSwKIAkJICAgIGVtX3R4X2Fic19pbnRfZGVsYXlfZGZsdCk7CisjaWZkZWYg MQorCQlTWVNDVExfQUREX1BST0MoJmFkYXB0ZXItPnN5c2N0bF9jdHgsCisJCSAgICBTWVNDVExf Q0hJTERSRU4oYWRhcHRlci0+c3lzY3RsX3RyZWUpLCBPSURfQVVUTywKKwkJICAgICJpbnRfdGhy b3R0bGVfY2VpbCIsIENUTFRZUEVfSU5UfENUTEZMQUdfUlcsCisJCSAgICBhZGFwdGVyLCAwLCBl bV9zeXNjdGxfdGhyb3R0bGVfY2VpbCwgIklVIiwKKwkJICAgICJpbnRlcnJ1cHQgdGhyb3R0bGlu ZyByYXRlIik7CisjZW5kaWYKIAl9CiAgICAgICAKIAkvKiBQYXJhbWV0ZXJzICh0byBiZSByZWFk IGZyb20gdXNlcikgKi8gICAKQEAgLTQwMyw2ICs0MjEsOSBAQAogCSAqLwogCWFkYXB0ZXItPmh3 LnJlcG9ydF90eF9lYXJseSA9IDE7CiAKKyNpZmRlZiAxCisJYWRhcHRlci0+dGhyb3R0bGVfY2Vp bCA9IE1BWF9JTlRTX1BFUl9TRUM7CisjZW5kaWYKIAogCWlmIChlbV9hbGxvY2F0ZV9wY2lfcmVz b3VyY2VzKGFkYXB0ZXIpKSB7CiAJCXByaW50ZigiZW0lZDogQWxsb2NhdGlvbiBvZiBQQ0kgcmVz b3VyY2VzIGZhaWxlZFxuIiwgCkBAIC0yNjA5LDExICsyNjMwLDE2IEBACiAJCUUxMDAwX1dSSVRF X1JFRygmYWRhcHRlci0+aHcsIFJBRFYsCiAJCSAgICBhZGFwdGVyLT5yeF9hYnNfaW50X2RlbGF5 LnZhbHVlKTsKIAorI2lmZGVmIDEKKyAgICAgICAgICAgICAgICBFMTAwMF9XUklURV9SRUcoJmFk YXB0ZXItPmh3LCBJVFIsCisJCSAgICBJVFJfVkFMVUUoYWRhcHRlci0+dGhyb3R0bGVfY2VpbCkp OworI2Vsc2UKICAgICAgICAgICAgICAgICAvKiBTZXQgdGhlIGludGVycnVwdCB0aHJvdHRsaW5n IHJhdGUuICBWYWx1ZSBpcyBjYWxjdWxhdGVkCiAgICAgICAgICAgICAgICAgICogYXMgREVGQVVM VF9JVFIgPSAxLyhNQVhfSU5UU19QRVJfU0VDICogMjU2bnMpICovCiAjZGVmaW5lIE1BWF9JTlRT X1BFUl9TRUMgICAgICAgIDgwMDAKICNkZWZpbmUgREVGQVVMVF9JVFIgICAgICAgICAgICAgMTAw MDAwMDAwMC8oTUFYX0lOVFNfUEVSX1NFQyAqIDI1NikKICAgICAgICAgICAgICAgICBFMTAwMF9X UklURV9SRUcoJmFkYXB0ZXItPmh3LCBJVFIsIERFRkFVTFRfSVRSKTsKKyNlbmRpZgogICAgICAg ICB9ICAgICAgIAogCiAJLyogU2V0dXAgdGhlIEJhc2UgYW5kIExlbmd0aCBvZiB0aGUgUnggRGVz Y3JpcHRvciBSaW5nICovCkBAIC0zMzgzLDQgKzM0MDksMjggQEAKIAkgICAgU1lTQ1RMX0NISUxE UkVOKGFkYXB0ZXItPnN5c2N0bF90cmVlKSwKIAkgICAgT0lEX0FVVE8sIG5hbWUsIENUTFRZUEVf SU5UfENUTEZMQUdfUlcsCiAJICAgIGluZm8sIDAsIGVtX3N5c2N0bF9pbnRfZGVsYXksICJJIiwg ZGVzY3JpcHRpb24pOworfQorCitzdGF0aWMgaW50CitlbV9zeXNjdGxfdGhyb3R0bGVfY2VpbChT WVNDVExfSEFORExFUl9BUkdTKQoreworCXN0cnVjdCBhZGFwdGVyICphZGFwdGVyOworCWludCBl cnJvcjsKKwl1X2ludDMyX3QgY2VpbDsKKwlpbnQgczsKKworCWFkYXB0ZXIgPSAoc3RydWN0IGFk YXB0ZXIgKilhcmcxOworCWNlaWwgPSAgYWRhcHRlci0+dGhyb3R0bGVfY2VpbDsKKwllcnJvciA9 IHN5c2N0bF9oYW5kbGVfaW50KG9pZHAsICZjZWlsLCAwLCByZXEpOworCWlmIChlcnJvciAhPSAw IHx8IHJlcS0+bmV3cHRyID09IE5VTEwpCisJCXJldHVybiBlcnJvcjsKKwlhZGFwdGVyLT50aHJv dHRsZV9jZWlsID0gY2VpbDsKKwkKKwlzID0gc3BsaW1wKCk7CisKKwlFMTAwMF9XUklURV9SRUco JmFkYXB0ZXItPmh3LCBJVFIsIElUUl9WQUxVRShjZWlsKSk7CisKKwlzcGx4KHMpOworCisJcmV0 dXJuIDA7CiB9Ci0tLSBpZl9lbS5oLTEuMjUuMi4xLm9yaWcJRnJpIE5vdiAxOSAxOTowMDowMyAy MDA0CisrKyBpZl9lbS5oCU1vbiBOb3YgMjIgMTM6Mjk6NTggMjAwNApAQCAtMzUzLDYgKzM1Myw5 IEBACiAJdV9pbnQxNl90ICAgICAgIGxpbmtfc3BlZWQ7CiAJdV9pbnQxNl90ICAgICAgIGxpbmtf ZHVwbGV4OwogCXVfaW50MzJfdCAgICAgICBzbWFydHNwZWVkOworI2lmZGVmIDEKKwl1X2ludDMy X3QJdGhyb3R0bGVfY2VpbDsKKyNlbmRpZgogCXN0cnVjdCBlbV9pbnRfZGVsYXlfaW5mbyB0eF9p bnRfZGVsYXk7CiAJc3RydWN0IGVtX2ludF9kZWxheV9pbmZvIHR4X2Fic19pbnRfZGVsYXk7CiAJ c3RydWN0IGVtX2ludF9kZWxheV9pbmZvIHJ4X2ludF9kZWxheTsK --------_41B90AE6BC9B03DC2588_MULTIPART_MIXED_--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20041210113318.BBF3.SHINO>