Commit f62f8b71 authored by Vasily Gorbik's avatar Vasily Gorbik
Browse files

Merge branch 'uaccess-inline-asm-cleanup' into features 



Heiko Carstens says:

===================
There are a couple of oddities within the s390 uaccess library
functions. Therefore cleanup the whole uaccess.c file.

There is no functional change, only improved readability. The output
of "objdump -Dr" was always compared before/after each patch to make
sure that the generated object file is identical, if that could be
expected. Therefore the series also includes more patches than really
required to cleanup the code.

Furthermore the kunit usercopy tests also still pass.
===================

Signed-off-by: default avatarVasily Gorbik <gor@linux.ibm.com>
parents 85206bf9 49d6e68f

arch/s390/configs/debug_defconfig

+4 −9
Original line number Diff line number Diff line
@@ -23,7 +23,6 @@ CONFIG_NUMA_BALANCING=y 
CONFIG_MEMCG=y

CONFIG_BLK_CGROUP=y

CONFIG_CFS_BANDWIDTH=y

CONFIG_RT_GROUP_SCHED=y

CONFIG_CGROUP_PIDS=y

CONFIG_CGROUP_RDMA=y

CONFIG_CGROUP_FREEZER=y
@@ -90,7 +89,6 @@ CONFIG_MINIX_SUBPARTITION=y 
CONFIG_SOLARIS_X86_PARTITION=y

CONFIG_UNIXWARE_DISKLABEL=y

CONFIG_IOSCHED_BFQ=y

CONFIG_BFQ_GROUP_IOSCHED=y

CONFIG_BINFMT_MISC=m

CONFIG_ZSWAP=y

CONFIG_ZSMALLOC_STAT=y
@@ -298,7 +296,6 @@ CONFIG_IP_NF_TARGET_REJECT=m 
CONFIG_IP_NF_NAT=m

CONFIG_IP_NF_TARGET_MASQUERADE=m

CONFIG_IP_NF_MANGLE=m

CONFIG_IP_NF_TARGET_CLUSTERIP=m

CONFIG_IP_NF_TARGET_ECN=m

CONFIG_IP_NF_TARGET_TTL=m

CONFIG_IP_NF_RAW=m
@@ -340,7 +337,6 @@ CONFIG_BRIDGE_MRP=y 
CONFIG_VLAN_8021Q=m

CONFIG_VLAN_8021Q_GVRP=y

CONFIG_NET_SCHED=y

CONFIG_NET_SCH_CBQ=m

CONFIG_NET_SCH_HTB=m

CONFIG_NET_SCH_HFSC=m

CONFIG_NET_SCH_PRIO=m
@@ -351,7 +347,6 @@ CONFIG_NET_SCH_SFQ=m 
CONFIG_NET_SCH_TEQL=m

CONFIG_NET_SCH_TBF=m

CONFIG_NET_SCH_GRED=m

CONFIG_NET_SCH_DSMARK=m

CONFIG_NET_SCH_NETEM=m

CONFIG_NET_SCH_DRR=m

CONFIG_NET_SCH_MQPRIO=m
@@ -363,14 +358,11 @@ CONFIG_NET_SCH_INGRESS=m 
CONFIG_NET_SCH_PLUG=m

CONFIG_NET_SCH_ETS=m

CONFIG_NET_CLS_BASIC=m

CONFIG_NET_CLS_TCINDEX=m

CONFIG_NET_CLS_ROUTE4=m

CONFIG_NET_CLS_FW=m

CONFIG_NET_CLS_U32=m

CONFIG_CLS_U32_PERF=y

CONFIG_CLS_U32_MARK=y

CONFIG_NET_CLS_RSVP=m

CONFIG_NET_CLS_RSVP6=m

CONFIG_NET_CLS_FLOW=m

CONFIG_NET_CLS_CGROUP=y

CONFIG_NET_CLS_BPF=m
@@ -584,7 +576,7 @@ CONFIG_DIAG288_WATCHDOG=m 
CONFIG_FB=y

CONFIG_FRAMEBUFFER_CONSOLE=y

CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y

# CONFIG_HID is not set

# CONFIG_HID_SUPPORT is not set

# CONFIG_USB_SUPPORT is not set

CONFIG_INFINIBAND=m

