21 Mar, 2012
1 commit
-
Pull trivial tree from Jiri Kosina:
"It's indeed trivial -- mostly documentation updates and a bunch of
typo fixes from Masanari.There are also several linux/version.h include removals from Jesper."
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (101 commits)
kcore: fix spelling in read_kcore() comment
constify struct pci_dev * in obvious cases
Revert "char: Fix typo in viotape.c"
init: fix wording error in mm_init comment
usb: gadget: Kconfig: fix typo for 'different'
Revert "power, max8998: Include linux/module.h just once in drivers/power/max8998_charger.c"
writeback: fix fn name in writeback_inodes_sb_nr_if_idle() comment header
writeback: fix typo in the writeback_control comment
Documentation: Fix multiple typo in Documentation
tpm_tis: fix tis_lock with respect to RCU
Revert "media: Fix typo in mixer_drv.c and hdmi_drv.c"
Doc: Update numastat.txt
qla4xxx: Add missing spaces to error messages
compiler.h: Fix typo
security: struct security_operations kerneldoc fix
Documentation: broken URL in libata.tmpl
Documentation: broken URL in filesystems.tmpl
mtd: simplify return logic in do_map_probe()
mm: fix comment typo of truncate_inode_pages_range
power: bq27x00: Fix typos in comment
...
22 Feb, 2012
1 commit
-
This provides unified readq()/writeq() helper functions for 32-bit
drivers.For some cases, readq/writeq without atomicity is harmful, and order of
io access has to be specified explicitly. So in this patch, new two
header files which contain non-atomic readq/writeq are added.- provides non-atomic readq/
writeq with the order of lower address -> higher address- provides non-atomic readq/
writeq with reversed orderThis allows us to remove some readq()s that were added drivers when the
default non-atomic ones were removed in commit dbee8a0affd5 ("x86:
remove 32-bit versions of readq()/writeq()")The drivers which need readq/writeq but can do with the non-atomic ones
must add the line:#include /* or hi-lo.h */
But this will be nop in 64-bit environments, and no other #ifdefs are
required. So I believe that this patch can solve the problem of
1. driver-specific readq/writeq
2. atomicity and order of io accessThis patch is tested with building allyesconfig and allmodconfig as
ARCH=x86 and ARCH=i386 on top of tip/master.Cc: Kashyap Desai
Cc: Len Brown
Cc: Ravi Anand
Cc: Vikas Chaudhary
Cc: Matthew Garrett
Cc: Jason Uhlenkott
Cc: James Bottomley
Cc: Thomas Gleixner
Cc: "H. Peter Anvin"
Cc: Roland Dreier
Cc: James Bottomley
Cc: Alan Cox
Cc: Matthew Wilcox
Cc: Andrew Morton
Signed-off-by: Hitoshi Mitake
Signed-off-by: Linus Torvalds
21 Feb, 2012
1 commit
-
There's no need for drivers/block/nvme.c to include linux/version.h,
so remove the include.Signed-off-by: Jesper Juhl
Signed-off-by: Jiri Kosina
19 Jan, 2012
1 commit
-
The type of 'make_request_fn' changed in 5a7bbad27a4 ("block: remove
support for bio remapping from ->make_request"), but the merge of the
nvme driver didn't take that into account, and as a result the driver
would compile with a warning:drivers/block/nvme.c: In function 'nvme_alloc_ns':
drivers/block/nvme.c:1336:2: warning: passing argument 2 of 'blk_queue_make_request' from incompatible pointer type [enabled by default]
include/linux/blkdev.h:830:13: note: expected 'void (*)(struct request_queue *, struct bio *)' but argument is of type 'int (*)(struct request_queue *, struct bio *)'It's benign, but the warning is annoying.
Reported-by: Stephen Rothwell
Cc: Matthew Wilcox
Signed-off-by: Linus Torvalds
11 Jan, 2012
11 commits
-
The number of submission & completion queues should be set by calling
Set Features, not Get Features.Reported-by: Kwok Kong
Signed-off-by: Matthew Wilcox -
Signed-off-by: Matthew Wilcox
-
QUEUE_FLAG_* are flags (other than QUEUE_FLAG_DEFAULT), so they cannot
be ORed together. Set the queue flags using queue_flag_set_unlocked().Reported-by: Donald Wood
Signed-off-by: Matthew Wilcox -
By using the iod->nents field (the same way other I/O paths do), we can
avoid recalculating the number of sg entries at unmap time, and make
nvme_unmap_user_pages() easier to call.Also, use the 'write' parameter instead of assuming DMA_FROM_DEVICE.
Signed-off-by: Matthew Wilcox
-
For user I/O and admin commands, we were forgetting to mark the end of
the SG list.Signed-off-by: Matthew Wilcox
-
We were always mapping as DMA_FROM_DEVICE then unmapping with
DMA_TO_DEVICE which was clearly not correct. Follow the same pattern as
nvme_submit_io() and key off the bottom bit of the opcode to determine
whether this is a read or a write.Signed-off-by: Matthew Wilcox
-
IO_TIMEOUT is a little too generic and might be used by other parts of
the kernel in the future.Signed-off-by: Matthew Wilcox
-
The new merged data structure is called nvme_iod. This improves performance
for mid-sized I/Os (in the 16k range) since we save a memory allocation.
It is also a slightly simpler interface to use.Signed-off-by: Matthew Wilcox
-
The queue is only needed for some rare occasions, and it's more consistent
to pass the device around.Signed-off-by: Matthew Wilcox
-
Upcoming patches require calling get_nvmeq when we don't have a namespace.
Some callers already have the device in a local variable anyway.Signed-off-by: Matthew Wilcox
-
Instead of encoding the handler type in the bottom two bits of the
per-completion context pointer, store the handler function as well
as the context pointer. This gives us more flexibility and the code
is clearer. It comes at the cost of an extra 8k of memory per queue,
but this feels like a reasonable price to pay.Signed-off-by: Matthew Wilcox
05 Nov, 2011
25 commits
-
The doorbell stride allows devices to spread out their doorbells instead
of packing them tightly. This feature was added as part of ECN 003.This patch also enables support for more than 512 queues :-)
Signed-off-by: Matthew Wilcox
-
Signed-off-by: Matthew Wilcox
-
ECN 001 documented that namespace 0 is not valid. Sending an Identify
with CNS of 0 and Namespace of 0 is an undefined command.Signed-off-by: Matthew Wilcox
-
The existing calculation underestimated the number of pages required
as it did not take into account the pointer at the end of each page.
The replacement calculation may overestimate the number of pages required
if the last page in the PRP List is entirely full. By using ->npages
as a counter as we fill in the pages, we ensure that we don't try to
free a page that was never allocated.Signed-off-by: Nisheeth Bhat
Signed-off-by: Matthew Wilcox -
Instead of open-coding calls to nvme_submit_admin_cmd, these
small wrappers are simpler to use (the patch removes 14 lines from
nvme_dev_add() for example).Signed-off-by: Matthew Wilcox
-
The driver was allocating 8k of memory, then freeing 4k of it.
Signed-off-by: Matthew Wilcox
-
dma_unmap_sg() must be called with the same 'nents' passed to
dma_map_sg(), not the number returned from dma_map_sg().Signed-off-by: Nisheeth Bhat
Signed-off-by: Matthew Wilcox -
Our SG list was constructed to always fill the entire first page, even
if that was more than the length of the I/O. This is probably harmless,
but some IOMMUs might do something bad.Correcting the first call to sg_set_page() made it look a lot closer to
the sg_set_page() in the loop, so fold the first call to sg_set_page()
into the loop.Reported-by: Nisheeth Bhat
Signed-off-by: Matthew Wilcox -
Missing 'break' in the switch statement meant that we'd fall through
to the 'return -EINVAL' case. -
Remove the special-purpose IDENTIFY, GET_RANGE_TYPE, DOWNLOAD_FIRMWARE
and ACTIVATE_FIRMWARE commands. Replace them with a generic ADMIN_CMD
ioctl that can submit any admin command.Add a new ID ioctl that returns the namespace ID of the queried device.
It corresponds to the SCSI Idlun ioctl.Signed-off-by: Matthew Wilcox
-
If the I/O was not completed by a single NVMe command, we add the
bio to the congestion list and wake up the kthread to resubmit it.
But the kthread calls remove_wait_queue() unconditionally, which
will oops if it's not on the wait queue. So add the kthread to
the wait queue before waking it up.Signed-off-by: Matthew Wilcox
-
nvme_setup_io_queues() was assuming that a NULL return from
nvme_create_queue() was an out-of-memory error. That's not necessarily
true; the adapter might return -EIO, for example. Change the calling
convention to return an ERR_PTR on failure instead of NULL.Signed-off-by: Matthew Wilcox
-
Signed-off-by: Matthew Wilcox
-
For the benefit of reviewers, add comments to a few functions describing
their calling contextSigned-off-by: Matthew Wilcox
-
If any of the memory allocations in nvme_setup_prps fail, handle it by
modifying the passed-in data length to reflect the number of bytes we are
actually able to send. Also allow the caller to specify the GFP flags
they need; for user-initiated commands, we can use GFP_KERNEL allocations.The various callers are updated to handle this possibility; the main
I/O path is already prepared for this possibility (as it may happen
due to nvme_map_bio being unable to map all the segments of the I/O).
The other callers return -ENOMEM instead of doing partial I/Os.Reported-by: Andi Kleen
Signed-off-by: Matthew Wilcox -
The current approach of using the namespace ID as the minor number
doesn't work when there are multiple adapters in the machine. Rather
than statically partitioning the number of namespaces between adapters,
dynamically allocate minor numbers to namespaces as they are detected.Signed-off-by: Matthew Wilcox
-
Previously it was being implicitly included through some other header file
Signed-off-by: Matthew Wilcox
-
In the kthread, walk the list of outstanding I/Os and check they've not
hit the timeout.Signed-off-by: Matthew Wilcox
-
The trailing '_data' on the end was annoying and inconsistent. Also, make
it actually return the data since this is needed for timing out commands.Signed-off-by: Matthew Wilcox
-
When an I/O completed with an error, we would call bio_endio twice
(once with -EIO and once with 0). Found by inspection.Signed-off-by: Matthew Wilcox
-
THe device reports (in its capability register) how long it will take
to initialise. If that time elapses before the ready bit becomes set,
conclude the device is broken and refuse to initialise it. Log a nice
error message so the user knows why we did nothing.Signed-off-by: Matthew Wilcox
-
We need to clear the affinity mask before calling free_irq()
Reported-by: Shane Michael Matthews
Signed-off-by: Matthew Wilcox -
The arbitration field was extended by one bit, shifting the shutdown
notification bits by one. Also, the SQ/CQ entry size was made
configurable for future extensions.Reported-by: Paul Luse
Signed-off-by: Matthew Wilcox -
Signed-off-by: Matthew Wilcox
-
The read and write commands don't define a 'result', so there's no need
to copy it back to userspace.Remove the ability of the ioctl to submit commands to a different
namespace; it's just asking for trouble, and the use case I have in mind
will be addressed througha different ioctl in the future. That removes
the need for both the block_shift and nsid arguments.Check that the opcode is one of 'read' or 'write'. Future opcodes may
be added in the future, but we will need a different structure definition
for them.The nblocks field is redefined to be 0-based. This allows the user to
request the full 65536 blocks.Don't byteswap the reftag, apptag and appmask. Martin Petersen tells
me these are calculated in big-endian and are transmitted to the device
in big-endian.Signed-off-by: Matthew Wilcox
