linux-toradex.git/drivers/s390/net, branch v4.11

s390/qeth: no ETH header for outbound AF_IUCV

2017-03-24T19:40:00+00:00

With AF_IUCV traffic, the skb passed to hard_start_xmit() has a 14 byte
slot at skb->data, intended for an ETH header. qeth_l3_fill_af_iucv_hdr()
fills this ETH header... and then immediately moves it to the
skb's headroom, where it disappears and is never seen again.

But it's still possible for us to return NETDEV_TX_BUSY after the skb has
been modified. Since we didn't get a private copy of the skb, the next
time the skb is delivered to hard_start_xmit() it no longer has the
expected layout (we moved the ETH header to the headroom, so skb->data
now starts at the IUCV_TRANS header). So when qeth_l3_fill_af_iucv_hdr()
does another round of rebuilding, the resulting qeth header ends up
all wrong. On transmission, the buffer is then rejected by
the HiperSockets device with SBALF15 = x'04'.
When this error is passed back to af_iucv as TX_NOTIFY_UNREACHABLE, it
tears down the offending socket.

As the ETH header for AF_IUCV serves no purpose, just align the code to
what we do for IP traffic on L3 HiperSockets: keep the ETH header at
skb->data, and pass down data_offset = ETH_HLEN to qeth_fill_buffer().
When mapping the payload into the SBAL elements, the ETH header is then
stripped off. This avoids the skb manipulations in
qeth_l3_fill_af_iucv_hdr(), and any buffer re-entering hard_start_xmit()
after NETDEV_TX_BUSY is now processed properly.

Signed-off-by: Julian Wiedmann 
Signed-off-by: Ursula Braun 
Signed-off-by: David S. Miller

s390/qeth: size calculation outbound buffers

2017-03-24T19:39:59+00:00

Depending on the device type, hard_start_xmit() builds different output
buffer formats. For instance with HiperSockets, on both L2 and L3 we
strip the ETH header from the skb - L3 doesn't need it, and L2 carries
it in the buffer's header element.
For this, we pass data_offset = ETH_HLEN all the way down to
__qeth_fill_buffer(), where skb->data is then adjusted accordingly.
But the initial size calculation still considers the *full* skb length
(including the ETH header). So qeth_get_elements_no() can erroneously
reject a skb as too big, even though it would actually fit into an
output buffer once the ETH header has been trimmed off later.

Fix this by passing an additional offset to qeth_get_elements_no(),
that indicates where in the skb the on-wire data actually begins.
Since the current code uses data_offset=-1 for some special handling
on OSA, we need to clamp data_offset to 0...

On HiperSockets this helps when sending ~MTU-size skbs with weird page
alignment. No change for OSA or AF_IUCV.

Signed-off-by: Julian Wiedmann 
Signed-off-by: Ursula Braun 
Signed-off-by: David S. Miller

s390/qeth: fix retrieval of vipa and proxy-arp addresses

2017-01-12T15:02:43+00:00

qeth devices in layer3 mode need a separate handling of vipa and proxy-arp
addresses. vipa and proxy-arp addresses processed by qeth can be read from
userspace. Introduced with commit 5f78e29ceebf ("qeth: optimize IP handling
in rx_mode callback") the retrieval of vipa and proxy-arp addresses is
broken, if more than one vipa or proxy-arp address are set.

The qeth code used local variable "int i" for 2 different purposes. This
patch now spends 2 separate local variables of type "int".
While touching these functions hash_for_each_safe() is converted to
hash_for_each(), since there is no removal of hash entries.

Signed-off-by: Ursula Braun 
Reviewed-by: Julian Wiedmann 
Reference-ID: RQM 3524
Signed-off-by: David S. Miller

s390/qeth: issue STARTLAN as first IPA command

2017-01-12T15:02:43+00:00

STARTLAN needs to be the first IPA command after MPC initialization
completes.
So move the qeth_send_startlan() call from the layer disciplines
into the core path, right after the MPC handshake.
While at it, replace the magic LAN OFFLINE return code
with the existing enum.

Signed-off-by: Julian Wiedmann 
Reviewed-by: Thomas Richter 
Reviewed-by: Ursula Braun 
Signed-off-by: David S. Miller

s390/qeth: shuffle MAC management functions around

2017-01-12T15:02:43+00:00

Move all MAC utility functions in one place, and drop the
forward declarations.

Signed-off-by: Julian Wiedmann 
Reviewed-by: Thomas Richter 
Signed-off-by: David S. Miller

s390/qeth: extract qeth_l2_remove_mac()

2017-01-12T15:02:43+00:00

This matches qeth_l2_write_mac().

Signed-off-by: Julian Wiedmann 
Reviewed-by: Thomas Richter 
Signed-off-by: David S. Miller

s390/qeth: consolidate errno translation

2017-01-12T15:02:43+00:00

Consolidate errno handling for MAC management: Instead of doing this in every
caller, do it in one place.

Signed-off-by: Julian Wiedmann 
Reviewed-by: Thomas Richter 
Suggested-by: Ursula Braun 
Signed-off-by: David S. Miller

s390/qeth: don't convert return code twice

2017-01-12T15:02:43+00:00

qeth_l2_send_groupmac() already translates the return code, so
calling qeth_setdel_makerc() a second time only produces garbage.

Signed-off-by: Julian Wiedmann 
Reviewed-by: Thomas Richter 
Reviewed-by: Ursula Braun 
Signed-off-by: David S. Miller

s390/qeth: drop qeth_l2_del_all_macs() parameter

2017-01-12T15:02:43+00:00

The only caller passes del = 0, so remove both the parameter and
the code that handles != 0.

Signed-off-by: Julian Wiedmann 
Reviewed-by: Thomas Richter 
Acked-by: Ursula Braun 
Signed-off-by: David S. Miller

s390/qeth: Remove QETH_IP_HEADER_SIZE

2017-01-12T15:02:43+00:00

Remove unused define QETH_IP_HEADER_SIZE.

Signed-off-by: Julian Wiedmann 
Reviewed-by: Thomas Richter 
Acked-by: Ursula Braun 
Signed-off-by: David S. Miller