* Re: [PATCH v3 0/5] net: macb: cover letter
From: Andrew Lunn @ 2019-06-22 14:54 UTC (permalink / raw)
To: Parshuram Raju Thombare
Cc: nicolas.ferre@microchip.com, davem@davemloft.net,
f.fainelli@gmail.com, linux@armlinux.org.uk,
netdev@vger.kernel.org, hkallweit1@gmail.com,
linux-kernel@vger.kernel.org, Rafal Ciepiela, Anil Joy Varughese,
Piotr Sroka
In-Reply-To: <CO2PR07MB2469E07AEBF64DFC8A3E3FAFC1E60@CO2PR07MB2469.namprd07.prod.outlook.com>
On Sat, Jun 22, 2019 at 03:18:42AM +0000, Parshuram Raju Thombare wrote:
> Hi Andrew,
>
> >On Fri, Jun 21, 2019 at 09:33:57AM +0100, Parshuram Thombare wrote:
> >> Hello !
> >>
> >> 2. 0002-net-macb-add-support-for-sgmii-MAC-PHY-interface.patch
> >> This patch add support for SGMII mode.
> >
> >Hi Parshuram
> >
> >What PHYs are using to test this? You mention TI PHY DP83867, but that seems to
> >be a plain old 10/100/1000 RGMII PHY.
> It is DP83867ISRGZ on VCU118 board.
Thanks.
As Russell says, this is still a 10/100/1000 PHY. What are you using
for the higher speeds?
Thanks
Andrew
^ permalink raw reply
* Re: [PATCH net-next 1/7] net: aquantia: replace internal driver version code with uts
From: Andrew Lunn @ 2019-06-22 15:05 UTC (permalink / raw)
To: Igor Russkikh, jakub.kicinski; +Cc: David S . Miller, netdev@vger.kernel.org
In-Reply-To: <f5f346ff5f727f1ccf0f889e358261a792397210.1561210852.git.igor.russkikh@aquantia.com>
On Sat, Jun 22, 2019 at 01:45:12PM +0000, Igor Russkikh wrote:
> As it was discussed some time previously, driver is better to
> report kernel version string, as it in a best way identifies
> the codebase.
>
> Signed-off-by: Igor Russkikh <igor.russkikh@aquantia.com>
Nice.
Devlink has just gained something similar to ethtool -i. Maybe we
should get the devlink core to also report the kernel version?
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Andrew
^ permalink raw reply
* Re: [PATCH net-next 2/7] net: aquantia: add documentation for the atlantic driver
From: Andrew Lunn @ 2019-06-22 15:16 UTC (permalink / raw)
To: Igor Russkikh; +Cc: David S . Miller, netdev@vger.kernel.org
In-Reply-To: <1e1b3a34f4ff27aad030e690058404b2140da914.1561210852.git.igor.russkikh@aquantia.com>
> + Jumbo Frames
> + ------------
> + The driver supports Jumbo Frames for all adapters. Jumbo Frames support is
> + enabled by changing the MTU to a value larger than the default of 1500.
> + The maximum value for the MTU is 16000. Use the ifconfig command to
> + increase the MTU size. For example:
> +
> + ifconfig <ethX> mtu 16000 up
ifconfig has been deprecated for many years. Please document the
iproute2 command.
> + Viewing adapter information
> + ---------------------
> + ethtool -i <ethX>
> +
> + Output example:
> + driver: atlantic
> + version: 1.6.9.0
> + firmware-version: 1.5.49
> + expansion-rom-version:
> + bus-info: 0000:01:00.0
> + supports-statistics: yes
> + supports-test: no
> + supports-eeprom-access: no
> + supports-register-dump: yes
> + supports-priv-flags: no
Shouldn't there be 5.2-rc5 in here somewhere, given the first patch in
this series?
> +
> + Disable GRO when routing/bridging
> + ---------------------------------
> + Due to a known kernel issue, GRO must be turned off when routing/bridging.
> + It can be done with command:
Is this a kernel issue, or a driver issue?
> + Interrupt coalescing support
> + ---------------------------------
> + ITR mode, TX/RX coalescing timings could be viewed with:
> +
> + ethtool -c <ethX>
> +
> + and changed with:
> +
> + ethtool -C <ethX> tx-usecs <usecs> rx-usecs <usecs>
> +
> + To disable coalescing:
> +
> + ethtool -C <ethX> tx-usecs 0 rx-usecs 0 tx-max-frames 1 tx-max-frames 1
Please put these before the module parameters. We should discourage
the use of module parameters. Using ethtool is the correct way to do
this.
> +License
> +=======
> +
> +aQuantia Corporation Network Driver
> +Copyright(c) 2014 - 2019 aQuantia Corporation.
> +
> +This program is free software; you can redistribute it and/or modify it
> +under the terms and conditions of the GNU General Public License,
> +version 2, as published by the Free Software Foundation.
grep SPDX drivers/net/ethernet/aquantia/atlantic/*.c
drivers/net/ethernet/aquantia/atlantic/aq_drvinfo.c:// SPDX-License-Identifier: GPL-2.0-or-later
drivers/net/ethernet/aquantia/atlantic/aq_ethtool.c:// SPDX-License-Identifier: GPL-2.0-only
drivers/net/ethernet/aquantia/atlantic/aq_filters.c:// SPDX-License-Identifier: GPL-2.0-or-later
drivers/net/ethernet/aquantia/atlantic/aq_hw_utils.c:// SPDX-License-Identifier: GPL-2.0-only
drivers/net/ethernet/aquantia/atlantic/aq_main.c:// SPDX-License-Identifier: GPL-2.0-only
drivers/net/ethernet/aquantia/atlantic/aq_nic.c:// SPDX-License-Identifier: GPL-2.0-only
drivers/net/ethernet/aquantia/atlantic/aq_pci_func.c:// SPDX-License-Identifier: GPL-2.0-only
drivers/net/ethernet/aquantia/atlantic/aq_ring.c:// SPDX-License-Identifier: GPL-2.0-only
drivers/net/ethernet/aquantia/atlantic/aq_vec.c:// SPDX-License-Identifier: GPL-2.0-only
You have a mix of 2 and 2+.
Andrew
^ permalink raw reply
* Re: [PATCH net-next 3/7] maintainers: declare aquantia atlantic driver maintenance
From: Andrew Lunn @ 2019-06-22 15:18 UTC (permalink / raw)
To: Igor Russkikh; +Cc: David S . Miller, netdev@vger.kernel.org
In-Reply-To: <83a97b48060f078beac0953cc6e8ced7112d03c1.1561210852.git.igor.russkikh@aquantia.com>
On Sat, Jun 22, 2019 at 01:45:17PM +0000, Igor Russkikh wrote:
> Aquantia is resposible now for all new features and bugfixes.
> Reflect that in MAINTAINERS.
>
> Signed-off-by: Igor Russkikh <igor.russkikh@aquantia.com>
> ---
> MAINTAINERS | 8 ++++++++
> 1 file changed, 8 insertions(+)
>
> diff --git a/MAINTAINERS b/MAINTAINERS
> index 0c55b0fedbe2..0f525f1a12dd 100644
> --- a/MAINTAINERS
> +++ b/MAINTAINERS
> @@ -1139,6 +1139,14 @@ L: linux-media@vger.kernel.org
> S: Maintained
> F: drivers/media/i2c/aptina-pll.*
>
> +AQUANTIA ETHERNET DRIVER (atlantic)
> +M: Igor Russkikh <igor.russkikh@aquantia.com>
> +L: netdev@vger.kernel.org
> +S: Supported
> +W: http://www.aquantia.com
> +Q: http://patchwork.ozlabs.org/project/netdev/list/
> +F: drivers/net/ethernet/aquantia/atlantic/
Please add a F: for the documentation you just added.
Andrew
^ permalink raw reply
* Re: [PATCH next 0/3] blackhole device to invalidate dst
From: David Ahern @ 2019-06-22 15:35 UTC (permalink / raw)
To: Mahesh Bandewar, Netdev
Cc: Eric Dumazet, David Miller, Michael Chan, Daniel Axtens,
Mahesh Bandewar
In-Reply-To: <20190622004519.89335-1-maheshb@google.com>
On 6/21/19 6:45 PM, Mahesh Bandewar wrote:
> When we invalidate dst or mark it "dead", we assign 'lo' to
> dst->dev. First of all this assignment is racy and more over,
> it has MTU implications.
>
> The standard dev MTU is 1500 while the Loopback MTU is 64k. TCP
> code when dereferencing the dst don't check if the dst is valid
> or not. TCP when dereferencing a dead-dst while negotiating a
> new connection, may use dst device which is 'lo' instead of
> using the correct device. Consider the following scenario:
>
Why doesn't the TCP code (or any code) check if a cached dst is valid?
That's the whole point of marking it dead - to tell users not to rely on
it.
^ permalink raw reply
* [PATCH net-next 1/1] Allow 0.0.0.0/8 as a valid address range
From: Dave Taht @ 2019-06-22 17:07 UTC (permalink / raw)
To: netdev; +Cc: Dave Taht, John Gilmore
In-Reply-To: <1561223254-13589-1-git-send-email-dave.taht@gmail.com>
The longstanding prohibition against using 0.0.0.0/8 dates back
to two issues with the early internet.
There was an interoperability problem with BSD 4.2 in 1984, fixed in
BSD 4.3 in 1986. BSD 4.2 has long since been retired.
Secondly, addresses of the form 0.x.y.z were initially defined only as
a source address in an ICMP datagram, indicating "node number x.y.z on
this IPv4 network", by nodes that know their address on their local
network, but do not yet know their network prefix, in RFC0792 (page
19). This usage of 0.x.y.z was later repealed in RFC1122 (section
3.2.2.7), because the original ICMP-based mechanism for learning the
network prefix was unworkable on many networks such as Ethernet (which
have longer addresses that would not fit into the 24 "node number"
bits). Modern networks use reverse ARP (RFC0903) or BOOTP (RFC0951)
or DHCP (RFC2131) to find their full 32-bit address and CIDR netmask
(and other parameters such as default gateways). 0.x.y.z has had
16,777,215 addresses in 0.0.0.0/8 space left unused and reserved for
future use, since 1989.
This patch allows for these 16m new IPv4 addresses to appear within
a box or on the wire. Layer 2 switches don't care.
0.0.0.0/32 is still prohibited, of course.
Signed-off-by: Dave Taht <dave.taht@gmail.com>
Signed-off-by: John Gilmore <gnu@toad.com>
Acked-by: Toke Høiland-Jørgensen <toke@redhat.com>
---
include/linux/in.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/include/linux/in.h b/include/linux/in.h
index 4d2fedfb753a..1873ef642605 100644
--- a/include/linux/in.h
+++ b/include/linux/in.h
@@ -63,7 +63,7 @@ static inline bool ipv4_is_all_snoopers(__be32 addr)
static inline bool ipv4_is_zeronet(__be32 addr)
{
- return (addr & htonl(0xff000000)) == htonl(0x00000000);
+ return (addr == 0);
}
/* Special-Use IPv4 Addresses (RFC3330) */
--
2.17.1
^ permalink raw reply related
* [net-next 0/1] Allow 0.0.0.0/8 as a valid address range
From: Dave Taht @ 2019-06-22 17:07 UTC (permalink / raw)
To: netdev; +Cc: Dave Taht
My talk's slides and video at netdev 0x13 about
"Potential IPv4 Unicast expansions" is up, here:
https://netdevconf.org/0x13/session.html?talk-ipv4-unicast-expansions
There are roughly 419 million IPv4 addresses that are unallocated and
unused in the 0, localhost, reserved future multicast, and 240/4
spaces.
Linux already supports 240/4 fully. SDN's such as AWS already support
the entire IPv4 address space as a unicast playground.
This first patch for 0/8 was intended primarily as a conversation
starter - arguably we should rename the function across 22 fairly
"hot" files - but:
Should Linux treat these ranges as policy, and no longer enforce via
mechanism?
A full patchset for adding 225-232, and 127 address spaces is on github:
https://github.com/dtaht/unicast-extensions
with the very few needed patches for routing daemons and BSD also
available there.
Dave Taht (1):
Allow 0.0.0.0/8 as a valid address range
include/linux/in.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
2.17.1
^ permalink raw reply
* [PATCH v2 net] af_packet: Block execution of tasks waiting for transmit to complete in AF_PACKET
From: Neil Horman @ 2019-06-22 17:41 UTC (permalink / raw)
To: netdev; +Cc: Neil Horman, Matteo Croce, David S. Miller, Willem de Bruijn
In-Reply-To: <20190619202533.4856-1-nhorman@tuxdriver.com>
When an application is run that:
a) Sets its scheduler to be SCHED_FIFO
and
b) Opens a memory mapped AF_PACKET socket, and sends frames with the
MSG_DONTWAIT flag cleared, its possible for the application to hang
forever in the kernel. This occurs because when waiting, the code in
tpacket_snd calls schedule, which under normal circumstances allows
other tasks to run, including ksoftirqd, which in some cases is
responsible for freeing the transmitted skb (which in AF_PACKET calls a
destructor that flips the status bit of the transmitted frame back to
available, allowing the transmitting task to complete).
However, when the calling application is SCHED_FIFO, its priority is
such that the schedule call immediately places the task back on the cpu,
preventing ksoftirqd from freeing the skb, which in turn prevents the
transmitting task from detecting that the transmission is complete.
We can fix this by converting the schedule call to a completion
mechanism. By using a completion queue, we force the calling task, when
it detects there are no more frames to send, to schedule itself off the
cpu until such time as the last transmitted skb is freed, allowing
forward progress to be made.
Tested by myself and the reporter, with good results
Appies to the net tree
Signed-off-by: Neil Horman <nhorman@tuxdriver.com>
Reported-by: Matteo Croce <mcroce@redhat.com>
CC: "David S. Miller" <davem@davemloft.net>
CC: Willem de Bruijn <willemdebruijn.kernel@gmail.com>
Change Notes:
V1->V2:
Enhance the sleep logic to support being interruptible and
allowing for honoring to SK_SNDTIMEO (Willem de Bruijn)
---
net/packet/af_packet.c | 60 ++++++++++++++++++++++++++++++++----------
net/packet/internal.h | 2 ++
2 files changed, 48 insertions(+), 14 deletions(-)
diff --git a/net/packet/af_packet.c b/net/packet/af_packet.c
index a29d66da7394..8ddb2f7aebb4 100644
--- a/net/packet/af_packet.c
+++ b/net/packet/af_packet.c
@@ -358,7 +358,8 @@ static inline struct page * __pure pgv_to_page(void *addr)
return virt_to_page(addr);
}
-static void __packet_set_status(struct packet_sock *po, void *frame, int status)
+static void __packet_set_status(struct packet_sock *po, void *frame, int status,
+ bool call_complete)
{
union tpacket_uhdr h;
@@ -381,6 +382,8 @@ static void __packet_set_status(struct packet_sock *po, void *frame, int status)
BUG();
}
+ if (po->wait_on_complete && call_complete)
+ complete(&po->skb_completion);
smp_wmb();
}
@@ -1148,6 +1151,14 @@ static void *packet_previous_frame(struct packet_sock *po,
return packet_lookup_frame(po, rb, previous, status);
}
+static void *packet_next_frame(struct packet_sock *po,
+ struct packet_ring_buffer *rb,
+ int status)
+{
+ unsigned int next = rb->head != rb->frame_max ? rb->head+1 : 0;
+ return packet_lookup_frame(po, rb, next, status);
+}
+
static void packet_increment_head(struct packet_ring_buffer *buff)
{
buff->head = buff->head != buff->frame_max ? buff->head+1 : 0;
@@ -2360,7 +2371,7 @@ static int tpacket_rcv(struct sk_buff *skb, struct net_device *dev,
#endif
if (po->tp_version <= TPACKET_V2) {
- __packet_set_status(po, h.raw, status);
+ __packet_set_status(po, h.raw, status, false);
sk->sk_data_ready(sk);
} else {
prb_clear_blk_fill_status(&po->rx_ring);
@@ -2400,7 +2411,7 @@ static void tpacket_destruct_skb(struct sk_buff *skb)
packet_dec_pending(&po->tx_ring);
ts = __packet_set_timestamp(po, ph, skb);
- __packet_set_status(po, ph, TP_STATUS_AVAILABLE | ts);
+ __packet_set_status(po, ph, TP_STATUS_AVAILABLE | ts, true);
}
sock_wfree(skb);
@@ -2585,13 +2596,13 @@ static int tpacket_parse_header(struct packet_sock *po, void *frame,
static int tpacket_snd(struct packet_sock *po, struct msghdr *msg)
{
- struct sk_buff *skb;
+ struct sk_buff *skb = NULL;
struct net_device *dev;
struct virtio_net_hdr *vnet_hdr = NULL;
struct sockcm_cookie sockc;
__be16 proto;
int err, reserve = 0;
- void *ph;
+ void *ph = NULL;
DECLARE_SOCKADDR(struct sockaddr_ll *, saddr, msg->msg_name);
bool need_wait = !(msg->msg_flags & MSG_DONTWAIT);
unsigned char *addr = NULL;
@@ -2600,9 +2611,12 @@ static int tpacket_snd(struct packet_sock *po, struct msghdr *msg)
int len_sum = 0;
int status = TP_STATUS_AVAILABLE;
int hlen, tlen, copylen = 0;
+ long timeo;
mutex_lock(&po->pg_vec_lock);
+ timeo = sock_sndtimeo(&po->sk, msg->msg_flags & MSG_DONTWAIT);
+
if (likely(saddr == NULL)) {
dev = packet_cached_dev_get(po);
proto = po->num;
@@ -2647,16 +2661,29 @@ static int tpacket_snd(struct packet_sock *po, struct msghdr *msg)
size_max = dev->mtu + reserve + VLAN_HLEN;
do {
+
+ if (po->wait_on_complete && need_wait) {
+ timeo = wait_for_completion_interruptible_timeout(&po->skb_completion, timeo);
+ po->wait_on_complete = 0;
+ if (!timeo) {
+ /* We timed out, break out and notify userspace */
+ err = -ETIMEDOUT;
+ goto out_status;
+ } else if (timeo == -ERESTARTSYS) {
+ err = -ERESTARTSYS;
+ goto out_status;
+ }
+ }
+
ph = packet_current_frame(po, &po->tx_ring,
TP_STATUS_SEND_REQUEST);
- if (unlikely(ph == NULL)) {
- if (need_wait && need_resched())
- schedule();
- continue;
- }
+
+ if (likely(ph == NULL))
+ break;
skb = NULL;
tp_len = tpacket_parse_header(po, ph, size_max, &data);
+
if (tp_len < 0)
goto tpacket_error;
@@ -2699,7 +2726,7 @@ static int tpacket_snd(struct packet_sock *po, struct msghdr *msg)
tpacket_error:
if (po->tp_loss) {
__packet_set_status(po, ph,
- TP_STATUS_AVAILABLE);
+ TP_STATUS_AVAILABLE, false);
packet_increment_head(&po->tx_ring);
kfree_skb(skb);
continue;
@@ -2719,7 +2746,9 @@ static int tpacket_snd(struct packet_sock *po, struct msghdr *msg)
}
skb->destructor = tpacket_destruct_skb;
- __packet_set_status(po, ph, TP_STATUS_SENDING);
+ __packet_set_status(po, ph, TP_STATUS_SENDING, false);
+ if (!packet_next_frame(po, &po->tx_ring, TP_STATUS_SEND_REQUEST))
+ po->wait_on_complete = 1;
packet_inc_pending(&po->tx_ring);
status = TP_STATUS_SEND_REQUEST;
@@ -2753,8 +2782,10 @@ static int tpacket_snd(struct packet_sock *po, struct msghdr *msg)
goto out_put;
out_status:
- __packet_set_status(po, ph, status);
- kfree_skb(skb);
+ if (ph)
+ __packet_set_status(po, ph, status, false);
+ if (skb)
+ kfree_skb(skb);
out_put:
dev_put(dev);
out:
@@ -3207,6 +3238,7 @@ static int packet_create(struct net *net, struct socket *sock, int protocol,
sock_init_data(sock, sk);
po = pkt_sk(sk);
+ init_completion(&po->skb_completion);
sk->sk_family = PF_PACKET;
po->num = proto;
po->xmit = dev_queue_xmit;
diff --git a/net/packet/internal.h b/net/packet/internal.h
index 3bb7c5fb3bff..bbb4be2c18e7 100644
--- a/net/packet/internal.h
+++ b/net/packet/internal.h
@@ -128,6 +128,8 @@ struct packet_sock {
unsigned int tp_hdrlen;
unsigned int tp_reserve;
unsigned int tp_tstamp;
+ struct completion skb_completion;
+ unsigned int wait_on_complete;
struct net_device __rcu *cached_dev;
int (*xmit)(struct sk_buff *skb);
struct packet_type prot_hook ____cacheline_aligned_in_smp;
--
2.20.1
^ permalink raw reply related
* [PATCH iproute2-next v3 1/2] ipaddress: correctly print a VF hw address in the IPoIB case
From: Denis Kirjanov @ 2019-06-22 18:00 UTC (permalink / raw)
To: stephen, dsahern; +Cc: netdev, linux-rdma, dledford, mkubecek, Denis Kirjanov
Current code assumes that we print ethernet mac and
that doesn't work in the IPoIB case with SRIOV-enabled hardware
Before:
11: ib1: <BROADCAST,MULTICAST,UP,LOWER_UP> mtu 2044 qdisc pfifo_fast
state UP mode DEFAULT group default qlen 256
link/infiniband
80:00:00:66:fe:80:00:00:00:00:00:00:24:8a:07:03:00:a4:3e:7c brd
00:ff:ff:ff:ff:12:40:1b:ff:ff:00:00:00:00:00:00:ff:ff:ff:ff
vf 0 MAC 14:80:00:00:66:fe, spoof checking off, link-state disable,
trust off, query_rss off
...
After:
11: ib1: <BROADCAST,MULTICAST,UP,LOWER_UP> mtu 2044 qdisc pfifo_fast
state UP mode DEFAULT group default qlen 256
link/infiniband
80:00:00:66:fe:80:00:00:00:00:00:00:24:8a:07:03:00:a4:3e:7c brd
00:ff:ff:ff:ff:12:40:1b:ff:ff:00:00:00:00:00:00:ff:ff:ff:ff
vf 0 link/infiniband
80:00:00:66:fe:80:00:00:00:00:00:00:24:8a:07:03:00:a4:3e:7c brd
00:ff:ff:ff:ff:12:40:1b:ff:ff:00:00:00:00:00:00:ff:ff:ff:ff, spoof
checking off, link-state disable, trust off, query_rss off
v1->v2: updated kernel headers to uapi commit
v2->v3: fixed alignment
Signed-off-by: Denis Kirjanov <kda@linux-powerpc.org>
---
ip/ipaddress.c | 44 +++++++++++++++++++++++++++++++++++++++-----
1 file changed, 39 insertions(+), 5 deletions(-)
diff --git a/ip/ipaddress.c b/ip/ipaddress.c
index b504200b..52078675 100644
--- a/ip/ipaddress.c
+++ b/ip/ipaddress.c
@@ -26,6 +26,7 @@
#include <linux/netdevice.h>
#include <linux/if_arp.h>
+#include <linux/if_infiniband.h>
#include <linux/sockios.h>
#include <linux/net_namespace.h>
@@ -349,9 +350,10 @@ static void print_af_spec(FILE *fp, struct rtattr *af_spec_attr)
static void print_vf_stats64(FILE *fp, struct rtattr *vfstats);
-static void print_vfinfo(FILE *fp, struct rtattr *vfinfo)
+static void print_vfinfo(struct ifinfomsg *ifi, FILE *fp, struct rtattr *vfinfo)
{
struct ifla_vf_mac *vf_mac;
+ struct ifla_vf_broadcast *vf_broadcast;
struct ifla_vf_tx_rate *vf_tx_rate;
struct rtattr *vf[IFLA_VF_MAX + 1] = {};
@@ -365,13 +367,45 @@ static void print_vfinfo(FILE *fp, struct rtattr *vfinfo)
parse_rtattr_nested(vf, IFLA_VF_MAX, vfinfo);
vf_mac = RTA_DATA(vf[IFLA_VF_MAC]);
+ vf_broadcast = RTA_DATA(vf[IFLA_VF_BROADCAST]);
vf_tx_rate = RTA_DATA(vf[IFLA_VF_TX_RATE]);
print_string(PRINT_FP, NULL, "%s ", _SL_);
print_int(PRINT_ANY, "vf", "vf %d ", vf_mac->vf);
- print_string(PRINT_ANY, "mac", "MAC %s",
- ll_addr_n2a((unsigned char *) &vf_mac->mac,
- ETH_ALEN, 0, b1, sizeof(b1)));
+
+ print_string(PRINT_ANY,
+ "link_type",
+ " link/%s ",
+ ll_type_n2a(ifi->ifi_type, b1, sizeof(b1)));
+
+ print_color_string(PRINT_ANY,
+ COLOR_MAC,
+ "address",
+ "%s",
+ ll_addr_n2a((unsigned char *) &vf_mac->mac,
+ ifi->ifi_type == ARPHRD_ETHER ?
+ ETH_ALEN : INFINIBAND_ALEN,
+ ifi->ifi_type,
+ b1, sizeof(b1)));
+
+ if (vf[IFLA_VF_BROADCAST]) {
+ if (ifi->ifi_flags&IFF_POINTOPOINT) {
+ print_string(PRINT_FP, NULL, " peer ", NULL);
+ print_bool(PRINT_JSON,
+ "link_pointtopoint", NULL, true);
+ } else
+ print_string(PRINT_FP, NULL, " brd ", NULL);
+
+ print_color_string(PRINT_ANY,
+ COLOR_MAC,
+ "broadcast",
+ "%s",
+ ll_addr_n2a((unsigned char *) &vf_broadcast->broadcast,
+ ifi->ifi_type == ARPHRD_ETHER ?
+ ETH_ALEN : INFINIBAND_ALEN,
+ ifi->ifi_type,
+ b1, sizeof(b1)));
+ }
if (vf[IFLA_VF_VLAN_LIST]) {
struct rtattr *i, *vfvlanlist = vf[IFLA_VF_VLAN_LIST];
@@ -1102,7 +1136,7 @@ int print_linkinfo(struct nlmsghdr *n, void *arg)
open_json_array(PRINT_JSON, "vfinfo_list");
for (i = RTA_DATA(vflist); RTA_OK(i, rem); i = RTA_NEXT(i, rem)) {
open_json_object(NULL);
- print_vfinfo(fp, i);
+ print_vfinfo(ifi, fp, i);
close_json_object();
}
close_json_array(PRINT_JSON, NULL);
--
2.12.3
^ permalink raw reply related
* [PATCH iproute2-next v3 2/2] uapi: update if_link.h
From: Denis Kirjanov @ 2019-06-22 18:00 UTC (permalink / raw)
To: stephen, dsahern; +Cc: netdev, linux-rdma, dledford, mkubecek, Denis Kirjanov
In-Reply-To: <20190622180035.40245-1-dkirjanov@suse.com>
update if_link.h to commit 75345f888f700c4ab2448287e35d48c760b202e6
("ipoib: show VF broadcast address")
Signed-off-by: Denis Kirjanov <kda@linux-powerpc.org>
---
include/uapi/linux/if_link.h | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/include/uapi/linux/if_link.h b/include/uapi/linux/if_link.h
index bfe7f9e6..5f271d84 100644
--- a/include/uapi/linux/if_link.h
+++ b/include/uapi/linux/if_link.h
@@ -692,6 +692,7 @@ enum {
IFLA_VF_IB_NODE_GUID, /* VF Infiniband node GUID */
IFLA_VF_IB_PORT_GUID, /* VF Infiniband port GUID */
IFLA_VF_VLAN_LIST, /* nested list of vlans, option for QinQ */
+ IFLA_VF_BROADCAST, /* VF broadcast */
__IFLA_VF_MAX,
};
@@ -702,6 +703,10 @@ struct ifla_vf_mac {
__u8 mac[32]; /* MAX_ADDR_LEN */
};
+struct ifla_vf_broadcast {
+ __u8 broadcast[32];
+};
+
struct ifla_vf_vlan {
__u32 vf;
__u32 vlan; /* 0 - 4095, 0 disables VLAN filter */
--
2.12.3
^ permalink raw reply related
* Re: [PATCH net-next 6/6] net/mssc/ocelot: Add basic Felix switch driver
From: Andrew Lunn @ 2019-06-22 20:57 UTC (permalink / raw)
To: Claudiu Manoil
Cc: David S . Miller, devicetree, Alexandre Belloni, netdev,
alexandru.marginean, linux-kernel, UNGLinuxDriver, Allan Nielsen,
Rob Herring, Catalin Horghidan, linux-arm-kernel
In-Reply-To: <1561131532-14860-7-git-send-email-claudiu.manoil@nxp.com>
On Fri, Jun 21, 2019 at 06:38:52PM +0300, Claudiu Manoil wrote:
> This supports a switch core ethernet device from Microsemi
> (VSC9959) that can be integrated on different SoCs as a PCIe
> endpoint device.
>
> The switchdev functionality is provided by the core Ocelot
> switch driver. In this regard, the current driver is an
> instance of Microsemi's Ocelot core driver.
>
> The patch adds the PCI device driver part and defines the
> register map for the Felix switch core, as it has some
> differences in register addresses and bitfield mappings
> compared to the Ocelot switch. Also some registers or
> bitfields present on Ocelot are not available on Felix.
> That's why this driver has its own register map instance.
> Other than that, the common registers and bitfields have the
> same functionality and share the same name.
>
> In a few cases, some h/w operations have to be done differently
> on Felix due to missing bitfields. This is the case for the
> switch core reset and init. Because for this operation Ocelot
> uses some bits that are not present on Felix, the later has to
> use a register from the global registers block (GCB) instead.
>
> Signed-off-by: Catalin Horghidan <catalin.horghidan@gmail.com>
> Signed-off-by: Claudiu Manoil <claudiu.manoil@nxp.com>
> ---
> drivers/net/ethernet/mscc/Kconfig | 8 +
> drivers/net/ethernet/mscc/Makefile | 9 +-
> drivers/net/ethernet/mscc/felix_board.c | 392 +++++++++++++++++++++
> drivers/net/ethernet/mscc/felix_regs.c | 448 ++++++++++++++++++++++++
> drivers/net/ethernet/mscc/ocelot.h | 7 +
> 5 files changed, 862 insertions(+), 2 deletions(-)
> create mode 100644 drivers/net/ethernet/mscc/felix_board.c
> create mode 100644 drivers/net/ethernet/mscc/felix_regs.c
>
> diff --git a/drivers/net/ethernet/mscc/Kconfig b/drivers/net/ethernet/mscc/Kconfig
> index bcec0587cf61..e5a7fa69307e 100644
> --- a/drivers/net/ethernet/mscc/Kconfig
> +++ b/drivers/net/ethernet/mscc/Kconfig
> @@ -29,4 +29,12 @@ config MSCC_OCELOT_SWITCH_OCELOT
> This driver supports the Ocelot network switch device as present on
> the Ocelot SoCs.
>
> +config MSCC_FELIX_SWITCH
> + tristate "Felix switch driver"
> + depends on MSCC_OCELOT_SWITCH
> + depends on PCI
> + help
> + This driver supports the Felix network switch device, connected as a
> + PCI device.
> +
> endif # NET_VENDOR_MICROSEMI
> diff --git a/drivers/net/ethernet/mscc/Makefile b/drivers/net/ethernet/mscc/Makefile
> index 9a36c26095c8..81593feb2ea1 100644
> --- a/drivers/net/ethernet/mscc/Makefile
> +++ b/drivers/net/ethernet/mscc/Makefile
> @@ -1,5 +1,10 @@
> # SPDX-License-Identifier: (GPL-2.0 OR MIT)
> obj-$(CONFIG_MSCC_OCELOT_SWITCH) += mscc_ocelot_common.o
> mscc_ocelot_common-y := ocelot.o ocelot_io.o
> -mscc_ocelot_common-y += ocelot_regs.o ocelot_tc.o ocelot_police.o ocelot_ace.o ocelot_flower.o
> -obj-$(CONFIG_MSCC_OCELOT_SWITCH_OCELOT) += ocelot_board.o
> +mscc_ocelot_common-y += ocelot_tc.o ocelot_police.o ocelot_ace.o ocelot_flower.o
> +
> +obj-$(CONFIG_MSCC_OCELOT_SWITCH_OCELOT) += mscc_ocelot.o
> +mscc_ocelot-$(CONFIG_MSCC_OCELOT_SWITCH_OCELOT) := ocelot_regs.o ocelot_board.o
> +
> +obj-$(CONFIG_MSCC_FELIX_SWITCH) += mscc_felix.o
> +mscc_felix-$(CONFIG_MSCC_FELIX_SWITCH) := felix_regs.o felix_board.o
> diff --git a/drivers/net/ethernet/mscc/felix_board.c b/drivers/net/ethernet/mscc/felix_board.c
> new file mode 100644
> index 000000000000..57f7a897b3ae
> --- /dev/null
> +++ b/drivers/net/ethernet/mscc/felix_board.c
> @@ -0,0 +1,392 @@
> +// SPDX-License-Identifier: (GPL-2.0 OR MIT)
> +/* Felix Switch driver
> + *
> + * Copyright 2018-2019 NXP
> + */
> +
> +#include <linux/module.h>
> +#include <linux/pci.h>
> +#include <linux/netdevice.h>
> +#include <linux/phy_fixed.h>
> +#include <linux/phy.h>
> +#include <linux/of_mdio.h>
> +#include <linux/of_net.h>
> +#include <linux/iopoll.h>
> +#include <net/switchdev.h>
> +#include "ocelot.h"
> +
> +#define FELIX_DRV_VER_MAJ 1
> +#define FELIX_DRV_VER_MIN 0
> +
> +#define FELIX_DRV_STR "Felix Switch driver"
> +#define FELIX_DRV_VER_STR __stringify(FELIX_DRV_VER_MAJ) "." \
> + __stringify(FELIX_DRV_VER_MIN)
Driver version strings are pretty pointless. What you really want to
know if the specific kernel version.
> +
> +#define FELIX_PORT_RES_START 0x0100000
> +#define FELIX_PORT_RES_SIZE 0x10000
This should really be in device tree. You then get a lot closer to the
binding for mscc-ocelot, and you can reuse more of its code.
> +static void felix_release_ports(struct ocelot *ocelot)
> +{
> + struct ocelot_port *ocelot_port;
> + struct phy_device *phydev;
> + struct device_node *dn;
> + int i;
> +
> + for (i = 0; i < ocelot->num_phys_ports; i++) {
> + ocelot_port = ocelot->ports[i];
> + if (!ocelot_port || !ocelot_port->phy || !ocelot_port->dev)
> + continue;
Phys are often optional, e.g. an RGMII interface to another switch, or
an SFP port.
> +
> + phydev = ocelot_port->phy;
> + unregister_netdev(ocelot_port->dev);
> + free_netdev(ocelot_port->dev);
> +
> + if (phy_is_pseudo_fixed_link(phydev)) {
> + dn = phydev->mdio.dev.of_node;
> + /* decr refcnt: of_phy_register_fixed_link */
> + of_phy_deregister_fixed_link(dn);
> + }
> + phy_device_free(phydev); /* decr refcnt: of_phy_find_device */
To be on the safe side, you should probably not free the netdev until
you free the phydev.
This function also seems pretty generic. Should it be shared?
> +static int felix_ports_init(struct pci_dev *pdev)
> +{
> + struct ocelot *ocelot = pci_get_drvdata(pdev);
> + struct device_node *np = ocelot->dev->of_node;
> + struct device_node *phy_node, *portnp;
> + struct phy_device *phydev;
> + void __iomem *port_regs;
> + resource_size_t base;
> + u32 port;
> + int err;
> +
> + ocelot->num_phys_ports = FELIX_MAX_NUM_PHY_PORTS;
> +
> + np = of_get_child_by_name(np, "ethernet-ports");
> + if (!np) {
> + dev_err(&pdev->dev, "ethernet-ports sub-node not found\n");
> + return -ENODEV;
> + }
> +
> + /* alloc netdev for each port */
> + err = ocelot_init(ocelot);
> + if (err)
> + return err;
> +
> + base = pci_resource_start(pdev, FELIX_SWITCH_BAR);
> + for_each_available_child_of_node(np, portnp) {
> + struct resource res = {};
> + int phy_mode;
> +
> + if (!portnp || !portnp->name ||
> + of_node_cmp(portnp->name, "port") ||
The name of the node should not matter.
> +static int felix_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id)
> +{
> +
> + register_netdevice_notifier(&ocelot_netdevice_nb);
> + register_switchdev_notifier(&ocelot_switchdev_nb);
> + register_switchdev_blocking_notifier(&ocelot_switchdev_blocking_nb);
This is also shared. So maybe move it into a common function?
> +
> + dev_info(&pdev->dev, "%s v%s\n", FELIX_DRV_STR, FELIX_DRV_VER_STR);
> + return 0;
> +
> +err_ports_init:
> +err_chip_init:
> +err_sw_core_init:
> + pci_iounmap(pdev, regs);
> +err_iomap:
> +err_resource_len:
> +err_alloc_ocelot:
> +err_dma:
> + pci_disable_device(pdev);
> +
> + return err;
> +}
> +
> +static void felix_pci_remove(struct pci_dev *pdev)
> +{
> + struct ocelot *ocelot;
> +
> + ocelot = pci_get_drvdata(pdev);
> +
> + /* stop workqueue thread */
> + ocelot_deinit(ocelot);
> + unregister_switchdev_blocking_notifier(&ocelot_switchdev_blocking_nb);
> + unregister_switchdev_notifier(&ocelot_switchdev_nb);
> + unregister_netdevice_notifier(&ocelot_netdevice_nb);
This is also common.
Andrew
^ permalink raw reply
* Re: [net v1] net: stmmac: set IC bit when transmitting frames with HW timestamp
From: David Miller @ 2019-06-22 23:18 UTC (permalink / raw)
To: weifeng.voon
Cc: mcoquelin.stm32, netdev, linux-kernel, joabreu, peppe.cavallaro,
andrew, f.fainelli, alexandre.torgue, boon.leong.ong
In-Reply-To: <1560955308-15190-1-git-send-email-weifeng.voon@intel.com>
From: Voon Weifeng <weifeng.voon@intel.com>
Date: Wed, 19 Jun 2019 22:41:48 +0800
> From: Roland Hii <roland.king.guan.hii@intel.com>
>
> When transmitting certain PTP frames, e.g. SYNC and DELAY_REQ, the
> PTP daemon, e.g. ptp4l, is polling the driver for the frame transmit
> hardware timestamp. The polling will most likely timeout if the tx
> coalesce is enabled due to the Interrupt-on-Completion (IC) bit is
> not set in tx descriptor for those frames.
>
> This patch will ignore the tx coalesce parameter and set the IC bit
> when transmitting PTP frames which need to report out the frame
> transmit hardware timestamp to user space.
>
> Fixes: f748be531d70 ("net: stmmac: Rework coalesce timer and fix multi-queue races")
> Signed-off-by: Roland Hii <roland.king.guan.hii@intel.com>
> Signed-off-by: Ong Boon Leong <boon.leong.ong@intel.com>
> Signed-off-by: Voon Weifeng <weifeng.voon@intel.com>
Applied and queued up for -stable.
^ permalink raw reply
* Re: [net v1] net: stmmac: fixed new system time seconds value calculation
From: David Miller @ 2019-06-22 23:18 UTC (permalink / raw)
To: weifeng.voon
Cc: mcoquelin.stm32, netdev, linux-kernel, joabreu, peppe.cavallaro,
andrew, f.fainelli, alexandre.torgue, boon.leong.ong
In-Reply-To: <1560953628-3248-1-git-send-email-weifeng.voon@intel.com>
From: Voon Weifeng <weifeng.voon@intel.com>
Date: Wed, 19 Jun 2019 22:13:48 +0800
> From: Roland Hii <roland.king.guan.hii@intel.com>
>
> When ADDSUB bit is set, the system time seconds field is calculated as
> the complement of the seconds part of the update value.
>
> For example, if 3.000000001 seconds need to be subtracted from the
> system time, this field is calculated as
> 2^32 - 3 = 4294967296 - 3 = 0x100000000 - 3 = 0xFFFFFFFD
>
> Previously, the 0x100000000 is mistakenly written as 100000000.
>
> This is further simplified from
> sec = (0x100000000ULL - sec);
> to
> sec = -sec;
>
> Fixes: ba1ffd74df74 ("stmmac: fix PTP support for GMAC4")
> Signed-off-by: Roland Hii <roland.king.guan.hii@intel.com>
> Signed-off-by: Ong Boon Leong <boon.leong.ong@intel.com>
> Signed-off-by: Voon Weifeng <weifeng.voon@intel.com>
Applied and queued up for -stable.
^ permalink raw reply
* Re: [PATCH] flow_dissector: Fix vlan header offset in __skb_flow_dissect
From: David Miller @ 2019-06-22 23:19 UTC (permalink / raw)
To: yuehaibing; +Cc: sdf, jianbol, jiri, mirq-linux, willemb, linux-kernel, netdev
In-Reply-To: <20190619160132.38416-1-yuehaibing@huawei.com>
From: YueHaibing <yuehaibing@huawei.com>
Date: Thu, 20 Jun 2019 00:01:32 +0800
> @@ -785,6 +785,9 @@ bool __skb_flow_dissect(const struct sk_buff *skb,
> skb && skb_vlan_tag_present(skb)) {
> proto = skb->protocol;
> } else {
> + if (dissector_vlan == FLOW_DISSECTOR_KEY_MAX)
> + nhoff -= sizeof(*vlan);
Even if this would have turned out to be the desired fix, you would need
to get rid of the extra spaces in that last statement.
^ permalink raw reply
* Re: [PATCH v4 1/1] net: fastopen: robustness and endianness fixes for SipHash
From: David Miller @ 2019-06-22 23:30 UTC (permalink / raw)
To: ard.biesheuvel
Cc: netdev, ebiggers, linux-crypto, herbert, edumazet, kuznet,
yoshfuji, jbaron, cpaasch, David.Laight, ycheng
In-Reply-To: <20190619214628.2960-2-ard.biesheuvel@linaro.org>
From: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Date: Wed, 19 Jun 2019 23:46:28 +0200
> Some changes to the TCP fastopen code to make it more robust
> against future changes in the choice of key/cookie size, etc.
>
> - Instead of keeping the SipHash key in an untyped u8[] buffer
> and casting it to the right type upon use, use the correct
> type directly. This ensures that the key will appear at the
> correct alignment if we ever change the way these data
> structures are allocated. (Currently, they are only allocated
> via kmalloc so they always appear at the correct alignment)
>
> - Use DIV_ROUND_UP when sizing the u64[] array to hold the
> cookie, so it is always of sufficient size, even if
> TCP_FASTOPEN_COOKIE_MAX is no longer a multiple of 8.
>
> - Drop the 'len' parameter from the tcp_fastopen_reset_cipher()
> function, which is no longer used.
>
> - Add endian swabbing when setting the keys and calculating the hash,
> to ensure that cookie values are the same for a given key and
> source/destination address pair regardless of the endianness of
> the server.
>
> Note that none of these are functional changes wrt the current
> state of the code, with the exception of the swabbing, which only
> affects big endian systems.
>
> Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Applied, thank you.
^ permalink raw reply
* Re: [PATCH net-next] hinic: implement the statistical interface of ethtool
From: David Miller @ 2019-06-22 23:42 UTC (permalink / raw)
To: xuechaojing
Cc: linux-kernel, netdev, luoshaokai, cloud.wangxiaoyun, chiqijun,
wulike1
In-Reply-To: <20190620055808.13474-1-xuechaojing@huawei.com>
From: Xue Chaojing <xuechaojing@huawei.com>
Date: Thu, 20 Jun 2019 05:58:08 +0000
> + p = (char *)(&txq_stats) +
> + hinic_tx_queue_stats[j].offset;
Parenthesis around &txq_stats is unnecessary.
> + p = (char *)(&rxq_stats) +
> + hinic_rx_queue_stats[j].offset;
Similarly for &rxq_stats.
> + p = (char *)(net_stats) + hinic_netdev_stats[j].offset;
Similarly for net_stats.
> + p = (char *)(&vport_stats) + hinic_function_stats[j].offset;
And &vport_stats.
> + p = (char *)(port_stats) + hinic_port_stats[j].offset;
And port_stats.
^ permalink raw reply
* Re: [PATCH] fjes: no need to check return value of debugfs_create functions
From: David Miller @ 2019-06-22 23:43 UTC (permalink / raw)
To: gregkh; +Cc: netdev, tiny.windzz
In-Reply-To: <20190620073106.GA22356@kroah.com>
From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Thu, 20 Jun 2019 09:31:06 +0200
> When calling debugfs functions, there is no need to ever check the
> return value. The function can work or not, but the code logic should
> never do something different based on this.
>
> Cc: "David S. Miller" <davem@davemloft.net>
> Cc: Yangtao Li <tiny.windzz@gmail.com>
> Cc: netdev@vger.kernel.org
> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Applied to net-next, thanks Greg.
^ permalink raw reply
* Re: [PATCH] sis900: fix TX completion
From: David Miller @ 2019-06-22 23:47 UTC (permalink / raw)
To: sergej.benilov; +Cc: venza, netdev
In-Reply-To: <20190620090218.11549-1-sergej.benilov@googlemail.com>
From: Sergej Benilov <sergej.benilov@googlemail.com>
Date: Thu, 20 Jun 2019 11:02:18 +0200
> Since commit 605ad7f184b60cfaacbc038aa6c55ee68dee3c89 "tcp: refine TSO autosizing",
> outbound throughput is dramatically reduced for some connections, as sis900
> is doing TX completion within idle states only.
>
> Make TX completion happen after every transmitted packet.
>
> Test:
> netperf
>
> before patch:
>> netperf -H remote -l -2000000 -- -s 1000000
> MIGRATED TCP STREAM TEST from 0.0.0.0 () port 0 AF_INET to 95.223.112.76 () port 0 AF_INET : demo
> Recv Send Send
> Socket Socket Message Elapsed
> Size Size Size Time Throughput
> bytes bytes bytes secs. 10^6bits/sec
>
> 87380 327680 327680 253.44 0.06
>
> after patch:
>> netperf -H remote -l -10000000 -- -s 1000000
> MIGRATED TCP STREAM TEST from 0.0.0.0 () port 0 AF_INET to 95.223.112.76 () port 0 AF_INET : demo
> Recv Send Send
> Socket Socket Message Elapsed
> Size Size Size Time Throughput
> bytes bytes bytes secs. 10^6bits/sec
>
> 87380 327680 327680 5.38 14.89
>
> Thx to Dave Miller and Eric Dumazet for helpful hints
>
> Signed-off-by: Sergej Benilov <sergej.benilov@googlemail.com>
Applied.
^ permalink raw reply
* Re: [PATCH net-next v2] ipv6: Error when route does not have any valid nexthops
From: David Miller @ 2019-06-22 23:51 UTC (permalink / raw)
To: idosch; +Cc: netdev, dsahern, mlxsw, idosch
In-Reply-To: <20190620091021.18210-1-idosch@idosch.org>
From: Ido Schimmel <idosch@idosch.org>
Date: Thu, 20 Jun 2019 12:10:21 +0300
> From: Ido Schimmel <idosch@mellanox.com>
>
> When user space sends invalid information in RTA_MULTIPATH, the nexthop
> list in ip6_route_multipath_add() is empty and 'rt_notif' is set to
> NULL.
>
> The code that emits the in-kernel notifications does not check for this
> condition, which results in a NULL pointer dereference [1].
>
> Fix this by bailing earlier in the function if the parsed nexthop list
> is empty. This is consistent with the corresponding IPv4 code.
>
> v2:
> * Check if parsed nexthop list is empty and bail with extack set
>
> [1]
...
>
> Reported-by: syzbot+382566d339d52cd1a204@syzkaller.appspotmail.com
> Fixes: ebee3cad835f ("ipv6: Add IPv6 multipath notifications for add / replace")
> Signed-off-by: Ido Schimmel <idosch@mellanox.com>
Applied.
^ permalink raw reply
* Re: [PATCH net] tipc: change to use register_pernet_device
From: David Miller @ 2019-06-22 23:54 UTC (permalink / raw)
To: lucien.xin; +Cc: netdev, jon.maloy, ying.xue, tipc-discussion
In-Reply-To: <1a8f3ada3e0a65b6e9250c4580a7c420b4ddddac.1561027168.git.lucien.xin@gmail.com>
From: Xin Long <lucien.xin@gmail.com>
Date: Thu, 20 Jun 2019 18:39:28 +0800
> This patch is to fix a dst defcnt leak, which can be reproduced by doing:
>
> # ip net a c; ip net a s; modprobe tipc
> # ip net e s ip l a n eth1 type veth peer n eth1 netns c
> # ip net e c ip l s lo up; ip net e c ip l s eth1 up
> # ip net e s ip l s lo up; ip net e s ip l s eth1 up
> # ip net e c ip a a 1.1.1.2/8 dev eth1
> # ip net e s ip a a 1.1.1.1/8 dev eth1
> # ip net e c tipc b e m udp n u1 localip 1.1.1.2
> # ip net e s tipc b e m udp n u1 localip 1.1.1.1
> # ip net d c; ip net d s; rmmod tipc
>
> and it will get stuck and keep logging the error:
>
> unregister_netdevice: waiting for lo to become free. Usage count = 1
>
> The cause is that a dst is held by the udp sock's sk_rx_dst set on udp rx
> path with udp_early_demux == 1, and this dst (eventually holding lo dev)
> can't be released as bearer's removal in tipc pernet .exit happens after
> lo dev's removal, default_device pernet .exit.
>
> "There are two distinct types of pernet_operations recognized: subsys and
> device. At creation all subsys init functions are called before device
> init functions, and at destruction all device exit functions are called
> before subsys exit function."
>
> So by calling register_pernet_device instead to register tipc_net_ops, the
> pernet .exit() will be invoked earlier than loopback dev's removal when a
> netns is being destroyed, as fou/gue does.
>
> Note that vxlan and geneve udp tunnels don't have this issue, as the udp
> sock is released in their device ndo_stop().
>
> This fix is also necessary for tipc dst_cache, which will hold dsts on tx
> path and I will introduce in my next patch.
>
> Reported-by: Li Shuang <shuali@redhat.com>
> Signed-off-by: Xin Long <lucien.xin@gmail.com>
Applied.
^ permalink raw reply
* Re: [PATCH net] tipc: add dst_cache support for udp media
From: David Miller @ 2019-06-22 23:54 UTC (permalink / raw)
To: lucien.xin; +Cc: netdev, jon.maloy, ying.xue, tipc-discussion, pabeni
In-Reply-To: <0ea2e8519f14d5c9e7bb7ba82a5be371bd4cb9ab.1561028621.git.lucien.xin@gmail.com>
From: Xin Long <lucien.xin@gmail.com>
Date: Thu, 20 Jun 2019 19:03:41 +0800
> As other udp/ip tunnels do, tipc udp media should also have a
> lockless dst_cache supported on its tx path.
>
> Here we add dst_cache into udp_replicast to support dst cache
> for both rmcast and rcast, and rmcast uses ub->rcast and each
> rcast uses its own node in ub->rcast.list.
>
> Signed-off-by: Xin Long <lucien.xin@gmail.com>
I'll apply this to net-next after the next net --> net-next
marge since it depends upon the register_pernet_device change.
^ permalink raw reply
* Re: [PATCH][net-next] netns: restore ops before calling ops_exit_list
From: David Miller @ 2019-06-22 23:56 UTC (permalink / raw)
To: lirongqing; +Cc: netdev, edumazet
In-Reply-To: <1561029880-1666-1-git-send-email-lirongqing@baidu.com>
From: Li RongQing <lirongqing@baidu.com>
Date: Thu, 20 Jun 2019 19:24:40 +0800
> ops has been iterated to first element when call pre_exit, and
> it needs to restore from save_ops, not save ops to save_ops
>
> Fixes: d7d99872c144 ("netns: add pre_exit method to struct pernet_operations")
> Signed-off-by: Li RongQing <lirongqing@baidu.com>
Applied, thank you.
^ permalink raw reply
* Re: [PATCH v2 net-next 0/2] net: mediatek: Add MT7621 TRGMII mode support
From: David Miller @ 2019-06-22 23:58 UTC (permalink / raw)
To: opensource
Cc: frank-w, sean.wang, f.fainelli, matthias.bgg, andrew,
vivien.didelot, netdev, john, linux-mediatek, linux-mips
In-Reply-To: <20190620122155.32078-1-opensource@vdorst.com>
From: René van Dorst <opensource@vdorst.com>
Date: Thu, 20 Jun 2019 14:21:53 +0200
> Like many other mediatek SOCs, the MT7621 SOC and the internal MT7530
> switch both supports TRGMII mode. MT7621 TRGMII speed is fix 1200MBit.
>
> v1->v2:
> - Fix breakage on non MT7621 SOC
> - Support 25MHz and 40MHz XTAL as MT7530 clocksource
Series applied, thanks.
^ permalink raw reply
* Re: [PATCH net] ipv6: fix neighbour resolution with raw socket
From: David Miller @ 2019-06-23 0:07 UTC (permalink / raw)
To: nicolas.dichtel; +Cc: netdev
In-Reply-To: <20190620123434.7219-1-nicolas.dichtel@6wind.com>
From: Nicolas Dichtel <nicolas.dichtel@6wind.com>
Date: Thu, 20 Jun 2019 14:34:34 +0200
> The scenario is the following: the user uses a raw socket to send an ipv6
> packet, destinated to a not-connected network, and specify a connected nh.
> Here is the corresponding python script to reproduce this scenario:
...
> fd00:175::/64 is a connected route and fd00:200::fa is not a connected
> host.
>
> With this scenario, the kernel starts by sending a NS to resolve
> fd00:175::2. When it receives the NA, it flushes its queue and try to send
> the initial packet. But instead of sending it, it sends another NS to
> resolve fd00:200::fa, which obvioulsy fails, thus the packet is dropped. If
> the user sends again the packet, it now uses the right nh (fd00:175::2).
>
> The problem is that ip6_dst_lookup_neigh() uses the rt6i_gateway, which is
> :: because the associated route is a connected route, thus it uses the dst
> addr of the packet. Let's use rt6_nexthop() to choose the right nh.
>
> Note that rt and in6addr_any are const in ip6_dst_lookup_neigh(), thus
> let's constify rt6_nexthop() to avoid ugly cast.
>
> Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com>
Applied and queued up for -stable, thanks.
^ permalink raw reply
* Re: [PATCH net] ipv6: fix neighbour resolution with raw socket
From: David Miller @ 2019-06-23 0:08 UTC (permalink / raw)
To: nicolas.dichtel; +Cc: netdev
In-Reply-To: <20190622.170712.2073255657139689928.davem@davemloft.net>
From: David Miller <davem@davemloft.net>
Date: Sat, 22 Jun 2019 17:07:12 -0700 (PDT)
> Applied and queued up for -stable, thanks.
Actually, this needs a warning fix in bluetooth and netfilter. Please
fix this up, do a proper allmodconfig build, and resubmit.
net/bluetooth/6lowpan.c: In function ‘peer_lookup_dst’:
net/bluetooth/6lowpan.c:188:11: warning: assignment discards ‘const’ qualifier from pointer target type [-Wdiscarded-qualifiers]
net/netfilter/nf_flow_table_ip.c: In function ‘nf_flow_offload_ipv6_hook’:
net/netfilter/nf_flow_table_ip.c:481:10: warning: assignment discards ‘const’ qualifier from pointer target type [-Wdiscarded-qualifiers]
Thank you.
^ permalink raw reply
page: next (older) | prev (newer) | latest
- recent:[subjects (threaded)|topics (new)|topics (active)]
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox