Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f0691533 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost 

Pull virtio/vhost updates from Michael Tsirkin:
 "New features, performance improvements, cleanups:

   - basic polling support for vhost
   - rework virtio to optionally use DMA API, fixing it on Xen
   - balloon stats gained a new entry
   - using the new napi_alloc_skb speeds up virtio net
   - virtio blk stats can now be read while another VCPU is busy
     inflating or deflating the balloon

  plus misc cleanups in various places"

* tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost:
  virtio_net: replace netdev_alloc_skb_ip_align() with napi_alloc_skb()
  vhost_net: basic polling support
  vhost: introduce vhost_vq_avail_empty()
  vhost: introduce vhost_has_work()
  virtio_balloon: Allow to resize and update the balloon stats in parallel
  virtio_balloon: Use a workqueue instead of "vballoon" kthread
  virtio/s390: size of SET_IND payload
  virtio/s390: use dev_to_virtio
  vhost: rename vhost_init_used()
  vhost: rename cross-endian helpers
  virtio_blk: VIRTIO_BLK_F_WCE->VIRTIO_BLK_F_FLUSH
  vring: Use the DMA API on Xen
  virtio_pci: Use the DMA API if enabled
  virtio_mmio: Use the DMA API if enabled
  virtio: Add improved queue allocation API
  virtio_ring: Support DMA APIs
  vring: Introduce vring_use_dma_api()
  s390/dma: Allow per device dma ops
  alpha/dma: use common noop dma ops
  dma: Provide simple noop dma ops
parents 2b2f72d8 c67f5db8

arch/alpha/kernel/pci-noop.c

+4 −42
Original line number Diff line number Diff line
@@ -123,44 +123,6 @@ static void *alpha_noop_alloc_coherent(struct device *dev, size_t size, 
	return ret;

}



static void alpha_noop_free_coherent(struct device *dev, size_t size,

				     void *cpu_addr, dma_addr_t dma_addr,

				     struct dma_attrs *attrs)

{

	free_pages((unsigned long)cpu_addr, get_order(size));

}



static dma_addr_t alpha_noop_map_page(struct device *dev, struct page *page,

				      unsigned long offset, size_t size,

				      enum dma_data_direction dir,

				      struct dma_attrs *attrs)

{

	return page_to_pa(page) + offset;

}



static int alpha_noop_map_sg(struct device *dev, struct scatterlist *sgl, int nents,

			     enum dma_data_direction dir, struct dma_attrs *attrs)

{

	int i;

	struct scatterlist *sg;



	for_each_sg(sgl, sg, nents, i) {

		void *va;



		BUG_ON(!sg_page(sg));

		va = sg_virt(sg);

		sg_dma_address(sg) = (dma_addr_t)virt_to_phys(va);

		sg_dma_len(sg) = sg->length;

	}



	return nents;

}



static int alpha_noop_mapping_error(struct device *dev, dma_addr_t dma_addr)

{

	return 0;

}



static int alpha_noop_supported(struct device *dev, u64 mask)

{

	return mask < 0x00ffffffUL ? 0 : 1;
@@ -168,10 +130,10 @@ static int alpha_noop_supported(struct device *dev, u64 mask) 


struct dma_map_ops alpha_noop_ops = {

	.alloc			= alpha_noop_alloc_coherent,

	.free			= alpha_noop_free_coherent,

	.map_page		= alpha_noop_map_page,

	.map_sg			= alpha_noop_map_sg,

	.mapping_error		= alpha_noop_mapping_error,

	.free			= dma_noop_free_coherent,

	.map_page		= dma_noop_map_page,

	.map_sg			= dma_noop_map_sg,

	.mapping_error		= dma_noop_mapping_error,

	.dma_supported		= alpha_noop_supported,

};

arch/s390/Kconfig

+1 −4
Original line number Diff line number Diff line
@@ -124,6 +124,7 @@ config S390 
	select HAVE_CMPXCHG_DOUBLE

	select HAVE_CMPXCHG_LOCAL

	select HAVE_DEBUG_KMEMLEAK

	select HAVE_DMA_API_DEBUG

	select HAVE_DYNAMIC_FTRACE

	select HAVE_DYNAMIC_FTRACE_WITH_REGS

	select HAVE_FTRACE_MCOUNT_RECORD
@@ -617,10 +618,6 @@ config HAS_IOMEM 
config IOMMU_HELPER

	def_bool PCI



config HAS_DMA

	def_bool PCI

	select HAVE_DMA_API_DEBUG



config NEED_SG_DMA_LENGTH

	def_bool PCI

arch/s390/include/asm/device.h

+5 −1
Original line number Diff line number Diff line
@@ -3,5 +3,9 @@ 
 *

 * This file is released under the GPLv2

 */

#include <asm-generic/device.h>

struct dev_archdata {

	struct dma_map_ops *dma_ops;

};



struct pdev_archdata {

};

arch/s390/include/asm/dma-mapping.h

+4 −2
Original line number Diff line number Diff line
@@ -11,11 +11,13 @@ 


#define DMA_ERROR_CODE		(~(dma_addr_t) 0x0)



extern struct dma_map_ops s390_dma_ops;

extern struct dma_map_ops s390_pci_dma_ops;



static inline struct dma_map_ops *get_dma_ops(struct device *dev)

{

	return &s390_dma_ops;

	if (dev && dev->archdata.dma_ops)

		return dev->archdata.dma_ops;

	return &dma_noop_ops;

}



static inline void dma_cache_sync(struct device *dev, void *vaddr, size_t size,

arch/s390/pci/pci.c

+1 −0
Original line number Diff line number Diff line
@@ -641,6 +641,7 @@ int pcibios_add_device(struct pci_dev *pdev) 
	int i;



	pdev->dev.groups = zpci_attr_groups;

	pdev->dev.archdata.dma_ops = &s390_pci_dma_ops;

	zpci_map_resources(pdev);



	for (i = 0; i < PCI_BAR_COUNT; i++) {