CONFIG_INFINIBAND_USER_ACCESS=m
@@ -828,6 +820,7 @@ CONFIG_PANIC_ON_OOPS=y 
CONFIG_DETECT_HUNG_TASK=y

CONFIG_WQ_WATCHDOG=y

CONFIG_TEST_LOCKUP=m

CONFIG_DEBUG_PREEMPT=y

CONFIG_PROVE_LOCKING=y

CONFIG_LOCK_STAT=y

CONFIG_DEBUG_ATOMIC_SLEEP=y
@@ -843,6 +836,7 @@ CONFIG_RCU_CPU_STALL_TIMEOUT=300 
# CONFIG_RCU_TRACE is not set

CONFIG_LATENCYTOP=y

CONFIG_BOOTTIME_TRACING=y

CONFIG_FPROBE=y

CONFIG_FUNCTION_PROFILER=y

CONFIG_STACK_TRACER=y

CONFIG_IRQSOFF_TRACER=y
@@ -857,6 +851,7 @@ CONFIG_SAMPLES=y 
CONFIG_SAMPLE_TRACE_PRINTK=m

CONFIG_SAMPLE_FTRACE_DIRECT=m

CONFIG_SAMPLE_FTRACE_DIRECT_MULTI=m

CONFIG_SAMPLE_FTRACE_OPS=m

CONFIG_DEBUG_ENTRY=y

CONFIG_CIO_INJECT=y

CONFIG_KUNIT=m

arch/s390/configs/defconfig

+3 −9
Original line number Diff line number Diff line
@@ -21,7 +21,6 @@ CONFIG_NUMA_BALANCING=y 
CONFIG_MEMCG=y

CONFIG_BLK_CGROUP=y

CONFIG_CFS_BANDWIDTH=y

CONFIG_RT_GROUP_SCHED=y

CONFIG_CGROUP_PIDS=y

CONFIG_CGROUP_RDMA=y

CONFIG_CGROUP_FREEZER=y
@@ -85,7 +84,6 @@ CONFIG_MINIX_SUBPARTITION=y 
CONFIG_SOLARIS_X86_PARTITION=y

CONFIG_UNIXWARE_DISKLABEL=y

CONFIG_IOSCHED_BFQ=y

CONFIG_BFQ_GROUP_IOSCHED=y

CONFIG_BINFMT_MISC=m

CONFIG_ZSWAP=y

CONFIG_ZSMALLOC_STAT=y
@@ -289,7 +287,6 @@ CONFIG_IP_NF_TARGET_REJECT=m 
CONFIG_IP_NF_NAT=m

CONFIG_IP_NF_TARGET_MASQUERADE=m

CONFIG_IP_NF_MANGLE=m

CONFIG_IP_NF_TARGET_CLUSTERIP=m

CONFIG_IP_NF_TARGET_ECN=m

CONFIG_IP_NF_TARGET_TTL=m

CONFIG_IP_NF_RAW=m
@@ -330,7 +327,6 @@ CONFIG_BRIDGE_MRP=y 
CONFIG_VLAN_8021Q=m

CONFIG_VLAN_8021Q_GVRP=y

CONFIG_NET_SCHED=y

CONFIG_NET_SCH_CBQ=m

CONFIG_NET_SCH_HTB=m

CONFIG_NET_SCH_HFSC=m

CONFIG_NET_SCH_PRIO=m
@@ -341,7 +337,6 @@ CONFIG_NET_SCH_SFQ=m 
CONFIG_NET_SCH_TEQL=m

CONFIG_NET_SCH_TBF=m

CONFIG_NET_SCH_GRED=m

CONFIG_NET_SCH_DSMARK=m

CONFIG_NET_SCH_NETEM=m

CONFIG_NET_SCH_DRR=m

CONFIG_NET_SCH_MQPRIO=m
@@ -353,14 +348,11 @@ CONFIG_NET_SCH_INGRESS=m 
CONFIG_NET_SCH_PLUG=m

CONFIG_NET_SCH_ETS=m

CONFIG_NET_CLS_BASIC=m

CONFIG_NET_CLS_TCINDEX=m

CONFIG_NET_CLS_ROUTE4=m

CONFIG_NET_CLS_FW=m

CONFIG_NET_CLS_U32=m

CONFIG_CLS_U32_PERF=y

