Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0e00fd47 authored by David S. Miller's avatar David S. Miller
Browse files

Merge "net: finish renaming lls to busy poll" 



Eliezer Tamir says:

====================
Here are three patches that complete the rename of lls to busy-poll

1. rename include/net/ll_poll.h to include/net/busy_poll.h
2. Rename ndo_ll_poll to ndo_busy_poll.
   Rename sk_mark_ll to sk_mark_napi_id.
   Rename skb_mark_ll to skb_mark_napi_id.
   Correct all useres of these functions.
   Update comments and defines  in include/net/busy_poll.h
3. Rename LL_SO to BUSY_POLL_SO
   Rename sysctl_net_ll_{read,poll} to sysctl_busy_{read,poll}
   Fix up users of these variables.
   Fix documentation for sysctl.

v2 fixed forgetting the ndo changes in v1
v3 is a resend with -M
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents bfffbea1 64b0dc51

Documentation/sysctl/net.txt

+9 −8
Original line number Diff line number Diff line
@@ -50,26 +50,27 @@ The maximum number of packets that kernel can handle on a NAPI interrupt, 
it's a Per-CPU variable.

Default: 64



low_latency_read

busy_read

----------------

Low latency busy poll timeout for socket reads. (needs CONFIG_NET_LL_RX_POLL)

Approximate time in us to busy loop waiting for packets on the device queue.

This sets the default value of the SO_LL socket option.

Can be set or overridden per socket by setting socket option SO_LL, which is

the preferred method of enabling.

If you need to enable the feature globally via sysctl, a value of 50 is recommended.

This sets the default value of the SO_BUSY_POLL socket option.

Can be set or overridden per socket by setting socket option SO_BUSY_POLL,

which is the preferred method of enabling. If you need to enable the feature

globally via sysctl, a value of 50 is recommended.

Will increase power usage.

Default: 0 (off)



low_latency_poll

busy_poll

----------------

Low latency busy poll timeout for poll and select. (needs CONFIG_NET_LL_RX_POLL)

Approximate time in us to busy loop waiting for events.

Recommended value depends on the number of sockets you poll on.

For several sockets 50, for several hundreds 100.

For more than that you probably want to use epoll.

Note that only sockets with SO_LL set will be busy polled, so you want to either

selectively set SO_LL on those sockets or set sysctl.net.low_latency_read globally.

Note that only sockets with SO_BUSY_POLL set will be busy polled,

so you want to either selectively set SO_BUSY_POLL on those sockets or set

sysctl.net.busy_read globally.

Will increase power usage.

Default: 0 (off)

arch/alpha/include/uapi/asm/socket.h

+1 −1
Original line number Diff line number Diff line
@@ -81,6 +81,6 @@ 


#define SO_SELECT_ERR_QUEUE	45



#define SO_LL			46

#define SO_BUSY_POLL			46



#endif /* _UAPI_ASM_SOCKET_H */

arch/avr32/include/uapi/asm/socket.h

+1 −1
Original line number Diff line number Diff line
@@ -74,6 +74,6 @@ 


#define SO_SELECT_ERR_QUEUE	45



#define SO_LL			46

#define SO_BUSY_POLL		46



#endif /* __ASM_AVR32_SOCKET_H */

arch/cris/include/uapi/asm/socket.h

+1 −1
Original line number Diff line number Diff line
@@ -76,7 +76,7 @@ 


#define SO_SELECT_ERR_QUEUE	45



#define SO_LL			46

#define SO_BUSY_POLL		46



#endif /* _ASM_SOCKET_H */

arch/frv/include/uapi/asm/socket.h

+1 −1
Original line number Diff line number Diff line
@@ -74,7 +74,7 @@ 


#define SO_SELECT_ERR_QUEUE	45



#define SO_LL			46

#define SO_BUSY_POLL		46



#endif /* _ASM_SOCKET_H */