Date: Sat, 21 May 2016 02:00:09 -0700 From: "K. Macy" <kmacy@freebsd.org> To: "K. Macy" <kmacy@freebsd.org>, Johan Hendriks <joh.hendriks@gmail.com>, "O. Hartmann" <ohartman@zedat.fu-berlin.de>, "current@freebsd.org" <current@freebsd.org>, "freebsd-net@freebsd.org" <freebsd-net@freebsd.org> Subject: Re: em(4) broken in HEAD? Message-ID: <CAHM0Q_O2JOQop-7C4prfQWOaKoPV%2BxTbnnn3L%2BQYO7LLM=7xFA@mail.gmail.com> In-Reply-To: <20160521062847.GA58736@ymer.vnode.se> References: <20160520115550.GA56197@ymer.vnode.se> <20160520135946.674eb7ac@hermann> <20160520140528.GA56478@ymer.vnode.se> <CAOaKuAWj9ON8ANpZK42xhw-1PnUuCm9dn7j%2BP9P-DAbDKJZ-Nw@mail.gmail.com> <CAHM0Q_NbPPPBUmuF988Ny_7QcCmU5-9WbtX7jHWhps=Chm96SQ@mail.gmail.com> <CAHM0Q_OOXsoA7=sh9oS9cOsmYShFxEGBKZFTK8K=ih5Vntyn7Q@mail.gmail.com> <20160521062847.GA58736@ymer.vnode.se>
next in thread | previous in thread | raw e-mail | index | archive | help
--089e0103ddf03d0ae50533566f8a Content-Type: text/plain; charset=UTF-8 Much to my chagrin, this too is my fault. Please apply the attached patch if it hasn't yet been committed to -CURRENT. On Fri, May 20, 2016 at 11:28 PM, Joel Dahl <joel@vnode.se> wrote: > On Fri, May 20, 2016 at 07:32:30PM -0700, K. Macy wrote: >> I'm seeing watchdog resets on em(4) in my VMWare as of the last day or two. >> >> > >> > >> > I don't use ipfw, aliases or anything other than stock networking. I >> > was unable to copy a large image off the VM without getting an >> > unending stream of watchdog resets which could only be fixed by a >> > reboot. Fortunately a subsequent IFC fixed it as of ~15 hours ago. >> > >> >> I take that back. It's still happening. > > OK - good to know. I'm going to be travelling for a few days so I won't have > time to do a binary search to find the commit that broke it. > > -- > Joel --089e0103ddf03d0ae50533566f8a Content-Type: text/x-patch; charset=US-ASCII; name="tq_wakeup.patch" Content-Disposition: attachment; filename="tq_wakeup.patch" Content-Transfer-Encoding: base64 X-Attachment-Id: f_iogxcmxt0 ZGlmZiAtLWdpdCBhL3N5cy9rZXJuL3N1YnJfdGFza3F1ZXVlLmMgYi9zeXMva2Vybi9zdWJyX3Rh c2txdWV1ZS5jCmluZGV4IDJlZjVhM2MuLjAwY2I0NmYgMTAwNjQ0Ci0tLSBhL3N5cy9rZXJuL3N1 YnJfdGFza3F1ZXVlLmMKKysrIGIvc3lzL2tlcm4vc3Vicl90YXNrcXVldWUuYwpAQCAtNjgsNyAr NjgsNiBAQCBzdHJ1Y3QgdGFza3F1ZXVlIHsKIAlUQUlMUV9IRUFEKCwgdGFza3F1ZXVlX2J1c3kp IHRxX2FjdGl2ZTsKIAlzdHJ1Y3QgbXR4CQl0cV9tdXRleDsKIAlzdHJ1Y3QgdGhyZWFkCQkqKnRx X3RocmVhZHM7Ci0Jc3RydWN0IHRocmVhZAkJKnRxX2N1cnRocmVhZDsKIAlpbnQJCQl0cV90Y291 bnQ7CiAJaW50CQkJdHFfc3BpbjsKIAlpbnQJCQl0cV9mbGFnczsKQEAgLTIyMiw3ICsyMjEsNyBA QCB0YXNrcXVldWVfZW5xdWV1ZV9sb2NrZWQoc3RydWN0IHRhc2txdWV1ZSAqcXVldWUsIHN0cnVj dCB0YXNrICp0YXNrKQogCSAqIENvdW50IG11bHRpcGxlIGVucXVldWVzLgogCSAqLwogCWlmICh0 YXNrLT50YV9wZW5kaW5nKSB7Ci0JCWlmICh0YXNrLT50YV9wZW5kaW5nIDwgVUNIQVJfTUFYKQor CQlpZiAodGFzay0+dGFfcGVuZGluZyA8IFVTSFJUX01BWCkKIAkJCXRhc2stPnRhX3BlbmRpbmcr KzsKIAkJVFFfVU5MT0NLKHF1ZXVlKTsKIAkJcmV0dXJuICgwKTsKQEAgLTQ2NSw4ICs0NjQsNyBA QCB0YXNrcXVldWVfcnVuX2xvY2tlZChzdHJ1Y3QgdGFza3F1ZXVlICpxdWV1ZSkKIAogCQlUUV9M T0NLKHF1ZXVlKTsKIAkJdGIudGJfcnVubmluZyA9IE5VTEw7Ci0JCWlmICgodGFzay0+dGFfZmxh Z3MgJiBUQVNLX1NLSVBfV0FLRVVQKSA9PSAwKQotCQkJd2FrZXVwKHRhc2spOworCQl3YWtldXAo dGFzayk7CiAKIAkJVEFJTFFfUkVNT1ZFKCZxdWV1ZS0+dHFfYWN0aXZlLCAmdGIsIHRiX2xpbmsp OwogCQl0Yl9maXJzdCA9IFRBSUxRX0ZJUlNUKCZxdWV1ZS0+dHFfYWN0aXZlKTsKQEAgLTQ4MSw5 ICs0NzksNyBAQCB0YXNrcXVldWVfcnVuKHN0cnVjdCB0YXNrcXVldWUgKnF1ZXVlKQogewogCiAJ VFFfTE9DSyhxdWV1ZSk7Ci0JcXVldWUtPnRxX2N1cnRocmVhZCA9IGN1cnRocmVhZDsKIAl0YXNr cXVldWVfcnVuX2xvY2tlZChxdWV1ZSk7Ci0JcXVldWUtPnRxX2N1cnRocmVhZCA9IE5VTEw7CiAJ VFFfVU5MT0NLKHF1ZXVlKTsKIH0KIApAQCAtNzE2LDcgKzcxMiw2IEBAIHRhc2txdWV1ZV90aHJl YWRfbG9vcCh2b2lkICphcmcpCiAJdHEgPSAqdHFwOwogCXRhc2txdWV1ZV9ydW5fY2FsbGJhY2so dHEsIFRBU0tRVUVVRV9DQUxMQkFDS19UWVBFX0lOSVQpOwogCVRRX0xPQ0sodHEpOwotCXRxLT50 cV9jdXJ0aHJlYWQgPSBjdXJ0aHJlYWQ7CiAJd2hpbGUgKCh0cS0+dHFfZmxhZ3MgJiBUUV9GTEFH U19BQ1RJVkUpICE9IDApIHsKIAkJLyogWFhYID8gKi8KIAkJdGFza3F1ZXVlX3J1bl9sb2NrZWQo dHEpOwpAQCAtNzMwLDcgKzcyNSw2IEBAIHRhc2txdWV1ZV90aHJlYWRfbG9vcCh2b2lkICphcmcp CiAJCVRRX1NMRUVQKHRxLCB0cSwgJnRxLT50cV9tdXRleCwgMCwgIi0iLCAwKTsKIAl9CiAJdGFz a3F1ZXVlX3J1bl9sb2NrZWQodHEpOwotCXRxLT50cV9jdXJ0aHJlYWQgPSBOVUxMOwogCS8qCiAJ ICogVGhpcyB0aHJlYWQgaXMgb24gaXRzIHdheSBvdXQsIHNvIGp1c3QgZHJvcCB0aGUgbG9jayB0 ZW1wb3JhcmlseQogCSAqIGluIG9yZGVyIHRvIGNhbGwgdGhlIHNodXRkb3duIGNhbGxiYWNrLiAg VGhpcyBhbGxvd3MgdGhlIGNhbGxiYWNrCkBAIC03NTQsOCArNzQ4LDcgQEAgdGFza3F1ZXVlX3Ro cmVhZF9lbnF1ZXVlKHZvaWQgKmNvbnRleHQpCiAKIAl0cXAgPSBjb250ZXh0OwogCXRxID0gKnRx cDsKLQlpZiAodHEtPnRxX2N1cnRocmVhZCAhPSBjdXJ0aHJlYWQpCi0JCXdha2V1cF9vbmUodHEp OworCXdha2V1cF9vbmUodHEpOwogfQogCiBUQVNLUVVFVUVfREVGSU5FKHN3aSwgdGFza3F1ZXVl X3N3aV9lbnF1ZXVlLCBOVUxMLApkaWZmIC0tZ2l0IGEvc3lzL3N5cy9fdGFzay5oIGIvc3lzL3N5 cy9fdGFzay5oCmluZGV4IDRjZmExNzEuLmNlODk3ODEgMTAwNjQ0Ci0tLSBhL3N5cy9zeXMvX3Rh c2suaAorKysgYi9zeXMvc3lzL190YXNrLmgKQEAgLTQ1LDggKzQ1LDcgQEAgdHlwZWRlZiB2b2lk IHRhc2tfZm5fdCh2b2lkICpjb250ZXh0LCBpbnQgcGVuZGluZyk7CiAKIHN0cnVjdCB0YXNrIHsK IAlTVEFJTFFfRU5UUlkodGFzaykgdGFfbGluazsJLyogKHEpIGxpbmsgZm9yIHF1ZXVlICovCi0J dWludDhfdAl0YV9wZW5kaW5nOwkJLyogKHEpIGNvdW50IHRpbWVzIHF1ZXVlZCAqLwotCXVpbnQ4 X3QJdGFfZmxhZ3M7CQkvKiAocSkgZmxhZ3MgKi8KKwl1aW50MTZfdCB0YV9wZW5kaW5nOwkJLyog KHEpIGNvdW50IHRpbWVzIHF1ZXVlZCAqLwogCXVfc2hvcnQJdGFfcHJpb3JpdHk7CQkvKiAoYykg UHJpb3JpdHkgKi8KIAl0YXNrX2ZuX3QgKnRhX2Z1bmM7CQkvKiAoYykgdGFzayBoYW5kbGVyICov CiAJdm9pZAkqdGFfY29udGV4dDsJCS8qIChjKSBhcmd1bWVudCBmb3IgaGFuZGxlciAqLwpkaWZm IC0tZ2l0IGEvc3lzL3N5cy90YXNrcXVldWUuaCBiL3N5cy9zeXMvdGFza3F1ZXVlLmgKaW5kZXgg YmMwMTA4OC4uNGM0MDQ0ZiAxMDA2NDQKLS0tIGEvc3lzL3N5cy90YXNrcXVldWUuaAorKysgYi9z eXMvc3lzL3Rhc2txdWV1ZS5oCkBAIC05OCw3ICs5OCw2IEBAIHZvaWQJdGFza3F1ZXVlX3NldF9j YWxsYmFjayhzdHJ1Y3QgdGFza3F1ZXVlICpxdWV1ZSwKIAogI2RlZmluZSBUQVNLX0lOSVRJQUxJ WkVSKHByaW9yaXR5LCBmdW5jLCBjb250ZXh0KQlcCiAJeyAudGFfcGVuZGluZyA9IDAsCQkJCVwK LQkgIC50YV9mbGFncyA9IDAsCQkJCVwKIAkgIC50YV9wcmlvcml0eSA9IChwcmlvcml0eSksCQkJ XAogCSAgLnRhX2Z1bmMgPSAoZnVuYyksCQkJCVwKIAkgIC50YV9jb250ZXh0ID0gKGNvbnRleHQp IH0KQEAgLTExNCw3ICsxMTMsNiBAQCB2b2lkCXRhc2txdWV1ZV90aHJlYWRfZW5xdWV1ZSh2b2lk ICpjb250ZXh0KTsKICAqLwogI2RlZmluZSBUQVNLX0lOSVQodGFzaywgcHJpb3JpdHksIGZ1bmMs IGNvbnRleHQpIGRvIHsJXAogCSh0YXNrKS0+dGFfcGVuZGluZyA9IDA7CQkJCVwKLQkodGFzaykt PnRhX2ZsYWdzID0gMDsJCQkJXAogCSh0YXNrKS0+dGFfcHJpb3JpdHkgPSAocHJpb3JpdHkpOwkJ XAogCSh0YXNrKS0+dGFfZnVuYyA9IChmdW5jKTsJCQlcCiAJKHRhc2spLT50YV9jb250ZXh0ID0g KGNvbnRleHQpOwkJCVwKQEAgLTIyNCw3ICsyMjIsNiBAQCBpbnQJdGFza3Fncm91cF9hZGp1c3Qo c3RydWN0IHRhc2txZ3JvdXAgKnFncm91cCwgaW50IGNudCwgaW50IHN0cmlkZSk7CiAKICNkZWZp bmUgR1RBU0tfSU5JVCh0YXNrLCBwcmlvcml0eSwgZnVuYywgY29udGV4dCkgZG8gewlcCiAJKHRh c2spLT50YV9wZW5kaW5nID0gMDsJCQkJXAotCSh0YXNrKS0+dGFfZmxhZ3MgPSBUQVNLX1NLSVBf V0FLRVVQOwkJXAogCSh0YXNrKS0+dGFfcHJpb3JpdHkgPSAocHJpb3JpdHkpOwkJXAogCSh0YXNr KS0+dGFfZnVuYyA9IChmdW5jKTsJCQlcCiAJKHRhc2spLT50YV9jb250ZXh0ID0gKGNvbnRleHQp OwkJCVwK --089e0103ddf03d0ae50533566f8a--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CAHM0Q_O2JOQop-7C4prfQWOaKoPV%2BxTbnnn3L%2BQYO7LLM=7xFA>