Date: Sat, 7 May 2011 19:09:03 -0700 From: Garrett Cooper <yanegomi@gmail.com> To: freebsd-hackers@freebsd.org Subject: Re: [PATCH] draft patch to make usr.bin/kdump WARNS?= 6 clean Message-ID: <BANLkTimGjDovv=SAYw98m4L=xOhojN1anQ@mail.gmail.com> In-Reply-To: <BANLkTin4ip5gp3gQJVz3dvONtW8cH7puCg@mail.gmail.com> References: <BANLkTinR1qXERz9QJfneM4aKXhdLdz3ZtQ@mail.gmail.com> <BANLkTiniKkdQYs7vyWmoeYDjJMH%2B0oAFRg@mail.gmail.com> <BANLkTimAZ3E6BNT606z_AN0uYGuVrN9N3A@mail.gmail.com> <BANLkTikHBVWkRDPBjSCkXLm-%2BUd-KisZgw@mail.gmail.com> <BANLkTin4ip5gp3gQJVz3dvONtW8cH7puCg@mail.gmail.com>
next in thread | previous in thread | raw e-mail | index | archive | help
--bcaec54a37aefd129604a2ba34ae
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: quoted-printable
On Mon, May 2, 2011 at 9:40 AM, Garrett Cooper <yanegomi@gmail.com> wrote:
> On Mon, May 2, 2011 at 9:24 AM, Garrett Cooper <yanegomi@gmail.com> wrote=
:
>> ---------- Forwarded message ----------
>> From: Garrett Cooper <yanegomi@gmail.com>
>> Date: Mon, May 2, 2011 at 9:24 AM
>> Subject: Re: [PATCH] draft patch to make usr.bin/kdump WARNS?=3D 6 clean
>> To: Arnaud Lacombe <lacombar@gmail.com>
>>
>>
>> On Mon, May 2, 2011 at 9:21 AM, Arnaud Lacombe <lacombar@gmail.com> wrot=
e:
>>> Hi,
>>>
>>> On Mon, May 2, 2011 at 12:10 PM, Garrett Cooper <yanegomi@gmail.com> wr=
ote:
>>>> =A0 =A0I wanted to do something different this weekend, and I picked
>>>> usr.bin/kdump as a likely 'victim' for converting from WARNS?=3D 0 to
>>>> WARNS?=3D 6. I'm curious as to whether or not this is on the right
>>>> track, but here's the reasoning I used:
>>>>
>>>> 1. Conditionally include diskmbr.h or diskpc98.h based on whether or
>>>> not an architecture was non-pc98 or pc98 to avoid duplicate
>>>> definitions, because the beforementioned headers are mutually
>>>> exclusive.
>>>> 2. Move the sockfamilyname declaration to kdump_subr.h as it's used in
>>>> the generated ioctl.c file.
>>>> 3. Fix a signed vs unsigned comparison with a simple cast because the
>>>> size_t value will be sufficiently small that it can be converted to a
>>>> signed comparison.
>>>> 4. Fix a cast assignment type source//dest value alignment issue on
>>>> ia64 assigning a struct sockaddr value to either struct sockaddr_in or
>>>> struct sockaddr_in6 by using calloc and memcpy.
>>>> 5. Fix structure alignment issues on arm by marking some structures as=
__packed.
>>>> 6. Fix a shadowed declaration for flags by renaming a locally scoped
>>>> variable to _flags; add appropriate type to field.
>>>> 7. Remove unused argument to ktruser_malloc.
>>>> 8. Add missing declarations for ktruser_malloc and ktruser_rtld.
>>>>
>>>> =A0 =A0I've run some basic tests and things seem sane (in particular
>>>> ktrace'ing ktrace :)... ktrace'ing 'ssh ::1' and ktrace'ing 'ssh
>>>> localhost', but I was wondering if there was anything I was missing or
>>>> if someone else who ran arm or ia64 could test this patch out for me.
>>>> =A0 =A0I've run make universe on amd64, i386, ia64, mips, and pc98, an=
d
>>>> things seem sane, but I can't play around with those machines to
>>>> determine whether or not they're functional at runtime with the above
>>>> changes.
>>>> Thanks!
>>>> -Garrett
>>>>
>>> I do not see any patch, either inline or attached.
>>>
>>> =A0- Arnaud
>>>
>>>> PS Oh yeah... no commit bit means that I can't commit this either, but
>>>> I was curious if my approach was correct before getting to that step
>>>> :).
>>
>> Yeah... I'm stupid for not attaching it. Need to get more sleep.
>
> Note to self: should be freeing socket structures after use, and I
> should apply similar logic to the rest of the socket inspection code.
> I'll attach another version after I do some more testing.
Here's an updated patch that was run through make universe a
couple of times.
Thanks!
-Garrett
--bcaec54a37aefd129604a2ba34ae
Content-Type: text/x-patch; charset=US-ASCII;
name="usr-bin-kdump-WARNS-6-clean.patch"
Content-Disposition: attachment; filename="usr-bin-kdump-WARNS-6-clean.patch"
Content-Transfer-Encoding: base64
X-Attachment-Id: f_gnfc8j201
SW5kZXg6IHVzci5iaW4va2R1bXAva2R1bXAuYwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSB1c3IuYmluL2tkdW1w
L2tkdW1wLmMJKHJldmlzaW9uIDIyMTIxOSkKKysrIHVzci5iaW4va2R1bXAva2R1bXAuYwkod29y
a2luZyBjb3B5KQpAQCAtOTksOCArOTksOSBAQAogdm9pZCBrdHJzb2NrYWRkcihzdHJ1Y3Qgc29j
a2FkZHIgKik7CiB2b2lkIGt0cnN0YXQoc3RydWN0IHN0YXQgKik7CiB2b2lkIGt0cnN0cnVjdChj
aGFyICosIHNpemVfdCk7Cit2b2lkIGt0cnVzZXJfbWFsbG9jKHVuc2lnbmVkIGNoYXIgKiBwKTsK
K3ZvaWQga3RydXNlcl9ydGxkKGludCBsZW4sIHVuc2lnbmVkIGNoYXIgKiBwKTsKIHZvaWQgdXNh
Z2Uodm9pZCk7Ci12b2lkIHNvY2tmYW1pbHluYW1lKGludCk7CiBjb25zdCBjaGFyICppb2N0bG5h
bWUodV9sb25nKTsKIAogaW50IHRpbWVzdGFtcCwgZGVjaW1hbCwgZmFuY3kgPSAxLCBzdXBwcmVz
c2RhdGEsIHRhaWwsIHRocmVhZHMsIG1heGRhdGEsCkBAIC01MjgsMTMgKzUyOSwxMyBAQAogCQkJ
CWlwKys7CiAJCQkJbmFyZy0tOwogCQkJfSBlbHNlIGlmIChrdHItPmt0cl9jb2RlID09IFNZU19v
cGVuKSB7Ci0JCQkJaW50CWZsYWdzOworCQkJCWludAlvcGVuX2ZsYWdzOwogCQkJCWludAltb2Rl
OwogCQkJCXByaW50X251bWJlcihpcCxuYXJnLGMpOwotCQkJCWZsYWdzID0gKmlwOworCQkJCW9w
ZW5fZmxhZ3MgPSAqaXA7CiAJCQkJbW9kZSA9ICorK2lwOwogCQkJCSh2b2lkKXB1dGNoYXIoJywn
KTsKLQkJCQlmbGFnc2FuZG1vZGVuYW1lIChmbGFncywgbW9kZSwgZGVjaW1hbCk7CisJCQkJZmxh
Z3NhbmRtb2RlbmFtZSAob3Blbl9mbGFncywgbW9kZSwgZGVjaW1hbCk7CiAJCQkJaXArKzsKIAkJ
CQluYXJnLT0yOwogCQkJfSBlbHNlIGlmIChrdHItPmt0cl9jb2RlID09IFNZU193YWl0NCkgewpA
QCAtMTE2Nyw3ICsxMTY4LDcgQEAKIAlzaXplX3QgbWFwc2l6ZTsKIAlpbnQgcmVmY250OwogCWNo
YXIgbmFtZVtNQVhQQVRITEVOXTsKLX07Cit9IF9fcGFja2VkOwogCiB2b2lkCiBrdHJ1c2VyX3J0
bGQoaW50IGxlbiwgdW5zaWduZWQgY2hhciAqcCkKQEAgLTEyNTMsMTAgKzEyNTQsMTAgQEAKIAl2
b2lkICpwOwogCXNpemVfdCBzOwogCXZvaWQgKnI7Ci19OworfSBfX3BhY2tlZDsKIAogdm9pZAot
a3RydXNlcl9tYWxsb2MoaW50IGxlbiwgdW5zaWduZWQgY2hhciAqcCkKK2t0cnVzZXJfbWFsbG9j
KHVuc2lnbmVkIGNoYXIgKnApCiB7CiAJc3RydWN0IHV0cmFjZV9tYWxsb2MgKnV0ID0gKHN0cnVj
dCB1dHJhY2VfbWFsbG9jICopcDsKIApAQCAtMTI4MCw3ICsxMjgxLDcgQEAKIAl9CiAKIAlpZiAo
bGVuID09IHNpemVvZihzdHJ1Y3QgdXRyYWNlX21hbGxvYykpIHsKLQkJa3RydXNlcl9tYWxsb2Mo
bGVuLCBwKTsKKwkJa3RydXNlcl9tYWxsb2MocCk7CiAJCXJldHVybjsKIAl9CiAKQEAgLTEzMTUs
NjEgKzEzMTYsNjcgQEAKIAlwcmludGYoIiwgIik7CiAKICNkZWZpbmUgY2hlY2tfc29ja2FkZHJf
bGVuKG4pCQkJCQlcCi0JaWYgKHNhXyMjbi0+cyMjbiMjX2xlbiA8IHNpemVvZihzdHJ1Y3Qgc29j
a2FkZHJfIyNuKSkgewlcCisJaWYgKHNhXyMjbi5zIyNuIyNfbGVuIDwgc2l6ZW9mKHN0cnVjdCBz
b2NrYWRkcl8jI24pKSB7CVwKIAkJcHJpbnRmKCJpbnZhbGlkIik7CQkJCVwKIAkJYnJlYWs7CQkJ
CQkJXAogCX0KIAogCXN3aXRjaChzYS0+c2FfZmFtaWx5KSB7CiAJY2FzZSBBRl9JTkVUOiB7Ci0J
CXN0cnVjdCBzb2NrYWRkcl9pbgkqc2FfaW47CisJCXN0cnVjdCBzb2NrYWRkcl9pbiBzYV9pbjsK
IAotCQlzYV9pbiA9IChzdHJ1Y3Qgc29ja2FkZHJfaW4gKilzYTsKKwkJbWVtc2V0KCZzYV9pbiwg
MCwgc2l6ZW9mKHNhX2luKSk7CisJCW1lbWNweSgmc2FfaW4sIHNhLCBzaXplb2Yoc2EpKTsKIAkJ
Y2hlY2tfc29ja2FkZHJfbGVuKGluKTsKLQkJaW5ldF9udG9wKEFGX0lORVQsICZzYV9pbi0+c2lu
X2FkZHIsIGFkZHIsIHNpemVvZiBhZGRyKTsKLQkJcHJpbnRmKCIlczoldSIsIGFkZHIsIG50b2hz
KHNhX2luLT5zaW5fcG9ydCkpOworCQlpbmV0X250b3AoQUZfSU5FVCwgJnNhX2luLnNpbl9hZGRy
LCBhZGRyLCBzaXplb2YgYWRkcik7CisJCXByaW50ZigiJXM6JXUiLCBhZGRyLCBudG9ocyhzYV9p
bi5zaW5fcG9ydCkpOwogCQlicmVhazsKIAl9CiAjaWZkZWYgTkVUQVRBTEsKIAljYXNlIEFGX0FQ
UExFVEFMSzogewotCQlzdHJ1Y3Qgc29ja2FkZHJfYXQJKnNhX2F0OworCQlzdHJ1Y3Qgc29ja2Fk
ZHJfYXQJc2FfYXQ7CiAJCXN0cnVjdCBuZXRyYW5nZQkJKm5yOwogCi0JCXNhX2F0ID0gKHN0cnVj
dCBzb2NrYWRkcl9hdCAqKXNhOworCQltZW1zZXQoJnNhX2F0LCAwLCBzaXplb2Yoc2FfYXQpKTsK
KwkJbWVtY3B5KCZzYV9hdCwgc2EsIHNpemVvZihzYSkpOwogCQljaGVja19zb2NrYWRkcl9sZW4o
YXQpOwotCQluciA9ICZzYV9hdC0+c2F0X3JhbmdlLnJfbmV0cmFuZ2U7Ci0JCXByaW50ZigiJWQu
JWQsICVkLSVkLCAlZCIsIG50b2hzKHNhX2F0LT5zYXRfYWRkci5zX25ldCksCi0JCQlzYV9hdC0+
c2F0X2FkZHIuc19ub2RlLCBudG9ocyhuci0+bnJfZmlyc3RuZXQpLAorCQluciA9ICZzYV9hdC5z
YXRfcmFuZ2Uucl9uZXRyYW5nZTsKKwkJcHJpbnRmKCIlZC4lZCwgJWQtJWQsICVkIiwgbnRvaHMo
c2FfYXQuc2F0X2FkZHIuc19uZXQpLAorCQkJc2FfYXQuc2F0X2FkZHIuc19ub2RlLCBudG9ocyhu
ci0+bnJfZmlyc3RuZXQpLAogCQkJbnRvaHMobnItPm5yX2xhc3RuZXQpLCBuci0+bnJfcGhhc2Up
OwogCQlicmVhazsKIAl9CiAjZW5kaWYKIAljYXNlIEFGX0lORVQ2OiB7Ci0JCXN0cnVjdCBzb2Nr
YWRkcl9pbjYJKnNhX2luNjsKKwkJc3RydWN0IHNvY2thZGRyX2luNiBzYV9pbjY7CiAKLQkJc2Ff
aW42ID0gKHN0cnVjdCBzb2NrYWRkcl9pbjYgKilzYTsKKwkJbWVtc2V0KCZzYV9pbjYsIDAsIHNp
emVvZihzYV9pbjYpKTsKKwkJbWVtY3B5KCZzYV9pbjYsIHNhLCBzaXplb2Yoc2EpKTsKIAkJY2hl
Y2tfc29ja2FkZHJfbGVuKGluNik7Ci0JCWluZXRfbnRvcChBRl9JTkVUNiwgJnNhX2luNi0+c2lu
Nl9hZGRyLCBhZGRyLCBzaXplb2YgYWRkcik7Ci0JCXByaW50ZigiWyVzXToldSIsIGFkZHIsIGh0
b25zKHNhX2luNi0+c2luNl9wb3J0KSk7CisJCWluZXRfbnRvcChBRl9JTkVUNiwgJnNhX2luNi5z
aW42X2FkZHIsIGFkZHIsIHNpemVvZiBhZGRyKTsKKwkJcHJpbnRmKCJbJXNdOiV1IiwgYWRkciwg
aHRvbnMoc2FfaW42LnNpbjZfcG9ydCkpOwogCQlicmVhazsKIAl9CiAjaWZkZWYgSVBYCiAJY2Fz
ZSBBRl9JUFg6IHsKLQkJc3RydWN0IHNvY2thZGRyX2lweAkqc2FfaXB4OworCQlzdHJ1Y3Qgc29j
a2FkZHJfaXB4IHNhX2lweDsKIAotCQlzYV9pcHggPSAoc3RydWN0IHNvY2thZGRyX2lweCAqKXNh
OworCQltZW1zZXQoJnNhX2lweCwgMCwgc2l6ZW9mKHNhX2lweCkpOworCQltZW1jcHkoJnNhX2lw
eCwgc2EsIHNpemVvZihzYSkpOwogCQljaGVja19zb2NrYWRkcl9sZW4oaXB4KTsKIAkJLyogWFhY
IHdpc2ggd2UgaGFkIGlweF9udG9wICovCi0JCXByaW50ZigiJXMiLCBpcHhfbnRvYShzYV9pcHgt
PnNpcHhfYWRkcikpOworCQlwcmludGYoIiVzIiwgaXB4X250b2Eoc2FfaXB4LnNpcHhfYWRkcikp
OworCQlmcmVlKHNhX2lweCk7CiAJCWJyZWFrOwogCX0KICNlbmRpZgogCWNhc2UgQUZfVU5JWDog
ewotCQlzdHJ1Y3Qgc29ja2FkZHJfdW4gKnNhX3VuOworCQlzdHJ1Y3Qgc29ja2FkZHJfdW4gc2Ff
dW47CiAKLQkJc2FfdW4gPSAoc3RydWN0IHNvY2thZGRyX3VuICopc2E7CisJCW1lbXNldCgmc2Ff
dW4sIDAsIHNpemVvZihzYV91bikpOworCQltZW1jcHkoJnNhX3VuLCBzYSwgc2l6ZW9mKHNhKSk7
CiAJCWNoZWNrX3NvY2thZGRyX2xlbih1bik7Ci0JCXByaW50ZigiJS4qcyIsIChpbnQpc2l6ZW9m
KHNhX3VuLT5zdW5fcGF0aCksIHNhX3VuLT5zdW5fcGF0aCk7CisJCXByaW50ZigiJS4qcyIsIChp
bnQpc2l6ZW9mKHNhX3VuLnN1bl9wYXRoKSwgc2FfdW4uc3VuX3BhdGgpOwogCQlicmVhazsKIAl9
CiAJZGVmYXVsdDoKQEAgLTE0ODAsOCArMTQ4Nyw4IEBACiAJaWYgKGRhdGFsZW4gPT0gMCkKIAkJ
Z290byBpbnZhbGlkOwogCS8qIHNhbml0eSBjaGVjayAqLwotCWZvciAoaSA9IDA7IGkgPCBuYW1l
bGVuOyArK2kpCi0JCWlmICghaXNhbHBoYSgodW5zaWduZWQgY2hhciluYW1lW2ldKSkKKwlmb3Ig
KGkgPSAwOyBpIDwgKGludCluYW1lbGVuOyArK2kpCisJCWlmICghaXNhbHBoYShuYW1lW2ldKSkK
IAkJCWdvdG8gaW52YWxpZDsKIAlpZiAoc3RyY21wKG5hbWUsICJzdGF0IikgPT0gMCkgewogCQlp
ZiAoZGF0YWxlbiAhPSBzaXplb2Yoc3RydWN0IHN0YXQpKQpJbmRleDogdXNyLmJpbi9rZHVtcC9r
ZHVtcF9zdWJyLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PQotLS0gdXNyLmJpbi9rZHVtcC9rZHVtcF9zdWJyLmgJKHJl
dmlzaW9uIDIyMTIxOSkKKysrIHVzci5iaW4va2R1bXAva2R1bXBfc3Vici5oCSh3b3JraW5nIGNv
cHkpCkBAIC00NSwzICs0NSw0IEBACiB2b2lkIG1pbmhlcml0bmFtZSAoaW50KTsKIHZvaWQgcXVv
dGFjdGxuYW1lIChpbnQpOwogdm9pZCBwdHJhY2VvcG5hbWUgKGludCk7Cit2b2lkIHNvY2tmYW1p
bHluYW1lKGludCk7CkluZGV4OiB1c3IuYmluL2tkdW1wL21raW9jdGxzCj09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t
IHVzci5iaW4va2R1bXAvbWtpb2N0bHMJKHJldmlzaW9uIDIyMTIxOSkKKysrIHVzci5iaW4va2R1
bXAvbWtpb2N0bHMJKHdvcmtpbmcgY29weSkKQEAgLTIyLDEyICsyMiwyMSBAQAogIyBYWFggc2hv
dWxkIHdlIHVzZSBhbiBBTlNJIGNwcD8KIGlvY3RsX2luY2x1ZGVzPWAKIAljZCAkMQotCWZpbmQg
LUggLXMgKiAtbmFtZSAnKi5oJyB8CisJZmluZCAtSCAtcyAqIC1uYW1lICcqLmgnIHwgZ3JlcCAt
diAnLipkaXNrLipcLmgnIHwgXAogCQl4YXJncyBlZ3JlcCAtbCBcCiAnXiNbIAldKmRlZmluZVsg
CV0rW0EtWmEtel9dW0EtWmEtejAtOV9dKlsgCV0rX0lPW15hLXowLTlfXScgfAogCQlhd2sgJ3tw
cmludGYoIiNpbmNsdWRlIDwlcz5cXFxcbiIsICQxKX0nCiBgCiAKK2Nhc2UgImB1bmFtZSAtbWAi
IGluCisqcGM5OCopCisJaW9jdGxfaW5jbHVkZXM9IiRpb2N0bF9pbmNsdWRlcyNpbmNsdWRlIDxz
eXMvZGlza3BjOTguaD5cXG4iCisJOzsKKyopCisJaW9jdGxfaW5jbHVkZXM9IiRpb2N0bF9pbmNs
dWRlcyNpbmNsdWRlIDxzeXMvZGlza21ici5oPlxcbiIKKwk7OworZXNhYworCiBhd2sgLXYgeD0i
JGlvY3RsX2luY2x1ZGVzIiAnQkVHSU4ge3ByaW50IHh9JyB8CiAJZ2NjIC1FIC1JJDEgLWRNIC1E
Q09NUEFUXzQzVFRZIC0gfAogCWF3ayAtdiBpb2N0bF9pbmNsdWRlcz0iJGlvY3RsX2luY2x1ZGVz
IiAtdiB1c2Vfc3dpdGNoPSIkdXNlX3N3aXRjaCIgJwpJbmRleDogdXNyLmJpbi9rZHVtcC9NYWtl
ZmlsZQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09Ci0tLSB1c3IuYmluL2tkdW1wL01ha2VmaWxlCShyZXZpc2lvbiAyMjEy
MTkpCisrKyB1c3IuYmluL2tkdW1wL01ha2VmaWxlCSh3b3JraW5nIGNvcHkpCkBAIC0xNSw3ICsx
NSw3IEBACiBTUkNTKz0JCWxpbnV4X3N5c2NhbGxzLmMKIC5lbmRpZgogCi1XQVJOUz89CQkwCitX
QVJOUz89CQk2CiAKIENMRUFORklMRVM9CWlvY3RsLmMga2R1bXBfc3Vici5jIGxpbnV4X3N5c2Nh
bGxzLmMKIAo=
--bcaec54a37aefd129604a2ba34ae--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?BANLkTimGjDovv=SAYw98m4L=xOhojN1anQ>