Unverified Commit ab23e59a authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!10766 Backport 5.10.213 LTS patches from upstream 

Merge Pull Request from: @sanglipeng 
 
https://gitee.com/openeuler/kernel/issues/IAI4UL

Conflicts:
Already merged(11):
abda366ece48  mmc: mmci: stm32: use a buffer for unaligned DMA requests
0224cbc53ba8  mmc: mmci: stm32: fix DMA API overlapping mappings warning
37fe99016b12  net: ice: Fix potential NULL pointer dereference in ice_bridge_setlink()
79ce2e54cc0a  net/ipv6: avoid possible UAF in ip6_route_mpath_notify()
5f4e51abfbe6  cpumap: Zero-initialise xdp_rxq_info struct before running XDP program
9dfc15a10dfd  net/rds: fix WARNING in rds_conn_connect_if_down
d1261bde59a3  netrom: Fix data-races around sysctl_netrom_network_ttl_initialiser
291d36d772f5  netrom: Fix a data-race around sysctl_netrom_transport_timeout
34a164d24482  netrom: Fix a data-race around sysctl_netrom_transport_maximum_tries
bbf950a6e96a  netrom: Fix data-races around sysctl_net_busy_read
ccd1108b16ab  netfilter: nf_conntrack_h323: Add protection for bmp length out of range

Rejected(2):
05edf43452c0  mm/hugetlb: change hugetlb_reserve_pages() to type bool
14136bed4104  mm: hugetlb pages should not be reserved by shmat() if SHM_NORESERVE

Kabi broken(3):
1dd423cfb050  regmap: allow to define reg_update_bits for no bus configuration
4db609d9902a  regmap: Add bulk read/write callbacks into regmap_config
871873b7f841  serial: max310x: fix IO data corruption in batched operations

Total patches: 70 - 11 - 2 - 3 = 54 
 
Link:https://gitee.com/openeuler/kernel/pulls/10766

 

Reviewed-by: default avatarYang Yingliang <yangyingliang@huawei.com>
Signed-off-by: default avatarYang Yingliang <yangyingliang@huawei.com>
parents 2470c2ce 36663e0f

arch/um/Kconfig

+13 −0
Original line number Original line Diff line number Diff line
@@ -93,6 +93,19 @@ config LD_SCRIPT_DYN 
	depends on !LD_SCRIPT_STATIC

	depends on !LD_SCRIPT_STATIC

	select MODULE_REL_CRCS if MODVERSIONS

	select MODULE_REL_CRCS if MODVERSIONS





config LD_SCRIPT_DYN_RPATH

	bool "set rpath in the binary" if EXPERT

	default y

	depends on LD_SCRIPT_DYN

	help

	  Add /lib (and /lib64 for 64-bit) to the linux binary's rpath

	  explicitly.



	  You may need to turn this off if compiling for nix systems

	  that have their libraries in random /nix directories and

	  might otherwise unexpected use libraries from /lib or /lib64

	  instead of the desired ones.



config HOSTFS

config HOSTFS

	tristate "Host filesystem"

	tristate "Host filesystem"

	help

	help

arch/um/Makefile

+2 −1
Original line number Original line Diff line number Diff line
@@ -118,7 +118,8 @@ archprepare: 
	$(Q)$(MAKE) $(build)=$(HOST_DIR)/um include/generated/user_constants.h

	$(Q)$(MAKE) $(build)=$(HOST_DIR)/um include/generated/user_constants.h





LINK-$(CONFIG_LD_SCRIPT_STATIC) += -static

LINK-$(CONFIG_LD_SCRIPT_STATIC) += -static

LINK-$(CONFIG_LD_SCRIPT_DYN) += -Wl,-rpath,/lib $(call cc-option, -no-pie)

LINK-$(CONFIG_LD_SCRIPT_DYN) += $(call cc-option, -no-pie)

LINK-$(CONFIG_LD_SCRIPT_DYN_RPATH) += -Wl,-rpath,/lib





CFLAGS_NO_HARDENING := $(call cc-option, -fno-PIC,) $(call cc-option, -fno-pic,) \

CFLAGS_NO_HARDENING := $(call cc-option, -fno-PIC,) $(call cc-option, -fno-pic,) \

	-fno-stack-protector $(call cc-option, -fno-stack-protector-all)

	-fno-stack-protector $(call cc-option, -fno-stack-protector-all)

arch/x86/Makefile.um

+1 −1
Original line number Original line Diff line number Diff line
@@ -44,7 +44,7 @@ ELF_FORMAT := elf64-x86-64 




# Not on all 64-bit distros /lib is a symlink to /lib64. PLD is an example.

# Not on all 64-bit distros /lib is a symlink to /lib64. PLD is an example.





