09 Aug, 2013
10 commits
-
This patch replace dma_length in "lib/swiotlb.c" to sg_dma_len() macro,
because the build error can occur if CONFIG_NEED_SG_DMA_LENGTH is not
set, and CONFIG_SWIOTLB is set.Singed-off-by: EunBong Song
Signed-off-by: Stefano Stabellini
Signed-off-by: Konrad Rzeszutek Wilk -
Currently ballooned out pages are mapped to 0 and have INVALID_P2M_ENTRY
in the p2m. These ballooned out pages are used to map foreign grants
by gntdev and blkback (see alloc_xenballooned_pages).Allocate a page per cpu and map all the ballooned out pages to the
corresponding mfn. Set the p2m accordingly. This way reading from a
ballooned out page won't cause a kernel crash (see
http://lists.xen.org/archives/html/xen-devel/2012-12/msg01154.html).Signed-off-by: Stefano Stabellini
Reviewed-by: David Vrabel
CC: alex@alex.org.uk
CC: dcrisan@flexiant.com
Signed-off-by: Konrad Rzeszutek Wilk -
The global array of port users and the port_user_lock limits
scalability of the evtchn device. Instead of the global array lookup,
use a per-use (per-fd) tree of event channels bound by that user and
protect the tree with a per-user lock.This is also a prerequiste for extended the number of supported event
channels, by removing the fixed size, per-event channel array.Signed-off-by: David Vrabel
Signed-off-by: Konrad Rzeszutek Wilk -
In m2p_remove_override() when removing the grant map from the kernel
mapping and replacing with a mapping to the original page, the grant
unmap will already have flushed the TLB and it is not necessary to do
it again after updating the mapping.Signed-off-by: David Vrabel
Cc: Stefano Stabellini
Signed-off-by: Konrad Rzeszutek Wilk
Reviewed-by: Stefano Stabellini -
Both Boris and David have graciously volunteered to help in
maintaining the Xen subsystem tree. Cementing this in the
MAINTAINERS file so they are copied on Xen related patches.Signed-off-by: Konrad Rzeszutek Wilk
Acked-by: Boris Ostrovsky
Acked-by: David Vrabel -
And also drop the virtualization one since we don't really use it.
Signed-off-by: Konrad Rzeszutek Wilk
Acked-by: Ian Campbell [for netback]
Acked-by: Stefano Stabellini -
The usage of strict_strtoul() is not preferred, because
strict_strtoul() is obsolete. Thus, kstrtoul() should be
used.Signed-off-by: Jingoo Han
Signed-off-by: Konrad Rzeszutek Wilk -
With the current implementation, the callback in the tail of the list
can be added twice, because the check done in
gnttab_request_free_callback is bogus, callback->next can be NULL if
it is the last callback in the list. If we add the same callback twice
we end up with an infinite loop, were callback == callback->next.Replace this check with a proper one that iterates over the list to
see if the callback has already been added.Signed-off-by: Roger Pau Monné
Cc: Konrad Rzeszutek Wilk
Cc: David Vrabel
Signed-off-by: Konrad Rzeszutek Wilk
Acked-by: Matt Wilson
Reviewed-by: David Vrabel
CC: stable@vger.kernel.org -
This is a complete rewrite of the Xen TPM frontend driver, taking
advantage of a simplified frontend/backend interface and adding support
for cancellation and timeouts. The backend for this driver is provided
by a vTPM stub domain using the interface in Xen 4.3.Signed-off-by: Daniel De Graaf
Acked-by: Matthew Fioravante
Reviewed-by: Konrad Rzeszutek Wilk
Acked-by: Peter Huewe
Reviewed-by: Peter Huewe
Signed-off-by: Konrad Rzeszutek Wilk -
This is based on a patch that Zhenzhong Duan had sent - which
was missing some of the remaining pieces. The kernel has the
logic to handle Xen-type-exceptions using the paravirt interface
in the assembler code (see PARAVIRT_ADJUST_EXCEPTION_FRAME -
pv_irq_ops.adjust_exception_frame and and INTERRUPT_RETURN -
pv_cpu_ops.iret).That means the nmi handler (and other exception handlers) use
the hypervisor iret.The other changes that would be neccessary for this would
be to translate the NMI_VECTOR to one of the entries on the
ipi_vector and make xen_send_IPI_mask_allbutself use different
events.Fortunately for us commit 1db01b4903639fcfaec213701a494fe3fb2c490b
(xen: Clean up apic ipi interface) implemented this and we piggyback
on the cleanup such that the apic IPI interface will pass the right
vector value for NMI.With this patch we can trigger NMIs within a PV guest (only tested
x86_64).For this to work with normal PV guests (not initial domain)
we need the domain to be able to use the APIC ops - they are
already implemented to use the Xen event channels. For that
to be turned on in a PV domU we need to remove the masking
of X86_FEATURE_APIC.Incidentally that means kgdb will also now work within
a PV guest without using the 'nokgdbroundup' workaround.Note that the 32-bit version is different and this patch
does not enable that.CC: Lisa Nguyen
CC: Ben Guthro
CC: Zhenzhong Duan
Signed-off-by: Konrad Rzeszutek Wilk
[v1: Fixed up per David Vrabel comments]
Reviewed-by: Ben Guthro
Reviewed-by: David Vrabel
05 Aug, 2013
5 commits
-
Pull dmaengine fixes from Vinod Koul:
"Two fixes for slave dmaengine. The first fixes cyclic dma transfers
for pl330 and the second one makes us return the correct error code on
probe"* 'fixes' of git://git.infradead.org/users/vkoul/slave-dma:
dma: pl330: Fix cyclic transfers
pch_dma: fix error return code in pch_dma_probe() -
Pull drm fix from Dave Airlie:
"Just a quick fix that a few people have reported, be nice to have in
asap"The drm tree seems to be very confused about 64-bit divides. Here it
uses a slow 64-by-64 bit divide to divide by a small constant. Oh well.
Doesn't look performance-critical, just stupid.* 'drm-fixes' of git://people.freedesktop.org/~airlied/linux:
drm/radeon: fix 64 bit divide in SI spm code -
Commit 46a1c2c7ae53 ("vfs: export lseek_execute() to modules") broke the
tmpfs SEEK_DATA/SEEK_HOLE implementation, because vfs_setpos() converts
the carefully prepared -ENXIO to -EINVAL. Other filesystems avoid it in
error cases: do the same in tmpfs.Signed-off-by: Hugh Dickins
Cc: Jie Liu
Cc: Al Viro
Signed-off-by: Linus Torvalds -
Pull sound fixes from Takashi Iwai:
"All small regression or small fixes, nothing surprising at this stage.- regression fix for intel Mac Mini quirk
- compress ioctl error fix
- ASoC fixes for control change notifications, some UI fixes,
driver-specific fixes (resource leak, build errors, etc)"* tag 'sound-3.11' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
ALSA: hda - Fix missing fixup for Mac Mini with STAC9221
ASoC: wm0010: Fix resource leak
ASoC: au1x: Fix build
ASoC: bf5xx-ac97: Fix compile error with SND_BF5XX_HAVE_COLD_RESET
ASoC: bfin-ac97: Fix prototype error following AC'97 refactoring
ALSA: compress: fix the return value for SNDRV_COMPRESS_VERSION
ASoC: dapm: Fix return value of snd_soc_dapm_put_{volsw,enum_virt}()
04 Aug, 2013
14 commits
-
Forgot to use the appropriate math64 function.
Signed-off-by: Alex Deucher
Signed-off-by: Dave Airlie -
Pull networking fixes from David Miller:
1) Don't ignore user initiated wireless regulatory settings on cards
with custom regulatory domains, from Arik Nemtsov.2) Fix length check of bluetooth information responses, from Jaganath
Kanakkassery.3) Fix misuse of PTR_ERR in btusb, from Adam Lee.
4) Handle rfkill properly while iwlwifi devices are offline, from
Emmanuel Grumbach.5) Fix r815x devices DMA'ing to stack buffers, from Hayes Wang.
6) Kernel info leak in ATM packet scheduler, from Dan Carpenter.
7) 8139cp doesn't check for DMA mapping errors, from Neil Horman.
8) Fix bridge multicast code to not snoop when no querier exists,
otherwise mutlicast traffic is lost. From Linus Lüssing.9) Avoid soft lockups in fib6_run_gc(), from Michal Kubecek.
10) Fix races in automatic address asignment on ipv6, which can result
in incorrect lifetime assignments. From Jiri Benc.11) Cure build bustage when CONFIG_NET_LL_RX_POLL is not set and rename
it CONFIG_NET_RX_BUSY_POLL to eliminate the last reference to the
original naming of this feature. From Cong Wang.12) Fix crash in TIPC when server socket creation fails, from Ying Xue.
13) macvlan_changelink() silently succeeds when it shouldn't, from
Michael S Tsirkin.14) HTB packet scheduler can crash due to sign extension, fix from
Stephen Hemminger.15) With the cable unplugged, r8169 prints out a message every 10
seconds, make it netif_dbg() instead of netif_warn(). From Peter
Wu.16) Fix memory leak in rtm_to_ifaddr(), from Daniel Borkmann.
17) sis900 gets spurious TX queue timeouts due to mismanagement of link
carrier state, from Denis Kirjanov.18) Validate somaxconn sysctl to make sure it fits inside of a u16.
From Roman Gushchin.19) Fix MAC address filtering on qlcnic, from Shahed Shaikh.
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (68 commits)
qlcnic: Fix for flash update failure on 83xx adapter
qlcnic: Fix link speed and duplex display for 83xx adapter
qlcnic: Fix link speed display for 82xx adapter
qlcnic: Fix external loopback test.
qlcnic: Removed adapter series name from warning messages.
qlcnic: Free up memory in error path.
qlcnic: Fix ingress MAC learning
qlcnic: Fix MAC address filter issue on 82xx adapter
net: ethernet: davinci_emac: drop IRQF_DISABLED
netlabel: use domain based selectors when address based selectors are not available
net: check net.core.somaxconn sysctl values
sis900: Fix the tx queue timeout issue
net: rtm_to_ifaddr: free ifa if ifa_cacheinfo processing fails
r8169: remove "PHY reset until link up" log spam
net: ethernet: cpsw: drop IRQF_DISABLED
htb: fix sign extension bug
macvlan: handle set_promiscuity failures
macvlan: better mode validation
tipc: fix oops when creating server socket fails
net: rename CONFIG_NET_LL_RX_POLL to CONFIG_NET_RX_BUSY_POLL
... -
Flash update routine was improperly checking register read API return value.
Modify register read API and perform proper error check.Signed-off-by: Himanshu Madhani
Signed-off-by: David S. Miller -
o Set link speed and duplex to unknown when link is not up.
Signed-off-by: Rajesh Borundia
Signed-off-by: Shahed Shaikh
Signed-off-by: David S. Miller -
o Do not obtain link speed from register when adapter
link is down.Signed-off-by: Rajesh Borundia
Signed-off-by: Shahed Shaikh
Signed-off-by: David S. Miller -
Driver was not handling external loopback diagnostic
test request.Signed-off-by: Shahed Shaikh
Signed-off-by: David S. Miller -
Signed-off-by: Pratik Pujar
Signed-off-by: Shahed Shaikh
Signed-off-by: David S. Miller -
Signed-off-by: Himanshu Madhani
Signed-off-by: Shahed Shaikh
Signed-off-by: David S. Miller -
o Delete MAC address from the adapter's filter table
if the source MAC address of ingress packet matches.Signed-off-by: Shahed Shaikh
Signed-off-by: David S. Miller -
Driver was passing the address of a pointer instead of
the pointer itself.Signed-off-by: Shahed Shaikh
Signed-off-by: David S. Miller -
IRQF_DISABLED is a no-op by now and should be removed.
Signed-off-by: Mugunthan V N
Signed-off-by: David S. Miller -
Pull nfsd bugfixes from Bruce Fields:
"Most of this is due to a screwup on my part -- some gss-proxy crashes
got fixed before the merge window but somehow never made it out of a
temporary git repo on my laptop...."* 'for-3.11' of git://linux-nfs.org/~bfields/linux:
svcrpc: set cr_gss_mech from gss-proxy as well as legacy upcall
svcrpc: fix kfree oops in gss-proxy code
svcrpc: fix gss-proxy xdr decoding oops
svcrpc: fix gss_rpc_upcall create error
NFSD/sunrpc: avoid deadlock on TCP connection due to memory pressure. -
Pull hwmon fix from Guenter Roeck:
"Fix chip initialization/configuration in MAX6697 driver"* tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging:
hwmon: (max6697) fix MAX6581 ideality -
Pull arm fixes fixes from Russell King:
"This fixes a couple of problems with commit 48be69a026b2 ("ARM: move
signal handlers into a vdso-like page"), one of which was originally
discovered via my testing originally, but the fix for it was never
actually committed.The other shows up on noMMU builds, and such platforms are extremely
rare and as such are not part of my nightly testing"* 'fixes' of git://git.linaro.org/people/rmk/linux-arm:
ARM: fix nommu builds with 48be69a02 (ARM: move signal handlers into a vdso-like page)
ARM: fix a cockup in 48be69a02 (ARM: move signal handlers into a vdso-like page)
03 Aug, 2013
11 commits
-
Without this patch, the values for ideality (register 0x4b) and ideality
selection mask (register 0x4c) are inverted.Signed-off-by: Vivien Didelot
Cc: stable@vger.kernel.org # 3.9+
Signed-off-by: Guenter Roeck -
Olof reports that noMMU builds error out with:
arch/arm/kernel/signal.c: In function 'setup_return':
arch/arm/kernel/signal.c:413:25: error: 'mm_context_t' has no member named 'sigpage'This shows one of the evilnesses of IS_ENABLED(). Get rid of it here
and replace it with #ifdef's - and as no noMMU platform can make use
of sigpage, depend on CONIFG_MMU not CONFIG_ARM_MPU.Reported-by: Olof Johansson
Signed-off-by: Russell King -
Unfortunately, I never committed the fix to a nasty oops which can
occur as a result of that commit:------------[ cut here ]------------
kernel BUG at /home/olof/work/batch/include/linux/mm.h:414!
Internal error: Oops - BUG: 0 [#1] PREEMPT SMP ARM
Modules linked in:
CPU: 0 PID: 490 Comm: killall5 Not tainted 3.11.0-rc3-00288-gabe0308 #53
task: e90acac0 ti: e9be8000 task.ti: e9be8000
PC is at special_mapping_fault+0xa4/0xc4
LR is at __do_fault+0x68/0x48cThis doesn't show up unless you do quite a bit of testing; a simple
boot test does not do this, so all my nightly tests were passing fine.The reason for this is that install_special_mapping() expects the
page array to stick around, and as this was only inserting one page
which was stored on the kernel stack, that's why this was blowing up.Reported-by: Olof Johansson
Tested-by: Olof Johansson
Signed-off-by: Russell King -
NetLabel has the ability to selectively assign network security labels
to outbound traffic based on either the LSM's "domain" (different for
each LSM), the network destination, or a combination of both. Depending
on the type of traffic, local or forwarded, and the type of traffic
selector, domain or address based, different hooks are used to label the
traffic; the goal being minimal overhead.Unfortunately, there is a bug such that a system using NetLabel domain
based traffic selectors does not correctly label outbound local traffic
that is not assigned to a socket. The issue is that in these cases
the associated NetLabel hook only looks at the address based selectors
and not the domain based selectors. This patch corrects this by
checking both the domain and address based selectors so that the correct
labeling is applied, regardless of the configuration type.In order to acomplish this fix, this patch also simplifies some of the
NetLabel domainhash structures to use a more common outbound traffic
mapping type: struct netlbl_dommap_def. This simplifies some of the code
in this patch and paves the way for further simplifications in the
future.Signed-off-by: Paul Moore
Signed-off-by: David S. Miller -
It's possible to assign an invalid value to the net.core.somaxconn
sysctl variable, because there is no checks at all.The sk_max_ack_backlog field of the sock structure is defined as
unsigned short. Therefore, the backlog argument in inet_listen()
shouldn't exceed USHRT_MAX. The backlog argument in the listen() syscall
is truncated to the somaxconn value. So, the somaxconn value shouldn't
exceed 65535 (USHRT_MAX).
Also, negative values of somaxconn are meaningless.before:
$ sysctl -w net.core.somaxconn=256
net.core.somaxconn = 256
$ sysctl -w net.core.somaxconn=65536
net.core.somaxconn = 65536
$ sysctl -w net.core.somaxconn=-100
net.core.somaxconn = -100after:
$ sysctl -w net.core.somaxconn=256
net.core.somaxconn = 256
$ sysctl -w net.core.somaxconn=65536
error: "Invalid argument" setting key "net.core.somaxconn"
$ sysctl -w net.core.somaxconn=-100
error: "Invalid argument" setting key "net.core.somaxconn"Based on a prior patch from Changli Gao.
Signed-off-by: Roman Gushchin
Reported-by: Changli Gao
Suggested-by: Eric Dumazet
Acked-by: Eric Dumazet
Signed-off-by: David S. Miller -
[ 198.720048] ------------[ cut here ]------------
[ 198.720108] WARNING: CPU: 0 PID: 0 at net/sched/sch_generic.c:255 dev_watchdog+0x229/0x240()
[ 198.720118] NETDEV WATCHDOG: eth0 (sis900): transmit queue 0 timed out
[ 198.720125] Modules linked in: bridge stp llc dmfe sundance 3c59x sis900 mii
[ 198.720159] CPU: 0 PID: 0 Comm: swapper Not tainted 3.11.0-rc3+ #12
[ 198.720167] Hardware name: System Manufacturer System Name/TUSI-M, BIOS ASUS TUSI-M ACPI BIOS
Revision 1013 Beta 001 12/14/2001
[ 198.720175] 000000ff c13fa6b9 c169ddcc c12208d6 c169ddf8 c1031e4d c1664a84 c169de24
[ 198.720197] 00000000 c165f5ea 000000ff c13fa6b9 00000001 000000ff c1664a84 c169de10
[ 198.720217] c1031f13 00000009 c169de08 c1664a84 c169de24 c169de50 c13fa6b9 c165f5ea
[ 198.720240] Call Trace:
[ 198.720257] [] ? dev_watchdog+0x229/0x240
[ 198.720274] [] dump_stack+0x16/0x20
[ 198.720306] [] warn_slowpath_common+0x7d/0xa0
[ 198.720318] [] ? dev_watchdog+0x229/0x240
[ 198.720330] [] warn_slowpath_fmt+0x33/0x40
[ 198.720342] [] dev_watchdog+0x229/0x240
[ 198.720357] [] call_timer_fn+0x78/0x150
[ 198.720369] [] ? internal_add_timer+0x40/0x40
[ 198.720381] [] ? dev_init_scheduler+0xa0/0xa0
[ 198.720392] [] run_timer_softirq+0x10f/0x200
[ 198.720412] [] ? __do_softirq+0x6f/0x210
[ 198.720424] [] ? dev_init_scheduler+0xa0/0xa0
[ 198.720435] [] __do_softirq+0xb8/0x210
[ 198.720467] [] ? _raw_spin_unlock+0x22/0x30
[ 198.720484] [] ? handle_irq+0x25/0xd0
[ 198.720496] [] irq_exit+0x9c/0xb0
[ 198.720508] [] do_IRQ+0x47/0x94
[ 198.720534] [] ? hrtimer_start+0x28/0x30
[ 198.720564] [] common_interrupt+0x31/0x38
[ 198.720589] [] ? default_idle+0x22/0xa0
[ 198.720600] [] arch_cpu_idle+0x17/0x30
[ 198.720631] [] cpu_startup_entry+0xcd/0x180
[ 198.720643] [] rest_init+0xaa/0xb0
[ 198.720654] [] ? reciprocal_value+0x50/0x50
[ 198.720668] [] ? repair_env_string+0x60/0x60
[ 198.720679] [] start_kernel+0x29a/0x350
[ 198.720690] [] ? repair_env_string+0x60/0x60
[ 198.720721] [] i386_start_kernel+0x39/0xa0
[ 198.720729] ---[ end trace 81e0a6266f5c73a8 ]---
[ 198.720740] eth0: Transmit timeout, status 00000204 00000000timer routine checks the link status and if it's up calls
netif_carrier_on() allowing upper layer to start the tx queue
even if the auto-negotiation process is not finished.Also remove ugly auto-negotiation check from the sis900_start_xmit()
CC: Duan Fugang
CC: Ben HutchingsSigned-off-by: Denis Kirjanov
Signed-off-by: David S. Miller -
Pull infiniband/rdma fixes from Roland Dreier:
- Fixes for the newly merged mlx5 hardware driver
- Stack info leak fixes from Dan Carpenter
- Fixes for pkey table handling with SR-IOV
- A few other small things* tag 'rdma-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband:
IPoIB: Fix pkey change flow for virtualization environments
IPoIB: Make sure child devices use valid/proper pkeys
IB/core: Create QP1 using the pkey index which contains the default pkey
mlx5_core: Variable may be used uninitialized
mlx5_core: Implement new initialization sequence
mlx5_core: Fix use after free in mlx5_cmd_comp_handler()
IB/mlx5: Fix stack info leak in mlx5_ib_alloc_ucontext()
IB/mlx5: Fix error return code in init_one()
IB/mlx4: Use default pkey when creating tunnel QPs
RDMA/cma: Only call cma_save_ib_info() for CM REQs
RDMA/cma: Fix accessing invalid private data for UD
RDMA/cma: Fix gcc warning
Revert "RDMA/nes: Fix compilation error when nes_debug is enabled"
IB/qib: Add err_decode() call for ring dump
RDMA/cxgb3: Fix stack info leak in iwch_create_cq()
RDMA/nes: Fix info leaks in nes_create_qp() and nes_create_cq()
RDMA/ocrdma: Fix several stack info leaks
RDMA/cxgb4: Fix stack info leak in c4iw_create_qp()
RDMA/ocrdma: Remove unused include -
Pull GPIO fixes from Linus Walleij:
"Yet another GPIO pull request, fixing the fix from the last one. It
turns out that fixing the boot path for device tree boots on OMAP
breaks out antique systems (such as OMAP1) and we need to find a
better way. So we're reverting that "fix" for the moment and thinking
about something better.Also fixing a build issue on the MSM driver"
* tag 'gpio-for-v3.11-3' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio:
gpio_msm: Fix build error due to missing err.h
Revert "gpio/omap: don't create an IRQ mapping for every GPIO on DT"
Revert "gpio/omap: auto request GPIO as input if used as IRQ via DT"
Revert "gpio/omap: fix build error when OF_GPIO is not defined." -
Commit 5c766d642 ("ipv4: introduce address lifetime") leaves the ifa
resource that was allocated via inet_alloc_ifa() unfreed when returning
the function with -EINVAL. Thus, free it first via inet_free_ifa().Signed-off-by: Daniel Borkmann
Reviewed-by: Jiri Pirko
Signed-off-by: David S. Miller -
This message was added in commit a7154cb8 (June 2004, [PATCH] r8169:
link handling and phy reset rework) and is printed every ten seconds
when no cable is connected and runtime power management is disabled.
(Before that commit, "Reset RTL8169s PHY" would be printed instead.)Signed-off-by: Peter Wu
Acked-by: Francois Romieu
Signed-off-by: David S. Miller
