This commit breaks the API again.
Move per-volume former syncer options into disk_conf.
Move per-connection former syncer options into net_conf.
Renamed the remainign sync_conf to res_opts
Syncer settings have been changeable at runtime, so we need to prepare
for these settings to be runtime-changeable in their new home as well.
Introduce new configuration operations, and share the netlink attribute
between "attach" (create new disk) and "disk-opts" (change options).
Same for "connect" and "net-opts".
Some fields cannot be changed at runtime, however.
Introduce a new flag GENLA_F_INVARIANT to be able to trigger on that in
the generated validation and assignment functions.
Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com>
Signed-off-by: Lars Ellenberg <lars.ellenberg@linbit.com>
s32 bm_offset; /* signed relative sector offset to bitmap */
/* u32 al_nr_extents; important for restoring the AL
- * is stored into sync_conf.al_extents, which in turn
+ * is stored into ldev->dc.al_extents, which in turn
* gets applied to act_log->nr_elements
*/
};
atomic_t net_cnt; /* Users of net_conf */
wait_queue_head_t net_cnt_wait;
wait_queue_head_t ping_wait; /* Woken upon reception of a ping, and a state change */
+ struct res_opts res_opts;
struct drbd_socket data; /* data/barrier/cstate/parameter packets */
struct drbd_socket meta; /* ping/ack (metadata) packets */
struct crypto_hash *cram_hmac_tfm;
struct crypto_hash *integrity_w_tfm; /* to be used by the worker thread */
struct crypto_hash *integrity_r_tfm; /* to be used by the receiver thread */
+ struct crypto_hash *csums_tfm;
+ struct crypto_hash *verify_tfm;
void *int_dig_out;
void *int_dig_in;
void *int_dig_vv;
unsigned long flags;
/* configured by drbdsetup */
- struct syncer_conf sync_conf;
struct drbd_backing_dev *ldev __protected_by(local);
sector_t p_size; /* partner's disk size */
/* size of out-of-sync range in sectors. */
sector_t ov_last_oos_size;
unsigned long ov_left; /* in bits */
- struct crypto_hash *csums_tfm;
- struct crypto_hash *verify_tfm;
struct drbd_bitmap *bitmap;
unsigned long bm_resync_fo; /* bit offset for drbd_bm_find_next */
char *data, size_t size);
#define USE_DATA_SOCKET 1
#define USE_META_SOCKET 0
-extern int drbd_send_sync_param(struct drbd_conf *mdev, struct syncer_conf *sc);
+extern int drbd_send_sync_param(struct drbd_conf *mdev);
extern int drbd_send_b_ack(struct drbd_conf *mdev, u32 barrier_nr,
u32 set_size);
extern int drbd_send_ack(struct drbd_conf *, enum drbd_packet,
return ok;
}
-int drbd_send_sync_param(struct drbd_conf *mdev, struct syncer_conf *sc)
+int drbd_send_sync_param(struct drbd_conf *mdev)
{
struct p_rs_param_95 *p;
struct socket *sock;
size = apv <= 87 ? sizeof(struct p_rs_param)
: apv == 88 ? sizeof(struct p_rs_param)
- + strlen(mdev->sync_conf.verify_alg) + 1
+ + strlen(mdev->tconn->net_conf->verify_alg) + 1
: apv <= 94 ? sizeof(struct p_rs_param_89)
: /* apv >= 95 */ sizeof(struct p_rs_param_95);
/* initialize verify_alg and csums_alg */
memset(p->verify_alg, 0, 2 * SHARED_SECRET_MAX);
- p->rate = cpu_to_be32(sc->rate);
- p->c_plan_ahead = cpu_to_be32(sc->c_plan_ahead);
- p->c_delay_target = cpu_to_be32(sc->c_delay_target);
- p->c_fill_target = cpu_to_be32(sc->c_fill_target);
- p->c_max_rate = cpu_to_be32(sc->c_max_rate);
+ if (get_ldev(mdev)) {
+ p->rate = cpu_to_be32(mdev->ldev->dc.resync_rate);
+ p->c_plan_ahead = cpu_to_be32(mdev->ldev->dc.c_plan_ahead);
+ p->c_delay_target = cpu_to_be32(mdev->ldev->dc.c_delay_target);
+ p->c_fill_target = cpu_to_be32(mdev->ldev->dc.c_fill_target);
+ p->c_max_rate = cpu_to_be32(mdev->ldev->dc.c_max_rate);
+ put_ldev(mdev);
+ } else {
+ p->rate = cpu_to_be32(DRBD_RATE_DEF);
+ p->c_plan_ahead = cpu_to_be32(DRBD_C_PLAN_AHEAD_DEF);
+ p->c_delay_target = cpu_to_be32(DRBD_C_DELAY_TARGET_DEF);
+ p->c_fill_target = cpu_to_be32(DRBD_C_FILL_TARGET_DEF);
+ p->c_max_rate = cpu_to_be32(DRBD_C_MAX_RATE_DEF);
+ }
if (apv >= 88)
- strcpy(p->verify_alg, mdev->sync_conf.verify_alg);
+ strcpy(p->verify_alg, mdev->tconn->net_conf->verify_alg);
if (apv >= 89)
- strcpy(p->csums_alg, mdev->sync_conf.csums_alg);
+ strcpy(p->csums_alg, mdev->tconn->net_conf->csums_alg);
rv = _drbd_send_cmd(mdev, sock, cmd, &p->head, size, 0);
} else
int bits;
/* may we use this feature? */
- if ((mdev->sync_conf.use_rle == 0) ||
+ if ((mdev->tconn->net_conf->use_rle == 0) ||
(mdev->tconn->agreed_pro_version < 90))
return 0;
static void drbd_set_defaults(struct drbd_conf *mdev)
{
- /* This way we get a compile error when sync_conf grows,
- and we forgot to initialize it here */
- mdev->sync_conf = (struct syncer_conf) {
- /* .rate = */ DRBD_RATE_DEF,
- /* .after = */ DRBD_AFTER_DEF,
- /* .al_extents = */ DRBD_AL_EXTENTS_DEF,
- /* .verify_alg = */ {}, 0,
- /* .cpu_mask = */ {}, 0,
- /* .csums_alg = */ {}, 0,
- /* .use_rle = */ 0,
- /* .on_no_data = */ DRBD_ON_NO_DATA_DEF,
- /* .c_plan_ahead = */ DRBD_C_PLAN_AHEAD_DEF,
- /* .c_delay_target = */ DRBD_C_DELAY_TARGET_DEF,
- /* .c_fill_target = */ DRBD_C_FILL_TARGET_DEF,
- /* .c_max_rate = */ DRBD_C_MAX_RATE_DEF,
- /* .c_min_rate = */ DRBD_C_MIN_RATE_DEF
- };
-
- /* Have to use that way, because the layout differs between
- big endian and little endian */
+ /* Beware! The actual layout differs
+ * between big endian and little endian */
mdev->state = (union drbd_state) {
{ .role = R_SECONDARY,
.peer = R_UNKNOWN,
drbd_thread_init(tconn, &tconn->worker, drbd_worker, "worker");
drbd_thread_init(tconn, &tconn->asender, drbd_asender, "asender");
+ tconn->res_opts = (struct res_opts) {
+ {}, 0, /* cpu_mask */
+ DRBD_ON_NO_DATA_DEF, /* on_no_data */
+ };
+
mutex_lock(&drbd_cfg_mutex);
list_add_tail(&tconn->all_tconn, &drbd_tconns);
mutex_unlock(&drbd_cfg_mutex);
void drbd_free_resources(struct drbd_conf *mdev)
{
- crypto_free_hash(mdev->csums_tfm);
- mdev->csums_tfm = NULL;
- crypto_free_hash(mdev->verify_tfm);
- mdev->verify_tfm = NULL;
+ crypto_free_hash(mdev->tconn->csums_tfm);
+ mdev->tconn->csums_tfm = NULL;
+ crypto_free_hash(mdev->tconn->verify_tfm);
+ mdev->tconn->verify_tfm = NULL;
crypto_free_hash(mdev->tconn->cram_hmac_tfm);
mdev->tconn->cram_hmac_tfm = NULL;
crypto_free_hash(mdev->tconn->integrity_w_tfm);
u32 md_size_sect;
u32 al_offset; /* offset to this block */
u32 al_nr_extents; /* important for restoring the AL */
- /* `-- act_log->nr_elements <-- sync_conf.al_extents */
+ /* `-- act_log->nr_elements <-- ldev->dc.al_extents */
u32 bm_offset; /* offset to the bitmap, from here */
u32 bm_bytes_per_bit; /* BM_BLOCK_SIZE */
u32 la_peer_max_bio_size; /* last peer max_bio_size */
for (i = UI_CURRENT; i < UI_SIZE; i++)
bdev->md.uuid[i] = be64_to_cpu(buffer->uuid[i]);
bdev->md.flags = be32_to_cpu(buffer->flags);
- mdev->sync_conf.al_extents = be32_to_cpu(buffer->al_nr_extents);
+ bdev->dc.al_extents = be32_to_cpu(buffer->al_nr_extents);
bdev->md.device_uuid = be64_to_cpu(buffer->device_uuid);
spin_lock_irq(&mdev->tconn->req_lock);
}
spin_unlock_irq(&mdev->tconn->req_lock);
- if (mdev->sync_conf.al_extents < 7)
- mdev->sync_conf.al_extents = 127;
+ if (bdev->dc.al_extents < 7)
+ bdev->dc.al_extents = 127;
err:
mutex_unlock(&mdev->md_io_mutex);
int drbd_adm_set_role(struct sk_buff *skb, struct genl_info *info);
int drbd_adm_attach(struct sk_buff *skb, struct genl_info *info);
+int drbd_adm_disk_opts(struct sk_buff *skb, struct genl_info *info);
int drbd_adm_detach(struct sk_buff *skb, struct genl_info *info);
int drbd_adm_connect(struct sk_buff *skb, struct genl_info *info);
+int drbd_adm_net_opts(struct sk_buff *skb, struct genl_info *info);
int drbd_adm_resize(struct sk_buff *skb, struct genl_info *info);
int drbd_adm_start_ov(struct sk_buff *skb, struct genl_info *info);
int drbd_adm_new_c_uuid(struct sk_buff *skb, struct genl_info *info);
int drbd_adm_suspend_io(struct sk_buff *skb, struct genl_info *info);
int drbd_adm_resume_io(struct sk_buff *skb, struct genl_info *info);
int drbd_adm_outdate(struct sk_buff *skb, struct genl_info *info);
-int drbd_adm_syncer(struct sk_buff *skb, struct genl_info *info);
+int drbd_adm_resource_opts(struct sk_buff *skb, struct genl_info *info);
int drbd_adm_get_status(struct sk_buff *skb, struct genl_info *info);
int drbd_adm_get_timeout_type(struct sk_buff *skb, struct genl_info *info);
/* .dumpit */
if (info->attrs[DRBD_NLA_CFG_CONTEXT]) {
struct nlattr *nla;
/* parse and validate only */
- err = drbd_cfg_context_from_attrs(NULL, info->attrs);
+ err = drbd_cfg_context_from_attrs(NULL, info);
if (err)
goto fail;
{
return err == -ENOMSG ? "required attribute missing" :
err == -EOPNOTSUPP ? "unknown mandatory attribute" :
+ err == -EEXIST ? "can not change invariant setting" :
"invalid attribute value";
}
memset(&parms, 0, sizeof(parms));
if (info->attrs[DRBD_NLA_SET_ROLE_PARMS]) {
- err = set_role_parms_from_attrs(&parms, info->attrs);
+ err = set_role_parms_from_attrs(&parms, info);
if (err) {
retcode = ERR_MANDATORY_TAG;
drbd_msg_put_info(from_attrs_err_to_txt(err));
* failed, and 0 on success. You should call drbd_md_sync() after you called
* this function.
*/
-static int drbd_check_al_size(struct drbd_conf *mdev)
+static int drbd_check_al_size(struct drbd_conf *mdev, struct disk_conf *dc)
{
struct lru_cache *n, *t;
struct lc_element *e;
unsigned int in_use;
int i;
- if (!expect(mdev->sync_conf.al_extents >= DRBD_AL_EXTENTS_MIN))
- mdev->sync_conf.al_extents = DRBD_AL_EXTENTS_MIN;
+ if (!expect(dc->al_extents >= DRBD_AL_EXTENTS_MIN))
+ dc->al_extents = DRBD_AL_EXTENTS_MIN;
if (mdev->act_log &&
- mdev->act_log->nr_elements == mdev->sync_conf.al_extents)
+ mdev->act_log->nr_elements == dc->al_extents)
return 0;
in_use = 0;
t = mdev->act_log;
n = lc_create("act_log", drbd_al_ext_cache, AL_UPDATES_PER_TRANSACTION,
- mdev->sync_conf.al_extents, sizeof(struct lc_element), 0);
+ dc->al_extents, sizeof(struct lc_element), 0);
if (n == NULL) {
dev_err(DEV, "Cannot allocate act_log lru!\n");
dev_info(DEV, "Suspended AL updates\n");
}
+int drbd_adm_disk_opts(struct sk_buff *skb, struct genl_info *info)
+{
+ enum drbd_ret_code retcode;
+ struct drbd_conf *mdev;
+ struct disk_conf *ndc; /* new disk conf */
+ int err, fifo_size;
+ int *rs_plan_s = NULL;
+
+ retcode = drbd_adm_prepare(skb, info, DRBD_ADM_NEED_MINOR);
+ if (!adm_ctx.reply_skb)
+ return retcode;
+ if (retcode != NO_ERROR)
+ goto out;
+
+ mdev = adm_ctx.mdev;
+
+ /* we also need a disk
+ * to change the options on */
+ if (!get_ldev(mdev)) {
+ retcode = ERR_NO_DISK;
+ goto out;
+ }
+
+/* FIXME freeze IO, cluster wide.
+ *
+ * We should make sure no-one uses
+ * some half-updated struct when we
+ * assign it later. */
+
+ ndc = kmalloc(sizeof(*ndc), GFP_KERNEL);
+ if (!ndc) {
+ retcode = ERR_NOMEM;
+ goto fail;
+ }
+
+ memcpy(ndc, &mdev->ldev->dc, sizeof(*ndc));
+ err = disk_conf_from_attrs_for_change(ndc, info);
+ if (err) {
+ retcode = ERR_MANDATORY_TAG;
+ drbd_msg_put_info(from_attrs_err_to_txt(err));
+ }
+
+ if (!expect(ndc->resync_rate >= 1))
+ ndc->resync_rate = 1;
+
+ /* clip to allowed range */
+ if (!expect(ndc->al_extents >= DRBD_AL_EXTENTS_MIN))
+ ndc->al_extents = DRBD_AL_EXTENTS_MIN;
+ if (!expect(ndc->al_extents <= DRBD_AL_EXTENTS_MAX))
+ ndc->al_extents = DRBD_AL_EXTENTS_MAX;
+
+ /* most sanity checks done, try to assign the new sync-after
+ * dependency. need to hold the global lock in there,
+ * to avoid a race in the dependency loop check. */
+ retcode = drbd_alter_sa(mdev, ndc->resync_after);
+ if (retcode != NO_ERROR)
+ goto fail;
+
+ fifo_size = (ndc->c_plan_ahead * 10 * SLEEP_TIME) / HZ;
+ if (fifo_size != mdev->rs_plan_s.size && fifo_size > 0) {
+ rs_plan_s = kzalloc(sizeof(int) * fifo_size, GFP_KERNEL);
+ if (!rs_plan_s) {
+ dev_err(DEV, "kmalloc of fifo_buffer failed");
+ retcode = ERR_NOMEM;
+ goto fail;
+ }
+ }
+
+ if (fifo_size != mdev->rs_plan_s.size) {
+ kfree(mdev->rs_plan_s.values);
+ mdev->rs_plan_s.values = rs_plan_s;
+ mdev->rs_plan_s.size = fifo_size;
+ mdev->rs_planed = 0;
+ rs_plan_s = NULL;
+ }
+
+ wait_event(mdev->al_wait, lc_try_lock(mdev->act_log));
+ drbd_al_shrink(mdev);
+ err = drbd_check_al_size(mdev, ndc);
+ lc_unlock(mdev->act_log);
+ wake_up(&mdev->al_wait);
+
+ if (err) {
+ retcode = ERR_NOMEM;
+ goto fail;
+ }
+
+ /* FIXME
+ * To avoid someone looking at a half-updated struct, we probably
+ * should have a rw-semaphor on net_conf and disk_conf.
+ */
+ mdev->ldev->dc = *ndc;
+
+ drbd_md_sync(mdev);
+
+
+ if (mdev->state.conn >= C_CONNECTED)
+ drbd_send_sync_param(mdev);
+
+ fail:
+ put_ldev(mdev);
+ kfree(ndc);
+ kfree(rs_plan_s);
+ out:
+ drbd_adm_finish(info, retcode);
+ return 0;
+}
+
int drbd_adm_attach(struct sk_buff *skb, struct genl_info *info)
{
struct drbd_conf *mdev;
goto fail;
}
- nbc->dc.disk_size = DRBD_DISK_SIZE_SECT_DEF;
- nbc->dc.on_io_error = DRBD_ON_IO_ERROR_DEF;
- nbc->dc.fencing = DRBD_FENCING_DEF;
- nbc->dc.max_bio_bvecs = DRBD_MAX_BIO_BVECS_DEF;
-
- err = disk_conf_from_attrs(&nbc->dc, info->attrs);
+ nbc->dc = (struct disk_conf) {
+ {}, 0, /* backing_dev */
+ {}, 0, /* meta_dev */
+ 0, /* meta_dev_idx */
+ DRBD_DISK_SIZE_SECT_DEF, /* disk_size */
+ DRBD_MAX_BIO_BVECS_DEF, /* max_bio_bvecs */
+ DRBD_ON_IO_ERROR_DEF, /* on_io_error */
+ DRBD_FENCING_DEF, /* fencing */
+ DRBD_RATE_DEF, /* resync_rate */
+ DRBD_AFTER_DEF, /* resync_after */
+ DRBD_AL_EXTENTS_DEF, /* al_extents */
+ DRBD_C_PLAN_AHEAD_DEF, /* c_plan_ahead */
+ DRBD_C_DELAY_TARGET_DEF, /* c_delay_target */
+ DRBD_C_FILL_TARGET_DEF, /* c_fill_target */
+ DRBD_C_MAX_RATE_DEF, /* c_max_rate */
+ DRBD_C_MIN_RATE_DEF, /* c_min_rate */
+ 0, /* no_disk_barrier */
+ 0, /* no_disk_flush */
+ 0, /* no_disk_drain */
+ 0, /* no_md_flush */
+ };
+
+ err = disk_conf_from_attrs(&nbc->dc, info);
if (err) {
retcode = ERR_MANDATORY_TAG;
drbd_msg_put_info(from_attrs_err_to_txt(err));
}
/* Since we are diskless, fix the activity log first... */
- if (drbd_check_al_size(mdev)) {
+ if (drbd_check_al_size(mdev, &nbc->dc)) {
retcode = ERR_NOMEM;
goto force_diskless_dec;
}
return 0;
}
+static bool conn_resync_running(struct drbd_tconn *tconn)
+{
+ struct drbd_conf *mdev;
+ int vnr;
+
+ idr_for_each_entry(&tconn->volumes, mdev, vnr) {
+ if (mdev->state.conn == C_SYNC_SOURCE ||
+ mdev->state.conn == C_SYNC_TARGET ||
+ mdev->state.conn == C_PAUSED_SYNC_S ||
+ mdev->state.conn == C_PAUSED_SYNC_T)
+ return true;
+ }
+ return false;
+}
+
+static bool conn_ov_running(struct drbd_tconn *tconn)
+{
+ struct drbd_conf *mdev;
+ int vnr;
+
+ idr_for_each_entry(&tconn->volumes, mdev, vnr) {
+ if (mdev->state.conn == C_VERIFY_S ||
+ mdev->state.conn == C_VERIFY_T)
+ return true;
+ }
+ return false;
+}
+
+int drbd_adm_net_opts(struct sk_buff *skb, struct genl_info *info)
+{
+ enum drbd_ret_code retcode;
+ struct drbd_tconn *tconn;
+ struct net_conf *new_conf = NULL;
+ int err;
+ int ovr; /* online verify running */
+ int rsr; /* re-sync running */
+ struct crypto_hash *verify_tfm = NULL;
+ struct crypto_hash *csums_tfm = NULL;
+
+
+ retcode = drbd_adm_prepare(skb, info, DRBD_ADM_NEED_CONN);
+ if (!adm_ctx.reply_skb)
+ return retcode;
+ if (retcode != NO_ERROR)
+ goto out;
+
+ tconn = adm_ctx.tconn;
+
+ new_conf = kzalloc(sizeof(struct net_conf), GFP_KERNEL);
+ if (!new_conf) {
+ retcode = ERR_NOMEM;
+ goto out;
+ }
+
+ /* we also need a net config
+ * to change the options on */
+ if (!get_net_conf(tconn)) {
+ drbd_msg_put_info("net conf missing, try connect");
+ retcode = ERR_INVALID_REQUEST;
+ goto out;
+ }
+
+ conn_reconfig_start(tconn);
+
+ memcpy(new_conf, tconn->net_conf, sizeof(*new_conf));
+ err = net_conf_from_attrs_for_change(new_conf, info);
+ if (err) {
+ retcode = ERR_MANDATORY_TAG;
+ drbd_msg_put_info(from_attrs_err_to_txt(err));
+ goto fail;
+ }
+
+ /* re-sync running */
+ rsr = conn_resync_running(tconn);
+ if (rsr && strcmp(new_conf->csums_alg, tconn->net_conf->csums_alg)) {
+ retcode = ERR_CSUMS_RESYNC_RUNNING;
+ goto fail;
+ }
+
+ if (!rsr && new_conf->csums_alg[0]) {
+ csums_tfm = crypto_alloc_hash(new_conf->csums_alg, 0, CRYPTO_ALG_ASYNC);
+ if (IS_ERR(csums_tfm)) {
+ csums_tfm = NULL;
+ retcode = ERR_CSUMS_ALG;
+ goto fail;
+ }
+
+ if (!drbd_crypto_is_hash(crypto_hash_tfm(csums_tfm))) {
+ retcode = ERR_CSUMS_ALG_ND;
+ goto fail;
+ }
+ }
+
+ /* online verify running */
+ ovr = conn_ov_running(tconn);
+ if (ovr) {
+ if (strcmp(new_conf->verify_alg, tconn->net_conf->verify_alg)) {
+ retcode = ERR_VERIFY_RUNNING;
+ goto fail;
+ }
+ }
+
+ if (!ovr && new_conf->verify_alg[0]) {
+ verify_tfm = crypto_alloc_hash(new_conf->verify_alg, 0, CRYPTO_ALG_ASYNC);
+ if (IS_ERR(verify_tfm)) {
+ verify_tfm = NULL;
+ retcode = ERR_VERIFY_ALG;
+ goto fail;
+ }
+
+ if (!drbd_crypto_is_hash(crypto_hash_tfm(verify_tfm))) {
+ retcode = ERR_VERIFY_ALG_ND;
+ goto fail;
+ }
+ }
+
+
+ /* For now, use struct assignment, not pointer assignment.
+ * We don't have any means to determine who might still
+ * keep a local alias into the struct,
+ * so we cannot just free it and hope for the best :(
+ * FIXME
+ * To avoid someone looking at a half-updated struct, we probably
+ * should have a rw-semaphor on net_conf and disk_conf.
+ */
+ *tconn->net_conf = *new_conf;
+
+ if (!rsr) {
+ crypto_free_hash(tconn->csums_tfm);
+ tconn->csums_tfm = csums_tfm;
+ csums_tfm = NULL;
+ }
+ if (!ovr) {
+ crypto_free_hash(tconn->verify_tfm);
+ tconn->verify_tfm = verify_tfm;
+ verify_tfm = NULL;
+ }
+
+ if (tconn->cstate >= C_WF_REPORT_PARAMS)
+ drbd_send_sync_param(minor_to_mdev(conn_lowest_minor(tconn)));
+
+ fail:
+ crypto_free_hash(csums_tfm);
+ crypto_free_hash(verify_tfm);
+ kfree(new_conf);
+ put_net_conf(tconn);
+ conn_reconfig_done(tconn);
+ out:
+ drbd_adm_finish(info, retcode);
+ return 0;
+}
+
int drbd_adm_connect(struct sk_buff *skb, struct genl_info *info)
{
char hmac_name[CRYPTO_MAX_ALG_NAME];
}
/* allocation not in the IO path, cqueue thread context */
- new_conf = kzalloc(sizeof(struct net_conf), GFP_KERNEL);
+ new_conf = kmalloc(sizeof(struct net_conf), GFP_KERNEL);
if (!new_conf) {
retcode = ERR_NOMEM;
goto fail;
}
- new_conf->timeout = DRBD_TIMEOUT_DEF;
- new_conf->try_connect_int = DRBD_CONNECT_INT_DEF;
- new_conf->ping_int = DRBD_PING_INT_DEF;
- new_conf->max_epoch_size = DRBD_MAX_EPOCH_SIZE_DEF;
- new_conf->max_buffers = DRBD_MAX_BUFFERS_DEF;
- new_conf->unplug_watermark = DRBD_UNPLUG_WATERMARK_DEF;
- new_conf->sndbuf_size = DRBD_SNDBUF_SIZE_DEF;
- new_conf->rcvbuf_size = DRBD_RCVBUF_SIZE_DEF;
- new_conf->ko_count = DRBD_KO_COUNT_DEF;
- new_conf->after_sb_0p = DRBD_AFTER_SB_0P_DEF;
- new_conf->after_sb_1p = DRBD_AFTER_SB_1P_DEF;
- new_conf->after_sb_2p = DRBD_AFTER_SB_2P_DEF;
- new_conf->want_lose = 0;
- new_conf->two_primaries = 0;
- new_conf->wire_protocol = DRBD_PROT_C;
- new_conf->ping_timeo = DRBD_PING_TIMEO_DEF;
- new_conf->rr_conflict = DRBD_RR_CONFLICT_DEF;
- new_conf->on_congestion = DRBD_ON_CONGESTION_DEF;
- new_conf->cong_extents = DRBD_CONG_EXTENTS_DEF;
-
- err = net_conf_from_attrs(new_conf, info->attrs);
+ *new_conf = (struct net_conf) {
+ {}, 0, /* my_addr */
+ {}, 0, /* peer_addr */
+ {}, 0, /* shared_secret */
+ {}, 0, /* cram_hmac_alg */
+ {}, 0, /* integrity_alg */
+ {}, 0, /* verify_alg */
+ {}, 0, /* csums_alg */
+ DRBD_PROTOCOL_DEF, /* wire_protocol */
+ DRBD_CONNECT_INT_DEF, /* try_connect_int */
+ DRBD_TIMEOUT_DEF, /* timeout */
+ DRBD_PING_INT_DEF, /* ping_int */
+ DRBD_PING_TIMEO_DEF, /* ping_timeo */
+ DRBD_SNDBUF_SIZE_DEF, /* sndbuf_size */
+ DRBD_RCVBUF_SIZE_DEF, /* rcvbuf_size */
+ DRBD_KO_COUNT_DEF, /* ko_count */
+ DRBD_MAX_BUFFERS_DEF, /* max_buffers */
+ DRBD_MAX_EPOCH_SIZE_DEF, /* max_epoch_size */
+ DRBD_UNPLUG_WATERMARK_DEF, /* unplug_watermark */
+ DRBD_AFTER_SB_0P_DEF, /* after_sb_0p */
+ DRBD_AFTER_SB_1P_DEF, /* after_sb_1p */
+ DRBD_AFTER_SB_2P_DEF, /* after_sb_2p */
+ DRBD_RR_CONFLICT_DEF, /* rr_conflict */
+ DRBD_ON_CONGESTION_DEF, /* on_congestion */
+ DRBD_CONG_FILL_DEF, /* cong_fill */
+ DRBD_CONG_EXTENTS_DEF, /* cong_extents */
+ 0, /* two_primaries */
+ 0, /* want_lose */
+ 0, /* no_cork */
+ 0, /* always_asbp */
+ 0, /* dry_run */
+ 0, /* use_rle */
+ };
+
+ err = net_conf_from_attrs(new_conf, info);
if (err) {
retcode = ERR_MANDATORY_TAG;
drbd_msg_put_info(from_attrs_err_to_txt(err));
tconn = adm_ctx.tconn;
memset(&parms, 0, sizeof(parms));
if (info->attrs[DRBD_NLA_DISCONNECT_PARMS]) {
- err = disconnect_parms_from_attrs(&parms, info->attrs);
+ err = disconnect_parms_from_attrs(&parms, info);
if (err) {
retcode = ERR_MANDATORY_TAG;
drbd_msg_put_info(from_attrs_err_to_txt(err));
memset(&rs, 0, sizeof(struct resize_parms));
if (info->attrs[DRBD_NLA_RESIZE_PARMS]) {
- err = resize_parms_from_attrs(&rs, info->attrs);
+ err = resize_parms_from_attrs(&rs, info);
if (err) {
retcode = ERR_MANDATORY_TAG;
drbd_msg_put_info(from_attrs_err_to_txt(err));
return 0;
}
-int drbd_adm_syncer(struct sk_buff *skb, struct genl_info *info)
+int drbd_adm_resource_opts(struct sk_buff *skb, struct genl_info *info)
{
- struct drbd_conf *mdev;
enum drbd_ret_code retcode;
- int err;
- int ovr; /* online verify running */
- int rsr; /* re-sync running */
- struct crypto_hash *verify_tfm = NULL;
- struct crypto_hash *csums_tfm = NULL;
- struct syncer_conf sc;
cpumask_var_t new_cpu_mask;
+ struct drbd_tconn *tconn;
int *rs_plan_s = NULL;
- int fifo_size;
+ struct res_opts sc;
+ int err;
- retcode = drbd_adm_prepare(skb, info, DRBD_ADM_NEED_MINOR);
+ retcode = drbd_adm_prepare(skb, info, DRBD_ADM_NEED_CONN);
if (!adm_ctx.reply_skb)
return retcode;
if (retcode != NO_ERROR)
goto fail;
- mdev = adm_ctx.mdev;
+ tconn = adm_ctx.tconn;
if (!zalloc_cpumask_var(&new_cpu_mask, GFP_KERNEL)) {
retcode = ERR_NOMEM;
if (((struct drbd_genlmsghdr*)info->userhdr)->flags
& DRBD_GENL_F_SET_DEFAULTS) {
- memset(&sc, 0, sizeof(struct syncer_conf));
- sc.rate = DRBD_RATE_DEF;
- sc.after = DRBD_AFTER_DEF;
- sc.al_extents = DRBD_AL_EXTENTS_DEF;
+ memset(&sc, 0, sizeof(struct res_opts));
sc.on_no_data = DRBD_ON_NO_DATA_DEF;
- sc.c_plan_ahead = DRBD_C_PLAN_AHEAD_DEF;
- sc.c_delay_target = DRBD_C_DELAY_TARGET_DEF;
- sc.c_fill_target = DRBD_C_FILL_TARGET_DEF;
- sc.c_max_rate = DRBD_C_MAX_RATE_DEF;
- sc.c_min_rate = DRBD_C_MIN_RATE_DEF;
} else
- memcpy(&sc, &mdev->sync_conf, sizeof(struct syncer_conf));
+ sc = tconn->res_opts;
- err = syncer_conf_from_attrs(&sc, info->attrs);
+ err = res_opts_from_attrs(&sc, info);
if (err) {
retcode = ERR_MANDATORY_TAG;
drbd_msg_put_info(from_attrs_err_to_txt(err));
goto fail;
}
- /* re-sync running */
- rsr = ( mdev->state.conn == C_SYNC_SOURCE ||
- mdev->state.conn == C_SYNC_TARGET ||
- mdev->state.conn == C_PAUSED_SYNC_S ||
- mdev->state.conn == C_PAUSED_SYNC_T );
-
- if (rsr && strcmp(sc.csums_alg, mdev->sync_conf.csums_alg)) {
- retcode = ERR_CSUMS_RESYNC_RUNNING;
- goto fail;
- }
-
- if (!rsr && sc.csums_alg[0]) {
- csums_tfm = crypto_alloc_hash(sc.csums_alg, 0, CRYPTO_ALG_ASYNC);
- if (IS_ERR(csums_tfm)) {
- csums_tfm = NULL;
- retcode = ERR_CSUMS_ALG;
- goto fail;
- }
-
- if (!drbd_crypto_is_hash(crypto_hash_tfm(csums_tfm))) {
- retcode = ERR_CSUMS_ALG_ND;
- goto fail;
- }
- }
-
- /* online verify running */
- ovr = (mdev->state.conn == C_VERIFY_S || mdev->state.conn == C_VERIFY_T);
-
- if (ovr) {
- if (strcmp(sc.verify_alg, mdev->sync_conf.verify_alg)) {
- retcode = ERR_VERIFY_RUNNING;
- goto fail;
- }
- }
-
- if (!ovr && sc.verify_alg[0]) {
- verify_tfm = crypto_alloc_hash(sc.verify_alg, 0, CRYPTO_ALG_ASYNC);
- if (IS_ERR(verify_tfm)) {
- verify_tfm = NULL;
- retcode = ERR_VERIFY_ALG;
- goto fail;
- }
-
- if (!drbd_crypto_is_hash(crypto_hash_tfm(verify_tfm))) {
- retcode = ERR_VERIFY_ALG_ND;
- goto fail;
- }
- }
-
/* silently ignore cpu mask on UP kernel */
if (nr_cpu_ids > 1 && sc.cpu_mask[0] != 0) {
err = __bitmap_parse(sc.cpu_mask, 32, 0,
cpumask_bits(new_cpu_mask), nr_cpu_ids);
if (err) {
- dev_warn(DEV, "__bitmap_parse() failed with %d\n", err);
+ conn_warn(tconn, "__bitmap_parse() failed with %d\n", err);
retcode = ERR_CPU_MASK_PARSE;
goto fail;
}
}
- if (!expect(sc.rate >= 1))
- sc.rate = 1;
-
- /* clip to allowed range */
- if (!expect(sc.al_extents >= DRBD_AL_EXTENTS_MIN))
- sc.al_extents = DRBD_AL_EXTENTS_MIN;
- if (!expect(sc.al_extents <= DRBD_AL_EXTENTS_MAX))
- sc.al_extents = DRBD_AL_EXTENTS_MAX;
-
- /* most sanity checks done, try to assign the new sync-after
- * dependency. need to hold the global lock in there,
- * to avoid a race in the dependency loop check. */
- retcode = drbd_alter_sa(mdev, sc.after);
- if (retcode != NO_ERROR)
- goto fail;
-
- fifo_size = (sc.c_plan_ahead * 10 * SLEEP_TIME) / HZ;
- if (fifo_size != mdev->rs_plan_s.size && fifo_size > 0) {
- rs_plan_s = kzalloc(sizeof(int) * fifo_size, GFP_KERNEL);
- if (!rs_plan_s) {
- dev_err(DEV, "kmalloc of fifo_buffer failed");
- retcode = ERR_NOMEM;
- goto fail;
- }
- }
-
- /* ok, assign the rest of it as well.
- * lock against receive_SyncParam() */
- spin_lock(&mdev->peer_seq_lock);
- mdev->sync_conf = sc;
-
- if (!rsr) {
- crypto_free_hash(mdev->csums_tfm);
- mdev->csums_tfm = csums_tfm;
- csums_tfm = NULL;
- }
-
- if (!ovr) {
- crypto_free_hash(mdev->verify_tfm);
- mdev->verify_tfm = verify_tfm;
- verify_tfm = NULL;
- }
-
- if (fifo_size != mdev->rs_plan_s.size) {
- kfree(mdev->rs_plan_s.values);
- mdev->rs_plan_s.values = rs_plan_s;
- mdev->rs_plan_s.size = fifo_size;
- mdev->rs_planed = 0;
- rs_plan_s = NULL;
- }
-
- spin_unlock(&mdev->peer_seq_lock);
- if (get_ldev(mdev)) {
- wait_event(mdev->al_wait, lc_try_lock(mdev->act_log));
- drbd_al_shrink(mdev);
- err = drbd_check_al_size(mdev);
- lc_unlock(mdev->act_log);
- wake_up(&mdev->al_wait);
+ tconn->res_opts = sc;
- put_ldev(mdev);
- drbd_md_sync(mdev);
-
- if (err) {
- retcode = ERR_NOMEM;
- goto fail;
- }
- }
-
- if (mdev->state.conn >= C_CONNECTED)
- drbd_send_sync_param(mdev, &sc);
-
- if (!cpumask_equal(mdev->tconn->cpu_mask, new_cpu_mask)) {
- cpumask_copy(mdev->tconn->cpu_mask, new_cpu_mask);
- drbd_calc_cpu_mask(mdev->tconn);
- mdev->tconn->receiver.reset_cpu_mask = 1;
- mdev->tconn->asender.reset_cpu_mask = 1;
- mdev->tconn->worker.reset_cpu_mask = 1;
+ if (!cpumask_equal(tconn->cpu_mask, new_cpu_mask)) {
+ cpumask_copy(tconn->cpu_mask, new_cpu_mask);
+ drbd_calc_cpu_mask(tconn);
+ tconn->receiver.reset_cpu_mask = 1;
+ tconn->asender.reset_cpu_mask = 1;
+ tconn->worker.reset_cpu_mask = 1;
}
- kobject_uevent(&disk_to_dev(mdev->vdisk)->kobj, KOBJ_CHANGE);
fail:
kfree(rs_plan_s);
free_cpumask_var(new_cpu_mask);
- crypto_free_hash(csums_tfm);
- crypto_free_hash(verify_tfm);
drbd_adm_finish(info, retcode);
return 0;
if (nla_put_drbd_cfg_context(skb, mdev->tconn->name, mdev->vnr))
goto nla_put_failure;
+ if (res_opts_to_skb(skb, &mdev->tconn->res_opts, exclude_sensitive))
+ goto nla_put_failure;
+
if (got_ldev)
if (disk_conf_to_skb(skb, &mdev->ldev->dc, exclude_sensitive))
goto nla_put_failure;
if (net_conf_to_skb(skb, mdev->tconn->net_conf, exclude_sensitive))
goto nla_put_failure;
- if (syncer_conf_to_skb(skb, &mdev->sync_conf, exclude_sensitive))
- goto nla_put_failure;
-
nla = nla_nest_start(skb, DRBD_NLA_STATE_INFO);
if (!nla)
goto nla_put_failure;
/* resume from last known position, if possible */
struct start_ov_parms parms =
{ .ov_start_sector = mdev->ov_start_sector };
- int err = start_ov_parms_from_attrs(&parms, info->attrs);
+ int err = start_ov_parms_from_attrs(&parms, info);
if (err) {
retcode = ERR_MANDATORY_TAG;
drbd_msg_put_info(from_attrs_err_to_txt(err));
mdev = adm_ctx.mdev;
memset(&args, 0, sizeof(args));
if (info->attrs[DRBD_NLA_NEW_C_UUID_PARMS]) {
- err = new_c_uuid_parms_from_attrs(&args, info->attrs);
+ err = new_c_uuid_parms_from_attrs(&args, info);
if (err) {
retcode = ERR_MANDATORY_TAG;
drbd_msg_put_info(from_attrs_err_to_txt(err));
&mdev->tconn->cstate_mutex :
&mdev->own_state_mutex;
- ok &= drbd_send_sync_param(mdev, &mdev->sync_conf);
+ ok &= drbd_send_sync_param(mdev);
ok &= drbd_send_sizes(mdev, 0, 0);
ok &= drbd_send_uuids(mdev);
ok &= drbd_send_state(mdev);
int throttle = 0;
/* feature disabled? */
- if (mdev->sync_conf.c_min_rate == 0)
+ if (mdev->ldev->dc.c_min_rate == 0)
return 0;
spin_lock_irq(&mdev->al_lock);
db = mdev->rs_mark_left[i] - rs_left;
dbdt = Bit2KB(db/dt);
- if (dbdt > mdev->sync_conf.c_min_rate)
+ if (dbdt > mdev->ldev->dc.c_min_rate)
throttle = 1;
}
return throttle;
if (drbd_recv(mdev->tconn, &p->head.payload, header_size) != header_size)
return false;
- mdev->sync_conf.rate = be32_to_cpu(p->rate);
+ if (get_ldev(mdev)) {
+ mdev->ldev->dc.resync_rate = be32_to_cpu(p->rate);
+ put_ldev(mdev);
+ }
if (apv >= 88) {
if (apv == 88) {
p->csums_alg[SHARED_SECRET_MAX-1] = 0;
}
- if (strcmp(mdev->sync_conf.verify_alg, p->verify_alg)) {
+ if (strcmp(mdev->tconn->net_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->sync_conf.verify_alg, p->verify_alg);
+ mdev->tconn->net_conf->verify_alg, p->verify_alg);
goto disconnect;
}
verify_tfm = drbd_crypto_alloc_digest_safe(mdev,
}
}
- if (apv >= 89 && strcmp(mdev->sync_conf.csums_alg, p->csums_alg)) {
+ if (apv >= 89 && strcmp(mdev->tconn->net_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->sync_conf.csums_alg, p->csums_alg);
+ mdev->tconn->net_conf->csums_alg, p->csums_alg);
goto disconnect;
}
csums_tfm = drbd_crypto_alloc_digest_safe(mdev,
}
}
- if (apv > 94) {
- mdev->sync_conf.rate = be32_to_cpu(p->rate);
- mdev->sync_conf.c_plan_ahead = be32_to_cpu(p->c_plan_ahead);
- mdev->sync_conf.c_delay_target = be32_to_cpu(p->c_delay_target);
- mdev->sync_conf.c_fill_target = be32_to_cpu(p->c_fill_target);
- mdev->sync_conf.c_max_rate = be32_to_cpu(p->c_max_rate);
+ if (apv > 94 && get_ldev(mdev)) {
+ mdev->ldev->dc.resync_rate = be32_to_cpu(p->rate);
+ mdev->ldev->dc.c_plan_ahead = be32_to_cpu(p->c_plan_ahead);
+ mdev->ldev->dc.c_delay_target = be32_to_cpu(p->c_delay_target);
+ mdev->ldev->dc.c_fill_target = be32_to_cpu(p->c_fill_target);
+ mdev->ldev->dc.c_max_rate = be32_to_cpu(p->c_max_rate);
- fifo_size = (mdev->sync_conf.c_plan_ahead * 10 * SLEEP_TIME) / HZ;
+ fifo_size = (mdev->ldev->dc.c_plan_ahead * 10 * SLEEP_TIME) / HZ;
if (fifo_size != mdev->rs_plan_s.size && fifo_size > 0) {
rs_plan_s = kzalloc(sizeof(int) * fifo_size, GFP_KERNEL);
if (!rs_plan_s) {
dev_err(DEV, "kmalloc of fifo_buffer failed");
+ put_ldev(mdev);
goto disconnect;
}
}
+ put_ldev(mdev);
}
spin_lock(&mdev->peer_seq_lock);
/* lock against drbd_nl_syncer_conf() */
if (verify_tfm) {
- strcpy(mdev->sync_conf.verify_alg, p->verify_alg);
- mdev->sync_conf.verify_alg_len = strlen(p->verify_alg) + 1;
- crypto_free_hash(mdev->verify_tfm);
- mdev->verify_tfm = 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 (csums_tfm) {
- strcpy(mdev->sync_conf.csums_alg, p->csums_alg);
- mdev->sync_conf.csums_alg_len = strlen(p->csums_alg) + 1;
- crypto_free_hash(mdev->csums_tfm);
- mdev->csums_tfm = 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);
}
if (fifo_size != mdev->rs_plan_s.size) {
rv = SS_CONNECTED_OUTDATES;
else if ((ns.conn == C_VERIFY_S || ns.conn == C_VERIFY_T) &&
- (mdev->sync_conf.verify_alg[0] == 0))
+ (mdev->tconn->net_conf->verify_alg[0] == 0))
rv = SS_NO_VERIFY_ALG;
else if ((ns.conn == C_VERIFY_S || ns.conn == C_VERIFY_T) &&
(ns.role == R_PRIMARY && ns.conn < C_CONNECTED && ns.pdsk > D_OUTDATED))
ns.susp_fen = 1; /* Suspend IO while fence-peer handler runs (peer lost) */
- if (mdev->sync_conf.on_no_data == OND_SUSPEND_IO &&
+ if (mdev->tconn->res_opts.on_no_data == OND_SUSPEND_IO &&
(ns.role == R_PRIMARY && ns.disk < D_UP_TO_DATE && ns.pdsk < D_UP_TO_DATE))
ns.susp_nod = 1; /* Suspend IO while no data available (no accessible data available) */
if (unlikely((peer_req->flags & EE_WAS_ERROR) != 0))
goto out;
- digest_size = crypto_hash_digestsize(mdev->csums_tfm);
+ digest_size = crypto_hash_digestsize(mdev->tconn->csums_tfm);
digest = kmalloc(digest_size, GFP_NOIO);
if (digest) {
sector_t sector = peer_req->i.sector;
unsigned int size = peer_req->i.size;
- drbd_csum_ee(mdev, mdev->csums_tfm, peer_req, digest);
+ drbd_csum_ee(mdev, mdev->tconn->csums_tfm, peer_req, digest);
/* Free peer_req and pages before send.
* In case we block on congestion, we could otherwise run into
* some distributed deadlock, if the other side blocks on
spin_lock(&mdev->peer_seq_lock); /* get an atomic view on mdev->rs_plan_s */
- steps = mdev->rs_plan_s.size; /* (mdev->sync_conf.c_plan_ahead * 10 * SLEEP_TIME) / HZ; */
+ steps = mdev->rs_plan_s.size; /* (mdev->ldev->dc.c_plan_ahead * 10 * SLEEP_TIME) / HZ; */
if (mdev->rs_in_flight + sect_in == 0) { /* At start of resync */
- want = ((mdev->sync_conf.rate * 2 * SLEEP_TIME) / HZ) * steps;
+ want = ((mdev->ldev->dc.resync_rate * 2 * SLEEP_TIME) / HZ) * steps;
} else { /* normal path */
- want = mdev->sync_conf.c_fill_target ? mdev->sync_conf.c_fill_target :
- sect_in * mdev->sync_conf.c_delay_target * HZ / (SLEEP_TIME * 10);
+ want = mdev->ldev->dc.c_fill_target ? mdev->ldev->dc.c_fill_target :
+ sect_in * mdev->ldev->dc.c_delay_target * HZ / (SLEEP_TIME * 10);
}
correction = want - mdev->rs_in_flight - mdev->rs_planed;
if (req_sect < 0)
req_sect = 0;
- max_sect = (mdev->sync_conf.c_max_rate * 2 * SLEEP_TIME) / HZ;
+ max_sect = (mdev->ldev->dc.c_max_rate * 2 * SLEEP_TIME) / HZ;
if (req_sect > max_sect)
req_sect = max_sect;
static int drbd_rs_number_requests(struct drbd_conf *mdev)
{
int number;
- if (mdev->rs_plan_s.size) { /* mdev->sync_conf.c_plan_ahead */
+ if (mdev->rs_plan_s.size) { /* mdev->ldev->dc.c_plan_ahead */
number = drbd_rs_controller(mdev) >> (BM_BLOCK_SHIFT - 9);
mdev->c_sync_rate = number * HZ * (BM_BLOCK_SIZE / 1024) / SLEEP_TIME;
} else {
- mdev->c_sync_rate = mdev->sync_conf.rate;
+ mdev->c_sync_rate = mdev->ldev->dc.resync_rate;
number = SLEEP_TIME * mdev->c_sync_rate / ((BM_BLOCK_SIZE / 1024) * HZ);
}
/* adjust very last sectors, in case we are oddly sized */
if (sector + (size>>9) > capacity)
size = (capacity-sector)<<9;
- if (mdev->tconn->agreed_pro_version >= 89 && mdev->csums_tfm) {
+ if (mdev->tconn->agreed_pro_version >= 89 && mdev->tconn->csums_tfm) {
switch (read_for_csum(mdev, sector, size)) {
case -EIO: /* Disk failure */
put_ldev(mdev);
if (os.conn == C_SYNC_TARGET || os.conn == C_PAUSED_SYNC_T)
khelper_cmd = "after-resync-target";
- if (mdev->csums_tfm && mdev->rs_total) {
+ if (mdev->tconn->csums_tfm && mdev->rs_total) {
const unsigned long s = mdev->rs_same_csum;
const unsigned long t = mdev->rs_total;
const int ratio =
/* quick hack to try to avoid a race against reconfiguration.
* a real fix would be much more involved,
* introducing more locking mechanisms */
- if (mdev->csums_tfm) {
- digest_size = crypto_hash_digestsize(mdev->csums_tfm);
+ if (mdev->tconn->csums_tfm) {
+ digest_size = crypto_hash_digestsize(mdev->tconn->csums_tfm);
D_ASSERT(digest_size == di->digest_size);
digest = kmalloc(digest_size, GFP_NOIO);
}
if (digest) {
- drbd_csum_ee(mdev, mdev->csums_tfm, peer_req, digest);
+ drbd_csum_ee(mdev, mdev->tconn->csums_tfm, peer_req, digest);
eq = !memcmp(digest, di->digest, digest_size);
kfree(digest);
}
if (unlikely(cancel))
goto out;
- digest_size = crypto_hash_digestsize(mdev->verify_tfm);
+ digest_size = crypto_hash_digestsize(mdev->tconn->verify_tfm);
digest = kmalloc(digest_size, GFP_NOIO);
if (!digest) {
ok = 0; /* terminate the connection in case the allocation failed */
}
if (likely(!(peer_req->flags & EE_WAS_ERROR)))
- drbd_csum_ee(mdev, mdev->verify_tfm, peer_req, digest);
+ drbd_csum_ee(mdev, mdev->tconn->verify_tfm, peer_req, digest);
else
memset(digest, 0, digest_size);
di = peer_req->digest;
if (likely((peer_req->flags & EE_WAS_ERROR) == 0)) {
- digest_size = crypto_hash_digestsize(mdev->verify_tfm);
+ digest_size = crypto_hash_digestsize(mdev->tconn->verify_tfm);
digest = kmalloc(digest_size, GFP_NOIO);
if (digest) {
- drbd_csum_ee(mdev, mdev->verify_tfm, peer_req, digest);
+ drbd_csum_ee(mdev, mdev->tconn->verify_tfm, peer_req, digest);
D_ASSERT(digest_size == di->digest_size);
eq = !memcmp(digest, di->digest, digest_size);
struct drbd_conf *odev = mdev;
while (1) {
- if (odev->sync_conf.after == -1)
+ if (odev->ldev->dc.resync_after == -1)
return 1;
- odev = minor_to_mdev(odev->sync_conf.after);
+ odev = minor_to_mdev(odev->ldev->dc.resync_after);
if (!expect(odev))
return 1;
if ((odev->state.conn >= C_SYNC_SOURCE &&
return ERR_SYNC_AFTER_CYCLE;
/* dependency chain ends here, no cycles. */
- if (odev->sync_conf.after == -1)
+ if (odev->ldev->dc.resync_after == -1)
return NO_ERROR;
/* follow the dependency chain */
- odev = minor_to_mdev(odev->sync_conf.after);
+ odev = minor_to_mdev(odev->ldev->dc.resync_after);
}
}
write_lock_irq(&global_state_lock);
retcode = sync_after_error(mdev, na);
if (retcode == NO_ERROR) {
- mdev->sync_conf.after = na;
+ mdev->ldev->dc.resync_after = na;
do {
changes = _drbd_pause_after(mdev);
changes |= _drbd_resume_next(mdev);
struct drbd_work *w = NULL;
struct drbd_conf *mdev;
LIST_HEAD(work_list);
- int minor, intr = 0;
+ int vnr, intr = 0;
while (get_t_state(thi) == RUNNING) {
drbd_thread_current_set_cpu(thi);
spin_unlock_irq(&tconn->data.work.q_lock);
drbd_thread_stop(&tconn->receiver);
- idr_for_each_entry(&tconn->volumes, mdev, minor) {
+ idr_for_each_entry(&tconn->volumes, mdev, vnr) {
D_ASSERT(mdev->state.disk == D_DISKLESS && mdev->state.conn == C_STANDALONE);
/* _drbd_set_state only uses stop_nowait.
* wait here for the exiting receiver. */
)
GENL_struct(DRBD_NLA_DISK_CONF, 3, disk_conf,
- __u64_field(1, GENLA_F_MANDATORY, disk_size)
- __str_field(2, GENLA_F_REQUIRED, backing_dev, 128)
- __str_field(3, GENLA_F_REQUIRED, meta_dev, 128)
- __u32_field(4, GENLA_F_REQUIRED, meta_dev_idx)
- __u32_field(5, GENLA_F_MANDATORY, max_bio_bvecs)
+ __str_field(1, GENLA_F_REQUIRED | GENLA_F_INVARIANT, backing_dev, 128)
+ __str_field(2, GENLA_F_REQUIRED | GENLA_F_INVARIANT, meta_dev, 128)
+ __u32_field(3, GENLA_F_REQUIRED | GENLA_F_INVARIANT, meta_dev_idx)
+
+ /* use the resize command to try and change the disk_size */
+ __u64_field(4, GENLA_F_MANDATORY | GENLA_F_INVARIANT, disk_size)
+ /* we could change the max_bio_bvecs,
+ * but it won't propagate through the stack */
+ __u32_field(5, GENLA_F_MANDATORY | GENLA_F_INVARIANT, max_bio_bvecs)
+
__u32_field(6, GENLA_F_MANDATORY, on_io_error)
__u32_field(7, GENLA_F_MANDATORY, fencing)
- __flg_field(8, GENLA_F_MANDATORY, no_disk_barrier)
- __flg_field(9, GENLA_F_MANDATORY, no_disk_flush)
- __flg_field(10, GENLA_F_MANDATORY, no_disk_drain)
- __flg_field(11, GENLA_F_MANDATORY, no_md_flush)
- __flg_field(12, GENLA_F_MANDATORY, use_bmbv)
+
+ __u32_field(8, GENLA_F_MANDATORY, resync_rate)
+ __u32_field(9, GENLA_F_MANDATORY, resync_after)
+ __u32_field(10, GENLA_F_MANDATORY, al_extents)
+ __u32_field(11, GENLA_F_MANDATORY, c_plan_ahead)
+ __u32_field(12, GENLA_F_MANDATORY, c_delay_target)
+ __u32_field(13, GENLA_F_MANDATORY, c_fill_target)
+ __u32_field(14, GENLA_F_MANDATORY, c_max_rate)
+ __u32_field(15, GENLA_F_MANDATORY, c_min_rate)
+
+ __flg_field(16, GENLA_F_MANDATORY, no_disk_barrier)
+ __flg_field(17, GENLA_F_MANDATORY, no_disk_flush)
+ __flg_field(18, GENLA_F_MANDATORY, no_disk_drain)
+ __flg_field(19, GENLA_F_MANDATORY, no_md_flush)
+
)
-GENL_struct(DRBD_NLA_SYNCER_CONF, 4, syncer_conf,
- __u32_field(1, GENLA_F_MANDATORY, rate)
- __u32_field(2, GENLA_F_MANDATORY, after)
- __u32_field(3, GENLA_F_MANDATORY, al_extents)
- __str_field(4, GENLA_F_MANDATORY, cpu_mask, 32)
- __str_field(5, GENLA_F_MANDATORY, verify_alg, SHARED_SECRET_MAX)
- __str_field(6, GENLA_F_MANDATORY, csums_alg, SHARED_SECRET_MAX)
- __flg_field(7, GENLA_F_MANDATORY, use_rle)
- __u32_field(8, GENLA_F_MANDATORY, on_no_data)
- __u32_field(9, GENLA_F_MANDATORY, c_plan_ahead)
- __u32_field(10, GENLA_F_MANDATORY, c_delay_target)
- __u32_field(11, GENLA_F_MANDATORY, c_fill_target)
- __u32_field(12, GENLA_F_MANDATORY, c_max_rate)
- __u32_field(13, GENLA_F_MANDATORY, c_min_rate)
+GENL_struct(DRBD_NLA_RESOURCE_OPTS, 4, res_opts,
+ __str_field(1, GENLA_F_MANDATORY, cpu_mask, 32)
+ __u32_field(2, GENLA_F_MANDATORY, on_no_data)
)
GENL_struct(DRBD_NLA_NET_CONF, 5, net_conf,
- __str_field(1, GENLA_F_MANDATORY | GENLA_F_SENSITIVE,
+ __bin_field(1, GENLA_F_REQUIRED | GENLA_F_INVARIANT, my_addr, 128)
+ __bin_field(2, GENLA_F_REQUIRED | GENLA_F_INVARIANT, peer_addr, 128)
+ __str_field(3, GENLA_F_MANDATORY | GENLA_F_SENSITIVE,
shared_secret, SHARED_SECRET_MAX)
- __str_field(2, GENLA_F_MANDATORY, cram_hmac_alg, SHARED_SECRET_MAX)
- __str_field(3, GENLA_F_MANDATORY, integrity_alg, SHARED_SECRET_MAX)
- __str_field(4, GENLA_F_REQUIRED, my_addr, 128)
- __str_field(5, GENLA_F_REQUIRED, peer_addr, 128)
- __u32_field(6, GENLA_F_REQUIRED, wire_protocol)
- __u32_field(7, GENLA_F_MANDATORY, try_connect_int)
- __u32_field(8, GENLA_F_MANDATORY, timeout)
- __u32_field(9, GENLA_F_MANDATORY, ping_int)
- __u32_field(10, GENLA_F_MANDATORY, ping_timeo)
- __u32_field(11, GENLA_F_MANDATORY, sndbuf_size)
- __u32_field(12, GENLA_F_MANDATORY, rcvbuf_size)
- __u32_field(13, GENLA_F_MANDATORY, ko_count)
- __u32_field(14, GENLA_F_MANDATORY, max_buffers)
- __u32_field(15, GENLA_F_MANDATORY, max_epoch_size)
- __u32_field(16, GENLA_F_MANDATORY, unplug_watermark)
- __u32_field(17, GENLA_F_MANDATORY, after_sb_0p)
- __u32_field(18, GENLA_F_MANDATORY, after_sb_1p)
- __u32_field(19, GENLA_F_MANDATORY, after_sb_2p)
- __u32_field(20, GENLA_F_MANDATORY, rr_conflict)
- __u32_field(21, GENLA_F_MANDATORY, on_congestion)
- __u32_field(22, GENLA_F_MANDATORY, cong_fill)
- __u32_field(23, GENLA_F_MANDATORY, cong_extents)
- __flg_field(24, GENLA_F_MANDATORY, two_primaries)
- __flg_field(25, GENLA_F_MANDATORY, want_lose)
- __flg_field(26, GENLA_F_MANDATORY, no_cork)
- __flg_field(27, GENLA_F_MANDATORY, always_asbp)
- __flg_field(28, GENLA_F_MANDATORY, dry_run)
+ __str_field(4, GENLA_F_MANDATORY, cram_hmac_alg, SHARED_SECRET_MAX)
+ __str_field(5, GENLA_F_MANDATORY, integrity_alg, SHARED_SECRET_MAX)
+ __str_field(6, GENLA_F_MANDATORY, verify_alg, SHARED_SECRET_MAX)
+ __str_field(7, GENLA_F_MANDATORY, csums_alg, SHARED_SECRET_MAX)
+ __u32_field(8, GENLA_F_MANDATORY, wire_protocol)
+ __u32_field(9, GENLA_F_MANDATORY, try_connect_int)
+ __u32_field(10, GENLA_F_MANDATORY, timeout)
+ __u32_field(11, GENLA_F_MANDATORY, ping_int)
+ __u32_field(12, GENLA_F_MANDATORY, ping_timeo)
+ __u32_field(13, GENLA_F_MANDATORY, sndbuf_size)
+ __u32_field(14, GENLA_F_MANDATORY, rcvbuf_size)
+ __u32_field(15, GENLA_F_MANDATORY, ko_count)
+ __u32_field(16, GENLA_F_MANDATORY, max_buffers)
+ __u32_field(17, GENLA_F_MANDATORY, max_epoch_size)
+ __u32_field(18, GENLA_F_MANDATORY, unplug_watermark)
+ __u32_field(19, GENLA_F_MANDATORY, after_sb_0p)
+ __u32_field(20, GENLA_F_MANDATORY, after_sb_1p)
+ __u32_field(21, GENLA_F_MANDATORY, after_sb_2p)
+ __u32_field(22, GENLA_F_MANDATORY, rr_conflict)
+ __u32_field(23, GENLA_F_MANDATORY, on_congestion)
+ __u32_field(24, GENLA_F_MANDATORY, cong_fill)
+ __u32_field(25, GENLA_F_MANDATORY, cong_extents)
+ __flg_field(26, GENLA_F_MANDATORY, two_primaries)
+ __flg_field(27, GENLA_F_MANDATORY | GENLA_F_INVARIANT, want_lose)
+ __flg_field(28, GENLA_F_MANDATORY, no_cork)
+ __flg_field(29, GENLA_F_MANDATORY, always_asbp)
+ __flg_field(30, GENLA_F_MANDATORY | GENLA_F_INVARIANT, dry_run)
+ __flg_field(31, GENLA_F_MANDATORY, use_rle)
)
GENL_struct(DRBD_NLA_SET_ROLE_PARMS, 6, set_role_parms,
GENL_op(DRBD_ADM_DEL_LINK, 8, GENL_doit(drbd_adm_delete_connection),
GENL_tla_expected(DRBD_NLA_CFG_CONTEXT, GENLA_F_REQUIRED))
- /* operates on replication links */
-GENL_op(DRBD_ADM_SYNCER, 9,
- GENL_doit(drbd_adm_syncer),
+GENL_op(DRBD_ADM_RESOURCE_OPTS, 9,
+ GENL_doit(drbd_adm_resource_opts),
GENL_tla_expected(DRBD_NLA_CFG_CONTEXT, GENLA_F_REQUIRED)
- GENL_tla_expected(DRBD_NLA_SYNCER_CONF, GENLA_F_MANDATORY)
+ GENL_tla_expected(DRBD_NLA_RESOURCE_OPTS, GENLA_F_MANDATORY)
)
GENL_op(
GENL_tla_expected(DRBD_NLA_NET_CONF, GENLA_F_REQUIRED)
)
+GENL_op(
+ DRBD_ADM_CHG_NET_OPTS, 29,
+ GENL_doit(drbd_adm_net_opts),
+ GENL_tla_expected(DRBD_NLA_CFG_CONTEXT, GENLA_F_REQUIRED)
+ GENL_tla_expected(DRBD_NLA_NET_CONF, GENLA_F_REQUIRED)
+)
+
GENL_op(DRBD_ADM_DISCONNECT, 11, GENL_doit(drbd_adm_disconnect),
GENL_tla_expected(DRBD_NLA_CFG_CONTEXT, GENLA_F_REQUIRED))
- /* operates on minors */
GENL_op(DRBD_ADM_ATTACH, 12,
GENL_doit(drbd_adm_attach),
GENL_tla_expected(DRBD_NLA_CFG_CONTEXT, GENLA_F_REQUIRED)
GENL_tla_expected(DRBD_NLA_DISK_CONF, GENLA_F_REQUIRED)
)
+GENL_op(DRBD_ADM_CHG_DISK_OPTS, 28,
+ GENL_doit(drbd_adm_disk_opts),
+ GENL_tla_expected(DRBD_NLA_CFG_CONTEXT, GENLA_F_REQUIRED)
+ GENL_tla_expected(DRBD_NLA_DISK_OPTS, GENLA_F_REQUIRED)
+)
+
GENL_op(
DRBD_ADM_RESIZE, 13,
GENL_doit(drbd_adm_resize),
GENL_tla_expected(DRBD_NLA_RESIZE_PARMS, GENLA_F_MANDATORY)
)
- /* operates on all volumes within a resource */
GENL_op(
DRBD_ADM_PRIMARY, 14,
GENL_doit(drbd_adm_set_role),
#define DRBD_CONG_EXTENTS_MAX DRBD_AL_EXTENTS_MAX
#define DRBD_CONG_EXTENTS_DEF DRBD_AL_EXTENTS_DEF
+#define DRBD_PROTOCOL_DEF DRBD_PROT_C
+
#undef RANGE
#endif
#undef GENL_struct
#define GENL_struct(tag_name, tag_number, s_name, s_fields) \
- /* static, potentially unused */ \
-int s_name ## _from_attrs(struct s_name *s, struct nlattr *tb[]) \
+/* *_from_attrs functions are static, but potentially unused */ \
+static int __ ## s_name ## _from_attrs(struct s_name *s, \
+ struct genl_info *info, bool exclude_invariants) \
{ \
const int maxtype = ARRAY_SIZE(s_name ## _nl_policy)-1; \
- struct nlattr *tla = tb[tag_number]; \
+ struct nlattr *tla = info->attrs[tag_number]; \
struct nlattr **ntb = nested_attr_tb; \
struct nlattr *nla; \
int err; \
\
s_fields \
return 0; \
-}
+} __attribute__((unused)) \
+static int s_name ## _from_attrs(struct s_name *s, \
+ struct genl_info *info) \
+{ \
+ return __ ## s_name ## _from_attrs(s, info, false); \
+} __attribute__((unused)) \
+static int s_name ## _from_attrs_for_change(struct s_name *s, \
+ struct genl_info *info) \
+{ \
+ return __ ## s_name ## _from_attrs(s, info, true); \
+} __attribute__((unused)) \
-#undef __field
-#define __field(attr_nr, attr_flag, name, nla_type, type, __get, __put) \
+#define __assign(attr_nr, attr_flag, name, nla_type, type, assignment...) \
nla = ntb[__nla_type(attr_nr)]; \
if (nla) { \
- if (s) \
- s->name = __get(nla); \
- DPRINT_FIELD("<<", nla_type, name, s, nla); \
+ if (exclude_invariants && ((attr_flag) & GENLA_F_INVARIANT)) { \
+ pr_info("<< must not change invariant attr: %s\n", #name); \
+ return -EEXIST; \
+ } \
+ assignment; \
+ } else if (exclude_invariants && ((attr_flag) & GENLA_F_INVARIANT)) { \
+ /* attribute missing from payload, */ \
+ /* which was expected */ \
} else if ((attr_flag) & GENLA_F_REQUIRED) { \
pr_info("<< missing attr: %s\n", #name); \
return -ENOMSG; \
}
+#undef __field
+#define __field(attr_nr, attr_flag, name, nla_type, type, __get, __put) \
+ __assign(attr_nr, attr_flag, name, nla_type, type, \
+ if (s) \
+ s->name = __get(nla); \
+ DPRINT_FIELD("<<", nla_type, name, s, nla))
+
/* validate_nla() already checked nla_len <= maxlen appropriately. */
#undef __array
#define __array(attr_nr, attr_flag, name, nla_type, type, maxlen, __get, __put) \
- nla = ntb[__nla_type(attr_nr)]; \
- if (nla) { \
+ __assign(attr_nr, attr_flag, name, nla_type, type, \
if (s) \
s->name ## _len = \
__get(s->name, nla, maxlen); \
- DPRINT_ARRAY("<<", nla_type, name, s, nla); \
- } else if ((attr_flag) & GENLA_F_REQUIRED) { \
- pr_info("<< missing attr: %s\n", #name); \
- return -ENOMSG; \
- } \
+ DPRINT_ARRAY("<<", nla_type, name, s, nla))
#include GENL_MAGIC_INCLUDE_FILE
GENLA_F_MANDATORY = 1 << 14,
GENLA_F_REQUIRED = 1 << 15,
- /* This will not be present in the __u16 .nla_type, but can be
- * triggered on in <struct>_to_skb, to exclude "sensitive"
- * information from broadcasts, or on unpriviledged get requests.
- * This is useful because genetlink multicast groups can be listened in
- * on by anyone. */
+ /* Below will not be present in the __u16 .nla_type, but can be
+ * triggered on in <struct>_to_skb resp. <struct>_from_attrs */
+
+ /* To exclude "sensitive" information from broadcasts, or on
+ * unpriviledged get requests. This is useful because genetlink
+ * multicast groups can be listened in on by anyone. */
GENLA_F_SENSITIVE = 1 << 16,
+
+ /* INVARIAN options cannot be changed at runtime.
+ * Useful to share an attribute policy and struct definition,
+ * between some "create" and "change" commands,
+ * but disallow certain fields to be changed online.
+ */
+ GENLA_F_INVARIANT = 1 << 17,
};
#define __nla_type(x) ((__u16)((__u16)(x) & (__u16)NLA_TYPE_MASK))
projects / deliverable / linux.git / commitdiff