LINK-$(CONFIG_LD_SCRIPT_DYN) += -Wl,-rpath,/lib64

LINK-$(CONFIG_LD_SCRIPT_DYN_RPATH) += -Wl,-rpath,/lib64

LINK-y += -m64

LINK-y += -m64





endif
 
endif

drivers/hv/channel.c

+168 −6
Original line number Original line Diff line number Diff line
@@ -503,6 +503,70 @@ int vmbus_establish_gpadl(struct vmbus_channel *channel, void *kbuffer, 
}

}

EXPORT_SYMBOL_GPL(vmbus_establish_gpadl);

EXPORT_SYMBOL_GPL(vmbus_establish_gpadl);





/**

 * request_arr_init - Allocates memory for the requestor array. Each slot

 * keeps track of the next available slot in the array. Initially, each

 * slot points to the next one (as in a Linked List). The last slot

 * does not point to anything, so its value is U64_MAX by default.

 * @size The size of the array

 */

static u64 *request_arr_init(u32 size)

{

	int i;

	u64 *req_arr;



	req_arr = kcalloc(size, sizeof(u64), GFP_KERNEL);

	if (!req_arr)

		return NULL;



	for (i = 0; i < size - 1; i++)

		req_arr[i] = i + 1;



	/* Last slot (no more available slots) */

	req_arr[i] = U64_MAX;



	return req_arr;

}



/*

 * vmbus_alloc_requestor - Initializes @rqstor's fields.

 * Index 0 is the first free slot

 * @size: Size of the requestor array

 */

static int vmbus_alloc_requestor(struct vmbus_requestor *rqstor, u32 size)

{

	u64 *rqst_arr;

	unsigned long *bitmap;



	rqst_arr = request_arr_init(size);

	if (!rqst_arr)

		return -ENOMEM;



	bitmap = bitmap_zalloc(size, GFP_KERNEL);

	if (!bitmap) {

		kfree(rqst_arr);

		return -ENOMEM;

	}



	rqstor->req_arr = rqst_arr;

	rqstor->req_bitmap = bitmap;

	rqstor->size = size;

	rqstor->next_request_id = 0;

	spin_lock_init(&rqstor->req_lock);



	return 0;

}



/*

 * vmbus_free_requestor - Frees memory allocated for @rqstor

 * @rqstor: Pointer to the requestor struct

 */

static void vmbus_free_requestor(struct vmbus_requestor *rqstor)

{

	kfree(rqstor->req_arr);

	bitmap_free(rqstor->req_bitmap);

}



static int __vmbus_open(struct vmbus_channel *newchannel,

static int __vmbus_open(struct vmbus_channel *newchannel,

		       void *userdata, u32 userdatalen,

		       void *userdata, u32 userdatalen,

		       void (*onchannelcallback)(void *context), void *context)

		       void (*onchannelcallback)(void *context), void *context)
@@ -523,6 +587,12 @@ static int __vmbus_open(struct vmbus_channel *newchannel, 
	if (newchannel->state != CHANNEL_OPEN_STATE)

	if (newchannel->state != CHANNEL_OPEN_STATE)

		return -EINVAL;

		return -EINVAL;





	/* Create and init requestor */

	if (newchannel->rqstor_size) {

		if (vmbus_alloc_requestor(&newchannel->requestor, newchannel->rqstor_size))

			return -ENOMEM;

	}



	newchannel->state = CHANNEL_OPENING_STATE;

	newchannel->state = CHANNEL_OPENING_STATE;

	newchannel->onchannel_callback = onchannelcallback;

	newchannel->onchannel_callback = onchannelcallback;

	newchannel->channel_callback_context = context;

	newchannel->channel_callback_context = context;
@@ -626,6 +696,7 @@ static int __vmbus_open(struct vmbus_channel *newchannel, 
error_clean_ring:

error_clean_ring:

	hv_ringbuffer_cleanup(&newchannel->outbound);

	hv_ringbuffer_cleanup(&newchannel->outbound);

	hv_ringbuffer_cleanup(&newchannel->inbound);

	hv_ringbuffer_cleanup(&newchannel->inbound);

	vmbus_free_requestor(&newchannel->requestor);

	newchannel->state = CHANNEL_OPEN_STATE;

	newchannel->state = CHANNEL_OPEN_STATE;

	return err;

	return err;

}

}
@@ -808,6 +879,9 @@ static int vmbus_close_internal(struct vmbus_channel *channel) 
		channel->ringbuffer_gpadlhandle = 0;

		channel->ringbuffer_gpadlhandle = 0;

	}

	}





	if (!ret)

		vmbus_free_requestor(&channel->requestor);



	return ret;

	return ret;

}

}
@@ -888,7 +962,7 @@ int vmbus_sendpacket(struct vmbus_channel *channel, void *buffer, 
	/* in 8-bytes granularity */

	/* in 8-bytes granularity */

	desc.offset8 = sizeof(struct vmpacket_descriptor) >> 3;

	desc.offset8 = sizeof(struct vmpacket_descriptor) >> 3;

	desc.len8 = (u16)(packetlen_aligned >> 3);

	desc.len8 = (u16)(packetlen_aligned >> 3);

	desc.trans_id = requestid;

	desc.trans_id = VMBUS_RQST_ERROR; /* will be updated in hv_ringbuffer_write() */





	bufferlist[0].iov_base = &desc;

	bufferlist[0].iov_base = &desc;

	bufferlist[0].iov_len = sizeof(struct vmpacket_descriptor);

	bufferlist[0].iov_len = sizeof(struct vmpacket_descriptor);
@@ -897,7 +971,7 @@ int vmbus_sendpacket(struct vmbus_channel *channel, void *buffer, 
	bufferlist[2].iov_base = &aligned_data;

	bufferlist[2].iov_base = &aligned_data;

	bufferlist[2].iov_len = (packetlen_aligned - packetlen);

	bufferlist[2].iov_len = (packetlen_aligned - packetlen);





	return hv_ringbuffer_write(channel, bufferlist, num_vecs);

	return hv_ringbuffer_write(channel, bufferlist, num_vecs, requestid);

}

}

