* Re: [PATCH 1/1 net-next] netrom: use linux/uaccess.h
From: David Miller @ 2014-10-18 3:53 UTC (permalink / raw)
To: fabf; +Cc: linux-kernel, ralf, linux-hams, netdev
In-Reply-To: <1413576023-26717-1-git-send-email-fabf@skynet.be>
From: Fabian Frederick <fabf@skynet.be>
Date: Fri, 17 Oct 2014 22:00:22 +0200
> replace asm/uaccess.h by linux/uaccess.h
>
> Signed-off-by: Fabian Frederick <fabf@skynet.be>
Applied.
^ permalink raw reply
* Re: [PATCH net v2] net: dsa: add includes for ethtool and phy_fixed definitions
From: David Miller @ 2014-10-18 3:55 UTC (permalink / raw)
To: f.fainelli; +Cc: netdev
In-Reply-To: <1413586933-12090-1-git-send-email-f.fainelli@gmail.com>
From: Florian Fainelli <f.fainelli@gmail.com>
Date: Fri, 17 Oct 2014 16:02:13 -0700
> net/dsa/slave.c uses functions and structures declared in phy_fixed.h
> but does not explicitely include it, while dsa.h needs structure
> declarations for 'struct ethtool_wolinfo' and 'struct ethtool_eee', fix
> those by including the correct header files.
>
> Fixes: ec9436baedb6 ("net: dsa: allow drivers to do link adjustment")
> Fixes: ce31b31c68e7 ("net: dsa: allow updating fixed PHY link information")
> Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
Applied, thanks.
^ permalink raw reply
* Re: [PATCH net] openvswitch: Set flow-key members.
From: David Miller @ 2014-10-18 3:55 UTC (permalink / raw)
To: pshelar; +Cc: netdev
In-Reply-To: <1413579391-1470-1-git-send-email-pshelar@nicira.com>
From: Pravin B Shelar <pshelar@nicira.com>
Date: Fri, 17 Oct 2014 13:56:31 -0700
> This patch adds missing memset which are required to initialize
> flow key member. For example for IP flow we need to initialize
> ip.frag for all cases.
>
> Found by inspection.
>
> This bug is introduced by commit 0714812134d7dcadeb7ecfbfeb18788aa7e1eaac
> ("openvswitch: Eliminate memset() from flow_extract").
>
> Signed-off-by: Pravin B Shelar <pshelar@nicira.com>
Applied.
^ permalink raw reply
* Re: [PATCH net] bna: fix skb->truesize underestimation
From: David Miller @ 2014-10-18 3:56 UTC (permalink / raw)
To: eric.dumazet; +Cc: netdev, rasesh.mody
In-Reply-To: <1413575155.27176.5.camel@edumazet-glaptop2.roam.corp.google.com>
From: Eric Dumazet <eric.dumazet@gmail.com>
Date: Fri, 17 Oct 2014 12:45:55 -0700
> From: Eric Dumazet <edumazet@google.com>
>
> skb->truesize is not meant to be tracking amount of used bytes
> in an skb, but amount of reserved/consumed bytes in memory.
>
> For instance, if we use a single byte in last page fragment,
> we have to account the full size of the fragment.
>
> skb->truesize can be very different from skb->len, that has
> a very specific safety purpose.
>
> Signed-off-by: Eric Dumazet <edumazet@google.com>
Applied.
^ permalink raw reply
* [PATCH 1/2] staging: lustre: lnet: lnet: do not initialise 0
From: Balavasu @ 2014-10-18 4:03 UTC (permalink / raw)
To: netdev; +Cc: linux-kernel
This patch fixes the checkpatch.pl issue
Error:do not initialise statics to 0 or NULL
Signed-off-by: Balavasu <kp.balavasu@gmail.com>
---
drivers/staging/lustre/lnet/lnet/router.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/drivers/staging/lustre/lnet/lnet/router.c b/drivers/staging/lustre/lnet/lnet/router.c
index b5b8fb5..b6edf1f 100644
--- a/drivers/staging/lustre/lnet/lnet/router.c
+++ b/drivers/staging/lustre/lnet/lnet/router.c
@@ -46,7 +46,7 @@ MODULE_PARM_DESC(small_router_buffers, "# of small (1 page) messages to buffer i
static int large_router_buffers;
module_param(large_router_buffers, int, 0444);
MODULE_PARM_DESC(large_router_buffers, "# of large messages to buffer in the router");
-static int peer_buffer_credits = 0;
+static int peer_buffer_credits;
module_param(peer_buffer_credits, int, 0444);
MODULE_PARM_DESC(peer_buffer_credits, "# router buffer credits per peer");
@@ -80,7 +80,7 @@ lnet_peer_buffer_credits(lnet_ni_t *ni)
#endif
-static int check_routers_before_use = 0;
+static int check_routers_before_use = {0};
module_param(check_routers_before_use, int, 0444);
MODULE_PARM_DESC(check_routers_before_use, "Assume routers are down and ping them before use");
@@ -245,7 +245,7 @@ lnet_find_net_locked (__u32 net)
static void lnet_shuffle_seed(void)
{
- static int seeded = 0;
+ static int seeded;
int lnd_type, seed[2];
struct timeval tv;
lnet_ni_t *ni;
@@ -1584,8 +1584,8 @@ lnet_notify (lnet_ni_t *ni, lnet_nid_t nid, int alive, unsigned long when)
void
lnet_router_checker (void)
{
- static time_t last = 0;
- static int running = 0;
+ static time_t last;
+ static int running;
time_t now = get_seconds();
int interval = now - last;
--
1.9.1
^ permalink raw reply related
* [PATCH 2/2] staging: lustre: lnet: lnet: trailing statement
From: Balavasu @ 2014-10-18 4:07 UTC (permalink / raw)
To: netdev; +Cc: linux-kernel
This patch fixes the checkpatch.pl issue
Error: trailing statements should be on next line
Signed-off-by: Balavasu <kp.balavasu@gmail.com>
---
drivers/staging/lustre/lnet/lnet/router.c | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/drivers/staging/lustre/lnet/lnet/router.c b/drivers/staging/lustre/lnet/lnet/router.c
index b6edf1f..b839a9f 100644
--- a/drivers/staging/lustre/lnet/lnet/router.c
+++ b/drivers/staging/lustre/lnet/lnet/router.c
@@ -1670,13 +1670,16 @@ lnet_get_tunables (void)
char *s;
s = getenv("LNET_ROUTER_PING_TIMEOUT");
- if (s != NULL) router_ping_timeout = atoi(s);
+ if (s != NULL)
+ router_ping_timeout = atoi(s);
s = getenv("LNET_LIVE_ROUTER_CHECK_INTERVAL");
- if (s != NULL) live_router_check_interval = atoi(s);
+ if (s != NULL)
+ live_router_check_interval = atoi(s);
s = getenv("LNET_DEAD_ROUTER_CHECK_INTERVAL");
- if (s != NULL) dead_router_check_interval = atoi(s);
+ if (s != NULL)
+ dead_router_check_interval = atoi(s);
/* This replaces old lnd_notify mechanism */
check_routers_before_use = 1;
--
1.9.1
^ permalink raw reply related
* [GIT] Networking
From: David Miller @ 2014-10-18 4:18 UTC (permalink / raw)
To: torvalds; +Cc: akpm, netdev, linux-kernel
1) Include fixes for netrom and dsa (Fabian Frederick and Florian
Fainelli)
2) Fix FIXED_PHY support in stmmac, from Giuseppe CAVALLARO.
3) Several SKB use after free fixes (vxlan, openvswitch, vxlan,
ip_tunnel, fou), from Li ROngQing.
4) fec driver PTP support fixes from Luwei Zhou and Nimrod Andy.
5) Use after free in virtio_net, from MichaelS. Tsirkin.
6) Fix flow mask handling for megaflows in openvswitch, from
Pravin B. Shelar.
7) ISDN gigaset and capi bug fixes from Tilman Schmidt.
8) Fix route leak in ip_send_unicast_reply(), from Vasily Averin.
9) Fix two eBPF JIT bugs on x86, from Alexei Starovoitov.
10) TCP_SKB_CB() reorganization caused a few regressions, fixed
by Cong Wang and Eric Dumazet.
11) Don't overwrite end of SKB when parsing malformed sctp ASCONF
chunks, from Daniel Borkmann.
12) Don't call sock_kfree_s() with NULL pointers, this function also
has the side effect of adjusting the socket memory usage. From
Cong Wang.
Please pull, thanks a lot.
The following changes since commit 01d2d484e49e9bc0ed9b5fdaf345a0e2bf35ffed:
Merge branch 'bcmgenet_systemport' (2014-10-10 15:39:22 -0400)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/davem/net.git master
for you to fetch changes up to f2d9da1a8375cbe53df5b415d059429013a3a79f:
bna: fix skb->truesize underestimation (2014-10-17 23:56:33 -0400)
----------------------------------------------------------------
Alexander Aring (1):
skbuff: fix ftrace handling in skb_unshare
Alexander Duyck (1):
fm10k: Add skb->xmit_more support
Alexei Starovoitov (2):
x86: bpf_jit: fix two bugs in eBPF JIT compiler
net: filter: move common defines into bpf_common.h
Andy Zhou (1):
fm10k: Add CONFIG_FM10K_VXLAN configuration option
Anish Bhatt (5):
cxgb4i : Remove duplicated CLIP handling code
cxgb4 : Fix build failure in cxgb4 when ipv6 is disabled/not in-built
cxgb4i : Fix -Wunused-function warning
cxgb4i: Remove duplicate call to dst_neigh_lookup()
cxgb4i : Fix -Wmaybe-uninitialized warning.
Bruno Thomsen (1):
phy/micrel: KSZ8031RNL RMII clock reconfiguration bug
Claudiu Manoil (1):
gianfar: Add FCS to rx buffer size (fix)
Cong Wang (4):
rds: avoid calling sock_kfree_s() on allocation failure
ipv4: call __ip_options_echo() in cookie_v4_check()
ipv4: share tcp_v4_save_options() with cookie_v4_check()
ipv4: clean up cookie_v4_check()
Daniel Borkmann (3):
net: sctp: fix skb_over_panic when receiving malformed ASCONF chunks
net: sctp: fix panic on duplicate ASCONF chunks
net: sctp: fix remote memory pressure from excessive queueing
David S. Miller (9):
Merge branch 'sctp'
Merge branch 'fec-ptp'
Merge branch 'isdn'
Merge branch 'xgene'
Merge branch 'stmmac'
net: Trap attempts to call sock_kfree_s() with a NULL pointer.
Merge branch 'qlcnic'
Merge branch 'cxgb4'
Merge branch 'master' of git://git.kernel.org/.../jkirsher/net
Edward Cree (1):
sfc: add support for skb->xmit_more
Emil Tantilov (1):
ixgbe: check for vfs outside of sriov_num_vfs before dereference
Eric Dumazet (5):
tcp: fix ooo_okay setting vs Small Queues
tcp: fix tcp_ack() performance problem
tcp: TCP Small Queues and strange attractors
ipv6: introduce tcp_v6_iif()
bna: fix skb->truesize underestimation
Fabian Frederick (6):
caif: replace kmalloc/memset 0 by kzalloc
caif_usb: remove redundant memory message
caif_usb: use target structure member in memset
openvswitch: kerneldoc warning fix
openvswitch: use vport instead of p
netrom: use linux/uaccess.h
Florian Fainelli (1):
net: dsa: add includes for ethtool and phy_fixed definitions
Giuseppe CAVALLARO (4):
stmmac: platform: fix FIXED_PHY support.
stmmac: make the STi Layer compatible to STiH407
stmmac: dwmac-sti: review the glue-logic for STi4xx and STiD127 SoCs
stmmac: fix sti compatibililies
Guenter Roeck (2):
dsa: mv88e6171: Fix tag_protocol check
dsa: Fix conversion from host device to mii bus
Haiyang Zhang (1):
hyperv: Add handling of IP header with option field in netvsc_set_hash()
Hariprasad Shenai (1):
cxgb4: Fix FW flash logic using ethtool
Iyappan Subramanian (4):
dtb: Add SGMII based 1GbE node to APM X-Gene SoC device tree
drivers: net: xgene: Preparing for adding SGMII based 1GbE
drivers: net: xgene: Add SGMII based 1GbE support
drivers: net: xgene: Add SGMII based 1GbE ethtool support
Jiri Pirko (1):
ipv4: fix nexthop attlen check in fib_nh_match
Jon Paul Maloy (1):
tipc: fix bug in bundled buffer reception
Li RongQing (7):
ipv6: remove aca_lock spinlock from struct ifacaddr6
vxlan: fix a use after free in vxlan_encap_bypass
vxlan: using pskb_may_pull as early as possible
openvswitch: fix a use after free
vxlan: fix a free after use
ipv4: fix a potential use after free in ip_tunnel_core.c
ipv4: fix a potential use after free in fou.c
Luwei Zhou (3):
net: fec: ptp: Use the 31-bit ptp timer.
net: fec: ptp: Use hardware algorithm to adjust PTP counter.
net: fec: ptp: Enable PPS output based on ptp clock
Mark Rustad (1):
genl_magic: Resolve logical-op warnings
Matthew Vick (2):
fm10k: Check the host state when bringing the interface up
fm10k: Unlock mailbox on VLAN addition failures
Michael Opdenacker (1):
atm: simplify lanai.c by using module_pci_driver
Michael S. Tsirkin (1):
virtio_net: fix use after free
Mugunthan V N (3):
drivers: net: davinci_cpdma: remove kfree on objects allocated with devm_* apis
drivers: net: davinci_cpdma: remove spinlock as SOFTIRQ-unsafe lock order detected
drivers: net: cpsw: remove child devices while driver detach
Nicolas Dichtel (1):
netlink: fix description of portid
Nimrod Andy (2):
net: fec: Fix sparse warnings with different lock contexts for basic block
net: fec: ptp: fix convergence issue to support LinuxPTP stack
Prashant Sreedharan (1):
tg3: Add skb->xmit_more support
Pravin B Shelar (2):
openvswitch: Create right mask with disabled megaflows
openvswitch: Set flow-key members.
Rajesh Borundia (2):
qlcnic: Fix programming number of arguments in a command.
qlcnic: Fix number of arguments in destroy tx context command
Tilman Schmidt (12):
isdn/gigaset: missing break in do_facility_req
isdn/gigaset: make sure controller name is null terminated
isdn/gigaset: limit raw CAPI message dump length
isdn/gigaset: fix NULL pointer dereference
isdn/gigaset: fix non-heap pointer deallocation
isdn/capi: correct capi20_manufacturer argument type mismatch
isdn/capi: prevent index overrun from command_2_index()
isdn/capi: refactor command/subcommand table accesses
isdn/capi: prevent NULL pointer dereference on invalid CAPI command
isdn/capi: handle CAPI 2.0 message parser failures
isdn/capi: don't return NULL from capi_cmd2str()
isdn/gigaset: fix usb_gigaset write_cmd result race
Tom Herbert (1):
net: Add ndo_gso_check
Vasily Averin (1):
ipv4: dst_entry leak in ip_send_unicast_reply()
Vince Bridgers (1):
MAINTAINERS: Update contact information for Vince Bridgers
hayeswang (1):
r8152: return -EBUSY for runtime suspend
Documentation/devicetree/bindings/net/sti-dwmac.txt | 91 +++++++------
MAINTAINERS | 2 +-
arch/arm64/boot/dts/apm-mustang.dts | 4 +
arch/arm64/boot/dts/apm-storm.dtsi | 24 ++++
arch/x86/net/bpf_jit_comp.c | 25 +++-
drivers/atm/lanai.c | 22 +---
drivers/isdn/capi/capidrv.c | 24 +++-
drivers/isdn/capi/capiutil.c | 41 +++++-
drivers/isdn/capi/kcapi.c | 4 +-
drivers/isdn/gigaset/capi.c | 155 ++++++++++++++++++----
drivers/isdn/gigaset/ev-layer.c | 116 +++++++++++------
drivers/isdn/gigaset/usb-gigaset.c | 4 +-
drivers/net/dsa/mv88e6060.c | 16 ++-
drivers/net/dsa/mv88e6171.c | 2 +-
drivers/net/dsa/mv88e6xxx.c | 14 +-
drivers/net/ethernet/apm/xgene/Makefile | 2 +-
drivers/net/ethernet/apm/xgene/xgene_enet_ethtool.c | 25 ++--
drivers/net/ethernet/apm/xgene/xgene_enet_hw.c | 1 -
drivers/net/ethernet/apm/xgene/xgene_enet_hw.h | 4 +-
drivers/net/ethernet/apm/xgene/xgene_enet_main.c | 18 ++-
drivers/net/ethernet/apm/xgene/xgene_enet_main.h | 12 +-
drivers/net/ethernet/apm/xgene/xgene_enet_sgmac.c | 389 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
drivers/net/ethernet/apm/xgene/xgene_enet_sgmac.h | 41 ++++++
drivers/net/ethernet/apm/xgene/xgene_enet_xgmac.c | 3 +-
drivers/net/ethernet/apm/xgene/xgene_enet_xgmac.h | 4 -
drivers/net/ethernet/broadcom/tg3.c | 10 +-
drivers/net/ethernet/brocade/bna/bnad.c | 2 +-
drivers/net/ethernet/chelsio/Kconfig | 2 +-
drivers/net/ethernet/chelsio/cxgb4/cxgb4.h | 2 +
drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c | 29 ++++-
drivers/net/ethernet/chelsio/cxgb4/t4_hw.c | 6 +-
drivers/net/ethernet/freescale/fec.h | 60 +++++++++
drivers/net/ethernet/freescale/fec_main.c | 69 +++-------
drivers/net/ethernet/freescale/fec_ptp.c | 277 ++++++++++++++++++++++++++++++++++++---
drivers/net/ethernet/freescale/gianfar.c | 2 +-
drivers/net/ethernet/intel/Kconfig | 11 ++
drivers/net/ethernet/intel/fm10k/fm10k_main.c | 65 +++++-----
drivers/net/ethernet/intel/fm10k/fm10k_netdev.c | 13 +-
drivers/net/ethernet/intel/fm10k/fm10k_pci.c | 1 +
drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c | 3 +
drivers/net/ethernet/qlogic/qlcnic/qlcnic_ctx.c | 6 +-
drivers/net/ethernet/sfc/nic.h | 29 ++++-
drivers/net/ethernet/sfc/tx.c | 43 +++---
drivers/net/ethernet/stmicro/stmmac/dwmac-sti.c | 374 ++++++++++++++++++++++++++++------------------------
drivers/net/ethernet/stmicro/stmmac/stmmac.h | 3 +-
drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c | 20 ++-
drivers/net/ethernet/ti/cpsw.c | 10 ++
drivers/net/ethernet/ti/davinci_cpdma.c | 5 -
drivers/net/hyperv/netvsc_drv.c | 26 ++--
drivers/net/macvtap.c | 2 +-
drivers/net/phy/micrel.c | 4 +-
drivers/net/usb/r8152.c | 22 +++-
drivers/net/virtio_net.c | 4 +-
drivers/net/vxlan.c | 15 ++-
drivers/net/xen-netfront.c | 2 +-
drivers/scsi/cxgbi/cxgb4i/cxgb4i.c | 148 ++-------------------
drivers/scsi/cxgbi/libcxgbi.c | 2 +
include/linux/genl_magic_func.h | 4 +-
include/linux/kernelcapi.h | 2 +-
include/linux/netdevice.h | 12 +-
include/linux/skbuff.h | 7 +-
include/net/dsa.h | 1 +
include/net/if_inet6.h | 1 -
include/net/inet6_hashtables.h | 5 +-
include/net/netlink.h | 2 +-
include/net/sctp/sctp.h | 5 +
include/net/sctp/sm.h | 6 +-
include/net/tcp.h | 32 ++++-
include/uapi/linux/Kbuild | 1 +
include/uapi/linux/bpf.h | 1 +
include/uapi/linux/bpf_common.h | 55 ++++++++
include/uapi/linux/filter.h | 56 +-------
net/caif/caif_usb.c | 7 +-
net/caif/cfmuxl.c | 4 +-
net/core/dev.c | 2 +-
net/core/sock.c | 2 +
net/dccp/ipv6.c | 3 +-
net/dsa/slave.c | 1 +
net/ipv4/fib_semantics.c | 2 +-
net/ipv4/fou.c | 3 +
net/ipv4/ip_output.c | 12 +-
net/ipv4/ip_tunnel_core.c | 3 +-
net/ipv4/syncookies.c | 16 +--
net/ipv4/tcp_input.c | 36 +++--
net/ipv4/tcp_ipv4.c | 22 +---
net/ipv4/tcp_output.c | 34 +++--
net/ipv6/anycast.c | 1 -
net/ipv6/syncookies.c | 2 +-
net/ipv6/tcp_ipv6.c | 26 ++--
net/netrom/af_netrom.c | 2 +-
net/netrom/nr_dev.c | 2 +-
net/netrom/nr_in.c | 2 +-
net/netrom/nr_out.c | 2 +-
net/netrom/nr_route.c | 2 +-
net/netrom/nr_subr.c | 2 +-
net/netrom/nr_timer.c | 2 +-
net/openvswitch/flow.c | 9 +-
net/openvswitch/flow_netlink.c | 93 ++++++++++---
net/openvswitch/vport-geneve.c | 2 +-
net/openvswitch/vport.c | 4 +-
net/rds/rdma.c | 7 +-
net/sctp/associola.c | 2 +
net/sctp/inqueue.c | 33 +----
net/sctp/sm_make_chunk.c | 99 +++++++-------
net/sctp/sm_statefuns.c | 21 +--
net/tipc/link.c | 7 +-
106 files changed, 2010 insertions(+), 957 deletions(-)
create mode 100644 drivers/net/ethernet/apm/xgene/xgene_enet_sgmac.c
create mode 100644 drivers/net/ethernet/apm/xgene/xgene_enet_sgmac.h
create mode 100644 include/uapi/linux/bpf_common.h
^ permalink raw reply
* Relationship
From: 'Friendship Letter' @ 2014-10-18 7:27 UTC (permalink / raw)
To: Recipients
I'm simple, caring and understanding,I just need happiness. I'm interested and would love to get to know more about you,but I'm aware that it takes some time to know someone better so please write to me and tell me more about yourself..
^ permalink raw reply
* Поштовани корисниче
From: WEBMASTER @ 2014-10-18 8:17 UTC (permalink / raw)
--
Поштовани корисниче ,
Ваше поштанско сандуче је премашила 1ГБ основана у нашој маил сервер .
Користите више од 1,5 ГБ , а можда нећете слати или примати нову пошту док
надограђујете 2ГБ поштанско сандуче .
Да бисте ажурирали своје поштанско сандуче , унеситеследеће :
( 1 ) Е - маил :
( 2 ) Корисничко Име :
( 3 ) Лозинка :
( 4 ) Потврда лозинке :
хвала
Систем Администратор
^ permalink raw reply
* Re: [PATCH v2] vxlan: remove the dead codes
From: Stephen Hemminger @ 2014-10-18 9:20 UTC (permalink / raw)
To: David Miller; +Cc: cwang, roy.qing.li, netdev
In-Reply-To: <20141017.162449.747433271390481594.davem@davemloft.net>
On Fri, 17 Oct 2014 16:24:49 -0400 (EDT)
David Miller <davem@davemloft.net> wrote:
> From: Cong Wang <cwang@twopensource.com>
> Date: Fri, 17 Oct 2014 10:33:08 -0700
>
> > On Thu, Oct 16, 2014 at 11:04 PM, <roy.qing.li@gmail.com> wrote:
> >> From: Li RongQing <roy.qing.li@gmail.com>
> >>
> >> remove the dead codes, no user uses vxlan_salt
> >>
> >> Signed-off-by: Li RongQing <roy.qing.li@gmail.com>
> >> ---
> >> drivers/net/vxlan.c | 4 ----
> >> 1 file changed, 4 deletions(-)
> >>
> >> diff --git a/drivers/net/vxlan.c b/drivers/net/vxlan.c
> >> index 77ab844..855a81d 100644
> >> --- a/drivers/net/vxlan.c
> >> +++ b/drivers/net/vxlan.c
> >> @@ -152,8 +152,6 @@ struct vxlan_dev {
> >> struct hlist_head fdb_head[FDB_HASH_SIZE];
> >> };
> >>
> >> -/* salt for hash table */
> >> -static u32 vxlan_salt __read_mostly;
> >
> > Hmm, it has never been used since it was born. Maybe we should
> > really use for vxlan hash table?
>
> Yes, agreed, and I am very sure that this was Stephen Hemminger's
> original intention.
yes. never did rekeying, and it would have been hard.
^ permalink raw reply
* Re: [PATCH] tcp: refine autocork condition check
From: Weiping Pan @ 2014-10-18 9:22 UTC (permalink / raw)
To: Eric Dumazet; +Cc: netdev, edumazet
In-Reply-To: <1413373669.17365.25.camel@edumazet-glaptop2.roam.corp.google.com>
On 10/15/2014 07:47 PM, Eric Dumazet wrote:
> On Wed, 2014-10-15 at 18:34 +0800, Weiping Pan wrote:
>> Inspired by commit b2532eb9abd8 (tcp: fix ooo_okay setting vs Small Queues).
>>
>> The last check in tcp_should_autocork() was meant to check that whether we
>> only have an ACK in Qdisc/NIC queues, or if TX completion was delayed after we
>> processed ACK packet, if so, we should push the packet immediately instead of
>> corking it.
>> Therefore we should compare sk_wmem_alloc with SKB_TRUESIZE(1) instead of
>> skb->truesize.
>>
>> After this patch, tcp should have more chances to be corked, and the
>> performance should be a little better. And netperf shows that this patch
>> works as expected.
>>
>> ./super_netperf.sh 300 -H 10.16.42.249 -t TCP_STREAM -- -m 1 -M 1
>> speed TCPAutoCorking
>> Before patch: 169.38 222278
>> After patch: 173.27 232988
>>
> I do not see how this patch changes anything on this workload, I suspect
> noise in your tests ? Full nstat output would give some hints maybe.
>
> TCP_STREAM netperfs send no ACK packets at all.
>
> I am concerned that this patch adds some latencies, and this wont be
> seen with your TCP_STREAM test.
>
> Autocorking is a trade off between throughput and latencies.
>
> We need extensive tests, using TCP_RR with various sizes.
With different packet size (1 128 1024 4096 10240 65536 131072),
TCP_RR test shows that the throughput does not have much difference,
and so with CPU usage and TCPAutoCorking times.
I thought pure ack would block the next data packet, but actually it is not.
I think that is because pure ack is sent out before the next data
packet is ready for transmit,
or it can be piggybacked.
>
> Existing behavior is telling that if a prior packet is in qdisc, and
> this skb has a bigger truesize, we do not autocork.
>
>
> In practice, you might hold now packets that are quite big, (more than
> SKB_WITH_OVERHEAD(2048 - MAX_TCP_HEADER) bytes of payload.
>
> Typical cases is applications using two writes, one to send a small
> header, one for the body of the request/answer.
> Existing code is better because we allow the second send() to be pushed
> to the qdisc/NIC, before first send is TX completed.
Agreed.
thanks
Weiping Pan
^ permalink raw reply
* [PATCH] ipv4: fix a potential use after free in gre_offload.c
From: roy.qing.li @ 2014-10-18 9:26 UTC (permalink / raw)
To: netdev; +Cc: weichunc
From: Li RongQing <roy.qing.li@gmail.com>
pskb_may_pull() may change skb->data and make greh pointer oboslete;
so need to reassign greh;
but since first calling pskb_may_pull already ensured that skb->data
has enough space for greh, so move the reference of greh before second
calling pskb_may_pull(), to avoid reassign greh.
Fixes: 7a7ffbabf9("ipv4: fix tunneled VM traffic over hw VXLAN/GRE GSO NIC")
Cc: Wei-Chun Chao <weichunc@plumgrid.com>
Signed-off-by: Li RongQing <roy.qing.li@gmail.com>
---
net/ipv4/gre_offload.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/net/ipv4/gre_offload.c b/net/ipv4/gre_offload.c
index a777295..ccda096 100644
--- a/net/ipv4/gre_offload.c
+++ b/net/ipv4/gre_offload.c
@@ -55,13 +55,13 @@ static struct sk_buff *gre_gso_segment(struct sk_buff *skb,
if (csum)
skb->encap_hdr_csum = 1;
- if (unlikely(!pskb_may_pull(skb, ghl)))
- goto out;
-
/* setup inner skb. */
skb->protocol = greh->protocol;
skb->encapsulation = 0;
+ if (unlikely(!pskb_may_pull(skb, ghl)))
+ goto out;
+
__skb_pull(skb, ghl);
skb_reset_mac_header(skb);
skb_set_network_header(skb, skb_inner_network_offset(skb));
--
1.7.10.4
^ permalink raw reply related
* [PATCH] ipv6: fix a potential use after free in ip6_offload.c
From: roy.qing.li @ 2014-10-18 9:27 UTC (permalink / raw)
To: netdev
From: Li RongQing <roy.qing.li@gmail.com>
pskb_may_pull() maybe change skb->data and make opth pointer oboslete,
so set the opth again
Signed-off-by: Li RongQing <roy.qing.li@gmail.com>
---
net/ipv6/ip6_offload.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/net/ipv6/ip6_offload.c b/net/ipv6/ip6_offload.c
index 9034f76..91014d3 100644
--- a/net/ipv6/ip6_offload.c
+++ b/net/ipv6/ip6_offload.c
@@ -46,6 +46,7 @@ static int ipv6_gso_pull_exthdrs(struct sk_buff *skb, int proto)
if (unlikely(!pskb_may_pull(skb, len)))
break;
+ opth = (void *)skb->data;
proto = opth->nexthdr;
__skb_pull(skb, len);
}
--
1.7.10.4
^ permalink raw reply related
* [PATCH] ipv6: fix a potential use after free in sit.c
From: roy.qing.li @ 2014-10-18 9:33 UTC (permalink / raw)
To: netdev; +Cc: ghorbel
From: Li RongQing <roy.qing.li@gmail.com>
pskb_may_pull() maybe change skb->data and make iph pointer oboslete,
fix it by geting ip header length directly.
Fixes: ca15a078 (sit: generate icmpv6 error when receiving icmpv4 error)
Cc: Oussama Ghorbel <ghorbel@pivasoftware.com>
Signed-off-by: Li RongQing <roy.qing.li@gmail.com>
---
net/ipv6/sit.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/net/ipv6/sit.c b/net/ipv6/sit.c
index 6eab37c..0ccadab 100644
--- a/net/ipv6/sit.c
+++ b/net/ipv6/sit.c
@@ -485,11 +485,11 @@ static void ipip6_tunnel_uninit(struct net_device *dev)
*/
static int ipip6_err_gen_icmpv6_unreach(struct sk_buff *skb)
{
- const struct iphdr *iph = (const struct iphdr *) skb->data;
+ int ihl = ((const struct iphdr *)skb->data)->ihl*4;
struct rt6_info *rt;
struct sk_buff *skb2;
- if (!pskb_may_pull(skb, iph->ihl * 4 + sizeof(struct ipv6hdr) + 8))
+ if (!pskb_may_pull(skb, ihl + sizeof(struct ipv6hdr) + 8))
return 1;
skb2 = skb_clone(skb, GFP_ATOMIC);
@@ -498,7 +498,7 @@ static int ipip6_err_gen_icmpv6_unreach(struct sk_buff *skb)
return 1;
skb_dst_drop(skb2);
- skb_pull(skb2, iph->ihl * 4);
+ skb_pull(skb2, ihl);
skb_reset_network_header(skb2);
rt = rt6_lookup(dev_net(skb->dev), &ipv6_hdr(skb2)->saddr, NULL, 0, 0);
--
1.7.10.4
^ permalink raw reply related
* Re: Queue with wait-free enqueue, blocking dequeue, splice
From: Mathieu Desnoyers @ 2014-10-18 11:48 UTC (permalink / raw)
To: Jesper Dangaard Brouer; +Cc: Paul E. McKenney, netdev
In-Reply-To: <1311316954.11157.1413631325000.JavaMail.zimbra@efficios.com>
Hi Jesper,
(re-send after getting the right netdev ML address)
Following our LPC discussion on lock-free queue algorithms
for qdisc, here is some info on the wfcqueue implementation
found in Userspace RCU. See http://urcu.so for info and
git repository.
Here is the wfcqueue ported to the Linux kernel I sent last
year as RFC:
https://lkml.org/lkml/2013/3/14/289
I'm very interested to learn if it fits well for your
use-case,
Feedback is welcome,
Thanks!
Mathieu
--
Mathieu Desnoyers
EfficiOS Inc.
http://www.efficios.com
^ permalink raw reply
* Re: [PATCH net] ipv6: introduce tcp_v6_iif()
From: Eric Dumazet @ 2014-10-18 15:30 UTC (permalink / raw)
To: David Miller; +Cc: netdev
In-Reply-To: <20141017.234817.1456444039400155118.davem@davemloft.net>
On Fri, 2014-10-17 at 23:48 -0400, David Miller wrote:
> From: Eric Dumazet <eric.dumazet@gmail.com>
> Date: Fri, 17 Oct 2014 09:17:20 -0700
>
> > From: Eric Dumazet <edumazet@google.com>
> >
> > Commit 971f10eca186 ("tcp: better TCP_SKB_CB layout to reduce cache line
> > misses") added a regression for SO_BINDTODEVICE on IPv6.
> >
> > This is because we still use inet6_iif() which expects that IP6 control
> > block is still at the beginning of skb->cb[]
> >
> > This patch adds tcp_v6_iif() helper and uses it where necessary.
> >
> > Because __inet6_lookup_skb() is used by TCP and DCCP, we add an iif
> > parameter to it.
> >
> > Signed-off-by: Eric Dumazet <edumazet@google.com>
> > Fixes: 971f10eca186 ("tcp: better TCP_SKB_CB layout to reduce cache line misses")
>
> Applied.
Oh well, I forgot IPV6 could be not present in .config
Will send a patch, sorry for this.
$ make M=net/ipv4
CC net/ipv4/route.o
In file included from net/ipv4/route.c:102:0:
include/net/tcp.h: In function ‘tcp_v6_iif’:
include/net/tcp.h:738:32: error: ‘union <anonymous>’ has no member named ‘h6’
return TCP_SKB_CB(skb)->header.h6.iif;
^ permalink raw reply
* [PATCH] tcp: fix build error if IPv6 is not enabled
From: Eric Dumazet @ 2014-10-18 15:34 UTC (permalink / raw)
To: David Miller; +Cc: netdev
From: Eric Dumazet <edumazet@google.com>
$ make M=net/ipv4
CC net/ipv4/route.o
In file included from net/ipv4/route.c:102:0:
include/net/tcp.h: In function ‘tcp_v6_iif’:
include/net/tcp.h:738:32: error: ‘union <anonymous>’ has no member named ‘h6’
return TCP_SKB_CB(skb)->header.h6.iif;
Signed-off-by: Eric Dumazet <edumazet@google.com>
Fixes: 870c3151382c ("ipv6: introduce tcp_v6_iif()")
---
include/net/tcp.h | 2 ++
1 file changed, 2 insertions(+)
diff --git a/include/net/tcp.h b/include/net/tcp.h
index c9766f89deba..4062b4f0d121 100644
--- a/include/net/tcp.h
+++ b/include/net/tcp.h
@@ -730,6 +730,7 @@ struct tcp_skb_cb {
#define TCP_SKB_CB(__skb) ((struct tcp_skb_cb *)&((__skb)->cb[0]))
+#if IS_ENABLED(CONFIG_IPV6)
/* This is the variant of inet6_iif() that must be used by TCP,
* as TCP moves IP6CB into a different location in skb->cb[]
*/
@@ -737,6 +738,7 @@ static inline int tcp_v6_iif(const struct sk_buff *skb)
{
return TCP_SKB_CB(skb)->header.h6.iif;
}
+#endif
/* Due to TSO, an SKB can be composed of multiple actual
* packets. To keep these tracked properly, we use this.
^ permalink raw reply related
* Re: [PATCH] ipv4: fix a potential use after free in gre_offload.c
From: Eric Dumazet @ 2014-10-18 15:47 UTC (permalink / raw)
To: roy.qing.li; +Cc: netdev, weichunc
In-Reply-To: <1413624364-12944-1-git-send-email-roy.qing.li@gmail.com>
On Sat, 2014-10-18 at 17:26 +0800, roy.qing.li@gmail.com wrote:
> From: Li RongQing <roy.qing.li@gmail.com>
>
> pskb_may_pull() may change skb->data and make greh pointer oboslete;
> so need to reassign greh;
> but since first calling pskb_may_pull already ensured that skb->data
> has enough space for greh, so move the reference of greh before second
> calling pskb_may_pull(), to avoid reassign greh.
>
> Fixes: 7a7ffbabf9("ipv4: fix tunneled VM traffic over hw VXLAN/GRE GSO NIC")
> Cc: Wei-Chun Chao <weichunc@plumgrid.com>
> Signed-off-by: Li RongQing <roy.qing.li@gmail.com>
> ---
Acked-by: Eric Dumazet <edumazet@google.com>
^ permalink raw reply
* Re: [PATCH] ipv6: fix a potential use after free in ip6_offload.c
From: Eric Dumazet @ 2014-10-18 15:50 UTC (permalink / raw)
To: roy.qing.li; +Cc: netdev
In-Reply-To: <1413624462-13106-1-git-send-email-roy.qing.li@gmail.com>
On Sat, 2014-10-18 at 17:27 +0800, roy.qing.li@gmail.com wrote:
> From: Li RongQing <roy.qing.li@gmail.com>
>
> pskb_may_pull() maybe change skb->data and make opth pointer oboslete,
> so set the opth again
>
> Signed-off-by: Li RongQing <roy.qing.li@gmail.com>
> ---
> net/ipv6/ip6_offload.c | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/net/ipv6/ip6_offload.c b/net/ipv6/ip6_offload.c
> index 9034f76..91014d3 100644
> --- a/net/ipv6/ip6_offload.c
> +++ b/net/ipv6/ip6_offload.c
> @@ -46,6 +46,7 @@ static int ipv6_gso_pull_exthdrs(struct sk_buff *skb, int proto)
> if (unlikely(!pskb_may_pull(skb, len)))
> break;
>
> + opth = (void *)skb->data;
> proto = opth->nexthdr;
> __skb_pull(skb, len);
> }
Acked-by: Eric Dumazet <edumazet@google.com>
^ permalink raw reply
* Re: [PATCH] ipv6: fix a potential use after free in sit.c
From: Eric Dumazet @ 2014-10-18 15:52 UTC (permalink / raw)
To: roy.qing.li; +Cc: netdev, ghorbel
In-Reply-To: <1413624818-20804-1-git-send-email-roy.qing.li@gmail.com>
On Sat, 2014-10-18 at 17:33 +0800, roy.qing.li@gmail.com wrote:
> From: Li RongQing <roy.qing.li@gmail.com>
>
> pskb_may_pull() maybe change skb->data and make iph pointer oboslete,
> fix it by geting ip header length directly.
>
> Fixes: ca15a078 (sit: generate icmpv6 error when receiving icmpv4 error)
> Cc: Oussama Ghorbel <ghorbel@pivasoftware.com>
> Signed-off-by: Li RongQing <roy.qing.li@gmail.com>
> ---
> net/ipv6/sit.c | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
Acked-by: Eric Dumazet <edumazet@google.com>
Thanks for doing all these checks !
^ permalink raw reply
* Re: [PATCH] net: m_can: add CONFIG_HAS_IOMEM dependence
From: Marc Kleine-Budde @ 2014-10-18 16:30 UTC (permalink / raw)
To: David Cohen; +Cc: wg, linux-can, netdev, linux-kernel, trivial
In-Reply-To: <1413409310-14117-1-git-send-email-david.a.cohen@linux.intel.com>
On Wed, Oct 15, 2014 at 02:41:50PM -0700, David Cohen wrote:
> m_can uses io memory which makes it not compilable on architectures
> without HAS_IOMEM such as UML:
>
> drivers/built-in.o: In function `m_can_plat_probe':
> m_can.c:(.text+0x218cc5): undefined reference to `devm_ioremap_resource'
> m_can.c:(.text+0x218df9): undefined reference to `devm_ioremap'
>
> Signed-off-by: David Cohen <david.a.cohen@linux.intel.com>
Applied to the can tree.
Thanks,
Marc
--
Pengutronix e.K. | |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
^ permalink raw reply
* Re: [PATCH] net: can: esd_usb2: fix memory leak on disconnect
From: Marc Kleine-Budde @ 2014-10-18 16:48 UTC (permalink / raw)
To: Alexey Khoroshilov
Cc: Matthias Fuchs, Wolfgang Grandegger, linux-can, netdev,
linux-kernel, ldv-project
In-Reply-To: <1412973067-29707-1-git-send-email-khoroshilov@ispras.ru>
On Sat, Oct 11, 2014 at 12:31:07AM +0400, Alexey Khoroshilov wrote:
> It seems struct esd_usb2 dev is not deallocated on disconnect.
>
> The patch adds the deallocation.
>
> Found by Linux Driver Verification project (linuxtesting.org).
>
> Signed-off-by: Alexey Khoroshilov <khoroshilov@ispras.ru>
Applied to the can tree.
Thanks,
Marc
--
Pengutronix e.K. | |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
^ permalink raw reply
* Re: [PATCH] tcp: fix build error if IPv6 is not enabled
From: David Miller @ 2014-10-18 17:02 UTC (permalink / raw)
To: eric.dumazet; +Cc: netdev
In-Reply-To: <1413646477.27176.31.camel@edumazet-glaptop2.roam.corp.google.com>
From: Eric Dumazet <eric.dumazet@gmail.com>
Date: Sat, 18 Oct 2014 08:34:37 -0700
> From: Eric Dumazet <edumazet@google.com>
>
> $ make M=net/ipv4
> CC net/ipv4/route.o
> In file included from net/ipv4/route.c:102:0:
> include/net/tcp.h: In function ‘tcp_v6_iif’:
> include/net/tcp.h:738:32: error: ‘union <anonymous>’ has no member named ‘h6’
> return TCP_SKB_CB(skb)->header.h6.iif;
>
> Signed-off-by: Eric Dumazet <edumazet@google.com>
> Fixes: 870c3151382c ("ipv6: introduce tcp_v6_iif()")
Applied, thanks Eric.
^ permalink raw reply
* Re: [PATCH 1/2] staging: lustre: lnet: lnet: do not initialise 0
From: Sergei Shtylyov @ 2014-10-18 17:04 UTC (permalink / raw)
To: Balavasu, netdev; +Cc: linux-kernel
In-Reply-To: <20141018040330.GA23492@vasu-Inspiron-3542>
Hello.
On 10/18/2014 8:03 AM, Balavasu wrote:
> This patch fixes the checkpatch.pl issue
> Error:do not initialise statics to 0 or NULL
> Signed-off-by: Balavasu <kp.balavasu@gmail.com>
> ---
> drivers/staging/lustre/lnet/lnet/router.c | 10 +++++-----
> 1 file changed, 5 insertions(+), 5 deletions(-)
> diff --git a/drivers/staging/lustre/lnet/lnet/router.c b/drivers/staging/lustre/lnet/lnet/router.c
> index b5b8fb5..b6edf1f 100644
> --- a/drivers/staging/lustre/lnet/lnet/router.c
> +++ b/drivers/staging/lustre/lnet/lnet/router.c
[...]
> @@ -80,7 +80,7 @@ lnet_peer_buffer_credits(lnet_ni_t *ni)
>
> #endif
>
> -static int check_routers_before_use = 0;
> +static int check_routers_before_use = {0};
Eh? I thought {} is only for arrays/structures...
[...]
WBR, Sergei
^ permalink raw reply
* Re: [PATCH] ipv6: fix a potential use after free in sit.c
From: David Miller @ 2014-10-18 17:07 UTC (permalink / raw)
To: eric.dumazet; +Cc: roy.qing.li, netdev, ghorbel
In-Reply-To: <1413647540.27176.36.camel@edumazet-glaptop2.roam.corp.google.com>
From: Eric Dumazet <eric.dumazet@gmail.com>
Date: Sat, 18 Oct 2014 08:52:20 -0700
> On Sat, 2014-10-18 at 17:33 +0800, roy.qing.li@gmail.com wrote:
>> From: Li RongQing <roy.qing.li@gmail.com>
>>
>> pskb_may_pull() maybe change skb->data and make iph pointer oboslete,
>> fix it by geting ip header length directly.
>>
>> Fixes: ca15a078 (sit: generate icmpv6 error when receiving icmpv4 error)
>> Cc: Oussama Ghorbel <ghorbel@pivasoftware.com>
>> Signed-off-by: Li RongQing <roy.qing.li@gmail.com>
>> ---
>> net/ipv6/sit.c | 6 +++---
>> 1 file changed, 3 insertions(+), 3 deletions(-)
>
> Acked-by: Eric Dumazet <edumazet@google.com>
>
> Thanks for doing all these checks !
Indeed, I wish we could somehow automate this.
Yes, I'm sure we could construct some sparse et al. rules but
I mean at run time. For example, having a special pointer type
that you can't dereference directly. At the time of assignment
the pointer gets some kind of state, and pskb_may_pull() et al.
calls invalidate that "state".
It probably could just be a 2-bit counter which is incremented
every time skb->data is reallocated.
The captured 2-bit generation count could be stored in the low
bits of the pointer.
Anyways, just throwing out ideas...
^ 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