* [PATCH net] ipv4/fib: don't warn when primary address is missing if in_dev is dead
From: Paolo Abeni @ 2016-04-21 20:23 UTC (permalink / raw)
To: netdev; +Cc: David S. Miller, Alexey Kuznetsov, linux-kernel
After commit fbd40ea0180a ("ipv4: Don't do expensive useless work
during inetdev destroy.") when deleting an interface,
fib_del_ifaddr() can be executed without any primary address
present on the dead interface.
The above is safe, but triggers some "bug: prim == NULL" warnings.
This commit avoids warning if the in_dev is dead
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
---
net/ipv4/fib_frontend.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/net/ipv4/fib_frontend.c b/net/ipv4/fib_frontend.c
index 8a9246d..63566ec 100644
--- a/net/ipv4/fib_frontend.c
+++ b/net/ipv4/fib_frontend.c
@@ -904,7 +904,11 @@ void fib_del_ifaddr(struct in_ifaddr *ifa, struct in_ifaddr *iprim)
if (ifa->ifa_flags & IFA_F_SECONDARY) {
prim = inet_ifa_byprefix(in_dev, any, ifa->ifa_mask);
if (!prim) {
- pr_warn("%s: bug: prim == NULL\n", __func__);
+ /* if the device has been deleted, we don't perform
+ * address promotion
+ */
+ if (!in_dev->dead)
+ pr_warn("%s: bug: prim == NULL\n", __func__);
return;
}
if (iprim && iprim != prim) {
--
1.8.3.1
^ permalink raw reply related
* RE: [net-next 15/17] fm10k: fix possible null pointer deref after kcalloc
From: Keller, Jacob E @ 2016-04-21 20:09 UTC (permalink / raw)
To: Kirsher, Jeffrey T, David Miller
Cc: netdev@vger.kernel.org, nhorman@redhat.com, sassmann@redhat.com,
jogreene@redhat.com
In-Reply-To: <1461268100.3018.5.camel@intel.com>
> On Thu, 2016-04-21 at 15:47 -0400, David Miller wrote:
> > From: "Keller, Jacob E" <jacob.e.keller@intel.com>
> > Date: Thu, 21 Apr 2016 19:44:24 +0000
> >
> > > Dave, please don't pull this patch. Krishneil found an issue with
> > > this patch, and I sent a corrected fix to squash in but it didn't
> > > make it into this one. I'd like to get the fix squashed in a resend
> > > before this is pulled into net-next.
> >
> > Too late, it's already in my tree.
>
> I will address Jakes concerns in my next fm10k pull request.
Thanks Jeff. Sorry I didn't notice this earlier.
Regards,
Jake
^ permalink raw reply
* Re: [PATCH net 0/2] tcp: Merge timestamp info when coalescing skbs
From: Willem de Bruijn @ 2016-04-21 19:58 UTC (permalink / raw)
To: Martin KaFai Lau
Cc: Network Development, Eric Dumazet, Neal Cardwell,
Soheil Hassas Yeganeh, Willem de Bruijn, Yuchung Cheng,
Kernel Team
In-Reply-To: <1461130769-1442865-1-git-send-email-kafai@fb.com>
On Wed, Apr 20, 2016 at 1:39 AM, Martin KaFai Lau <kafai@fb.com> wrote:
> This series is separated from the RFC series related to
> tcp_sendmsg(MSG_EOR) and it is targeting for the net branch.
> This patchset is focusing on fixing cases where TCP
> timestamp could be lost after coalescing skbs.
Thanks for fixing these edge cases, Martin. And for the detailed
packetdrill tests to reproduce them. Those are very informative.
It took me too long to study the retransmit and especially the SACK
code to Ack the patches in a timely manner. But, yes, these code
paths had definitely escaped me when working on the earlier tcp
timestamping patches. Fixes look great, too, so fwiw a belated
Acked-by: Willem de Bruijn <willemb@google.com>
^ permalink raw reply
* [GIT] Networking
From: David Miller @ 2016-04-21 19:55 UTC (permalink / raw)
To: torvalds; +Cc: akpm, netdev, linux-kernel
1) Fix memory leak in iwlwifi, from Matti Gottlieb.
2) Add missing registration of netfilter arp_tables into initial
namespace, from Florian Westphal.
3) Fix potential NULL deref in DecNET routing code.
4) Restrict NETLINK_URELEASE to truly bound sockets only, from Dmitry
Ivanov.
5) Fix dst ref counting in VRF, from David Ahern.
6) Fix TSO segmenting limits in i40e driver, from Alexander Duyck.
7) Fix heap leak in PACKET_DIAG_MCLIST, from Mathias Krause.
8) Ravalidate IPV6 datagram socket cached routes properly, particularly
with UDP, from Martin KaFai Lau.
9) Fix endian bug in RDS dp_ack_seq handling, from Qing Huang.
10) Fix stats typing in bcmgenet driver, from Eric Dumazet.
11) Openvswitch needs to orphan SKBs before ipv6 fragmentation
handing, from Joe Stringer.
12) SPI device reference leak in spi_ks8895 PHY driver, from Mark
Brown.
13) atl2 doesn't actually support scatter-gather, so don't advertise
the feature. From Ben Hucthings.
Please pull, thanks a lot!
The following changes since commit 183c948a3cb3efbf45eabed41fa7ee04c19378fc:
Merge tag 'tty-4.6-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty (2016-04-09 12:32:44 -0700)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/davem/net.git
for you to fetch changes up to b4f70527f052b0c00be4d7cac562baa75b212df5:
openvswitch: use flow protocol when recalculating ipv6 checksums (2016-04-21 15:28:47 -0400)
----------------------------------------------------------------
Alexander Duyck (1):
i40e/i40evf: Limit TSO to 7 descriptors for payload instead of 8 per packet
Alexei Starovoitov (1):
bpf/verifier: reject invalid LD_ABS | BPF_DW instruction
Andrew Goodbody (2):
cpsw: Prevent NUll pointer dereference with two PHYs
Revert "Prevent NUll pointer dereference with two PHYs on cpsw"
Arnd Bergmann (3):
bcma: fix building without OF_IRQ
rtlwifi: fix gcc-6 indentation warning
macsec: fix crypto Kconfig dependency
Ben Hutchings (1):
atl2: Disable unimplemented scatter/gather feature
Bjørn Mork (1):
cdc_mbim: apply "NDP to end" quirk to all Huawei devices
Chris Friesen (1):
route: do not cache fib route info on local routes with oif
Craig Gallek (2):
soreuseport: fix ordering for mixed v4/v6 sockets
soreuseport: test mixed v4/v6 sockets
Daniel Borkmann (1):
vlan: pull on __vlan_insert_tag error path and fix csum correction
Daniel Jurgens (2):
net/mlx4_core: Implement pci_resume callback
net/mlx4_core: Avoid repeated calls to pci enable/disable
David Ahern (3):
net: vrf: Fix dst reference counting
net: vrf: Fix dev refcnt leak due to IPv6 prefix route
net: ipv6: Do not keep linklocal and loopback addresses
David Daney (1):
net: thunderx: Fix broken of_node_put() code.
David S. Miller (12):
decnet: Do not build routes to devices without decnet private data.
Merge branch 'tipc-fixes'
Merge tag 'wireless-drivers-for-davem-2016-04-13' of git://git.kernel.org/.../kvalo/wireless-drivers
Merge git://git.kernel.org/.../pablo/nf
Merge branch 'master' of git://git.kernel.org/.../jkirsher/net-queue
Merge tag 'mac80211-for-davem-2016-04-14' of git://git.kernel.org/.../jberg/mac80211
Merge branch 'ipv6-dgram-dst-cache'
Merge branch 'soreuseport-mixed-v4-v6-fixes'
Merge branch 'dsa-mv88e6xxx-fix-cross-chip-bridging'
Merge branch 'tcp-coalesce-merge-timestamps'
Merge branch 'qed-fixes'
Merge branch 'mlx4-fixes'
Dmitry Ivanov (2):
netlink: don't send NETLINK_URELEASE for unbound sockets
nl80211: check netlink protocol in socket release notification
Emmanuel Grumbach (1):
iwlwifi: pcie: lower the debug level for RSA semaphore access
Emrah Demir (1):
mISDN: Fixing missing validation in base_sock_bind()
Eran Ben Elisha (1):
net/mlx4_en: Split SW RX dropped counter per RX ring
Eric Dumazet (1):
net: bcmgenet: device stats are unsigned long
Erik Hugne (2):
tipc: make dist queue pernet
tipc: purge deferred updates from dead nodes
Eugenia Emantayev (1):
net/mlx4_core: Don't allow to VF change global pause settings
Felix Fietkau (1):
bgmac: fix MAC soft-reset bit for corerev > 4
Florian Westphal (1):
netfilter: arp_tables: register table in initns
Grygorii Strashko (1):
drivers: net: cpsw: fix wrong regs access in cpsw_ndo_open
Hariprasad Shenai (1):
cxgb4: Stop Rx Queues before freeing it up
Jacob Keller (1):
fm10k: fix multi-bit VLAN update requests from VF
Jia-Ju Bai (1):
b43: Fix memory leaks in b43_bus_dev_ssb_init and b43_bus_dev_bcma_init
Joe Stringer (1):
openvswitch: Orphan skbs before IPv6 defrag
John Crispin (1):
net: mediatek: update the IRQ part of the binding document
Jorgen Hansen (1):
VSOCK: Only check error on skb_recv_datagram when skb is NULL
Jozsef Kadlecsik (1):
netfilter: nf_conntrack_tcp: Fix stack out of bounds when parsing TCP options
Kalle Valo (1):
Merge tag 'iwlwifi-for-kalle-2016-03-30' of https://git.kernel.org/.../iwlwifi/iwlwifi-fixes
Konstantin Khlebnikov (3):
net/mlx4_en: allocate non 0-order pages for RX ring with __GFP_NOMEMALLOC
net/mlx4_en: do batched put_page using atomic_sub
cls_cgroup: get sk_classid only from full sockets
Lars Persson (1):
net: sched: do not requeue a NULL skb
Manish Chopra (3):
qede: Fix various memory allocation error flows for fastpath
qede: Fix setting Skb network header
qede: Fix single MTU sized packet from firmware GRO flow
Marcelo Ricardo Leitner (1):
sctp: avoid refreshing heartbeat timer too often
Mark Brown (1):
net: phy: spi_ks8895: Don't leak references to SPI devices
Martin KaFai Lau (7):
ipv6: datagram: Refactor flowi6 init codes to a new function
ipv6: datagram: Refactor dst lookup and update codes to a new function
ipv6: datagram: Update dst cache of a connected datagram sk during pmtu update
ipv6: udp: Do a route lookup and update during release_cb
tcp: Fix SOF_TIMESTAMPING_TX_ACK when handling dup acks
tcp: Merge tx_flags and tskey in tcp_collapse_retrans
tcp: Merge tx_flags and tskey in tcp_shifted_skb
Mathias Krause (1):
packet: fix heap info leak in PACKET_DIAG_MCLIST sock_diag interface
Matti Gottlieb (1):
iwlwifi: mvm: fix memory leak in paging
Neil Armstrong (2):
net: ethernet: davinci_emac: Fix Unbalanced pm_runtime_enable
net: ethernet: davinci_emac: Fix platform_data overwrite
Phil Reid (1):
net: stmmac: socfgpa: Ensure emac bit set in System Manger for PTP
Phil Sutter (1):
netfilter: ebtables: Fix extension lookup with identical name
Qing Huang (1):
RDS: fix endianness for dp_ack_seq
Rafał Miłecki (1):
bgmac: reset & enable Ethernet core before using it
Sergei Shtylyov (1):
sh_eth: re-enable-E-MAC interrupts in sh_eth_set_ringparam()
Shrikrishna Khare (1):
Driver: Vmxnet3: set CHECKSUM_UNNECESSARY for IPv6 packets
Simon Horman (1):
openvswitch: use flow protocol when recalculating ipv6 checksums
Vivien Didelot (3):
net: dsa: mv88e6xxx: unlock DSA and CPU ports
net: dsa: mv88e6xxx: enable SA learning on DSA ports
net: dsa: mv88e6xxx: share the same default FDB
Wolfram Sang (1):
net: ethernet: renesas: ravb_main: test clock rate to avoid division by 0
santosh.shilimkar@oracle.com (1):
RDS: Fix the atomicity for congestion map update
stephen hemminger (1):
devlink: add missing install of header
Documentation/devicetree/bindings/net/mediatek-net.txt | 7 ++-
drivers/bcma/main.c | 17 ++------
drivers/isdn/mISDN/socket.c | 3 ++
drivers/net/Kconfig | 1 +
drivers/net/dsa/mv88e6xxx.c | 34 +++------------
drivers/net/ethernet/atheros/atlx/atl2.c | 2 +-
drivers/net/ethernet/broadcom/bgmac.c | 5 +++
drivers/net/ethernet/broadcom/bgmac.h | 6 +--
drivers/net/ethernet/broadcom/genet/bcmgenet.c | 6 ++-
drivers/net/ethernet/cavium/thunder/thunder_bgx.c | 5 ++-
drivers/net/ethernet/chelsio/cxgb4/cxgb4.h | 3 ++
drivers/net/ethernet/chelsio/cxgb4/sge.c | 20 +++++++--
drivers/net/ethernet/chelsio/cxgb4/t4_hw.c | 33 ++++++++++++++
drivers/net/ethernet/intel/fm10k/fm10k_pf.c | 30 +++++++++----
drivers/net/ethernet/intel/i40e/i40e_txrx.c | 49 +++++++++++----------
drivers/net/ethernet/intel/i40e/i40e_txrx.h | 10 +++--
drivers/net/ethernet/intel/i40evf/i40e_txrx.c | 49 +++++++++++----------
drivers/net/ethernet/intel/i40evf/i40e_txrx.h | 10 +++--
drivers/net/ethernet/mellanox/mlx4/en_ethtool.c | 5 ++-
drivers/net/ethernet/mellanox/mlx4/en_port.c | 5 ++-
drivers/net/ethernet/mellanox/mlx4/en_rx.c | 12 ++++--
drivers/net/ethernet/mellanox/mlx4/main.c | 76 ++++++++++++++++++++++++--------
drivers/net/ethernet/mellanox/mlx4/mlx4.h | 2 +
drivers/net/ethernet/mellanox/mlx4/mlx4_en.h | 1 +
drivers/net/ethernet/mellanox/mlx4/port.c | 13 ++++++
drivers/net/ethernet/qlogic/qede/qede_main.c | 157 ++++++++++++++++++++++++++++++++++++++++++------------------------
drivers/net/ethernet/renesas/ravb_main.c | 3 ++
drivers/net/ethernet/renesas/sh_eth.c | 6 +--
drivers/net/ethernet/stmicro/stmmac/dwmac-socfpga.c | 16 +++++--
drivers/net/ethernet/ti/cpsw.c | 4 +-
drivers/net/ethernet/ti/davinci_emac.c | 3 +-
drivers/net/phy/spi_ks8995.c | 2 +-
drivers/net/usb/cdc_mbim.c | 9 +++-
drivers/net/vmxnet3/vmxnet3_drv.c | 12 ++++--
drivers/net/vmxnet3/vmxnet3_int.h | 4 +-
drivers/net/vrf.c | 177 +++++++--------------------------------------------------------------------
drivers/net/wireless/broadcom/b43/main.c | 6 ++-
drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c | 2 +
drivers/net/wireless/intel/iwlwifi/mvm/ops.c | 2 -
drivers/net/wireless/intel/iwlwifi/pcie/trans.c | 4 +-
drivers/net/wireless/realtek/rtlwifi/rtl8821ae/dm.c | 6 +--
include/linux/mlx4/device.h | 7 +++
include/linux/rculist_nulls.h | 39 +++++++++++++++++
include/net/cls_cgroup.h | 7 ++-
include/net/ip6_route.h | 3 ++
include/net/ipv6.h | 2 +
include/net/route.h | 3 ++
include/net/sctp/structs.h | 8 +++-
include/net/sock.h | 6 ++-
include/net/tcp.h | 2 +
include/uapi/linux/Kbuild | 1 +
kernel/bpf/verifier.c | 1 +
net/bridge/netfilter/ebtables.c | 6 ++-
net/core/skbuff.c | 7 ++-
net/decnet/dn_route.c | 9 +++-
net/ipv4/netfilter/arptable_filter.c | 6 +++
net/ipv4/route.c | 19 ++++++--
net/ipv4/tcp_input.c | 4 +-
net/ipv4/tcp_output.c | 16 +++++++
net/ipv4/udp.c | 9 +++-
net/ipv6/addrconf.c | 22 +++++++++-
net/ipv6/datagram.c | 169 ++++++++++++++++++++++++++++++++++++++++++++---------------------------
net/ipv6/route.c | 19 ++++++--
net/ipv6/udp.c | 1 +
net/netfilter/nf_conntrack_proto_tcp.c | 4 ++
net/netlink/af_netlink.c | 2 +-
net/openvswitch/actions.c | 4 +-
net/openvswitch/conntrack.c | 1 +
net/packet/af_packet.c | 1 +
net/rds/cong.c | 4 +-
net/rds/ib_cm.c | 2 +-
net/sched/sch_generic.c | 5 ++-
net/sctp/outqueue.c | 15 ++++---
net/sctp/sm_make_chunk.c | 3 +-
net/sctp/sm_sideeffect.c | 36 +++++++---------
net/sctp/transport.c | 19 +++++---
net/tipc/core.c | 1 +
net/tipc/core.h | 3 ++
net/tipc/name_distr.c | 35 +++++++++++----
net/vmw_vsock/vmci_transport.c | 7 +--
net/wireless/nl80211.c | 2 +-
tools/testing/selftests/net/.gitignore | 1 +
tools/testing/selftests/net/Makefile | 2 +-
tools/testing/selftests/net/reuseport_dualstack.c | 208 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
84 files changed, 1009 insertions(+), 529 deletions(-)
create mode 100644 tools/testing/selftests/net/reuseport_dualstack.c
^ permalink raw reply
* Re: [net-next 15/17] fm10k: fix possible null pointer deref after kcalloc
From: Jeff Kirsher @ 2016-04-21 19:48 UTC (permalink / raw)
To: David Miller, jacob.e.keller; +Cc: netdev, nhorman, sassmann, jogreene
In-Reply-To: <20160421.154727.1143899173479860095.davem@davemloft.net>
[-- Attachment #1: Type: text/plain, Size: 516 bytes --]
On Thu, 2016-04-21 at 15:47 -0400, David Miller wrote:
> From: "Keller, Jacob E" <jacob.e.keller@intel.com>
> Date: Thu, 21 Apr 2016 19:44:24 +0000
>
> > Dave, please don't pull this patch. Krishneil found an issue with
> > this patch, and I sent a corrected fix to squash in but it didn't
> > make it into this one. I'd like to get the fix squashed in a resend
> > before this is pulled into net-next.
>
> Too late, it's already in my tree.
I will address Jakes concerns in my next fm10k pull request.
[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
^ permalink raw reply
* Re: [net-next 15/17] fm10k: fix possible null pointer deref after kcalloc
From: David Miller @ 2016-04-21 19:47 UTC (permalink / raw)
To: jacob.e.keller; +Cc: jeffrey.t.kirsher, netdev, nhorman, sassmann, jogreene
In-Reply-To: <02874ECE860811409154E81DA85FBB5857A7C1E0@ORSMSX115.amr.corp.intel.com>
From: "Keller, Jacob E" <jacob.e.keller@intel.com>
Date: Thu, 21 Apr 2016 19:44:24 +0000
> Dave, please don't pull this patch. Krishneil found an issue with
> this patch, and I sent a corrected fix to squash in but it didn't
> make it into this one. I'd like to get the fix squashed in a resend
> before this is pulled into net-next.
Too late, it's already in my tree.
^ permalink raw reply
* Re: [PATCH net-next 1/2] tcp: Carry txstamp_ack in tcp_fragment_tstamp
From: Willem de Bruijn @ 2016-04-21 19:45 UTC (permalink / raw)
To: Martin KaFai Lau
Cc: Network Development, Eric Dumazet, Neal Cardwell,
Soheil Hassas Yeganeh, Willem de Bruijn, Yuchung Cheng,
Kernel Team
In-Reply-To: <1461131448-1460418-2-git-send-email-kafai@fb.com>
On Wed, Apr 20, 2016 at 1:50 AM, Martin KaFai Lau <kafai@fb.com> wrote:
> When a tcp skb is sliced into two smaller skbs (e.g. in
> tcp_fragment() and tso_fragment()), it does not carry
> the txstamp_ack bit to the newly created skb if it is needed.
> The end result is a timestamping event (SCM_TSTAMP_ACK) will
> be missing from the sk->sk_error_queue.
>
> This patch carries this bit to the new skb2
> in tcp_fragment_tstamp().
> Signed-off-by: Martin KaFai Lau <kafai@fb.com>
> Cc: Eric Dumazet <edumazet@google.com>
> Cc: Neal Cardwell <ncardwell@google.com>
> Cc: Soheil Hassas Yeganeh <soheil@google.com>
> Cc: Willem de Bruijn <willemb@google.com>
> Cc: Yuchung Cheng <ycheng@google.com>
> Acked-by: Soheil Hassas Yeganeh <soheil@google.com>
Acked-by: Willem de Bruijn <willemb@google.com>
^ permalink raw reply
* RE: [net-next 15/17] fm10k: fix possible null pointer deref after kcalloc
From: Keller, Jacob E @ 2016-04-21 19:44 UTC (permalink / raw)
To: Kirsher, Jeffrey T, davem@davemloft.net
Cc: netdev@vger.kernel.org, nhorman@redhat.com, sassmann@redhat.com,
jogreene@redhat.com
In-Reply-To: <1461218969-68578-16-git-send-email-jeffrey.t.kirsher@intel.com>
> -----Original Message-----
> From: Kirsher, Jeffrey T
> Sent: Wednesday, April 20, 2016 11:09 PM
> To: davem@davemloft.net
> Cc: Keller, Jacob E <jacob.e.keller@intel.com>; netdev@vger.kernel.org;
> nhorman@redhat.com; sassmann@redhat.com; jogreene@redhat.com;
> Kirsher, Jeffrey T <jeffrey.t.kirsher@intel.com>
> Subject: [net-next 15/17] fm10k: fix possible null pointer deref after kcalloc
>
> From: Jacob Keller <jacob.e.keller@intel.com>
>
> When writing a new default redirection table, we needed to populate
> a new RSS table using ethtool_rxfh_indir_default. We populated this
> table into a region of memory allocated using kcalloc, but never checked
> this for NULL. Fix this by moving the default table generation into
> fm10k_write_reta. If this function is passed a table, use it. Otherwise,
> generate the default table using ethtool_rxfh_indir_default, 4 at at
> time.
>
> Fixes: 0ea7fae44094 ("fm10k: use ethtool_rxfh_indir_default for default
> redirection table")
> Signed-off-by: Jacob Keller <jacob.e.keller@intel.com>
> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> ---
Hi Dave, and Jeff,
Dave, please don't pull this patch. Krishneil found an issue with this patch, and I sent a corrected fix to squash in but it didn't make it into this one. I'd like to get the fix squashed in a resend before this is pulled into net-next.
Thanks,
Jake
^ permalink raw reply
* Re: [PATCH] ixgbevf: Fix relaxed order settings in VF driver
From: Babu Moger @ 2016-04-21 19:39 UTC (permalink / raw)
To: Alexander Duyck
Cc: Jeff Kirsher, Brandeburg, Jesse, shannon nelson, Carolyn Wyborny,
Skidmore, Donald C, Bruce W Allan, John Ronciak, Mitch Williams,
intel-wired-lan, Netdev, linux-kernel@vger.kernel.org,
Sowmini Varadhan
In-Reply-To: <CAKgT0UdEP9ZMnNjSSqh-vZvaEc9N8_X_KWvykChxRv1bretYtw@mail.gmail.com>
Hi Alex,
On 4/21/2016 2:22 PM, Alexander Duyck wrote:
> On Thu, Apr 21, 2016 at 11:13 AM, Alexander Duyck
> <alexander.duyck@gmail.com> wrote:
>> On Thu, Apr 21, 2016 at 10:21 AM, Babu Moger <babu.moger@oracle.com> wrote:
>>> Current code writes the tx/rx relaxed order without reading it first.
>>> This can lead to unintended consequences as we are forcibly writing
>>> other bits.
>>
>> The consequences were very much intended as there are situations where
>> enabling relaxed ordering can lead to data corruption.
>>
>>> We noticed this problem while testing VF driver on sparc. Relaxed
>>> order settings for rx queue were all messed up which was causing
>>> performance drop with VF interface.
>>
>> What additional relaxed ordering bits are you enabling on Sparc? I'm
>> assuming it is just the Rx data write back but I want to verify.
>>
>>> Fixed it by reading the registers first and setting the specific
>>> bit of interest. With this change we are able to match the bandwidth
>>> equivalent to PF interface.
>>>
>>> Signed-off-by: Babu Moger <babu.moger@oracle.com>
>>
>> Fixed is a relative term here since you are only chasing performance
>> from what I can tell. We need to make certain that this doesn't break
>> the driver on any other architectures by leading to things like data
>> corruption.
>>
>> - Alex
>
> It occurs to me that what might be easier is instead of altering the
> configuration on all architectures you could instead wrap the write so
> that on SPARC you include the extra bits you need and on all other
> architectures you leave the write as-is similar to how the code in the
> ixgbe_start_hw_gen2 only clears the bits if CONFIG_SPARC is not
> defined.
Here are the default values that I see when testing on Sparc.
Default tx value 0x2a00
All below 3 set
#define IXGBE_DCA_TXCTRL_DESC_RRO_EN (1 << 9) /* Tx rd Desc Relax Order */
#define IXGBE_DCA_TXCTRL_DESC_WRO_EN (1 << 11) /* Tx Desc writeback RO bit */
#define IXGBE_DCA_TXCTRL_DATA_RRO_EN (1 << 13) /* Tx rd data Relax Order */
I am not too worried about tx values. I can keep it as it is. It did not
seem to cause any problems right now.
Default rx value 0xb200
All below 3 set plus one more
#define IXGBE_DCA_RXCTRL_DESC_RRO_EN (1 << 9) /* DCA Rx rd Desc Relax Order */
#define IXGBE_DCA_RXCTRL_DATA_WRO_EN (1 << 13) /* Rx wr data Relax Order */
#define IXGBE_DCA_RXCTRL_HEAD_WRO_EN (1 << 15) /* Rx wr header RO */
Is there a reason to disable IXGBE_DCA_RXCTRL_DATA_WRO_EN and
IXGBE_DCA_RXCTRL_HEAD_WRO_EN for RX?
I would think CONFIG_SPARC should be our last option. What do you think?
>
> - Alex
>
^ permalink raw reply
* Re: [PATCH net-next 0/7] net: network drivers should not depend on geneve/vxlan
From: David Miller @ 2016-04-21 19:36 UTC (permalink / raw)
To: hannes; +Cc: netdev, jesse
In-Reply-To: <1461224591.4101216.585253121.498EBE7C@webmail.messagingengine.com>
From: Hannes Frederic Sowa <hannes@stressinduktion.org>
Date: Thu, 21 Apr 2016 09:43:11 +0200
> Hi David,
>
> On Wed, Apr 20, 2016, at 03:11, David Miller wrote:
>> From: Hannes Frederic Sowa <hannes@stressinduktion.org>
>> Date: Wed, 20 Apr 2016 03:06:13 +0200
>>
>> > On Wed, Apr 20, 2016, at 02:27, David Miller wrote:
>> >> From: Hannes Frederic Sowa <hannes@stressinduktion.org>
>> >> Date: Mon, 18 Apr 2016 21:19:41 +0200
>> >>
>> >> > This patchset removes the dependency of network drivers on vxlan or
>> >> > geneve, so those don't get autoloaded when the nic driver is loaded.
>> >> >
>> >> > Also audited the code such that vxlan_get_rx_port and geneve_get_rx_port
>> >> > are not called without rtnl lock.
>> >>
>> >> In net-next, the 'qed' driver has tunneling offload support too.
>> >> Don't you need to update this series to handle that driver as
>> >> well?
>> >
>> > I audited qede as well:
>> >
>> > qede calls {vxlan,geneve}_get_rx_port only from ndo_open which isn't
>> > reused anywhere else in the driver, only from ndo_open, which holds
>> > rtnl_lock also. Thus the driver is safe and doesn't need a change.
>>
>> I'm talking about your final patches which elide the dependencies.
>
> could you look at this again? If you have further feedback I am happy to
> incooperate those.
Series applied, thanks Hannes.
^ permalink raw reply
* Re: [PATCH v2 0/4] net: thunderx: Add multiqset support for DPDK
From: David Miller @ 2016-04-21 19:31 UTC (permalink / raw)
To: sunil.kovvuri
Cc: netdev, linux-kernel, linux-arm-kernel, sgoutham, robert.richter
In-Reply-To: <1461221872-38841-1-git-send-email-sunil.kovvuri@gmail.com>
From: sunil.kovvuri@gmail.com
Date: Thu, 21 Apr 2016 12:27:48 +0530
> This patch series mainly adds support for userspace application
> like DPDK with a VNIC VF attached to request additional QSets
> for having morethan the default 8 queues.
I don't think it's appropriate to add facilities for non-upstream
features, especially DPDK.
Thanks.
^ permalink raw reply
* Re: [PATCH net] openvswitch: use flow protocol when recalculating ipv6 checksums
From: David Miller @ 2016-04-21 19:29 UTC (permalink / raw)
To: simon.horman; +Cc: pshelar, jesse, netdev, dev, jrajahalme
In-Reply-To: <1461203355-3088-1-git-send-email-simon.horman@netronome.com>
From: Simon Horman <simon.horman@netronome.com>
Date: Thu, 21 Apr 2016 11:49:15 +1000
> When using masked actions the ipv6_proto field of an action
> to set IPv6 fields may be zero rather than the prevailing protocol
> which will result in skipping checksum recalculation.
>
> This patch resolves the problem by relying on the protocol
> in the flow key rather than that in the set field action.
>
> Fixes: 83d2b9ba1abc ("net: openvswitch: Support masked set actions.")
> Cc: Jarno Rajahalme <jrajahalme@nicira.com>
> Signed-off-by: Simon Horman <simon.horman@netronome.com>
Looks good to me, applied and queued up for -stable.
Thanks Simon.
^ permalink raw reply
* Re: [PATCH net] Driver: Vmxnet3: set CHECKSUM_UNNECESSARY for IPv6 packets
From: David Miller @ 2016-04-21 19:29 UTC (permalink / raw)
To: skhare; +Cc: netdev, linux-kernel, pv-drivers, heoj
In-Reply-To: <1461201149-45583-1-git-send-email-skhare@vmware.com>
From: Shrikrishna Khare <skhare@vmware.com>
Date: Wed, 20 Apr 2016 18:12:29 -0700
> For IPv6, if the device indicates that the checksum is correct, set
> CHECKSUM_UNNECESSARY.
>
> Reported-by: Subbarao Narahari <snarahari@vmware.com>
> Signed-off-by: Shrikrishna Khare <skhare@vmware.com>
> Signed-off-by: Jin Heo <heoj@vmware.com>
Applied.
^ permalink raw reply
* Re: [PATCH] ixgbevf: Fix relaxed order settings in VF driver
From: Alexander Duyck @ 2016-04-21 19:22 UTC (permalink / raw)
To: Babu Moger
Cc: Jeff Kirsher, Brandeburg, Jesse, shannon nelson, Carolyn Wyborny,
Skidmore, Donald C, Bruce W Allan, John Ronciak, Mitch Williams,
intel-wired-lan, Netdev, linux-kernel@vger.kernel.org,
Sowmini Varadhan
In-Reply-To: <CAKgT0UeU+Q1HDvR8pK3kxYofjEqk8jVeh5xONoUpD34MsPZCCA@mail.gmail.com>
On Thu, Apr 21, 2016 at 11:13 AM, Alexander Duyck
<alexander.duyck@gmail.com> wrote:
> On Thu, Apr 21, 2016 at 10:21 AM, Babu Moger <babu.moger@oracle.com> wrote:
>> Current code writes the tx/rx relaxed order without reading it first.
>> This can lead to unintended consequences as we are forcibly writing
>> other bits.
>
> The consequences were very much intended as there are situations where
> enabling relaxed ordering can lead to data corruption.
>
>> We noticed this problem while testing VF driver on sparc. Relaxed
>> order settings for rx queue were all messed up which was causing
>> performance drop with VF interface.
>
> What additional relaxed ordering bits are you enabling on Sparc? I'm
> assuming it is just the Rx data write back but I want to verify.
>
>> Fixed it by reading the registers first and setting the specific
>> bit of interest. With this change we are able to match the bandwidth
>> equivalent to PF interface.
>>
>> Signed-off-by: Babu Moger <babu.moger@oracle.com>
>
> Fixed is a relative term here since you are only chasing performance
> from what I can tell. We need to make certain that this doesn't break
> the driver on any other architectures by leading to things like data
> corruption.
>
> - Alex
It occurs to me that what might be easier is instead of altering the
configuration on all architectures you could instead wrap the write so
that on SPARC you include the extra bits you need and on all other
architectures you leave the write as-is similar to how the code in the
ixgbe_start_hw_gen2 only clears the bits if CONFIG_SPARC is not
defined.
- Alex
^ permalink raw reply
* Re: [PATCH net] atl2: Disable unimplemented scatter/gather feature
From: David Miller @ 2016-04-21 19:12 UTC (permalink / raw)
To: ben; +Cc: netdev, jyackoski
In-Reply-To: <20160420222308.GJ3348@decadent.org.uk>
From: Ben Hutchings <ben@decadent.org.uk>
Date: Wed, 20 Apr 2016 23:23:08 +0100
> atl2 includes NETIF_F_SG in hw_features even though it has no support
> for non-linear skbs. This bug was originally harmless since the
> driver does not claim to implement checksum offload and that used to
> be a requirement for SG.
>
> Now that SG and checksum offload are independent features, if you
> explicitly enable SG *and* use one of the rare protocols that can use
> SG without checkusm offload, this potentially leaks sensitive
> information (before you notice that it just isn't working). Therefore
> this obscure bug has been designated CVE-2016-2117.
>
> Reported-by: Justin Yackoski <jyackoski@crypto-nite.com>
> Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
> Fixes: ec5f06156423 ("net: Kill link between CSUM and SG features.")
Applied and queued up for -stable, thanks.
^ permalink raw reply
* Re: [net-next PATCH v2 0/3] Feature tweaks/fixes follow-up to GSO partial patches
From: David Miller @ 2016-04-21 19:11 UTC (permalink / raw)
To: aduyck; +Cc: netdev, alexander.duyck
In-Reply-To: <20160420144720.3100.74116.stgit@ahduyck-xeon-server>
From: Alexander Duyck <aduyck@mirantis.com>
Date: Wed, 20 Apr 2016 10:49:00 -0400
> This patch series is a set of minor fix-ups and tweaks following the GSO
> partial and TSO with IPv4 ID mangling patches. It mostly is just meant to
> make certain that if we have GSO partial support at the device we can make
> use of it from the far end of the tunnel.
>
> v2: Added cover page which was forgotten with first submission.
> Added patch that enables TSOv4 IP ID mangling w/ tunnels and/or VLANs.
Since I already applied the first two patches, I just applied the third one
here by itself.
I hope that's OK.
Thanks.
^ permalink raw reply
* Re: [PATCH net-next V3 00/11] Mellanox 100G mlx5 driver receive path optimizations
From: David Miller @ 2016-04-21 19:09 UTC (permalink / raw)
To: saeedm; +Cc: netdev, ogerlitz, talal, tariqt, eranbe, edumazet, brouer
In-Reply-To: <1461178939-20687-1-git-send-email-saeedm@mellanox.com>
From: Saeed Mahameed <saeedm@mellanox.com>
Date: Wed, 20 Apr 2016 22:02:08 +0300
...
> This series includes Some RX modifications and optimizations for
> the mlx5 Ethernet driver.
...
Series applied, thanks.
^ permalink raw reply
* Re: [PATCH net-next 0/2] net: bcmsysport: utilize newer NAPI APIs
From: David Miller @ 2016-04-21 19:06 UTC (permalink / raw)
To: f.fainelli; +Cc: netdev, edumazet, pgynther
In-Reply-To: <1461177429-23553-1-git-send-email-f.fainelli@gmail.com>
From: Florian Fainelli <f.fainelli@gmail.com>
Date: Wed, 20 Apr 2016 11:37:07 -0700
> These two patches are very analoguous to what was already submitted for
> BCMGENET and switch the SYSTEMPORT driver to utilizing __napi_schedule_irqoff()
> and napi_complete_done for the RX NAPI context.
Applied, thanks.
^ permalink raw reply
* Re: [PATCH net 0/4] Mellaox 40G driver fixes for 4.6-rc
From: David Miller @ 2016-04-21 19:03 UTC (permalink / raw)
To: ogerlitz; +Cc: netdev, eranbe, yishaih
In-Reply-To: <1461157278-18528-1-git-send-email-ogerlitz@mellanox.com>
From: Or Gerlitz <ogerlitz@mellanox.com>
Date: Wed, 20 Apr 2016 16:01:14 +0300
> With the fix for ARM bug being under the works, these are
> few other fixes for mlx4 we have ready to go.
>
> Eran addressed the problematic/wrong reporting of dropped packets, Daniel
> fixed some matters related to PPC EEH's and Jenny's patch makes sure
> VFs can't change the port's pause settings.
Series applied, thanks.
^ permalink raw reply
* Re: [PATCH net 9/9] net/mlx5e: Reset link modes upon setting speed to zero
From: Saeed Mahameed @ 2016-04-21 19:01 UTC (permalink / raw)
To: David Miller
Cc: Saeed Mahameed, Linux Netdev List, Or Gerlitz, Tal Alon,
Eran Ben Elisha
In-Reply-To: <20160421.140454.143155848960923980.davem@davemloft.net>
On Thu, Apr 21, 2016 at 9:04 PM, David Miller <davem@davemloft.net> wrote:
> From: Saeed Mahameed <saeedm@mellanox.com>
> Date: Tue, 19 Apr 2016 15:33:42 +0300
>
>> Upon ethtool request to set speed to 0 we handle it as a special request
>> to reset link modes to Device's defaults.
>>
>> Fixes: f62b8bb8f2d3 ("net/mlx5: Extend mlx5_core to support ConnectX-4
>> Ethernet functionality")
>> Signed-off-by: Saeed Mahameed <saeedm@mellanox.com>
>
> Please don't try to sneak things like this into the patches you submit.
>
No one is trying to sneak things here, This patch is transparent
enough and well documented, it is not fair to call it "sneaking" !
I am glad this is what you think about the patch, but i am a little
bit stunned of what you think about me .
> If you continue to add weird stuff like this, I will never _ever_ be
> able to trust you guys and have a high degree of confidence in your
> changes. If you continue like this, I will always have to audit your
> patches very strictly which is very time consuming for me.
>
Well i wanted to argue on why i think it is ok to treat speed=0 as
special reset request, but I also kinda agree with you on this, I
won't waste more of your time on this.
I hope I won't disappoint you in the future, after all we learn from the best.
> Do not extend ethtool's semantics in a way which suits you specifically.
>
> If we want to have this semantic, you must first propose it as a
> global semantic which then in turn can be adopted by all drivers
> supporting ethtool.
>
Sure thing, will drop this patch now, and will improve it later.
Thank you.
^ permalink raw reply
* Re: [PATCH] net: phy: spi_ks8895: Don't leak references to SPI devices
From: David Miller @ 2016-04-21 19:00 UTC (permalink / raw)
To: broonie; +Cc: f.fainelli, netdev
In-Reply-To: <1461153245-7992-1-git-send-email-broonie@kernel.org>
From: Mark Brown <broonie@kernel.org>
Date: Wed, 20 Apr 2016 12:54:05 +0100
> The ks8895 driver is using spi_dev_get() apparently just to take a copy
> of the SPI device used to instantiate it but never calls spi_dev_put()
> to free it. Since the device is guaranteed to exist between probe() and
> remove() there should be no need for the driver to take an extra
> reference to it so fix the leak by just using a straight assignment.
>
> Signed-off-by: Mark Brown <broonie@kernel.org>
Applied.
^ permalink raw reply
* Re: [PATCH 2/2] net: ethernet: davinci_emac: Fix platform_data overwrite
From: David Miller @ 2016-04-21 18:58 UTC (permalink / raw)
To: narmstrong
Cc: andrew, thomas.lendacky, mugunthanvnm, netdev, linux-kernel,
b.hutchman
In-Reply-To: <1461142605-4335-1-git-send-email-narmstrong@baylibre.com>
From: Neil Armstrong <narmstrong@baylibre.com>
Date: Wed, 20 Apr 2016 10:56:45 +0200
> When the DaVinci emac driver is removed and re-probed, the actual
> pdev->dev.platform_data is populated with an unwanted valid pointer saved by
> the previous davinci_emac_of_get_pdata() call, causing a kernel crash when
> calling priv->int_disable() in emac_int_disable().
>
> Unable to handle kernel paging request at virtual address c8622a80
> ...
> [<c0426fb4>] (emac_int_disable) from [<c0427700>] (emac_dev_open+0x290/0x5f8)
> [<c0427700>] (emac_dev_open) from [<c04c00ec>] (__dev_open+0xb8/0x120)
> [<c04c00ec>] (__dev_open) from [<c04c0370>] (__dev_change_flags+0x88/0x14c)
> [<c04c0370>] (__dev_change_flags) from [<c04c044c>] (dev_change_flags+0x18/0x48)
> [<c04c044c>] (dev_change_flags) from [<c052bafc>] (devinet_ioctl+0x6b4/0x7ac)
> [<c052bafc>] (devinet_ioctl) from [<c04a1428>] (sock_ioctl+0x1d8/0x2c0)
> [<c04a1428>] (sock_ioctl) from [<c014f054>] (do_vfs_ioctl+0x41c/0x600)
> [<c014f054>] (do_vfs_ioctl) from [<c014f2a4>] (SyS_ioctl+0x6c/0x7c)
> [<c014f2a4>] (SyS_ioctl) from [<c000ff60>] (ret_fast_syscall+0x0/0x1c)
>
> Fixes: 42f59967a091 ("net: ethernet: davinci_emac: add OF support")
> Cc: Brian Hutchinson <b.hutchman@gmail.com>
> Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
Applied.
^ permalink raw reply
* Re: [PATCH 1/2] net: ethernet: davinci_emac: Fix Unbalanced pm_runtime_enable
From: David Miller @ 2016-04-21 18:58 UTC (permalink / raw)
To: narmstrong
Cc: andrew, thomas.lendacky, mugunthanvnm, netdev, linux-kernel,
b.hutchman
In-Reply-To: <1461142573-4276-1-git-send-email-narmstrong@baylibre.com>
From: Neil Armstrong <narmstrong@baylibre.com>
Date: Wed, 20 Apr 2016 10:56:13 +0200
> In order to avoid an Unbalanced pm_runtime_enable in the DaVinci
> emac driver when the device is removed and re-probed, and a
> pm_runtime_disable() call in davinci_emac_remove().
>
> Actually, using unbind/bind on a TI DM8168 SoC gives :
> $ echo 4a120000.ethernet > /sys/bus/platform/drivers/davinci_emac/unbind
> net eth1: DaVinci EMAC: davinci_emac_remove()
> $ echo 4a120000.ethernet > /sys/bus/platform/drivers/davinci_emac/bind
> davinci_emac 4a120000.ethernet: Unbalanced pm_runtime_enable
>
> Cc: Brian Hutchinson <b.hutchman@gmail.com>
> Fixes: 3ba97381343b ("net: ethernet: davinci_emac: add pm_runtime support")
> Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
Applied.
^ permalink raw reply
* Re: [PATCH net-next 0/2] tcp: Handle txstamp_ack when fragmenting/coalescing skbs
From: David Miller @ 2016-04-21 18:52 UTC (permalink / raw)
To: kafai; +Cc: netdev, edumazet, ncardwell, soheil, willemb, ycheng, kernel-team
In-Reply-To: <1461131448-1460418-1-git-send-email-kafai@fb.com>
From: Martin KaFai Lau <kafai@fb.com>
Date: Tue, 19 Apr 2016 22:50:46 -0700
> The second patch depends on the recently posted series
> for the net branch:
> "tcp: Merge timestamp info when coalescing skbs"
I'll therefore apply this after I do my next merge of net into
net-next, just FYI...
^ permalink raw reply
* Re: [PATCH v2 net 0/3] qede: Bug fixes
From: David Miller @ 2016-04-21 18:51 UTC (permalink / raw)
To: manish.chopra; +Cc: netdev, Ariel.Elior, Yuval.Mintz
In-Reply-To: <1461135809-9776-1-git-send-email-manish.chopra@qlogic.com>
From: Manish Chopra <manish.chopra@qlogic.com>
Date: Wed, 20 Apr 2016 03:03:26 -0400
> This series fixes -
>
> * various memory allocation failure flows for fastpath
> * issues with respect to driver GRO packets handling
>
> V1->V2
>
> * Send series against net instead of net-next.
>
> Please consider applying this series to "net"
Series applied, thanks.
^ 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