Ilya Dryomov
6d7fdb0ab3
Revert "libceph: use memalloc flags for net IO"
...
This reverts commit 89baaa570a .
Dirty page throttling should be sufficient for us in the general case
so there is no need to use __GFP_MEMALLOC - it would be needed only in
the swap-over-rbd case, which we currently don't support. (It would
probably take approximately the commit that is being reverted to add
that support, but we would also need the "swap" option to distinguish
from the general case and make sure swap ceph_client-s aren't shared
with anything else.) See ceph-devel threads [1] and [2] for the
details of why enabling pfmemalloc reserves for all cases is a bad
thing.
On top of potential system lockups related to drained emergency
reserves, this turned out to cause ceph lockups in case peers are on
the same host and communicating via loopback due to sk_filter()
dropping pfmemalloc skbs on the receiving side because the receiving
loopback socket is not tagged with SOCK_MEMALLOC.
[1] "SOCK_MEMALLOC vs loopback"
http://www.spinics.net/lists/ceph-devel/msg22998.html
[2] "[PATCH] libceph: don't set memalloc flags in loopback case"
http://www.spinics.net/lists/ceph-devel/msg23392.html
Conflicts:
net/ceph/messenger.c [ context: tcp_nodelay option ]
Cc: Mike Christie <michaelc@cs.wisc.edu>
Cc: Mel Gorman <mgorman@suse.de>
Cc: Sage Weil <sage@redhat.com>
Cc: stable@vger.kernel.org # 3.18+, needs backporting
Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
Acked-by: Mike Christie <michaelc@cs.wisc.edu>
Acked-by: Mel Gorman <mgorman@suse.de>
2015-04-07 19:08:35 +03:00
..
6lowpan
net/6lowpan: Remove FSF address from GPL statement.
2014-12-05 12:43:04 +01:00
9p
9p/trans_virtio: fix hot-unplug
2015-03-13 15:55:41 +10:30
802
8021q
vlan: advertise link netns via netlink
2015-01-23 17:51:15 -08:00
appletalk
new helper: memcpy_from_msg()
2014-11-24 04:28:48 -05:00
atm
put iov_iter into msghdr
2014-12-09 16:29:03 -05:00
ax25
new helper: memcpy_from_msg()
2014-11-24 04:28:48 -05:00
batman-adv
batman-adv: Kconfig, Add missing DEBUG_FS dependency
2015-01-07 22:17:11 +01:00
bluetooth
Bluetooth: Fix potential NULL dereference
2015-02-03 09:02:12 +01:00
bridge
bridge: reset bridge mtu after deleting an interface
2015-03-14 19:12:38 -04:00
caif
caif: fix MSG_OOB test in caif_seqpkt_recvmsg()
2015-03-15 22:19:17 -04:00
can
can: add missing initialisations in CAN related skbuffs
2015-03-09 10:22:24 +01:00
ceph
Revert "libceph: use memalloc flags for net IO"
2015-04-07 19:08:35 +03:00
core
ipv6: protect skb->sk accesses from recursive dereference inside the stack
2015-04-06 16:12:49 -04:00
dcb
dcbnl : Disable software interrupts before taking dcb_lock
2014-11-16 14:50:52 -05:00
dccp
net: introduce helper macro for_each_cmsghdr
2014-12-10 22:41:55 -05:00
decnet
net: move fib_rules_unregister() under rtnl lock
2015-04-02 20:52:34 -04:00
dns_resolver
Merge commit 'v3.16' into next
2014-10-01 00:44:04 +10:00
dsa
net: dsa: fix filling routing table from OF description
2015-04-06 17:31:37 -04:00
ethernet
net: Add Transparent Ethernet Bridging GRO support.
2015-01-02 15:46:41 -05:00
hsr
net/hsr: Fix NULL pointer dereference and refcnt bugs when deleting a HSR interface.
2015-03-01 13:40:23 -05:00
ieee802154
netlink: make nlmsg_end() and genlmsg_end() void
2015-01-18 01:03:45 -05:00
ipv4
net: move fib_rules_unregister() under rtnl lock
2015-04-02 20:52:34 -04:00
ipv6
ipv6: protect skb->sk accesses from recursive dereference inside the stack
2015-04-06 16:12:49 -04:00
ipx
switch ipxrtr_route_packet() from iovec to msghdr
2014-11-24 04:28:49 -05:00
irda
TTY/Serial fixes for 4.0-rc3
2015-03-08 12:25:40 -07:00
iucv
af_iucv: fix AF_IUCV sendmsg() errno
2015-03-31 16:06:50 -04:00
key
new helper: memcpy_from_msg()
2014-11-24 04:28:48 -05:00
l2tp
l2tp: unregister l2tp_net_ops on failure path
2015-04-06 16:53:02 -04:00
lapb
lapb: move EXPORT_SYMBOL after functions.
2014-10-24 15:51:42 -04:00
llc
net: llc: use correct size for sysctl timeout entries
2015-01-25 00:23:21 -08:00
mac80211
mac80211: fix RX A-MPDU session reorder timer deletion
2015-04-01 14:35:01 +02:00
mac802154
mac802154: fix kbuild test robot warning
2015-01-03 01:51:51 +01:00
mpls
net: mark some potential candidates __read_mostly
2015-01-30 17:58:39 -08:00
netfilter
netfilter: nft_compat: set IP6T_F_PROTO flag if protocol is set
2015-03-22 19:32:05 +01:00
netlabel
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security
2015-02-11 20:25:11 -08:00
netlink
rhashtable: remove indirection for grow/shrink decision functions
2015-02-27 16:06:02 -05:00
netrom
new helper: memcpy_from_msg()
2014-11-24 04:28:48 -05:00
nfc
NFC: nci: Move NFCEE discovery logic
2015-02-04 09:15:18 +01:00
openvswitch
openvswitch: Return vport module ref before destruction
2015-03-31 15:59:50 -04:00
packet
net: delete stale packet_mclist entries
2015-03-09 16:17:43 -04:00
phonet
phonet netlink: allow multiple messages per skb in route dump
2015-01-19 16:20:17 -05:00
rds
rds: avoid potential stack overflow
2015-03-12 00:28:01 -04:00
rfkill
Last round of updates for net-next:
2015-02-04 14:57:45 -08:00
rose
new helper: memcpy_from_msg()
2014-11-24 04:28:48 -05:00
rxrpc
rxrpc: bogus MSG_PEEK test in rxrpc_recvmsg()
2015-03-15 22:20:09 -04:00
sched
act_bpf: allow non-default TC_ACT opcodes as BPF exec outcome
2015-03-17 22:15:06 -04:00
sctp
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2015-02-05 14:33:28 -08:00
sunrpc
sunrpc: make debugfs file creation failure non-fatal
2015-03-31 14:15:08 -04:00
switchdev
Merge branch 'kconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild
2015-02-19 10:36:45 -08:00
tipc
tipc: fix a slab object leak
2015-03-31 23:10:08 -04:00
unix
net: remove sock_iocb
2015-01-28 23:15:07 -08:00
vmw_vsock
vmci: propagate msghdr all way down to __qp_memcpy_to_queue()
2015-02-04 01:34:14 -05:00
wimax
wimax: convert printk to pr_foo()
2014-10-07 20:28:44 -04:00
wireless
nl80211: ignore HT/VHT capabilities without QoS/WMM
2015-03-16 09:36:11 +01:00
x25
new helper: memcpy_from_msg()
2014-11-24 04:28:48 -05:00
xfrm
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec
2015-03-16 16:16:49 -04:00
compat.c
net: compat: Update get_compat_msghdr() to match copy_msghdr_from_user() behaviour
2015-03-20 16:31:09 -04:00
Kconfig
kconfig: use bool instead of boolean for type definition attributes
2015-01-07 13:08:04 +01:00
Makefile
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2014-12-16 15:53:03 -08:00
socket.c
net: validate the range we feed to iov_iter_init() in sys_sendto/sys_recvfrom
2015-03-20 16:38:06 -04:00
sysctl_net.c