From owner-svn-src-all@FreeBSD.ORG Thu May 24 10:47:22 2012 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7C083106564A; Thu, 24 May 2012 10:47:22 +0000 (UTC) (envelope-from melifaro@FreeBSD.org) Received: from mail.ipfw.ru (unknown [IPv6:2a01:4f8:120:6141::2]) by mx1.freebsd.org (Postfix) with ESMTP id F039A8FC0A; Thu, 24 May 2012 10:47:21 +0000 (UTC) Received: from v6.mpls.in ([2a02:978:2::5] helo=ws.su29.net) by mail.ipfw.ru with esmtpsa (TLSv1:CAMELLIA256-SHA:256) (Exim 4.76 (FreeBSD)) (envelope-from ) id 1SXVZp-000HKC-BZ; Thu, 24 May 2012 14:47:29 +0400 Message-ID: <4FBE1120.8020704@FreeBSD.org> Date: Thu, 24 May 2012 14:44:48 +0400 From: "Alexander V. Chernikov" User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:9.0) Gecko/20120121 Thunderbird/9.0 MIME-Version: 1.0 To: Jung-uk Kim References: <201205212219.q4LMJKR9076035@svn.freebsd.org> <4FBD7E65.1060205@FreeBSD.org> In-Reply-To: <4FBD7E65.1060205@FreeBSD.org> Content-Type: multipart/mixed; boundary="------------010906000107090302010705" Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org Subject: Re: svn commit: r235746 - head/sys/net X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 24 May 2012 10:47:22 -0000 This is a multi-part message in MIME format. --------------010906000107090302010705 Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit On 24.05.2012 04:18, Jung-uk Kim wrote: ... >> @@ -1664,7 +1668,7 @@ bpf_setf(struct bpf_d *d, struct bpf_pro >> struct bpf_insn *fcode, *old; u_int wfilter, flen, size; #ifdef >> BPF_JITTER - bpf_jit_filter *ofunc; + bpf_jit_filter *ofunc, >> *jfunc; #endif int need_upgrade; #ifdef COMPAT_FREEBSD32 @@ -1695,6 >> +1699,13 @@ bpf_setf(struct bpf_d *d, struct bpf_pro else fcode = >> NULL; /* Make compiler happy */ >> >> +#ifdef BPF_JITTER + if (fp->bf_insns != NULL) + jfunc = >> bpf_jitter(fcode, flen); + else + jfunc = NULL; /* Make compiler >> happy */ +#endif + BPF_LOCK(); >> >> if (cmd == BIOCSETWF) { > ... > > This is completely wrong. First, fcode has not been initialized with Ups. Does the attached patch look ok to you? --------------010906000107090302010705 Content-Type: text/plain; name="bpf_jitter.diff" Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="bpf_jitter.diff" SW5kZXg6IHN5cy9uZXQvYnBmLmMKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gc3lzL25ldC9icGYuYwko cmV2aXNpb24gMjM1NzUwKQorKysgc3lzL25ldC9icGYuYwkod29ya2luZyBjb3B5KQpAQCAt MTczNyw5ICsxNzM3LDE2IEBAIGJwZl9zZXRmKHN0cnVjdCBicGZfZCAqZCwgc3RydWN0IGJw Zl9wcm9ncmFtICpmcCwKIAogCW5lZWRfdXBncmFkZSA9IDA7CiAJc2l6ZSA9IGZsZW4gKiBz aXplb2YoKmZwLT5iZl9pbnNucyk7Ci0JaWYgKHNpemUgPiAwKQorCWlmIChzaXplID4gMCkg eworCQkvKiBXZSdyZSBzZXR0aW5nIHVwIG5ldyBmaWx0ZXIuIENvcHkgYW5kIGNoZWNrIGFj dHVhbCBkYXRhICovCiAJCWZjb2RlID0gKHN0cnVjdCBicGZfaW5zbiAqKW1hbGxvYyhzaXpl LCBNX0JQRiwgTV9XQUlUT0spOwotCWVsc2UKKwkJaWYgKGNvcHlpbigoY2FkZHJfdClmcC0+ YmZfaW5zbnMsIChjYWRkcl90KWZjb2RlLCBzaXplKSAhPSAwIHx8CisJCSAgICAoYnBmX3Zh bGlkYXRlKGZjb2RlLCAoaW50KWZsZW4pID09IDApKSB7CisJCQlmcmVlKGZjb2RlLCBNX0JQ Rik7CisJCQlyZXR1cm4gKEVJTlZBTCk7CisJCX0KKwkJLyogRmlsdGVyIGlzIGNvcGllZCBp bnNpZGUgZmNvZGUgYW5kIGlzIHBlcmZlY3RseSB2YWxpZCAqLworCX0gZWxzZQogCQlmY29k ZSA9IE5VTEw7IC8qIE1ha2UgY29tcGlsZXIgaGFwcHkgKi8KIAogI2lmZGVmIEJQRl9KSVRU RVIKQEAgLTE3OTUsNTUgKzE4MDIsNTAgQEAgYnBmX3NldGYoc3RydWN0IGJwZl9kICpkLCBz dHJ1Y3QgYnBmX3Byb2dyYW0gKmZwLAogCQlyZXR1cm4gKDApOwogCX0KIAotCWlmIChjb3B5 aW4oKGNhZGRyX3QpZnAtPmJmX2luc25zLCAoY2FkZHJfdClmY29kZSwgc2l6ZSkgPT0gMCAm JgotCSAgICBicGZfdmFsaWRhdGUoZmNvZGUsIChpbnQpZmxlbikpIHsKLQkJLyogCi0JCSAq IFByb3RlY3QgZmlsdGVyIGNoYW5nZSBieSBpbnRlcmZhY2UgbG9jawotCQkgKiBBZGRpdGlv bmFsbHksIHdlIGFyZSBwcm90ZWN0ZWQgYnkgZ2xvYmFsIGxvY2sgaGVyZS4KLQkJICovCi0J CWlmIChkLT5iZF9iaWYgIT0gTlVMTCkKLQkJCUJQRklGX1dMT0NLKGQtPmJkX2JpZik7Ci0J CUJQRkRfTE9DSyhkKTsKLQkJaWYgKHdmaWx0ZXIpCi0JCQlkLT5iZF93ZmlsdGVyID0gZmNv ZGU7Ci0JCWVsc2UgewotCQkJZC0+YmRfcmZpbHRlciA9IGZjb2RlOworCS8qIAorCSAqIFNl dCB1cCBuZXcgZmlsdGVyLgorCSAqIFByb3RlY3QgZmlsdGVyIGNoYW5nZSBieSBpbnRlcmZh Y2UgbG9jaworCSAqIEFkZGl0aW9uYWxseSwgd2UgYXJlIHByb3RlY3RlZCBieSBnbG9iYWwg bG9jayBoZXJlLgorCSAqLworCWlmIChkLT5iZF9iaWYgIT0gTlVMTCkKKwkJQlBGSUZfV0xP Q0soZC0+YmRfYmlmKTsKKwlCUEZEX0xPQ0soZCk7CisJaWYgKHdmaWx0ZXIpCisJCWQtPmJk X3dmaWx0ZXIgPSBmY29kZTsKKwllbHNlIHsKKwkJZC0+YmRfcmZpbHRlciA9IGZjb2RlOwog I2lmZGVmIEJQRl9KSVRURVIKLQkJCWQtPmJkX2JmaWx0ZXIgPSBqZnVuYzsKKwkJZC0+YmRf YmZpbHRlciA9IGpmdW5jOwogI2VuZGlmCi0JCQlpZiAoY21kID09IEJJT0NTRVRGKQotCQkJ CXJlc2V0X2QoZCk7CisJCWlmIChjbWQgPT0gQklPQ1NFVEYpCisJCQlyZXNldF9kKGQpOwog Ci0JCQkvKgotCQkJICogRG8gbm90IHJlcXVpcmUgdXBncmFkZSBieSBmaXJzdCBCSU9DU0VU RgotCQkJICogKHVzZWQgdG8gc2V0IHNuYXBsZW4pIGJ5IHBjYXBfb3Blbl9saXZlKCkKLQkJ CSAqLwotCQkJaWYgKChkLT5iZF93cml0ZXIgIT0gMCkgJiYgKC0tZC0+YmRfd3JpdGVyID09 IDApKQotCQkJCW5lZWRfdXBncmFkZSA9IDE7Ci0JCQlDVFI0KEtUUl9ORVQsICIlczogZmls dGVyIGZ1bmN0aW9uIHNldCBieSBwaWQgJWQsICIKLQkJCSAgICAiYmRfd3JpdGVyIGNvdW50 ZXIgJWQsIG5lZWRfdXBncmFkZSAlZCIsCi0JCQkgICAgX19mdW5jX18sIGQtPmJkX3BpZCwg ZC0+YmRfd3JpdGVyLCBuZWVkX3VwZ3JhZGUpOwotCQl9Ci0JCUJQRkRfVU5MT0NLKGQpOwot CQlpZiAoZC0+YmRfYmlmICE9IE5VTEwpCi0JCQlCUEZJRl9XVU5MT0NLKGQtPmJkX2JpZik7 Ci0JCWlmIChvbGQgIT0gTlVMTCkKLQkJCWZyZWUoKGNhZGRyX3Qpb2xkLCBNX0JQRik7CisJ CS8qCisJCSAqIERvIG5vdCByZXF1aXJlIHVwZ3JhZGUgYnkgZmlyc3QgQklPQ1NFVEYKKwkJ ICogKHVzZWQgdG8gc2V0IHNuYXBsZW4pIGJ5IHBjYXBfb3Blbl9saXZlKCkKKwkJICovCisJ CWlmICgoZC0+YmRfd3JpdGVyICE9IDApICYmICgtLWQtPmJkX3dyaXRlciA9PSAwKSkKKwkJ CW5lZWRfdXBncmFkZSA9IDE7CisJCUNUUjQoS1RSX05FVCwgIiVzOiBmaWx0ZXIgZnVuY3Rp b24gc2V0IGJ5IHBpZCAlZCwgIgorCQkgICAgImJkX3dyaXRlciBjb3VudGVyICVkLCBuZWVk X3VwZ3JhZGUgJWQiLAorCQkgICAgX19mdW5jX18sIGQtPmJkX3BpZCwgZC0+YmRfd3JpdGVy LCBuZWVkX3VwZ3JhZGUpOworCX0KKwlCUEZEX1VOTE9DSyhkKTsKKwlpZiAoZC0+YmRfYmlm ICE9IE5VTEwpCisJCUJQRklGX1dVTkxPQ0soZC0+YmRfYmlmKTsKKwlpZiAob2xkICE9IE5V TEwpCisJCWZyZWUoKGNhZGRyX3Qpb2xkLCBNX0JQRik7CiAjaWZkZWYgQlBGX0pJVFRFUgot CQlpZiAob2Z1bmMgIT0gTlVMTCkKLQkJCWJwZl9kZXN0cm95X2ppdF9maWx0ZXIob2Z1bmMp OworCWlmIChvZnVuYyAhPSBOVUxMKQorCQlicGZfZGVzdHJveV9qaXRfZmlsdGVyKG9mdW5j KTsKICNlbmRpZgogCi0JCS8qIE1vdmUgZCB0byBhY3RpdmUgcmVhZGVycyBsaXN0ICovCi0J CWlmIChuZWVkX3VwZ3JhZGUgIT0gMCkKLQkJCWJwZl91cGdyYWRlZChkKTsKKwkvKiBNb3Zl IGQgdG8gYWN0aXZlIHJlYWRlcnMgbGlzdCAqLworCWlmIChuZWVkX3VwZ3JhZGUgIT0gMCkK KwkJYnBmX3VwZ3JhZGVkKGQpOwogCi0JCUJQRl9VTkxPQ0soKTsKLQkJcmV0dXJuICgwKTsK LQl9Ci0JZnJlZSgoY2FkZHJfdClmY29kZSwgTV9CUEYpOwogCUJQRl9VTkxPQ0soKTsKLQly ZXR1cm4gKEVJTlZBTCk7CisJcmV0dXJuICgwKTsKIH0KIAogLyoKSW5kZXg6IHN5cy9uZXQv YnBmX2ppdHRlci5jCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIHN5cy9uZXQvYnBmX2ppdHRlci5jCShy ZXZpc2lvbiAyMzU3NTApCisrKyBzeXMvbmV0L2JwZl9qaXR0ZXIuYwkod29ya2luZyBjb3B5 KQpAQCAtNzEsNyArNzEsNyBAQCBicGZfaml0dGVyKHN0cnVjdCBicGZfaW5zbiAqZnAsIGlu dCBuaW5zKQogCS8qIEFsbG9jYXRlIHRoZSBmaWx0ZXIgc3RydWN0dXJlLiAqLwogI2lmZGVm IF9LRVJORUwKIAlmaWx0ZXIgPSAoc3RydWN0IGJwZl9qaXRfZmlsdGVyICopbWFsbG9jKHNp emVvZigqZmlsdGVyKSwKLQkgICAgTV9CUEZKSVQsIE1fTk9XQUlUKTsKKwkgICAgTV9CUEZK SVQsIE1fV0FJVE9LKTsKICNlbHNlCiAJZmlsdGVyID0gKHN0cnVjdCBicGZfaml0X2ZpbHRl ciAqKW1hbGxvYyhzaXplb2YoKmZpbHRlcikpOwogI2VuZGlmCg== --------------010906000107090302010705--