if_epair altq support problem
Ermal Luçi
eri at freebsd.org
Sat Mar 25 01:16:21 UTC 2017
On Fri, Mar 24, 2017 at 5:48 PM, Özkan KIRIK <ozkan.kirik at gmail.com> wrote:
> Hi again,
> This patch works perfectly also.
> Thank you so much.
> Is it possible to commit this patch to repo?
>
https://svnweb.freebsd.org/changeset/base/315877
>
> On Thu, Mar 23, 2017 at 10:57 PM, Ermal Luçi <eri at freebsd.org> wrote:
>
>>
>>
>> On Thu, Mar 23, 2017 at 12:16 PM, Özkan KIRIK <ozkan.kirik at gmail.com>
>> wrote:
>>
>>> Ermal thank you again,
>>> It compiles but pf still says that "pfctl: epair0b: driver does not
>>> support altq"
>>> :/
>>>
>>
>> The only way to get that error is by not applying the patch properly :)
>>
>>
>>>
>>> On Thu, Mar 23, 2017 at 9:46 PM, Ermal Luçi <eri at freebsd.org> wrote:
>>>
>>>>
>>>> On Thu, Mar 23, 2017 at 11:06 AM, Özkan KIRIK <ozkan.kirik at 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 = epair_start;
>>>> ifp->if_ioctl = epair_ioctl;
>>>> ifp->if_init = epair_init;
>>>> - ifp->if_snd.ifq_maxlen = ifqmaxlen;
>>>> + IFQ_SET_MAXLEN(&ifp->if_snd, ifqmaxlen);
>>>> + IFQ_SET_READY(&ifp->if_snd);
>>>> /* Assign a hopefully unique, locally administered etheraddr. */
>>>> eaddr[0] = 0x02;
>>>> eaddr[3] = (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 = epair_start;
>>>> ifp->if_ioctl = epair_ioctl;
>>>> ifp->if_init = epair_init;
>>>> - ifp->if_snd.ifq_maxlen = 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 = if_clone_create(name, len, (caddr_t)scb);
>>>>
>>>>
>>>>
>>>> On Wed, Mar 22, 2017 at 11:44 PM, Ermal Luçi <eri at freebsd.org> wrote:
>>>>>
>>>>>>
>>>>>> On Wed, Mar 22, 2017 at 10:50 AM, Özkan KIRIK <ozkan.kirik at gmail.com>
>>>>>> 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, Özkan KIRIK <ozkan.kirik at gmail.com>
>>>>>>> wrote:
>>>>>>>
>>>>>>>> Thank You Ermal !
>>>>>>>>
>>>>>>>> It works perfectly, can you commit this patch to 11.0 RELENG and
>>>>>>>> MFC to 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çi <eri at freebsd.org>
>>>>>>>> wrote:
>>>>>>>>
>>>>>>>>>
>>>>>>>>>
>>>>>>>>> On Tue, Mar 21, 2017 at 5:26 AM, Özkan KIRIK <
>>>>>>>>> ozkan.kirik at gmail.com> wrote:
>>>>>>>>>
>>>>>>>>>> Hello,
>>>>>>>>>>
>>>>>>>>>> I sent this email also to freebsd-pf list. But I think that the
>>>>>>>>>> main
>>>>>>>>>> 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=altq#end>*
>>>>>>>>>>
>>>>>>>>>> The driver modifications described in altq(9)
>>>>>>>>>> <https://www.freebsd.org/cgi/man.cgi?query=altq&sektion=9&ap
>>>>>>>>>> ropos=0&manpath=FreeBSD+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=ae&sektion=4&apro
>>>>>>>>>> pos=0&manpath=FreeBSD+11.0-RELEASE+and+Ports>,
>>>>>>>>>> age(4) <https://www.freebsd.org/cgi/m
>>>>>>>>>> an.cgi?query=age&sektion=4&apropos=0&manpath=FreeBSD+11.0-RE
>>>>>>>>>> LEASE+and+Ports>,
>>>>>>>>>> alc(4) <https://www.freebsd.org/cgi/m
>>>>>>>>>> an.cgi?query=alc&sektion=4&apropos=0&manpath=FreeBSD+11.0-RE
>>>>>>>>>> LEASE+and+Ports>,
>>>>>>>>>> ale(4) <https://www.freebsd.org/cgi/m
>>>>>>>>>> an.cgi?query=ale&sektion=4&apropos=0&manpath=FreeBSD+11.0-RE
>>>>>>>>>> LEASE+and+Ports>,
>>>>>>>>>> an(4) <https://www.freebsd.org/cgi/m
>>>>>>>>>> an.cgi?query=an&sektion=4&apropos=0&manpath=FreeBSD+11.0-REL
>>>>>>>>>> EASE+and+Ports>,
>>>>>>>>>> ath(4) <https://www.freebsd.org/cgi/m
>>>>>>>>>> an.cgi?query=ath&sektion=4&apropos=0&manpath=FreeBSD+11.0-RE
>>>>>>>>>> LEASE+and+Ports>,
>>>>>>>>>> aue(4) <https://www.freebsd.org/cgi/m
>>>>>>>>>> an.cgi?query=aue&sektion=4&apropos=0&manpath=FreeBSD+11.0-RE
>>>>>>>>>> LEASE+and+Ports>,
>>>>>>>>>> axe(4) <https://www.freebsd.org/cgi/m
>>>>>>>>>> an.cgi?query=axe&sektion=4&apropos=0&manpath=FreeBSD+11.0-RE
>>>>>>>>>> LEASE+and+Ports>,
>>>>>>>>>> bce(4) <https://www.freebsd.org/cgi/m
>>>>>>>>>> an.cgi?query=bce&sektion=4&apropos=0&manpath=FreeBSD+11.0-RE
>>>>>>>>>> LEASE+and+Ports>,
>>>>>>>>>> bfe(4) <https://www.freebsd.org/cgi/m
>>>>>>>>>> an.cgi?query=bfe&sektion=4&apropos=0&manpath=FreeBSD+11.0-RE
>>>>>>>>>> LEASE+and+Ports>,
>>>>>>>>>> bge(4) <https://www.freebsd.org/cgi/m
>>>>>>>>>> an.cgi?query=bge&sektion=4&apropos=0&manpath=FreeBSD+11.0-RE
>>>>>>>>>> LEASE+and+Ports>,
>>>>>>>>>> bxe(4) <https://www.freebsd.org/cgi/m
>>>>>>>>>> an.cgi?query=bxe&sektion=4&apropos=0&manpath=FreeBSD+11.0-RE
>>>>>>>>>> LEASE+and+Ports>,
>>>>>>>>>> cas(4) <https://www.freebsd.org/cgi/m
>>>>>>>>>> an.cgi?query=cas&sektion=4&apropos=0&manpath=FreeBSD+11.0-RE
>>>>>>>>>> LEASE+and+Ports>,
>>>>>>>>>> cxgbe(4) <https://www.freebsd.org/cgi/m
>>>>>>>>>> an.cgi?query=cxgbe&sektion=4&apropos=0&manpath=FreeBSD+11.0-
>>>>>>>>>> RELEASE+and+Ports>,
>>>>>>>>>> dc(4) <https://www.freebsd.org/cgi/m
>>>>>>>>>> an.cgi?query=dc&sektion=4&apropos=0&manpath=FreeBSD+11.0-REL
>>>>>>>>>> EASE+and+Ports>,
>>>>>>>>>> de(4) <https://www.freebsd.org/cgi/m
>>>>>>>>>> an.cgi?query=de&sektion=4&apropos=0&manpath=FreeBSD+11.0-REL
>>>>>>>>>> EASE+and+Ports>,
>>>>>>>>>> ed(4) <https://www.freebsd.org/cgi/m
>>>>>>>>>> an.cgi?query=ed&sektion=4&apropos=0&manpath=FreeBSD+11.0-REL
>>>>>>>>>> EASE+and+Ports>,
>>>>>>>>>> em(4) <https://www.freebsd.org/cgi/m
>>>>>>>>>> an.cgi?query=em&sektion=4&apropos=0&manpath=FreeBSD+11.0-REL
>>>>>>>>>> EASE+and+Ports>,
>>>>>>>>>> ep(4) <https://www.freebsd.org/cgi/m
>>>>>>>>>> an.cgi?query=ep&sektion=4&apropos=0&manpath=FreeBSD+11.0-REL
>>>>>>>>>> EASE+and+Ports>,
>>>>>>>>>> epair(4) <https://www.freebsd.org/cgi/m
>>>>>>>>>> an.cgi?query=epair&sektion=4&apropos=0&manpath=FreeBSD+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 += len;
>>>>>>>>>> 524 if (mflags & (M_BCAST|M_MCAST))
>>>>>>>>>> 525 ifp->if_omcasts++;
>>>>>>>>>> 526
>>>>>>>>>> 527 if ((ifp->if_drv_flags &
>>>>>>>>>> IFF_DRV_OACTIVE) == 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 = IFCAP_VLAN_MTU;
>>>>>>>>> ifp->if_capenable = IFCAP_VLAN_MTU;
>>>>>>>>> ifp->if_start = epair_start;
>>>>>>>>> + if_setstartfn(ifp, epair_start);
>>>>>>>>> + if_setsendqlen(ifp, ifqmaxlen);
>>>>>>>>> + if_setsendqready(ifp);
>>>>>>>>> ifp->if_ioctl = epair_ioctl;
>>>>>>>>> ifp->if_init = epair_init;
>>>>>>>>> - ifp->if_snd.ifq_maxlen = ifqmaxlen;
>>>>>>>>> /* Assign a hopefully unique, locally administered
>>>>>>>>> etheraddr. */
>>>>>>>>> eaddr[0] = 0x02;
>>>>>>>>> eaddr[3] = (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 = IFF_BROADCAST | IFF_SIMPLEX |
>>>>>>>>> IFF_MULTICAST;
>>>>>>>>> ifp->if_capabilities = IFCAP_VLAN_MTU;
>>>>>>>>> ifp->if_capenable = IFCAP_VLAN_MTU;
>>>>>>>>> - ifp->if_start = epair_start;
>>>>>>>>> + if_setstartfn(ifp, epair_start);
>>>>>>>>> + if_setsendqlen(ifp, ifqmaxlen);
>>>>>>>>> + if_setsendqready(ifp);
>>>>>>>>> ifp->if_ioctl = epair_ioctl;
>>>>>>>>> ifp->if_init = epair_init;
>>>>>>>>> - ifp->if_snd.ifq_maxlen = ifqmaxlen;
>>>>>>>>> /* We need to play some tricks here for the second
>>>>>>>>> interface. */
>>>>>>>>> strlcpy(name, epairname, len);
>>>>>>>>> error = 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
>>>>>>>>>> Özkan KIRIK
>>>>>>>>>> _______________________________________________
>>>>>>>>>> freebsd-net at freebsd.org mailing list
>>>>>>>>>> https://lists.freebsd.org/mailman/listinfo/freebsd-net
>>>>>>>>>> To unsubscribe, send any mail to "freebsd-net-unsubscribe at freeb
>>>>>>>>>> sd.org"
>>>>>>>>>
>>>>>>>>>
>>>>>>>>>
>>>>>>>>>
>>>>>>>>> --
>>>>>>>>> Ermal
>>>>>>>>>
>>>>>>>>
>>>>>>>>
>>>>>>>
>>>>>>
>>>>>>
>>>>>> --
>>>>>> Ermal
>>>>>>
>>>>>
>>>>>
>>>>
>>>>
>>>> --
>>>> Ermal
>>>>
>>>
>>>
>>
>>
>> --
>> Ermal
>>
>
>
--
Ermal
More information about the freebsd-net
mailing list