diff options
author | Philipp Reisner | 2011-04-20 17:47:29 +0200 |
---|---|---|
committer | Philipp Reisner | 2012-11-08 16:49:03 +0100 |
commit | 91fd4dad64ce7ac48c4c30c7756c6d3c41e8ad0a (patch) | |
tree | 893fd0577cee16c9b5e7534724047f10856f7df4 /drivers/block/drbd/drbd_receiver.c | |
parent | drbd: rcu_read_lock() and rcu_dereference() for tconn->net_conf (diff) | |
download | kernel-qcow2-linux-91fd4dad64ce7ac48c4c30c7756c6d3c41e8ad0a.tar.gz kernel-qcow2-linux-91fd4dad64ce7ac48c4c30c7756c6d3c41e8ad0a.tar.xz kernel-qcow2-linux-91fd4dad64ce7ac48c4c30c7756c6d3c41e8ad0a.zip |
drbd: Proper locking for updates to net_conf under RCU
Removing the get_net_conf()/put_net_conf() functions
Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com>
Signed-off-by: Lars Ellenberg <lars.ellenberg@linbit.com>
Diffstat (limited to 'drivers/block/drbd/drbd_receiver.c')
-rw-r--r-- | drivers/block/drbd/drbd_receiver.c | 83 |
1 files changed, 53 insertions, 30 deletions
diff --git a/drivers/block/drbd/drbd_receiver.c b/drivers/block/drbd/drbd_receiver.c index 59f9af96374e..397f97701988 100644 --- a/drivers/block/drbd/drbd_receiver.c +++ b/drivers/block/drbd/drbd_receiver.c @@ -3138,6 +3138,7 @@ static int receive_SyncParam(struct drbd_tconn *tconn, struct packet_info *pi) unsigned int header_size, data_size, exp_max_sz; struct crypto_hash *verify_tfm = NULL; struct crypto_hash *csums_tfm = NULL; + struct net_conf *old_conf, *new_conf = NULL; const int apv = tconn->agreed_pro_version; int *rs_plan_s = NULL; int fifo_size = 0; @@ -3212,10 +3213,13 @@ static int receive_SyncParam(struct drbd_tconn *tconn, struct packet_info *pi) p->csums_alg[SHARED_SECRET_MAX-1] = 0; } - if (strcmp(mdev->tconn->net_conf->verify_alg, p->verify_alg)) { + mutex_lock(&mdev->tconn->net_conf_update); + old_conf = mdev->tconn->net_conf; + + if (strcmp(old_conf->verify_alg, p->verify_alg)) { if (mdev->state.conn == C_WF_REPORT_PARAMS) { dev_err(DEV, "Different verify-alg settings. me=\"%s\" peer=\"%s\"\n", - mdev->tconn->net_conf->verify_alg, p->verify_alg); + old_conf->verify_alg, p->verify_alg); goto disconnect; } verify_tfm = drbd_crypto_alloc_digest_safe(mdev, @@ -3226,10 +3230,10 @@ static int receive_SyncParam(struct drbd_tconn *tconn, struct packet_info *pi) } } - if (apv >= 89 && strcmp(mdev->tconn->net_conf->csums_alg, p->csums_alg)) { + if (apv >= 89 && strcmp(old_conf->csums_alg, p->csums_alg)) { if (mdev->state.conn == C_WF_REPORT_PARAMS) { dev_err(DEV, "Different csums-alg settings. me=\"%s\" peer=\"%s\"\n", - mdev->tconn->net_conf->csums_alg, p->csums_alg); + old_conf->csums_alg, p->csums_alg); goto disconnect; } csums_tfm = drbd_crypto_alloc_digest_safe(mdev, @@ -3259,22 +3263,38 @@ static int receive_SyncParam(struct drbd_tconn *tconn, struct packet_info *pi) put_ldev(mdev); } - spin_lock(&mdev->peer_seq_lock); - /* lock against drbd_nl_syncer_conf() */ - if (verify_tfm) { - strcpy(mdev->tconn->net_conf->verify_alg, p->verify_alg); - mdev->tconn->net_conf->verify_alg_len = strlen(p->verify_alg) + 1; - crypto_free_hash(mdev->tconn->verify_tfm); - mdev->tconn->verify_tfm = verify_tfm; - dev_info(DEV, "using verify-alg: \"%s\"\n", p->verify_alg); + if (verify_tfm || csums_tfm) { + new_conf = kzalloc(sizeof(struct net_conf), GFP_KERNEL); + if (!new_conf) { + dev_err(DEV, "Allocation of new net_conf failed\n"); + goto disconnect; + } + + *new_conf = *old_conf; + + if (verify_tfm) { + strcpy(new_conf->verify_alg, p->verify_alg); + new_conf->verify_alg_len = strlen(p->verify_alg) + 1; + crypto_free_hash(mdev->tconn->verify_tfm); + mdev->tconn->verify_tfm = verify_tfm; + dev_info(DEV, "using verify-alg: \"%s\"\n", p->verify_alg); + } + if (csums_tfm) { + strcpy(new_conf->csums_alg, p->csums_alg); + new_conf->csums_alg_len = strlen(p->csums_alg) + 1; + crypto_free_hash(mdev->tconn->csums_tfm); + mdev->tconn->csums_tfm = csums_tfm; + dev_info(DEV, "using csums-alg: \"%s\"\n", p->csums_alg); + } + rcu_assign_pointer(tconn->net_conf, new_conf); } - if (csums_tfm) { - strcpy(mdev->tconn->net_conf->csums_alg, p->csums_alg); - mdev->tconn->net_conf->csums_alg_len = strlen(p->csums_alg) + 1; - crypto_free_hash(mdev->tconn->csums_tfm); - mdev->tconn->csums_tfm = csums_tfm; - dev_info(DEV, "using csums-alg: \"%s\"\n", p->csums_alg); + mutex_unlock(&mdev->tconn->net_conf_update); + if (new_conf) { + synchronize_rcu(); + kfree(old_conf); } + + spin_lock(&mdev->peer_seq_lock); if (fifo_size != mdev->rs_plan_s.size) { kfree(mdev->rs_plan_s.values); mdev->rs_plan_s.values = rs_plan_s; @@ -3286,6 +3306,7 @@ static int receive_SyncParam(struct drbd_tconn *tconn, struct packet_info *pi) return 0; disconnect: + mutex_unlock(&mdev->tconn->net_conf_update); /* just for completeness: actually not needed, * as this is not reached if csums_tfm was ok. */ crypto_free_hash(csums_tfm); @@ -3715,7 +3736,9 @@ static int receive_state(struct drbd_tconn *tconn, struct packet_info *pi) } } - mdev->tconn->net_conf->want_lose = 0; + mutex_lock(&mdev->tconn->net_conf_update); + mdev->tconn->net_conf->want_lose = 0; /* without copy; single bit op is atomic */ + mutex_unlock(&mdev->tconn->net_conf_update); drbd_md_sync(mdev); /* update connected indicator, la_size, ... */ @@ -4183,13 +4206,17 @@ static void drbd_disconnect(struct drbd_tconn *tconn) spin_unlock_irq(&tconn->req_lock); if (oc == C_DISCONNECTING) { - wait_event(tconn->net_cnt_wait, atomic_read(&tconn->net_cnt) == 0); + struct net_conf *old_conf; - crypto_free_hash(tconn->cram_hmac_tfm); - tconn->cram_hmac_tfm = NULL; + mutex_lock(&tconn->net_conf_update); + old_conf = tconn->net_conf; + rcu_assign_pointer(tconn->net_conf, NULL); + conn_free_crypto(tconn); + mutex_unlock(&tconn->net_conf_update); + + synchronize_rcu(); + kfree(old_conf); - kfree(tconn->net_conf); - tconn->net_conf = NULL; conn_request_state(tconn, NS(conn, C_STANDALONE), CS_VERBOSE); } } @@ -4568,12 +4595,8 @@ int drbdd_init(struct drbd_thread *thi) } } while (h == 0); - if (h > 0) { - if (get_net_conf(tconn)) { - drbdd(tconn); - put_net_conf(tconn); - } - } + if (h > 0) + drbdd(tconn); drbd_disconnect(tconn); |