Date: Thu, 23 Mar 2017 11:46:53 -0700 From: =?UTF-8?Q?Ermal_Lu=C3=A7i?= <eri@freebsd.org> To: =?UTF-8?B?w5Z6a2FuIEtJUklL?= <ozkan.kirik@gmail.com> Cc: "freebsd-net@freebsd.org" <freebsd-net@freebsd.org> Subject: Re: if_epair altq support problem Message-ID: <CAPBZQG1JoaAeMkrLenPAfm7cyeGRDVKkcDmoWjh%2BJvYjc5Oifw@mail.gmail.com> In-Reply-To: <CAAcX-AG6y827P3wzmAxn1_sWpy48WpXMmQn3AK-fcrap_kB%2BcA@mail.gmail.com> References: <CAAcX-AFJ4mmFQt2k3gdsG4c8g3d-ypzSFpypQLQF_3Jdw0W3ew@mail.gmail.com> <CAPBZQG0oUHamfmvZxk8_LaPG_%2BhTbPTuvX4h7Y9osrsvcH1L3g@mail.gmail.com> <CAAcX-AFcnwAMCBcaFVYBBAGJ=hV-8P8zoP%2BxPj6T9i4eX1UFEA@mail.gmail.com> <CAAcX-AHPVSDhKrPdPCG9b3qvGPG7HOH5d_rs4o6Fjt8_%2B5gw6g@mail.gmail.com> <CAPBZQG32fZ-S5Qr-RhssgxP%2BVv_v4NTGvogLgBTTw=5heKWHwg@mail.gmail.com> <CAAcX-AG6y827P3wzmAxn1_sWpy48WpXMmQn3AK-fcrap_kB%2BcA@mail.gmail.com>
next in thread | previous in thread | raw e-mail | index | archive | help
On Thu, Mar 23, 2017 at 11:06 AM, =C3=96zkan KIRIK <ozkan.kirik@gmail.com> =
wrote:
> Thank you, I'm waiting for 10.3 fix :)
> have a nice day
>
This should work for 10.3++
diff --git a/sys/net/if_epair.c b/sys/net/if_epair.c
index 540f06c..d028a95 100644
--- a/sys/net/if_epair.c
+++ b/sys/net/if_epair.c
@@ -829,7 +829,8 @@ epair_clone_create(struct if_clone *ifc, char *name,
size_t len, caddr_t params)
ifp->if_start =3D epair_start;
ifp->if_ioctl =3D epair_ioctl;
ifp->if_init =3D epair_init;
- ifp->if_snd.ifq_maxlen =3D ifqmaxlen;
+ IFQ_SET_MAXLEN(&ifp->if_snd, ifqmaxlen);
+ IFQ_SET_READY(&ifp->if_snd);
/* Assign a hopefully unique, locally administered etheraddr. */
eaddr[0] =3D 0x02;
eaddr[3] =3D (ifp->if_index >> 8) & 0xff;
@@ -855,7 +856,8 @@ epair_clone_create(struct if_clone *ifc, char *name,
size_t len, caddr_t params)
ifp->if_start =3D epair_start;
ifp->if_ioctl =3D epair_ioctl;
ifp->if_init =3D epair_init;
- ifp->if_snd.ifq_maxlen =3D ifqmaxlen;
+ IFQ_SET_MAXLEN(&ifp->if_snd, ifqmaxlen);
+ IFQ_SET_READY(&ifp->if_snd);
/* We need to play some tricks here for the second interface. */
strlcpy(name, epairname, len);
error =3D if_clone_create(name, len, (caddr_t)scb);
On Wed, Mar 22, 2017 at 11:44 PM, Ermal Lu=C3=A7i <eri@freebsd.org> wrote:
>
>>
>> On Wed, Mar 22, 2017 at 10:50 AM, =C3=96zkan KIRIK <ozkan.kirik@gmail.co=
m>
>> wrote:
>>
>>> Sorry, I mistested on 10.3RELENG.
>>> it works on 11 RELENG, But at 10.3RELENG it throws
>>>
>>> /usr/src/sys/modules/if_epair/../../net/if_epair.c:830:2: error:
>>> implicit declaration of function 'if_setstartfn' is invalid in C99
>>> [-Werror,-Wimplicit-function-declaration]
>>>
>>>
>>> On Wed, Mar 22, 2017 at 8:18 PM, =C3=96zkan KIRIK <ozkan.kirik@gmail.co=
m>
>>> wrote:
>>>
>>>> Thank You Ermal !
>>>>
>>>> It works perfectly, can you commit this patch to 11.0 RELENG and MFC t=
o
>>>> 10.3 RELENG ?
>>>>
>>>>
>> Thanks, for confirming that it fixes your issues.
>> Yeah, on 10.3 its almost the same fix i will deal with it.
>>
>>
>>> Regards
>>>>
>>>> On Wed, Mar 22, 2017 at 6:59 AM, Ermal Lu=C3=A7i <eri@freebsd.org> wro=
te:
>>>>
>>>>>
>>>>>
>>>>> On Tue, Mar 21, 2017 at 5:26 AM, =C3=96zkan KIRIK <ozkan.kirik@gmail.=
com>
>>>>> wrote:
>>>>>
>>>>>> Hello,
>>>>>>
>>>>>> I sent this email also to freebsd-pf list. But I think that the mai=
n
>>>>>> problem is belongs to sys/net/if_epair.c.
>>>>>>
>>>>>> I'm using FreeBSD 10.3-p17 amd64. epair pseudo device is listed as
>>>>>> supperted deviced at the Man page of altq(4).
>>>>>> From man page of altq :
>>>>>>
>>>>>> *SUPPORTED DEVICES <https://www.freebsd.org/cgi/m
>>>>>> an.cgi?query=3Daltq#end>*
>>>>>>
>>>>>> The driver modifications described in altq(9)
>>>>>> <https://www.freebsd.org/cgi/man.cgi?query=3Daltq&sektion=3D9&ap
>>>>>> ropos=3D0&manpath=3DFreeBSD+11.0-RELEASE+and+Ports>
>>>>>> are required to use a cer-
>>>>>> tain network card with *ALTQ*. They have been applied to
>>>>>> the following
>>>>>> hardware drivers: ae(4)
>>>>>> <https://www.freebsd.org/cgi/man.cgi?query=3Dae&sektion=3D4&apro
>>>>>> pos=3D0&manpath=3DFreeBSD+11.0-RELEASE+and+Ports>,
>>>>>> age(4) <https://www.freebsd.org/cgi/man.cgi?query=3Dage&sektion=3D4&=
apr
>>>>>> opos=3D0&manpath=3DFreeBSD+11.0-RELEASE+and+Ports>,
>>>>>> alc(4) <https://www.freebsd.org/cgi/man.cgi?query=3Dalc&sektion=3D4&=
apr
>>>>>> opos=3D0&manpath=3DFreeBSD+11.0-RELEASE+and+Ports>,
>>>>>> ale(4) <https://www.freebsd.org/cgi/man.cgi?query=3Dale&sektion=3D4&=
apr
>>>>>> opos=3D0&manpath=3DFreeBSD+11.0-RELEASE+and+Ports>,
>>>>>> an(4) <https://www.freebsd.org/cgi/man.cgi?query=3Dan&sektion=3D4&ap=
ro
>>>>>> pos=3D0&manpath=3DFreeBSD+11.0-RELEASE+and+Ports>,
>>>>>> ath(4) <https://www.freebsd.org/cgi/man.cgi?query=3Dath&sektion=3D4&=
apr
>>>>>> opos=3D0&manpath=3DFreeBSD+11.0-RELEASE+and+Ports>,
>>>>>> aue(4) <https://www.freebsd.org/cgi/man.cgi?query=3Daue&sektion=3D4&=
apr
>>>>>> opos=3D0&manpath=3DFreeBSD+11.0-RELEASE+and+Ports>,
>>>>>> axe(4) <https://www.freebsd.org/cgi/m
>>>>>> an.cgi?query=3Daxe&sektion=3D4&apropos=3D0&manpath=3DFreeBSD+11.0-RE
>>>>>> LEASE+and+Ports>,
>>>>>> bce(4) <https://www.freebsd.org/cgi/man.cgi?query=3Dbce&sektion=3D4&=
apr
>>>>>> opos=3D0&manpath=3DFreeBSD+11.0-RELEASE+and+Ports>,
>>>>>> bfe(4) <https://www.freebsd.org/cgi/man.cgi?query=3Dbfe&sektion=3D4&=
apr
>>>>>> opos=3D0&manpath=3DFreeBSD+11.0-RELEASE+and+Ports>,
>>>>>> bge(4) <https://www.freebsd.org/cgi/man.cgi?query=3Dbge&sektion=3D4&=
apr
>>>>>> opos=3D0&manpath=3DFreeBSD+11.0-RELEASE+and+Ports>,
>>>>>> bxe(4) <https://www.freebsd.org/cgi/man.cgi?query=3Dbxe&sektion=3D4&=
apr
>>>>>> opos=3D0&manpath=3DFreeBSD+11.0-RELEASE+and+Ports>,
>>>>>> cas(4) <https://www.freebsd.org/cgi/man.cgi?query=3Dcas&sektion=3D4&=
apr
>>>>>> opos=3D0&manpath=3DFreeBSD+11.0-RELEASE+and+Ports>,
>>>>>> cxgbe(4) <https://www.freebsd.org/cgi/man.cgi?query=3Dcxgbe&sektion=
=3D4&a
>>>>>> propos=3D0&manpath=3DFreeBSD+11.0-RELEASE+and+Ports>,
>>>>>> dc(4) <https://www.freebsd.org/cgi/man.cgi?query=3Ddc&sektion=3D4&ap=
ro
>>>>>> pos=3D0&manpath=3DFreeBSD+11.0-RELEASE+and+Ports>,
>>>>>> de(4) <https://www.freebsd.org/cgi/man.cgi?query=3Dde&sektion=3D4&ap=
ro
>>>>>> pos=3D0&manpath=3DFreeBSD+11.0-RELEASE+and+Ports>,
>>>>>> ed(4) <https://www.freebsd.org/cgi/m
>>>>>> an.cgi?query=3Ded&sektion=3D4&apropos=3D0&manpath=3DFreeBSD+11.0-REL
>>>>>> EASE+and+Ports>,
>>>>>> em(4) <https://www.freebsd.org/cgi/man.cgi?query=3Dem&sektion=3D4&ap=
ro
>>>>>> pos=3D0&manpath=3DFreeBSD+11.0-RELEASE+and+Ports>,
>>>>>> ep(4) <https://www.freebsd.org/cgi/man.cgi?query=3Dep&sektion=3D4&ap=
ro
>>>>>> pos=3D0&manpath=3DFreeBSD+11.0-RELEASE+and+Ports>,
>>>>>> epair(4) <https://www.freebsd.org/cgi/man.cgi?query=3Depair&sektion=
=3D4&a
>>>>>> propos=3D0&manpath=3DFreeBSD+11.0-RELEASE+and+Ports>,
>>>>>>
>>>>>> ....
>>>>>>
>>>>>> But while trying to use it the system says that it's not suppoerted.=
I
>>>>>> tried on FreeBSD 11 also. The output is below:
>>>>>>
>>>>>> pf.conf :
>>>>>> altq on epair0b hfsc bandwidth 1Mb queue { ftp, ssh, icmp, other }
>>>>>> queue ftp bandwidth 30% priority 0 hfsc (upperlimit 99%)
>>>>>> queue ssh bandwidth 30% priority 2 hfsc (upperlimit 99%)
>>>>>> queue icmp bandwidth 10% priority 2 hfsc (upperlimit 99%)
>>>>>> queue other bandwidth 30% priority 1 hfsc (default upperlimit 99%)
>>>>>>
>>>>>>
>>>>>> # ifconfig epair0 create
>>>>>> # ifconfig epair0a up
>>>>>> # ifconfig epair0b up
>>>>>> # pfctl -f pf.conf
>>>>>> pfctl: epair0b: driver does not support altq
>>>>>>
>>>>>> # sysctl -a | grep ALTQ
>>>>>> options ALTQ_NOPCC
>>>>>> options ALTQ_PRIQ
>>>>>> options ALTQ_CDNR
>>>>>> options ALTQ_HFSC
>>>>>> options ALTQ_RIO
>>>>>> options ALTQ_RED
>>>>>> options ALTQ_CBQ
>>>>>> options ALTQ
>>>>>>
>>>>>>
>>>>>> I have a look on /usr/src/sys/net/if_epair.c, and found the ALTQ
>>>>>> section:
>>>>>>
>>>>>> 514 #ifdef ALTQ
>>>>>> 515 /* Support ALTQ via the clasic if_start() path. */
>>>>>> 516 IF_LOCK(&ifp->if_snd);
>>>>>> 517 if (ALTQ_IS_ENABLED(&ifp->if_snd)) {
>>>>>> 518 ALTQ_ENQUEUE(&ifp->if_snd, m, NULL, error);
>>>>>> 519 if (error)
>>>>>> 520 ifp->if_snd.ifq_drops++;
>>>>>> 521 IF_UNLOCK(&ifp->if_snd);
>>>>>> 522 if (!error) {
>>>>>> 523 ifp->if_obytes +=3D len;
>>>>>> 524 if (mflags & (M_BCAST|M_MCAST))
>>>>>> 525 ifp->if_omcasts++;
>>>>>> 526
>>>>>> 527 if ((ifp->if_drv_flags &
>>>>>> IFF_DRV_OACTIVE) =3D=3D 0)
>>>>>> 528 epair_start_locked(ifp);
>>>>>> 529 else
>>>>>> 530 (void)epair_add_ifp_for_drain
>>>>>> ing(ifp);
>>>>>> 531 }
>>>>>> 532 return (error);
>>>>>> 533 }
>>>>>> 534 IF_UNLOCK(&ifp->if_snd);
>>>>>> 535 #endif
>>>>>>
>>>>>>
>>>>>
>>>>> Just apply manually this patch to make it work.
>>>>>
>>>>> diff --git a/sys/net/if_epair.c b/sys/net/if_epair.c
>>>>> index 540f06c..04733a5 100644
>>>>> --- a/sys/net/if_epair.c
>>>>> +++ b/sys/net/if_epair.c
>>>>> @@ -827,9 +827,11 @@ epair_clone_create(struct if_clone *ifc, char
>>>>> *name, size_t len, caddr_t params)
>>>>> ifp->if_capabilities =3D IFCAP_VLAN_MTU;
>>>>> ifp->if_capenable =3D IFCAP_VLAN_MTU;
>>>>> ifp->if_start =3D epair_start;
>>>>> + if_setstartfn(ifp, epair_start);
>>>>> + if_setsendqlen(ifp, ifqmaxlen);
>>>>> + if_setsendqready(ifp);
>>>>> ifp->if_ioctl =3D epair_ioctl;
>>>>> ifp->if_init =3D epair_init;
>>>>> - ifp->if_snd.ifq_maxlen =3D ifqmaxlen;
>>>>> /* Assign a hopefully unique, locally administered etheraddr.
>>>>> */
>>>>> eaddr[0] =3D 0x02;
>>>>> eaddr[3] =3D (ifp->if_index >> 8) & 0xff;
>>>>> @@ -852,10 +854,11 @@ epair_clone_create(struct if_clone *ifc, char
>>>>> *name, size_t len, caddr_t params)
>>>>> ifp->if_flags =3D IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST=
;
>>>>> ifp->if_capabilities =3D IFCAP_VLAN_MTU;
>>>>> ifp->if_capenable =3D IFCAP_VLAN_MTU;
>>>>> - ifp->if_start =3D epair_start;
>>>>> + if_setstartfn(ifp, epair_start);
>>>>> + if_setsendqlen(ifp, ifqmaxlen);
>>>>> + if_setsendqready(ifp);
>>>>> ifp->if_ioctl =3D epair_ioctl;
>>>>> ifp->if_init =3D epair_init;
>>>>> - ifp->if_snd.ifq_maxlen =3D ifqmaxlen;
>>>>> /* We need to play some tricks here for the second interface.
>>>>> */
>>>>> strlcpy(name, epairname, len);
>>>>> error =3D if_clone_create(name, len, (caddr_t)scb);
>>>>>
>>>>>
>>>>>
>>>>>
>>>>>
>>>>>> I have no idea that why it says that it doesn't support altq altough
>>>>>> the
>>>>>> source code contains ALTQ section.
>>>>>>
>>>>>>
>>>>>> Regards
>>>>>> =C3=96zkan KIRIK
>>>>>> _______________________________________________
>>>>>> freebsd-net@freebsd.org mailing list
>>>>>> https://lists.freebsd.org/mailman/listinfo/freebsd-net
>>>>>> To unsubscribe, send any mail to "freebsd-net-unsubscribe@freebsd.or=
g
>>>>>> "
>>>>>
>>>>>
>>>>>
>>>>>
>>>>> --
>>>>> Ermal
>>>>>
>>>>
>>>>
>>>
>>
>>
>> --
>> Ermal
>>
>
>
--=20
Ermal
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CAPBZQG1JoaAeMkrLenPAfm7cyeGRDVKkcDmoWjh%2BJvYjc5Oifw>