EXPORT_SYMBOL(vmbus_sendpacket);

EXPORT_SYMBOL(vmbus_sendpacket);
@@ -939,7 +1013,7 @@ int vmbus_sendpacket_pagebuffer(struct vmbus_channel *channel, 
	desc.flags = VMBUS_DATA_PACKET_FLAG_COMPLETION_REQUESTED;

	desc.flags = VMBUS_DATA_PACKET_FLAG_COMPLETION_REQUESTED;

	desc.dataoffset8 = descsize >> 3; /* in 8-bytes granularity */

	desc.dataoffset8 = descsize >> 3; /* in 8-bytes granularity */

	desc.length8 = (u16)(packetlen_aligned >> 3);

	desc.length8 = (u16)(packetlen_aligned >> 3);

	desc.transactionid = requestid;

	desc.transactionid = VMBUS_RQST_ERROR; /* will be updated in hv_ringbuffer_write() */

	desc.reserved = 0;

	desc.reserved = 0;

	desc.rangecount = pagecount;

	desc.rangecount = pagecount;
@@ -956,7 +1030,7 @@ int vmbus_sendpacket_pagebuffer(struct vmbus_channel *channel, 
	bufferlist[2].iov_base = &aligned_data;

	bufferlist[2].iov_base = &aligned_data;

	bufferlist[2].iov_len = (packetlen_aligned - packetlen);

	bufferlist[2].iov_len = (packetlen_aligned - packetlen);





	return hv_ringbuffer_write(channel, bufferlist, 3);

	return hv_ringbuffer_write(channel, bufferlist, 3, requestid);

}

}

EXPORT_SYMBOL_GPL(vmbus_sendpacket_pagebuffer);

EXPORT_SYMBOL_GPL(vmbus_sendpacket_pagebuffer);
@@ -983,7 +1057,7 @@ int vmbus_sendpacket_mpb_desc(struct vmbus_channel *channel, 
	desc->flags = VMBUS_DATA_PACKET_FLAG_COMPLETION_REQUESTED;

	desc->flags = VMBUS_DATA_PACKET_FLAG_COMPLETION_REQUESTED;

	desc->dataoffset8 = desc_size >> 3; /* in 8-bytes granularity */

	desc->dataoffset8 = desc_size >> 3; /* in 8-bytes granularity */

	desc->length8 = (u16)(packetlen_aligned >> 3);

	desc->length8 = (u16)(packetlen_aligned >> 3);

	desc->transactionid = requestid;

	desc->transactionid = VMBUS_RQST_ERROR; /* will be updated in hv_ringbuffer_write() */

	desc->reserved = 0;

	desc->reserved = 0;

	desc->rangecount = 1;

	desc->rangecount = 1;
@@ -994,7 +1068,7 @@ int vmbus_sendpacket_mpb_desc(struct vmbus_channel *channel, 
	bufferlist[2].iov_base = &aligned_data;

	bufferlist[2].iov_base = &aligned_data;

	bufferlist[2].iov_len = (packetlen_aligned - packetlen);

	bufferlist[2].iov_len = (packetlen_aligned - packetlen);





	return hv_ringbuffer_write(channel, bufferlist, 3);

	return hv_ringbuffer_write(channel, bufferlist, 3, requestid);

}

}