CONFIG_CLS_U32_MARK=y

CONFIG_NET_CLS_RSVP=m

CONFIG_NET_CLS_RSVP6=m

CONFIG_NET_CLS_FLOW=m

CONFIG_NET_CLS_CGROUP=y

CONFIG_NET_CLS_BPF=m
@@ -573,7 +565,7 @@ CONFIG_DIAG288_WATCHDOG=m 
CONFIG_FB=y

CONFIG_FRAMEBUFFER_CONSOLE=y

CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y

# CONFIG_HID is not set

# CONFIG_HID_SUPPORT is not set

# CONFIG_USB_SUPPORT is not set

CONFIG_INFINIBAND=m

CONFIG_INFINIBAND_USER_ACCESS=m
@@ -795,6 +787,7 @@ CONFIG_RCU_REF_SCALE_TEST=m 
CONFIG_RCU_CPU_STALL_TIMEOUT=60

CONFIG_LATENCYTOP=y

CONFIG_BOOTTIME_TRACING=y

CONFIG_FPROBE=y

CONFIG_FUNCTION_PROFILER=y

CONFIG_STACK_TRACER=y

CONFIG_SCHED_TRACER=y
@@ -805,6 +798,7 @@ CONFIG_SAMPLES=y 
CONFIG_SAMPLE_TRACE_PRINTK=m

CONFIG_SAMPLE_FTRACE_DIRECT=m

CONFIG_SAMPLE_FTRACE_DIRECT_MULTI=m

CONFIG_SAMPLE_FTRACE_OPS=m

CONFIG_KUNIT=m

CONFIG_KUNIT_DEBUGFS=y

CONFIG_LKDTM=m

arch/s390/configs/zfcpdump_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -58,7 +58,7 @@ CONFIG_ZFCP=y 
# CONFIG_VMCP is not set

# CONFIG_MONWRITER is not set

# CONFIG_S390_VMUR is not set

# CONFIG_HID is not set

# CONFIG_HID_SUPPORT is not set

# CONFIG_VIRTIO_MENU is not set

# CONFIG_VHOST_MENU is not set

# CONFIG_IOMMU_SUPPORT is not set

arch/s390/lib/uaccess.c

+71 −66
Original line number Diff line number Diff line
@@ -27,14 +27,13 @@ void debug_user_asce(int exit) 
	      "kernel: %016llx user: %016llx\n",

	      exit ? "exit" : "entry", cr1, cr7,

	      S390_lowcore.kernel_asce, S390_lowcore.user_asce);



}

#endif /*CONFIG_DEBUG_ENTRY */



static unsigned long raw_copy_from_user_key(void *to, const void __user *from,

					    unsigned long size, unsigned long key)

