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

!12657 NFSD: Limit the number of concurrent async COPY operations 

Merge Pull Request from: @ci-robot 
 
PR sync from: Li Lingfeng <lilingfeng3@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/B2XMNXS6LO3DSXHOWCHKHBTBFQ5BXSS5/ 
 
https://gitee.com/src-openeuler/kernel/issues/IAYR9C 
 
Link:https://gitee.com/openeuler/kernel/pulls/12657

 

Reviewed-by: default avatarYang Yingliang <yangyingliang@huawei.com>
Signed-off-by: default avatarYang Yingliang <yangyingliang@huawei.com>
parents 9f81f24a 21d4f077

fs/nfsd/netns.h

+1 −0
Original line number Diff line number Diff line
@@ -128,6 +128,7 @@ struct nfsd_net { 
	u32		s2s_cp_cl_id;

	struct idr	s2s_cp_stateids;

	spinlock_t	s2s_cp_lock;

	atomic_t	pending_async_copies;



	/*

	 * Version information

fs/nfsd/nfs4proc.c

+9 −2
Original line number Diff line number Diff line
@@ -1111,6 +1111,7 @@ void nfs4_put_copy(struct nfsd4_copy *copy) 
{

	if (!refcount_dec_and_test(&copy->refcount))

		return;

	atomic_dec(&copy->cp_nn->pending_async_copies);

	kfree(copy);

}
@@ -1534,10 +1535,16 @@ nfsd4_copy(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate, 
	if (!copy->cp_synchronous) {

		struct nfsd_net *nn = net_generic(SVC_NET(rqstp), nfsd_net_id);



		status = nfserrno(-ENOMEM);

		async_copy = kzalloc(sizeof(struct nfsd4_copy), GFP_KERNEL);

		if (!async_copy)

			goto out_err;

		async_copy->cp_nn = nn;

		/* Arbitrary cap on number of pending async copy operations */

		if (atomic_inc_return(&nn->pending_async_copies) >

				(int)rqstp->rq_pool->sp_nrthreads) {

			atomic_dec(&nn->pending_async_copies);

			goto out_err;

		}

		if (!nfs4_init_copy_state(nn, copy))

			goto out_err;

		refcount_set(&async_copy->refcount, 1);
@@ -1562,7 +1569,7 @@ nfsd4_copy(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate, 
out_err:

	if (async_copy)

		cleanup_async_copy(async_copy);

	status = nfserrno(-ENOMEM);

	status = nfserr_jukebox;

	if (!copy->cp_intra)

		nfsd4_interssc_disconnect(copy->ss_mnt);

	goto out;

fs/nfsd/nfs4state.c

+1 −0
Original line number Diff line number Diff line
@@ -7327,6 +7327,7 @@ static int nfs4_state_create_net(struct net *net) 
	spin_lock_init(&nn->client_lock);

	spin_lock_init(&nn->s2s_cp_lock);

	idr_init(&nn->s2s_cp_stateids);

	atomic_set(&nn->pending_async_copies, 0);



	spin_lock_init(&nn->blocked_locks_lock);

	INIT_LIST_HEAD(&nn->blocked_locks_lru);

fs/nfsd/xdr4.h

+1 −0
Original line number Diff line number Diff line
@@ -579,6 +579,7 @@ struct nfsd4_copy { 
	struct vfsmount		*ss_mnt;

	struct nfs_fh		c_fh;

	nfs4_stateid		stateid;

	struct nfsd_net		*cp_nn;

};

extern bool inter_copy_offload_enable;