From owner-freebsd-hackers@FreeBSD.ORG Sat Jun 18 08:19:15 2011 Return-Path: Delivered-To: freebsd-hackers@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id F2E0A106566B for ; Sat, 18 Jun 2011 08:19:15 +0000 (UTC) (envelope-from yanegomi@gmail.com) Received: from mail-vx0-f182.google.com (mail-vx0-f182.google.com [209.85.220.182]) by mx1.freebsd.org (Postfix) with ESMTP id 928F48FC08 for ; Sat, 18 Jun 2011 08:19:15 +0000 (UTC) Received: by vxc34 with SMTP id 34so3477929vxc.13 for ; Sat, 18 Jun 2011 01:19:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:mime-version:date:message-id:subject:from:to:cc :content-type; bh=524e53r+IrAVpf9ZP7ocKDTGIua43FqcWnpXCbEbJr4=; b=bL21x7UNR364c3bx0QeZy6g/6CpODDEM4wwUNyeBWTnBJgrnw6PmYdqcZl/DiiMzWL ATrxQtd0I9T/IphTEyWf9Mq8EnAfbRhvXLzkrSI7FvclL58VmlPtuJMOvFLt3YV1rjq6 H6Ou8jgCALNSRRBMBdzuzauEnQcmRSuLGxF1Q= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:date:message-id:subject:from:to:cc:content-type; b=xw2y1oPkB75vETud1gAxztDg9X/5Gy1JZAdyjD+OsAIi472+UzvkyNR1+4TvlS6Air pGZNKbA2qJ0W3RPybTncmoQGM2H41NDZn0OC/1MMJzOe4MVt31BMwukpDBuKgL+OWnFo lU3bzn7YAuhqZhDKfEuAUGl3QT5va+aY5p6Vc= MIME-Version: 1.0 Received: by 10.220.210.69 with SMTP id gj5mr1176170vcb.58.1308385154590; Sat, 18 Jun 2011 01:19:14 -0700 (PDT) Received: by 10.220.189.202 with HTTP; Sat, 18 Jun 2011 01:19:14 -0700 (PDT) Date: Sat, 18 Jun 2011 01:19:14 -0700 Message-ID: From: Garrett Cooper To: dfr@freebsd.org Content-Type: multipart/mixed; boundary=0022154700ae5e694204a5f828b1 Cc: freebsd-hackers@freebsd.org Subject: [PATCH] improve MOD_DPF macro and other misc. cleanup X-BeenThere: freebsd-hackers@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Technical Discussions relating to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 18 Jun 2011 08:19:16 -0000 --0022154700ae5e694204a5f828b1 Content-Type: text/plain; charset=ISO-8859-1 Hi Doug, I tried using the MODULE_DEBUG #define and I ran into some compile issues. This patch gets things to work and adds an official option / entry to NOTES for help with other folks debugging kern_module.c logic. I also added some additional data to assist with determining causes of failure, as well as remove an impossible == NULL case when using malloc(.., M_WAITOK). Thanks! -Garrett --0022154700ae5e694204a5f828b1 Content-Type: text/x-patch; charset=US-ASCII; name="mod_dpf.patch" Content-Disposition: attachment; filename="mod_dpf.patch" Content-Transfer-Encoding: base64 X-Attachment-Id: f_gp2al9af1 SW5kZXg6IHN5cy9rZXJuL2tlcm5fbW9kdWxlLmMKPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gc3lzL2tlcm4va2Vy bl9tb2R1bGUuYwkocmV2aXNpb24gMjIzMTM4KQorKysgc3lzL2tlcm4va2Vybl9tb2R1bGUuYwko d29ya2luZyBjb3B5KQpAQCAtMjUsNiArMjUsNyBAQAogICovCiAKICNpbmNsdWRlICJvcHRfY29t cGF0LmgiCisjaW5jbHVkZSAib3B0X2dsb2JhbC5oIgogCiAjaW5jbHVkZSA8c3lzL2NkZWZzLmg+ CiBfX0ZCU0RJRCgiJEZyZWVCU0QkIik7CkBAIC00NCw2ICs0NSwxNSBAQAogI2luY2x1ZGUgPHN5 cy9tb2R1bGUuaD4KICNpbmNsdWRlIDxzeXMvbGlua2VyLmg+CiAKKyNpZmRlZiBNT0RVTEVfREVC VUcKKyNpbmNsdWRlIDxzeXMvc3lzY3RsLmg+CisKK2ludAltb2RfZGVidWcgPSAxOworCitTWVND VExfSU5UKF9kZWJ1ZywgT0lEX0FVVE8sIG1vZHVsZV9kZWJ1ZywgQ1RMVFlQRV9JTlR8Q1RMRkxB R19SV3xDVExGTEFHX1RVTiwKKyAgICAmbW9kX2RlYnVnLCAwLCAia2VybmVsIG1vZHVsZSBldmVu dHMgdG8gaW50ZXJjZXB0Iik7CisjZW5kaWYKKwogc3RhdGljIE1BTExPQ19ERUZJTkUoTV9NT0RV TEUsICJtb2R1bGUiLCAibW9kdWxlIGRhdGEgc3RydWN0dXJlcyIpOwogCiBzdHJ1Y3QgbW9kdWxl IHsKQEAgLTE2NCwxMCArMTc0LDYgQEAKIAl9CiAJbmFtZWxlbiA9IHN0cmxlbihkYXRhLT5uYW1l KSArIDE7CiAJbmV3bW9kID0gbWFsbG9jKHNpemVvZihzdHJ1Y3QgbW9kdWxlKSArIG5hbWVsZW4s IE1fTU9EVUxFLCBNX1dBSVRPSyk7Ci0JaWYgKG5ld21vZCA9PSBOVUxMKSB7Ci0JCU1PRF9YVU5M T0NLOwotCQlyZXR1cm4gKEVOT01FTSk7Ci0JfQogCW5ld21vZC0+cmVmcyA9IDE7CiAJbmV3bW9k LT5pZCA9IG5leHRpZCsrOwogCW5ld21vZC0+bmFtZSA9IChjaGFyICopKG5ld21vZCArIDEpOwpA QCAtMTkwLDcgKzE5Niw3IEBACiAKIAlNT0RfWExPQ0tfQVNTRVJUOwogCi0JTU9EX0RQRihSRUZT LCAoIm1vZHVsZV9yZWZlcmVuY2U6IGJlZm9yZSwgcmVmcz0lZFxuIiwgbW9kLT5yZWZzKSk7CisJ TU9EX0RQRihSRUZTLCAibW9kdWxlX3JlZmVyZW5jZTogYmVmb3JlLCByZWZzPSVkXG4iLCBtb2Qt PnJlZnMpOwogCW1vZC0+cmVmcysrOwogfQogCkBAIC0yMDEsMTIgKzIwNywxNyBAQAogCU1PRF9Y TE9DS19BU1NFUlQ7CiAKIAlpZiAobW9kLT5yZWZzIDw9IDApCi0JCXBhbmljKCJtb2R1bGVfcmVs ZWFzZTogYmFkIHJlZmVyZW5jZSBjb3VudCIpOworCQlwYW5pYygibW9kdWxlX3JlbGVhc2U6IGJh ZCByZWZlcmVuY2UgY291bnQsIHJlZnM9JWRcbiIsCisJCSAgICBtb2QtPnJlZnMpOwogCi0JTU9E X0RQRihSRUZTLCAoIm1vZHVsZV9yZWxlYXNlOiBiZWZvcmUsIHJlZnM9JWRcbiIsIG1vZC0+cmVm cykpOwotCQorCU1PRF9EUEYoUkVGUywgIm1vZHVsZV9yZWxlYXNlOiBiZWZvcmUsIG1vZHVsZT0l cyByZWZzPSVkXG4iLAorCSAgICBtb2QtPm5hbWUsIG1vZC0+cmVmcyk7CisKIAltb2QtPnJlZnMt LTsKIAlpZiAobW9kLT5yZWZzID09IDApIHsKKwkJTU9EX0RQRihSRUZTLAorCQkgICAgIm1vZHVs ZV9yZWxlYXNlOiBmcmVlaW5nIGxhc3QgcmVmZXJlbmNlIHRvIG1vZHVsZTogJXNcbiIsCisJCSAg ICBtb2QtPm5hbWUpOwogCQlUQUlMUV9SRU1PVkUoJm1vZHVsZXMsIG1vZCwgbGluayk7CiAJCWlm IChtb2QtPmZpbGUpCiAJCQlUQUlMUV9SRU1PVkUoJm1vZC0+ZmlsZS0+bW9kdWxlcywgbW9kLCBm bGluayk7CkluZGV4OiBzeXMvc3lzL21vZHVsZS5oCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIHN5cy9zeXMvbW9k dWxlLmgJKHJldmlzaW9uIDIyMzEzOCkKKysrIHN5cy9zeXMvbW9kdWxlLmgJKHdvcmtpbmcgY29w eSkKQEAgLTE3NywxOCArMTc3LDE4IEBACiB2b2lkCW1vZHVsZV9zZXRzcGVjaWZpYyhtb2R1bGVf dCwgbW9kc3BlY2lmaWNfdCAqKTsKIHN0cnVjdCBsaW5rZXJfZmlsZSAqbW9kdWxlX2ZpbGUobW9k dWxlX3QpOwogCi0jaWZkZWYJTU9EX0RFQlVHCisjaWZkZWYJTU9EVUxFX0RFQlVHCiBleHRlcm4g aW50IG1vZF9kZWJ1ZzsKICNkZWZpbmUJTU9EX0RFQlVHX1JFRlMJMQogCi0jZGVmaW5lCU1PRF9E UEYoY2F0LCBhcmdzKSBkbyB7CQkJCQkJXAorI2RlZmluZQlNT0RfRFBGKGNhdCwgZm10LCAuLi4p IGRvIHsJCQkJCVwKIAlpZiAobW9kX2RlYnVnICYgTU9EX0RFQlVHXyMjY2F0KQkJCQlcCi0JCXBy aW50ZihhcmdzKTsJCQkJCQlcCisJCXByaW50ZihmbXQsICMjX19WQV9BUkdTX18pOwkJCQlcCiB9 IHdoaWxlICgwKQogCi0jZWxzZQkvKiAhTU9EX0RFQlVHICovCisjZWxzZQkvKiAhTU9EVUxFX0RF QlVHICovCiAKLSNkZWZpbmUJTU9EX0RQRihjYXQsIGFyZ3MpCisjZGVmaW5lCU1PRF9EUEYoY2F0 LCBmbXQsIC4uLikKICNlbmRpZgogI2VuZGlmCS8qIF9LRVJORUwgKi8KIAo= --0022154700ae5e694204a5f828b1--