{

	unsigned long tmp1, tmp2;

	unsigned long rem;

	union oac spec = {

		.oac2.key = key,

		.oac2.as = PSW_BITS_AS_SECONDARY,
@@ -42,28 +41,30 @@ static unsigned long raw_copy_from_user_key(void *to, const void __user *from, 
		.oac2.a = 1,

	};



	tmp1 = -4096UL;

	asm volatile(

		"	lr	0,%[spec]\n"

		"0: mvcos 0(%2),0(%1),%0\n"

		"6: jz    4f\n"

		"1: algr  %0,%3\n"

		"   slgr  %1,%3\n"

		"   slgr  %2,%3\n"

		"0:	mvcos	0(%[to]),0(%[from]),%[size]\n"

		"1:	jz	5f\n"

		"	algr	%[size],%[val]\n"

		"	slgr	%[from],%[val]\n"

		"	slgr	%[to],%[val]\n"

		"	j	0b\n"

		"2: la    %4,4095(%1)\n"/* %4 = ptr + 4095 */

		"   nr    %4,%3\n"	/* %4 = (ptr + 4095) & -4096 */

		"   slgr  %4,%1\n"

		"   clgr  %0,%4\n"	/* copy crosses next page boundary? */

		"   jnh   5f\n"

		"3: mvcos 0(%2),0(%1),%4\n"

		"7: slgr  %0,%4\n"

		"   j     5f\n"

		"4: slgr  %0,%0\n"

		"5:\n"

		EX_TABLE(0b,2b) EX_TABLE(3b,5b) EX_TABLE(6b,2b) EX_TABLE(7b,5b)

		: "+a" (size), "+a" (from), "+a" (to), "+a" (tmp1), "=a" (tmp2)

		: [spec] "d" (spec.val)

		"2:	la	%[rem],4095(%[from])\n"	/* rem = from + 4095 */

		"	nr	%[rem],%[val]\n"	/* rem = (from + 4095) & -4096 */

		"	slgr	%[rem],%[from]\n"

		"	clgr	%[size],%[rem]\n"	/* copy crosses next page boundary? */

		"	jnh	6f\n"

		"3:	mvcos	0(%[to]),0(%[from]),%[rem]\n"

		"4:	slgr	%[size],%[rem]\n"

		"	j	6f\n"

		"5:	slgr	%[size],%[size]\n"

		"6:\n"

		EX_TABLE(0b, 2b)

		EX_TABLE(1b, 2b)

		EX_TABLE(3b, 6b)

		EX_TABLE(4b, 6b)

		: [size] "+&a" (size), [from] "+&a" (from), [to] "+&a" (to), [rem] "=&a" (rem)

		: [val] "a" (-4096UL), [spec] "d" (spec.val)

		: "cc", "memory", "0");

	return size;

}
@@ -94,7 +95,7 @@ EXPORT_SYMBOL(_copy_from_user_key); 
static unsigned long raw_copy_to_user_key(void __user *to, const void *from,

					  unsigned long size, unsigned long key)

{

	unsigned long tmp1, tmp2;

	unsigned long rem;

	union oac spec = {

		.oac1.key = key,

		.oac1.as = PSW_BITS_AS_SECONDARY,
@@ -102,28 +103,30 @@ static unsigned long raw_copy_to_user_key(void __user *to, const void *from, 
		.oac1.a = 1,

	};



	tmp1 = -4096UL;

	asm volatile(

		"	lr	0,%[spec]\n"

		"0: mvcos 0(%1),0(%2),%0\n"

		"6: jz    4f\n"

		"1: algr  %0,%3\n"

		"   slgr  %1,%3\n"

		"   slgr  %2,%3\n"

		"0:	mvcos	0(%[to]),0(%[from]),%[size]\n"

		"1:	jz	5f\n"

		"	algr	%[size],%[val]\n"

		"	slgr	%[to],%[val]\n"

		"	slgr	%[from],%[val]\n"

		"	j	0b\n"

		"2: la    %4,4095(%1)\n"/* %4 = ptr + 4095 */

		"   nr    %4,%3\n"	/* %4 = (ptr + 4095) & -4096 */

		"   slgr  %4,%1\n"

		"   clgr  %0,%4\n"	/* copy crosses next page boundary? */

		"   jnh   5f\n"

		"3: mvcos 0(%1),0(%2),%4\n"

		"7: slgr  %0,%4\n"

		"   j     5f\n"

		"4: slgr  %0,%0\n"

		"5:\n"

		EX_TABLE(0b,2b) EX_TABLE(3b,5b) EX_TABLE(6b,2b) EX_TABLE(7b,5b)

		: "+a" (size), "+a" (to), "+a" (from), "+a" (tmp1), "=a" (tmp2)

		: [spec] "d" (spec.val)

		"2:	la	%[rem],4095(%[to])\n"	/* rem = to + 4095 */

		"	nr	%[rem],%[val]\n"	/* rem = (to + 4095) & -4096 */

		"	slgr	%[rem],%[to]\n"

		"	clgr	%[size],%[rem]\n"	/* copy crosses next page boundary? */

		"	jnh	6f\n"

		"3:	mvcos	0(%[to]),0(%[from]),%[rem]\n"

		"4:	slgr	%[size],%[rem]\n"

		"	j	6f\n"

		"5:	slgr	%[size],%[size]\n"

		"6:\n"

		EX_TABLE(0b, 2b)

		EX_TABLE(1b, 2b)

		EX_TABLE(3b, 6b)

		EX_TABLE(4b, 6b)

		: [size] "+&a" (size), [to] "+&a" (to), [from] "+&a" (from), [rem] "=&a" (rem)

		: [val] "a" (-4096UL), [spec] "d" (spec.val)

		: "cc", "memory", "0");

	return size;

}
@@ -147,33 +150,35 @@ EXPORT_SYMBOL(_copy_to_user_key); 


unsigned long __clear_user(void __user *to, unsigned long size)

{

	unsigned long tmp1, tmp2;

	unsigned long rem;

	union oac spec = {

		.oac1.as = PSW_BITS_AS_SECONDARY,

		.oac1.a = 1,

	};



	tmp1 = -4096UL;

	asm volatile(

		"	lr	0,%[spec]\n"

		"0: mvcos 0(%1),0(%4),%0\n"

		"6: jz	  4f\n"

		"1: algr  %0,%2\n"

		"   slgr  %1,%2\n"

		"0:	mvcos	0(%[to]),0(%[zeropg]),%[size]\n"

		"1:	jz	5f\n"

		"	algr	%[size],%[val]\n"

		"	slgr	%[to],%[val]\n"

		"	j	0b\n"

		"2: la	  %3,4095(%1)\n"/* %4 = to + 4095 */

		"   nr	  %3,%2\n"	/* %4 = (to + 4095) & -4096 */

		"   slgr  %3,%1\n"

		"   clgr  %0,%3\n"	/* copy crosses next page boundary? */

		"   jnh	  5f\n"

		"3: mvcos 0(%1),0(%4),%3\n"

		"7: slgr  %0,%3\n"

		"   j	  5f\n"

		"4: slgr  %0,%0\n"

		"5:\n"

		EX_TABLE(0b,2b) EX_TABLE(6b,2b) EX_TABLE(3b,5b) EX_TABLE(7b,5b)

		: "+a" (size), "+a" (to), "+a" (tmp1), "=a" (tmp2)

		: "a" (empty_zero_page), [spec] "d" (spec.val)

		"2:	la	%[rem],4095(%[to])\n"	/* rem = to + 4095 */

		"	nr	%[rem],%[val]\n"	/* rem = (to + 4095) & -4096 */

		"	slgr	%[rem],%[to]\n"

		"	clgr	%[size],%[rem]\n"	/* copy crosses next page boundary? */

		"	jnh	6f\n"

		"3:	mvcos	0(%[to]),0(%[zeropg]),%[rem]\n"

		"4:	slgr	%[size],%[rem]\n"

		"	j	6f\n"

		"5:	slgr	%[size],%[size]\n"

		"6:\n"

		EX_TABLE(0b, 2b)

		EX_TABLE(1b, 2b)

		EX_TABLE(3b, 6b)

		EX_TABLE(4b, 6b)

		: [size] "+&a" (size), [to] "+&a" (to), [rem] "=&a" (rem)

		: [val] "a" (-4096UL), [zeropg] "a" (empty_zero_page), [spec] "d" (spec.val)

		: "cc", "memory", "0");

	return size;

}

arch/s390/pci/pci.c

+10 −6
Original line number Diff line number Diff line
@@ -544,8 +544,7 @@ static struct resource *__alloc_res(struct zpci_dev *zdev, unsigned long start, 
	return r;

}



int zpci_setup_bus_resources(struct zpci_dev *zdev,

			     struct list_head *resources)

int zpci_setup_bus_resources(struct zpci_dev *zdev)

{

	unsigned long addr, size, flags;

	struct resource *res;
@@ -581,7 +580,6 @@ int zpci_setup_bus_resources(struct zpci_dev *zdev, 
			return -ENOMEM;

		}

		zdev->bars[i].res = res;

		pci_add_resource(resources, res);

	}

	zdev->has_resources = 1;
@@ -590,17 +588,23 @@ int zpci_setup_bus_resources(struct zpci_dev *zdev, 


static void zpci_cleanup_bus_resources(struct zpci_dev *zdev)

{

	struct resource *res;

	int i;



	pci_lock_rescan_remove();

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

		if (!zdev->bars[i].size || !zdev->bars[i].res)

		res = zdev->bars[i].res;

		if (!res)

			continue;



		release_resource(res);

		pci_bus_remove_resource(zdev->zbus->bus, res);

		zpci_free_iomap(zdev, zdev->bars[i].map_idx);

		release_resource(zdev->bars[i].res);

		kfree(zdev->bars[i].res);

		zdev->bars[i].res = NULL;

		kfree(res);

	}

	zdev->has_resources = 0;

	pci_unlock_rescan_remove();

}



int pcibios_device_add(struct pci_dev *pdev)