Date: Mon, 22 Sep 2025 02:26:12 +0200 From: Guido Falsi <madpilot@FreeBSD.org> To: Gleb Smirnoff <glebius@freebsd.org> Cc: "Herbert J. Skuhra" <herbert@gojira.at>, src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: 31ec8b6407fd - main - sys/netinet6: Implement RFC 7217 Message-ID: <63c07846-cd1b-4ff2-8c35-c0a6db6954cc@FreeBSD.org> In-Reply-To: <aNCDmk7dcv8jE7yi@cell.glebi.us> References: <202509201231.58KCVqBC047480@gitrepo.freebsd.org> <874iswhip4.wl-herbert@gojira.at> <bad8cb94-8243-468a-9919-a713a9426eae@FreeBSD.org> <07503de1-785e-4e4d-b4e4-0524aeb064e1@FreeBSD.org> <87jz1sc9fr.wl-herbert@gojira.at> <31da7dd5-ae67-4fb4-aa47-81e57f460c9d@FreeBSD.org> <aNBKeJwyBFpkt77b@cell.glebi.us> <909b3e33-0639-4abc-915f-073cd0f304da@FreeBSD.org> <aNCDmk7dcv8jE7yi@cell.glebi.us>
next in thread | previous in thread | raw e-mail | index | archive | help
This is a multi-part message in MIME format. --------------CiyNtVCmAby94etLq2JHMfHd Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit On 9/22/25 01:00, Gleb Smirnoff wrote: > On Sun, Sep 21, 2025 at 09:17:15PM +0200, Guido Falsi wrote: > G> > Is struct nd_ifinfo something that is used as argument to ioctl(2)? > G> > If so, then adding counter_u64_t into it is not correct. > G> > > G> > I would suggest to not revert the change as a whole, but remove the > G> > counter only and bring struct nd_ifinfo back to original. The counter > G> > should probably go into struct in6_ifextra that is pointed by > G> > if->if_afdata[AF_INET6]. > G> > G> Thanks for the feedback and suggestion! > G> > G> You are definitely right! I'm in the process to create a review for such a > G> change shortly, I'll post it as soon as I'm able to have the code tested. > > As long as Herbert confirms that the patch fixes the issue for him, please > consider the change as approved by an src committer and please push it. We > want to enter the stabweek that starts tomorrow without a ABI breakage. > @Herbert I'm attaching a patch against base sources for you to test. It moves the new counter to in6_ifextra structure, removing the ABI breakage I introduced. Everything should be back to working with this. Can you confirm it fixes the issue for you? Thanks in advance! -- Guido Falsi <madpilot@FreeBSD.org> --------------CiyNtVCmAby94etLq2JHMfHd Content-Type: text/x-patch; charset=UTF-8; name="0001-Move-dad_failures-to-in6_ifextra.patch" Content-Disposition: attachment; filename="0001-Move-dad_failures-to-in6_ifextra.patch" Content-Transfer-Encoding: base64 RnJvbSBiOWI4MTRhNmJmYzg0ODE4YWZmY2U5MjQzMTcyZTRiNTkxZTAyMjE1IE1vbiBTZXAg MTcgMDA6MDA6MDAgMjAwMQpGcm9tOiBHdWlkbyBGYWxzaSA8bWFkcGlsb3RARnJlZUJTRC5v cmc+CkRhdGU6IFN1biwgMjEgU2VwIDIwMjUgMTk6MjM6MjggKzAyMDAKU3ViamVjdDogW1BB VENIXSBNb3ZlIGRhZF9mYWlsdXJlcyB0byBpbjZfaWZleHRyYQoKLS0tCiBzeXMvbmV0aW5l dDYvaW42LmMgICAgICAgICAgfCAzICsrKwogc3lzL25ldGluZXQ2L2luNl9pZmF0dGFjaC5j IHwgMiArLQogc3lzL25ldGluZXQ2L2luNl92YXIuaCAgICAgIHwgMiArKwogc3lzL25ldGlu ZXQ2L25kNi5jICAgICAgICAgIHwgNCAtLS0tCiBzeXMvbmV0aW5ldDYvbmQ2LmggICAgICAg ICAgfCAxIC0KIHN5cy9uZXRpbmV0Ni9uZDZfbmJyLmMgICAgICB8IDYgKysrLS0tCiBzeXMv bmV0aW5ldDYvbmQ2X3J0ci5jICAgICAgfCAyICstCiA3IGZpbGVzIGNoYW5nZWQsIDEwIGlu c2VydGlvbnMoKyksIDEwIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL3N5cy9uZXRpbmV0 Ni9pbjYuYyBiL3N5cy9uZXRpbmV0Ni9pbjYuYwppbmRleCA0Zjc1NmE3NWZhYzcuLjhlZjc1 NWUyZGMwYSAxMDA2NDQKLS0tIGEvc3lzL25ldGluZXQ2L2luNi5jCisrKyBiL3N5cy9uZXRp bmV0Ni9pbjYuYwpAQCAtMjYwNCw2ICsyNjA0LDggQEAgaW42X2RvbWlmYXR0YWNoKHN0cnVj dCBpZm5ldCAqaWZwKQogCUNPVU5URVJfQVJSQVlfQUxMT0MoZXh0LT5pY21wNl9pZnN0YXQs CiAJICAgIHNpemVvZihzdHJ1Y3QgaWNtcDZfaWZzdGF0KSAvIHNpemVvZih1aW50NjRfdCks IE1fV0FJVE9LKTsKIAorCWV4dC0+ZGFkX2ZhaWx1cmVzID0gY291bnRlcl91NjRfYWxsb2Mo TV9XQUlUT0spOworCiAJZXh0LT5uZF9pZmluZm8gPSBuZDZfaWZhdHRhY2goaWZwKTsKIAll eHQtPnNjb3BlNl9pZCA9IHNjb3BlNl9pZmF0dGFjaChpZnApOwogCWV4dC0+bGx0YWJsZSA9 IGluNl9sbHRhdHRhY2goaWZwKTsKQEAgLTI2MzksNiArMjY0MSw3IEBAIGluNl9kb21pZmRl dGFjaChzdHJ1Y3QgaWZuZXQgKmlmcCwgdm9pZCAqYXV4KQogCUNPVU5URVJfQVJSQVlfRlJF RShleHQtPmljbXA2X2lmc3RhdCwKIAkgICAgc2l6ZW9mKHN0cnVjdCBpY21wNl9pZnN0YXQp IC8gc2l6ZW9mKHVpbnQ2NF90KSk7CiAJZnJlZShleHQtPmljbXA2X2lmc3RhdCwgTV9JRkFE RFIpOworCWNvdW50ZXJfdTY0X2ZyZWUoZXh0LT5kYWRfZmFpbHVyZXMpOwogCWZyZWUoZXh0 LCBNX0lGQUREUik7CiB9CiAKZGlmZiAtLWdpdCBhL3N5cy9uZXRpbmV0Ni9pbjZfaWZhdHRh Y2guYyBiL3N5cy9uZXRpbmV0Ni9pbjZfaWZhdHRhY2guYwppbmRleCA1N2ZlMTJhMWM5M2Iu LjRmZGUzNDZmYjY5MSAxMDA2NDQKLS0tIGEvc3lzL25ldGluZXQ2L2luNl9pZmF0dGFjaC5j CisrKyBiL3N5cy9uZXRpbmV0Ni9pbjZfaWZhdHRhY2guYwpAQCAtMzc3LDcgKzM3Nyw3IEBA IGluNl9nZXRfc3RhYmxlaWZpZChzdHJ1Y3QgaWZuZXQgKmlmcCwgc3RydWN0IGluNl9hZGRy ICppbjYsIGludCBwcmVmaXhsZW4pCiAJfQogCWhvc3R1dWlkX2xlbiA9IHN0cmxlbihob3N0 dXVpZCk7CiAKLQlkYWRfZmFpbHVyZXMgPSBjb3VudGVyX3U2NF9mZXRjaChORF9JRklORk8o aWZwKS0+ZGFkX2ZhaWx1cmVzKTsKKwlkYWRfZmFpbHVyZXMgPSBjb3VudGVyX3U2NF9mZXRj aChEQURfRkFJTFVSRVMoaWZwKSk7CiAKIAkvKgogCSAqIFJGQyA3MjE3IHNlY3Rpb24gNwpk aWZmIC0tZ2l0IGEvc3lzL25ldGluZXQ2L2luNl92YXIuaCBiL3N5cy9uZXRpbmV0Ni9pbjZf dmFyLmgKaW5kZXggZTVhYjgzZTZhMmExLi5lNTExZWFkMjRmMDggMTAwNjQ0Ci0tLSBhL3N5 cy9uZXRpbmV0Ni9pbjZfdmFyLmgKKysrIGIvc3lzL25ldGluZXQ2L2luNl92YXIuaApAQCAt MTA2LDkgKzEwNiwxMSBAQCBzdHJ1Y3QgaW42X2lmZXh0cmEgewogCXN0cnVjdCBzY29wZTZf aWQgKnNjb3BlNl9pZDsKIAlzdHJ1Y3QgbGx0YWJsZSAqbGx0YWJsZTsKIAlzdHJ1Y3QgbWxk X2lmc29mdGMgKm1sZF9pZmluZm87CisJY291bnRlcl91NjRfdCBkYWRfZmFpbHVyZXM7CS8q IERBRCBmYWlsdXJlcyB3aGVuIHVzaW5nIFJGQyA3MjE3IHN0YWJsZSBhZGRyZXNzZXMgKi8K IH07CiAKICNkZWZpbmUJTExUQUJMRTYoaWZwKQkoKChzdHJ1Y3QgaW42X2lmZXh0cmEgKiko aWZwKS0+aWZfYWZkYXRhW0FGX0lORVQ2XSktPmxsdGFibGUpCisjZGVmaW5lCURBRF9GQUlM VVJFUyhpZnApCSgoKHN0cnVjdCBpbjZfaWZleHRyYSAqKShpZnApLT5pZl9hZmRhdGFbQUZf SU5FVDZdKS0+ZGFkX2ZhaWx1cmVzKQogCiAjaWZkZWYgX0tFUk5FTAogCmRpZmYgLS1naXQg YS9zeXMvbmV0aW5ldDYvbmQ2LmMgYi9zeXMvbmV0aW5ldDYvbmQ2LmMKaW5kZXggOTM4ZDQx MTcxMWYwLi4wMGRmNWVmY2VmOTIgMTAwNjQ0Ci0tLSBhL3N5cy9uZXRpbmV0Ni9uZDYuYwor KysgYi9zeXMvbmV0aW5ldDYvbmQ2LmMKQEAgLTMyOSw4ICszMjksNiBAQCBuZDZfaWZhdHRh Y2goc3RydWN0IGlmbmV0ICppZnApCiAJCW5kLT5mbGFncyB8PSBORDZfSUZGX1NUQUJMRUFE RFI7CiAJfQogCi0JbmQtPmRhZF9mYWlsdXJlcyA9IGNvdW50ZXJfdTY0X2FsbG9jKE1fV0FJ VE9LKTsKLQogCXJldHVybiBuZDsKIH0KIApAQCAtMzUwLDggKzM0OCw2IEBAIG5kNl9pZmRl dGFjaChzdHJ1Y3QgaWZuZXQgKmlmcCwgc3RydWN0IG5kX2lmaW5mbyAqbmQpCiAJfQogCU5F VF9FUE9DSF9FWElUKGV0KTsKIAotCWNvdW50ZXJfdTY0X2ZyZWUobmQtPmRhZF9mYWlsdXJl cyk7Ci0KIAlmcmVlKG5kLCBNX0lQNk5EUCk7CiB9CiAKZGlmZiAtLWdpdCBhL3N5cy9uZXRp bmV0Ni9uZDYuaCBiL3N5cy9uZXRpbmV0Ni9uZDYuaAppbmRleCAxZGUyYTc3ZGRmNmQuLjVm ZTAyN2FjNWU3YyAxMDA2NDQKLS0tIGEvc3lzL25ldGluZXQ2L25kNi5oCisrKyBiL3N5cy9u ZXRpbmV0Ni9uZDYuaApAQCAtNzYsNyArNzYsNiBAQCBzdHJ1Y3QgbmRfaWZpbmZvIHsKIAl1 X2ludDhfdCByYW5kb21zZWVkMFs4XTsgLyogdXBwZXIgNjQgYml0cyBvZiBNRDUgZGlnZXN0 ICovCiAJdV9pbnQ4X3QgcmFuZG9tc2VlZDFbOF07IC8qIGxvd2VyIDY0IGJpdHMgKHVzdWFs bHkgdGhlIEVVSTY0IElGSUQpICovCiAJdV9pbnQ4X3QgcmFuZG9taWRbOF07CS8qIGN1cnJl bnQgcmFuZG9tIElEICovCi0JY291bnRlcl91NjRfdCBkYWRfZmFpbHVyZXM7CS8qIERBRCBm YWlsdXJlcyB3aGVuIHVzaW5nIFJGQyA3MjE3IHN0YWJsZSBhZGRyZXNzZXMgKi8KIH07CiAK ICNkZWZpbmUgTkQ2X0lGRl9QRVJGT1JNTlVECTB4MQpkaWZmIC0tZ2l0IGEvc3lzL25ldGlu ZXQ2L25kNl9uYnIuYyBiL3N5cy9uZXRpbmV0Ni9uZDZfbmJyLmMKaW5kZXggNzZiMWZkODZl ZTA4Li5jYzE3YjRlMWE0MDIgMTAwNjQ0Ci0tLSBhL3N5cy9uZXRpbmV0Ni9uZDZfbmJyLmMK KysrIGIvc3lzL25ldGluZXQ2L25kNl9uYnIuYwpAQCAtMTQ3Myw3ICsxNDczLDcgQEAgbmQ2 X2RhZF90aW1lcih2b2lkICphcmcpCiAJCQlpZiAoKE5EX0lGSU5GTyhpZnApLT5mbGFncyAm IE5ENl9JRkZfSUZESVNBQkxFRCkgPT0gMCkgewogCQkJCWlhLT5pYTZfZmxhZ3MgJj0gfklO Nl9JRkZfVEVOVEFUSVZFOwogCQkJCWlmICgoTkRfSUZJTkZPKGlmcCktPmZsYWdzICYgTkQ2 X0lGRl9TVEFCTEVBRERSKSAmJiAhKGlhLT5pYTZfZmxhZ3MgJiBJTjZfSUZGX1RFTVBPUkFS WSkpCi0JCQkJCWNvdW50ZXJfdTY0X3plcm8oTkRfSUZJTkZPKGlmcCktPmRhZF9mYWlsdXJl cyk7CisJCQkJCWNvdW50ZXJfdTY0X3plcm8oREFEX0ZBSUxVUkVTKGlmcCkpOwogCQkJfQog CiAJCQluZDZsb2coKExPR19ERUJVRywKQEAgLTE1MjIsMTAgKzE1MjIsMTAgQEAgbmQ2X2Rh ZF9kdXBsaWNhdGVkKHN0cnVjdCBpZmFkZHIgKmlmYSwgc3RydWN0IGRhZHEgKmRwKQogCSAq IE1vcmUgYWRkcmVzc2VzIHdpbGwgYmUgZ2VuZXJhdGVkIGFzIGxvbmcgYXMgcmV0cmllcyBh cmUgbm90IGV4aGF1c3RlZC4KIAkgKi8KIAlpZiAoKE5EX0lGSU5GTyhpZnApLT5mbGFncyAm IE5ENl9JRkZfU1RBQkxFQUREUikgJiYgIShpYS0+aWE2X2ZsYWdzICYgSU42X0lGRl9URU1Q T1JBUlkpKSB7Ci0JCXVpbnQ2NF90IGRhZF9mYWlsdXJlcyA9IGNvdW50ZXJfdTY0X2ZldGNo KE5EX0lGSU5GTyhpZnApLT5kYWRfZmFpbHVyZXMpOworCQl1aW50NjRfdCBkYWRfZmFpbHVy ZXMgPSBjb3VudGVyX3U2NF9mZXRjaChEQURfRkFJTFVSRVMoaWZwKSk7CiAKIAkJaWYgKGRh ZF9mYWlsdXJlcyA8PSBWX2lwNl9zdGFibGVhZGRyX21heHJldHJpZXMpIHsKLQkJCWNvdW50 ZXJfdTY0X2FkZChORF9JRklORk8oaWZwKS0+ZGFkX2ZhaWx1cmVzLCAxKTsKKwkJCWNvdW50 ZXJfdTY0X2FkZChEQURfRkFJTFVSRVMoaWZwKSwgMSk7CiAJCQkvKiBpZiByZXRyaWVzIGV4 aGF1c3RlZCwgb3V0cHV0IGFuIGluZm9ybWF0aXZlIGVycm9yIG1lc3NhZ2UgKi8KIAkJCWlm IChkYWRfZmFpbHVyZXMgPT0gVl9pcDZfc3RhYmxlYWRkcl9tYXhyZXRyaWVzKQogCQkJCWxv ZyhMT0dfRVJSLCAiJXM6IG1hbnVhbCBpbnRlcnZlbnRpb24gcmVxdWlyZWQsIGNvbnNpZGVy IGRpc2FibGluZyBcInN0YWJsZWFkZHJcIiBvbiB0aGUgaW50ZXJmYWNlIgpkaWZmIC0tZ2l0 IGEvc3lzL25ldGluZXQ2L25kNl9ydHIuYyBiL3N5cy9uZXRpbmV0Ni9uZDZfcnRyLmMKaW5k ZXggMDE2MjNhNDUwNmJlLi43OGRjNTVkZDI5MmYgMTAwNjQ0Ci0tLSBhL3N5cy9uZXRpbmV0 Ni9uZDZfcnRyLmMKKysrIGIvc3lzL25ldGluZXQ2L25kNl9ydHIuYwpAQCAtMTc1Nyw3ICsx NzU3LDcgQEAgcHJlbGlzdF91cGRhdGUoc3RydWN0IG5kX3ByZWZpeGN0bCAqbmV3LCBzdHJ1 Y3QgbmRfZGVmcm91dGVyICpkciwKIAkJICogdG8gZmFpbCBhbmQgbm8gZnVydGhlciByZXRy aWVzIHNob3VsZCBoYXBwZW4uCiAJCSAqLwogCQlpZiAoTkRfSUZJTkZPKGlmcCktPmZsYWdz ICYgTkQ2X0lGRl9TVEFCTEVBRERSICYmCi0JCSAgICBjb3VudGVyX3U2NF9mZXRjaChORF9J RklORk8oaWZwKS0+ZGFkX2ZhaWx1cmVzKSA8PSBWX2lwNl9zdGFibGVhZGRyX21heHJldHJp ZXMgJiYKKwkJICAgIGNvdW50ZXJfdTY0X2ZldGNoKERBRF9GQUlMVVJFUyhpZnApKSA8PSBW X2lwNl9zdGFibGVhZGRyX21heHJldHJpZXMgJiYKIAkJICAgIGlmYTYtPmlhNl9mbGFncyAm IChJTjZfSUZGX0RVUExJQ0FURUQgfCBJTjZfSUZGX1RFTVBPUkFSWSkpCiAJCQljb250aW51 ZTsKIAotLSAKMi41MS4wCgo= --------------CiyNtVCmAby94etLq2JHMfHd--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?63c07846-cd1b-4ff2-8c35-c0a6db6954cc>