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

Merge tag 's390-5.9-3' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux 

Pull s390 fixes from Vasily Gorbik:

 - a couple of fixes for storage key handling relevant for debugging

 - add cond_resched into potentially slow subchannels scanning loop

 - fixes for PF/VF linking and to ignore stale PCI configuration request
   events

* tag 's390-5.9-3' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
  s390/pci: fix PF/VF linking on hot plug
  s390/pci: re-introduce zpci_remove_device()
  s390/pci: fix zpci_bus_link_virtfn()
  s390/ptrace: fix storage key handling
  s390/runtime_instrumentation: fix storage key handling
  s390/pci: ignore stale configuration request event
  s390/cio: add cond_resched() in the slow_eval_known_fn() loop
parents b2d9e996 b97bf44f

arch/s390/kernel/ptrace.c

+5 −2
Original line number Diff line number Diff line
@@ -1268,7 +1268,6 @@ static bool is_ri_cb_valid(struct runtime_instr_cb *cb) 
		cb->pc == 1 &&

		cb->qc == 0 &&

		cb->reserved2 == 0 &&

		cb->key == PAGE_DEFAULT_KEY &&

		cb->reserved3 == 0 &&

		cb->reserved4 == 0 &&

		cb->reserved5 == 0 &&
@@ -1330,7 +1329,11 @@ static int s390_runtime_instr_set(struct task_struct *target, 
		kfree(data);

		return -EINVAL;

	}



	/*

	 * Override access key in any case, since user space should

	 * not be able to set it, nor should it care about it.

	 */

	ri_cb.key = PAGE_DEFAULT_KEY >> 4;

	preempt_disable();

	if (!target->thread.ri_cb)

		target->thread.ri_cb = data;

arch/s390/kernel/runtime_instr.c

+1 −1
Original line number Diff line number Diff line
@@ -57,7 +57,7 @@ static void init_runtime_instr_cb(struct runtime_instr_cb *cb) 
	cb->k = 1;

	cb->ps = 1;

	cb->pc = 1;

	cb->key = PAGE_DEFAULT_KEY;

	cb->key = PAGE_DEFAULT_KEY >> 4;

	cb->v = 1;

}

arch/s390/pci/pci.c

+15 −7
Original line number Diff line number Diff line
@@ -672,6 +672,19 @@ int zpci_disable_device(struct zpci_dev *zdev) 
}

EXPORT_SYMBOL_GPL(zpci_disable_device);



void zpci_remove_device(struct zpci_dev *zdev)

{

	struct zpci_bus *zbus = zdev->zbus;

	struct pci_dev *pdev;



	pdev = pci_get_slot(zbus->bus, zdev->devfn);

	if (pdev) {

		if (pdev->is_virtfn)

			return zpci_remove_virtfn(pdev, zdev->vfn);

		pci_stop_and_remove_bus_device_locked(pdev);

	}

}



int zpci_create_device(struct zpci_dev *zdev)