EXPORT_SYMBOL_GPL(vmbus_sendpacket_mpb_desc);

EXPORT_SYMBOL_GPL(vmbus_sendpacket_mpb_desc);
@@ -1042,3 +1116,91 @@ int vmbus_recvpacket_raw(struct vmbus_channel *channel, void *buffer, 
				  buffer_actual_len, requestid, true);

				  buffer_actual_len, requestid, true);

}

}

EXPORT_SYMBOL_GPL(vmbus_recvpacket_raw);

EXPORT_SYMBOL_GPL(vmbus_recvpacket_raw);



/*

 * vmbus_next_request_id - Returns a new request id. It is also

 * the index at which the guest memory address is stored.

 * Uses a spin lock to avoid race conditions.

 * @rqstor: Pointer to the requestor struct

 * @rqst_add: Guest memory address to be stored in the array

 */

u64 vmbus_next_request_id(struct vmbus_requestor *rqstor, u64 rqst_addr)

{

	unsigned long flags;

	u64 current_id;

	const struct vmbus_channel *channel =

		container_of(rqstor, const struct vmbus_channel, requestor);



	/* Check rqstor has been initialized */

	if (!channel->rqstor_size)

		return VMBUS_NO_RQSTOR;



	spin_lock_irqsave(&rqstor->req_lock, flags);

	current_id = rqstor->next_request_id;



	/* Requestor array is full */

	if (current_id >= rqstor->size) {

		spin_unlock_irqrestore(&rqstor->req_lock, flags);

		return VMBUS_RQST_ERROR;

	}



	rqstor->next_request_id = rqstor->req_arr[current_id];

	rqstor->req_arr[current_id] = rqst_addr;



	/* The already held spin lock provides atomicity */

	bitmap_set(rqstor->req_bitmap, current_id, 1);



	spin_unlock_irqrestore(&rqstor->req_lock, flags);



	/*

	 * Cannot return an ID of 0, which is reserved for an unsolicited

	 * message from Hyper-V.

	 */

	return current_id + 1;

}

EXPORT_SYMBOL_GPL(vmbus_next_request_id);



/*

 * vmbus_request_addr - Returns the memory address stored at @trans_id

 * in @rqstor. Uses a spin lock to avoid race conditions.

 * @rqstor: Pointer to the requestor struct

 * @trans_id: Request id sent back from Hyper-V. Becomes the requestor's

 * next request id.

 */

u64 vmbus_request_addr(struct vmbus_requestor *rqstor, u64 trans_id)

{

	unsigned long flags;

	u64 req_addr;

	const struct vmbus_channel *channel =

		container_of(rqstor, const struct vmbus_channel, requestor);



	/* Check rqstor has been initialized */

	if (!channel->rqstor_size)

		return VMBUS_NO_RQSTOR;



	/* Hyper-V can send an unsolicited message with ID of 0 */

	if (!trans_id)

		return trans_id;



	spin_lock_irqsave(&rqstor->req_lock, flags);



	/* Data corresponding to trans_id is stored at trans_id - 1 */

	trans_id--;



	/* Invalid trans_id */

	if (trans_id >= rqstor->size || !test_bit(trans_id, rqstor->req_bitmap)) {

		spin_unlock_irqrestore(&rqstor->req_lock, flags);

		return VMBUS_RQST_ERROR;

	}



	req_addr = rqstor->req_arr[trans_id];

	rqstor->req_arr[trans_id] = rqstor->next_request_id;

	rqstor->next_request_id = trans_id;



	/* The already held spin lock provides atomicity */

	bitmap_clear(rqstor->req_bitmap, trans_id, 1);



	spin_unlock_irqrestore(&rqstor->req_lock, flags);

	return req_addr;

}

EXPORT_SYMBOL_GPL(vmbus_request_addr);

drivers/hv/hyperv_vmbus.h

+2 −1
Original line number Original line Diff line number Diff line
@@ -180,7 +180,8 @@ int hv_ringbuffer_init(struct hv_ring_buffer_info *ring_info, 
void hv_ringbuffer_cleanup(struct hv_ring_buffer_info *ring_info);

void hv_ringbuffer_cleanup(struct hv_ring_buffer_info *ring_info);





int hv_ringbuffer_write(struct vmbus_channel *channel,

int hv_ringbuffer_write(struct vmbus_channel *channel,

			const struct kvec *kv_list, u32 kv_count);

			const struct kvec *kv_list, u32 kv_count,

			u64 requestid);





int hv_ringbuffer_read(struct vmbus_channel *channel,

int hv_ringbuffer_read(struct vmbus_channel *channel,

		       void *buffer, u32 buflen, u32 *buffer_actual_len,

		       void *buffer, u32 buflen, u32 *buffer_actual_len,