drbd: prepare to queue write requests on a submit worker (113fef9e) · Commits · e / devices / android_kernel_oneplus_sm8150

drivers/block/drbd/drbd_int.h

+13 −0

Original line number	Original line	Diff line number	Diff line
	@@ -894,6 +894,14 @@ struct drbd_tconn { /* is a resource from the config file */
	} send;		} send;
	};		};

			struct submit_worker {
			struct workqueue_struct *wq;
			struct work_struct worker;

			spinlock_t lock;
			struct list_head writes;
			};

	struct drbd_conf {		struct drbd_conf {
	struct drbd_tconn *tconn;		struct drbd_tconn *tconn;
	int vnr; /* volume number within the connection */		int vnr; /* volume number within the connection */
	@@ -1034,6 +1042,10 @@ struct drbd_conf {
	atomic_t ap_in_flight; /* App sectors in flight (waiting for ack) */		atomic_t ap_in_flight; /* App sectors in flight (waiting for ack) */
	unsigned int peer_max_bio_size;		unsigned int peer_max_bio_size;
	unsigned int local_max_bio_size;		unsigned int local_max_bio_size;

			/* any requests that would block in drbd_make_request()
			* are deferred to this single-threaded work queue */
			struct submit_worker submit;
	};		};

	static inline struct drbd_conf *minor_to_mdev(unsigned int minor)		static inline struct drbd_conf *minor_to_mdev(unsigned int minor)
	@@ -1440,6 +1452,7 @@ extern void conn_free_crypto(struct drbd_tconn *tconn);
	extern int proc_details;		extern int proc_details;

	/* drbd_req */		/* drbd_req */
			extern void do_submit(struct work_struct *ws);
	extern void __drbd_make_request(struct drbd_conf , struct bio , unsigned long);		extern void __drbd_make_request(struct drbd_conf , struct bio , unsigned long);
	extern void drbd_make_request(struct request_queue q, struct bio bio);		extern void drbd_make_request(struct request_queue q, struct bio bio);
	extern int drbd_read_remote(struct drbd_conf mdev, struct drbd_request req);		extern int drbd_read_remote(struct drbd_conf mdev, struct drbd_request req);

drivers/block/drbd/drbd_main.c

+25 −1

Original line number	Original line	Diff line number	Diff line
	@@ -45,7 +45,7 @@
	#include <linux/reboot.h>		#include <linux/reboot.h>
	#include <linux/notifier.h>		#include <linux/notifier.h>
	#include <linux/kthread.h>		#include <linux/kthread.h>
			#include <linux/workqueue.h>
	#define __KERNEL_SYSCALLS__		#define __KERNEL_SYSCALLS__
	#include <linux/unistd.h>		#include <linux/unistd.h>
	#include <linux/vmalloc.h>		#include <linux/vmalloc.h>
	@@ -2300,6 +2300,7 @@ static void drbd_cleanup(void)
	idr_for_each_entry(&minors, mdev, i) {		idr_for_each_entry(&minors, mdev, i) {
	idr_remove(&minors, mdev_to_minor(mdev));		idr_remove(&minors, mdev_to_minor(mdev));
	idr_remove(&mdev->tconn->volumes, mdev->vnr);		idr_remove(&mdev->tconn->volumes, mdev->vnr);
			destroy_workqueue(mdev->submit.wq);
	del_gendisk(mdev->vdisk);		del_gendisk(mdev->vdisk);
	/* synchronize_rcu(); No other threads running at this point */		/* synchronize_rcu(); No other threads running at this point */
	kref_put(&mdev->kref, &drbd_minor_destroy);		kref_put(&mdev->kref, &drbd_minor_destroy);
	@@ -2589,6 +2590,21 @@ void conn_destroy(struct kref *kref)
	kfree(tconn);		kfree(tconn);
	}		}

			int init_submitter(struct drbd_conf *mdev)
			{
			/* opencoded create_singlethread_workqueue(),
			* to be able to say "drbd%d", ..., minor */
			mdev->submit.wq = alloc_workqueue("drbd%u_submit",
			WQ_UNBOUND \| WQ_MEM_RECLAIM, 1, mdev->minor);
			if (!mdev->submit.wq)
			return -ENOMEM;

			INIT_WORK(&mdev->submit.worker, do_submit);
			spin_lock_init(&mdev->submit.lock);
			INIT_LIST_HEAD(&mdev->submit.writes);
			return 0;
			}

	enum drbd_ret_code conn_new_minor(struct drbd_tconn *tconn, unsigned int minor, int vnr)		enum drbd_ret_code conn_new_minor(struct drbd_tconn *tconn, unsigned int minor, int vnr)
	{		{
	struct drbd_conf *mdev;		struct drbd_conf *mdev;
	@@ -2678,6 +2694,12 @@ enum drbd_ret_code conn_new_minor(struct drbd_tconn *tconn, unsigned int minor,
	goto out_idr_remove_minor;		goto out_idr_remove_minor;
	}		}

			if (init_submitter(mdev)) {
			err = ERR_NOMEM;
			drbd_msg_put_info("unable to create submit workqueue");
			goto out_idr_remove_vol;
			}

	add_disk(disk);		add_disk(disk);
	kref_init(&mdev->kref); /* one ref for both idrs and the the add_disk */		kref_init(&mdev->kref); /* one ref for both idrs and the the add_disk */

	@@ -2688,6 +2710,8 @@ enum drbd_ret_code conn_new_minor(struct drbd_tconn *tconn, unsigned int minor,

	return NO_ERROR;		return NO_ERROR;

			out_idr_remove_vol:
			idr_remove(&tconn->volumes, vnr_got);
	out_idr_remove_minor:		out_idr_remove_minor:
	idr_remove(&minors, minor_got);		idr_remove(&minors, minor_got);
	synchronize_rcu();		synchronize_rcu();

drivers/block/drbd/drbd_nl.c

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -3173,6 +3173,7 @@ static enum drbd_ret_code adm_delete_minor(struct drbd_conf *mdev)
	CS_VERBOSE + CS_WAIT_COMPLETE);		CS_VERBOSE + CS_WAIT_COMPLETE);
	idr_remove(&mdev->tconn->volumes, mdev->vnr);		idr_remove(&mdev->tconn->volumes, mdev->vnr);
	idr_remove(&minors, mdev_to_minor(mdev));		idr_remove(&minors, mdev_to_minor(mdev));
			destroy_workqueue(mdev->submit.wq);
	del_gendisk(mdev->vdisk);		del_gendisk(mdev->vdisk);
	synchronize_rcu();		synchronize_rcu();
	kref_put(&mdev->kref, &drbd_minor_destroy);		kref_put(&mdev->kref, &drbd_minor_destroy);

drivers/block/drbd/drbd_req.c

+29 −0

Original line number	Original line	Diff line number	Diff line
	@@ -1160,6 +1160,35 @@ void __drbd_make_request(struct drbd_conf mdev, struct bio bio, unsigned long
	drbd_send_and_submit(mdev, req);		drbd_send_and_submit(mdev, req);
	}		}

			void __drbd_make_request_from_worker(struct drbd_conf mdev, struct drbd_request req)
			{
			const int rw = bio_rw(req->master_bio);

			if (rw == WRITE && req->private_bio && req->i.size
			&& !test_bit(AL_SUSPENDED, &mdev->flags)) {
			drbd_al_begin_io(mdev, &req->i, false);
			req->rq_state \|= RQ_IN_ACT_LOG;
			}
			drbd_send_and_submit(mdev, req);
			}


			void do_submit(struct work_struct *ws)
			{
			struct drbd_conf *mdev = container_of(ws, struct drbd_conf, submit.worker);
			LIST_HEAD(writes);
			struct drbd_request req, tmp;

			spin_lock(&mdev->submit.lock);
			list_splice_init(&mdev->submit.writes, &writes);
			spin_unlock(&mdev->submit.lock);

			list_for_each_entry_safe(req, tmp, &writes, tl_requests) {
			list_del_init(&req->tl_requests);
			__drbd_make_request_from_worker(mdev, req);
			}
			}

	void drbd_make_request(struct request_queue q, struct bio bio)		void drbd_make_request(struct request_queue q, struct bio bio)
	{		{
	struct drbd_conf mdev = (struct drbd_conf ) q->queuedata;		struct drbd_conf mdev = (struct drbd_conf ) q->queuedata;