{

	int rc;
@@ -716,13 +729,8 @@ void zpci_release_device(struct kref *kref) 
{

	struct zpci_dev *zdev = container_of(kref, struct zpci_dev, kref);



	if (zdev->zbus->bus) {

		struct pci_dev *pdev;



		pdev = pci_get_slot(zdev->zbus->bus, zdev->devfn);

		if (pdev)

			pci_stop_and_remove_bus_device_locked(pdev);

	}

	if (zdev->zbus->bus)

		zpci_remove_device(zdev);



	switch (zdev->state) {

	case ZPCI_FN_STATE_ONLINE:

arch/s390/pci/pci_bus.c

+30 −22
Original line number Diff line number Diff line
@@ -132,13 +132,14 @@ static int zpci_bus_link_virtfn(struct pci_dev *pdev, 
{

	int rc;



	virtfn->physfn = pci_dev_get(pdev);

	rc = pci_iov_sysfs_link(pdev, virtfn, vfid);

	if (rc) {

		pci_dev_put(pdev);

		virtfn->physfn = NULL;

	if (rc)

		return rc;

	}



	virtfn->is_virtfn = 1;

	virtfn->multifunction = 0;

	virtfn->physfn = pci_dev_get(pdev);



	return 0;

}
@@ -151,9 +152,9 @@ static int zpci_bus_setup_virtfn(struct zpci_bus *zbus, 
	int vfid = vfn - 1; /* Linux' vfid's start at 0 vfn at 1*/

	int rc = 0;



	virtfn->is_virtfn = 1;

	virtfn->multifunction = 0;

	WARN_ON(vfid < 0);

	if (!zbus->multifunction)

		return 0;



	/* If the parent PF for the given VF is also configured in the

	 * instance, it must be on the same zbus.

	 * We can then identify the parent PF by checking what
@@ -165,11 +166,17 @@ static int zpci_bus_setup_virtfn(struct zpci_bus *zbus, 
		zdev = zbus->function[i];

		if (zdev && zdev->is_physfn) {

			pdev = pci_get_slot(zbus->bus, zdev->devfn);

			if (!pdev)

				continue;

			cand_devfn = pci_iov_virtfn_devfn(pdev, vfid);

			if (cand_devfn == virtfn->devfn) {

				rc = zpci_bus_link_virtfn(pdev, virtfn, vfid);

				/* balance pci_get_slot() */

				pci_dev_put(pdev);

				break;

			}

			/* balance pci_get_slot() */

			pci_dev_put(pdev);

		}

	}

	return rc;
@@ -178,12 +185,23 @@ static int zpci_bus_setup_virtfn(struct zpci_bus *zbus, 
static inline int zpci_bus_setup_virtfn(struct zpci_bus *zbus,

		struct pci_dev *virtfn, int vfn)

{

	virtfn->is_virtfn = 1;

	virtfn->multifunction = 0;

	return 0;

}

#endif



void pcibios_bus_add_device(struct pci_dev *pdev)

{

	struct zpci_dev *zdev = to_zpci(pdev);



	/*

	 * With pdev->no_vf_scan the common PCI probing code does not

	 * perform PF/VF linking.

	 */

	if (zdev->vfn)

		zpci_bus_setup_virtfn(zdev->zbus, pdev, zdev->vfn);



}



static int zpci_bus_add_device(struct zpci_bus *zbus, struct zpci_dev *zdev)

{

	struct pci_bus *bus;
@@ -214,20 +232,10 @@ static int zpci_bus_add_device(struct zpci_bus *zbus, struct zpci_dev *zdev) 
	}



	pdev = pci_scan_single_device(bus, zdev->devfn);

	if (pdev) {

		if (!zdev->is_physfn) {

			rc = zpci_bus_setup_virtfn(zbus, pdev, zdev->vfn);

			if (rc)

				goto failed_with_pdev;

		}

	if (pdev)

		pci_bus_add_device(pdev);

	}

	return 0;



failed_with_pdev:

	pci_stop_and_remove_bus_device(pdev);

	pci_dev_put(pdev);

	return rc;

	return 0;

}



static void zpci_bus_add_devices(struct zpci_bus *zbus)

arch/s390/pci/pci_bus.h

+13 −0
Original line number Diff line number Diff line
@@ -29,3 +29,16 @@ static inline struct zpci_dev *get_zdev_by_bus(struct pci_bus *bus, 


	return (devfn >= ZPCI_FUNCTIONS_PER_BUS) ? NULL : zbus->function[devfn];

}



#ifdef CONFIG_PCI_IOV

static inline void zpci_remove_virtfn(struct pci_dev *pdev, int vfn)

{



	pci_lock_rescan_remove();

	/* Linux' vfid's start at 0 vfn at 1 */

	pci_iov_remove_virtfn(pdev->physfn, vfn - 1);

	pci_unlock_rescan_remove();

}

#else /* CONFIG_PCI_IOV */

static inline void zpci_remove_virtfn(struct pci_dev *pdev, int vfn) {}

#endif /* CONFIG_PCI_IOV */