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

Merge tag 'for-linus-5.10b-rc1c-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip 

Pull more xen updates from Juergen Gross:

 - a series for the Xen pv block drivers adding module parameters for
   better control of resource usge

 - a cleanup series for the Xen event driver

* tag 'for-linus-5.10b-rc1c-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip:
  Documentation: add xen.fifo_events kernel parameter description
  xen/events: unmask a fifo event channel only if it was masked
  xen/events: only register debug interrupt for 2-level events
  xen/events: make struct irq_info private to events_base.c
  xen: remove no longer used functions
  xen-blkfront: Apply changed parameter name to the document
  xen-blkfront: add a parameter for disabling of persistent grants
  xen-blkback: add a parameter for disabling of persistent grants
parents 81ecf91e 1a89c1dc

Documentation/ABI/testing/sysfs-driver-xen-blkback

+9 −0
Original line number Diff line number Diff line
@@ -35,3 +35,12 @@ Description: 
                controls the duration in milliseconds that blkback will not

                cache any page not backed by a grant mapping.

                The default is 10ms.



What:           /sys/module/xen_blkback/parameters/feature_persistent

Date:           September 2020

KernelVersion:  5.10

Contact:        SeongJae Park <sjpark@amazon.de>

Description:

                Whether to enable the persistent grants feature or not.  Note

                that this option only takes effect on newly created backends.

                The default is Y (enable).

Documentation/ABI/testing/sysfs-driver-xen-blkfront

+10 −1
Original line number Diff line number Diff line 
What:           /sys/module/xen_blkfront/parameters/max

What:           /sys/module/xen_blkfront/parameters/max_indirect_segments

Date:           June 2013

KernelVersion:  3.11

Contact:        Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
@@ -8,3 +8,12 @@ Description: 
                is 32 - higher value means more potential throughput but more

                memory usage. The backend picks the minimum of the frontend

                and its default backend value.



What:           /sys/module/xen_blkfront/parameters/feature_persistent

Date:           September 2020

KernelVersion:  5.10

Contact:        SeongJae Park <sjpark@amazon.de>

Description:

                Whether to enable the persistent grants feature or not.  Note

                that this option only takes effect on newly created frontends.

                The default is Y (enable).

Documentation/admin-guide/kernel-parameters.txt

+7 −0
Original line number Diff line number Diff line
@@ -5978,6 +5978,13 @@ 
			After which time (jiffies) the event handling loop

			should start to delay EOI handling. Default is 2.



	xen.fifo_events=	[XEN]

			Boolean parameter to disable using fifo event handling

			even if available. Normally fifo event handling is

			preferred over the 2-level event handling, as it is

			fairer and the number of possible event channels is

			much higher. Default is on (use fifo events).



	nopv=		[X86,XEN,KVM,HYPER_V,VMWARE]

			Disables the PV optimizations forcing the guest to run

			as generic guest with no PV drivers. Currently support

arch/x86/xen/smp.c

+11 −8
Original line number Diff line number Diff line
@@ -88,14 +88,17 @@ int xen_smp_intr_init(unsigned int cpu) 
	per_cpu(xen_callfunc_irq, cpu).irq = rc;

	per_cpu(xen_callfunc_irq, cpu).name = callfunc_name;



	if (!xen_fifo_events) {

		debug_name = kasprintf(GFP_KERNEL, "debug%d", cpu);

	rc = bind_virq_to_irqhandler(VIRQ_DEBUG, cpu, xen_debug_interrupt,

		rc = bind_virq_to_irqhandler(VIRQ_DEBUG, cpu,

					     xen_debug_interrupt,

					     IRQF_PERCPU | IRQF_NOBALANCING,

					     debug_name, NULL);

		if (rc < 0)

			goto fail;

		per_cpu(xen_debug_irq, cpu).irq = rc;

		per_cpu(xen_debug_irq, cpu).name = debug_name;

	}



	callfunc_name = kasprintf(GFP_KERNEL, "callfuncsingle%d", cpu);

	rc = bind_ipi_to_irqhandler(XEN_CALL_FUNCTION_SINGLE_VECTOR,

arch/x86/xen/xen-ops.h

+2 −0
Original line number Diff line number Diff line
@@ -29,6 +29,8 @@ extern struct start_info *xen_start_info; 
extern struct shared_info xen_dummy_shared_info;

extern struct shared_info *HYPERVISOR_shared_info;



extern bool xen_fifo_events;



void xen_setup_mfn_list_list(void);

void xen_build_mfn_list_list(void);

void xen_setup_machphys_mapping(void);

CRA Git | Maintained and supported by SUSTech CRA and CCSE