#define HALF_SEC (CFS_HZ >> 1)
+#define OSD_OTABLE_MAX_HASH 0x00000000ffffffffULL
+
#define SCRUB_NEXT_BREAK 1 /* exit current loop and process next group */
#define SCRUB_NEXT_CONTINUE 2 /* skip current object and process next bit */
#define SCRUB_NEXT_EXIT 3 /* exit all the loops */
#define SCRUB_IT_CRASH 2
static int osd_inode_iteration(struct osd_thread_info *info,
- struct osd_device *dev, __u32 max, int preload)
+ struct osd_device *dev, __u32 max, bool preload)
{
osd_iit_next_policy next;
osd_iit_exec_policy exec;
int rc;
ENTRY;
- if (preload == 0) {
+ if (!preload) {
struct osd_scrub *scrub = &dev->od_scrub;
next = osd_scrub_next;
brelse(param.bitmap);
RETURN(rc);
}
+
+ if (preload && dev->od_otable_it->ooi_stopping) {
+ brelse(param.bitmap);
+ RETURN(0);
+ }
}
next_group:
brelse(param.bitmap);
+
+ if (preload && dev->od_otable_it->ooi_stopping)
+ RETURN(0);
}
if (*pos > limit)
ENTRY;
rc = osd_inode_iteration(osd_oti_get(env), dev,
- OSD_OTABLE_IT_CACHE_SIZE, 1);
+ OSD_OTABLE_IT_CACHE_SIZE, true);
if (rc == SCRUB_IT_ALL)
it->ooi_all_cached = 1;
CDEBUG(D_LFSCK, "OI scrub: flags = 0x%x, pos = %u\n",
scrub->os_start_flags, scrub->os_pos_current);
- rc = osd_inode_iteration(osd_oti_get(&env), dev, ~0U, 0);
+ rc = osd_inode_iteration(osd_oti_get(&env), dev, ~0U, false);
if (unlikely(rc == SCRUB_IT_CRASH))
GOTO(out, rc = -EINVAL);
GOTO(post, rc);
dev->od_otable_it = it;
it->ooi_dev = dev;
+ it->ooi_pid = cfs_curproc_pid();
it->ooi_cache.ooc_consumer_idx = -1;
if (flags & DOIF_OUTUSED)
it->ooi_used_outside = 1;
}
rc = do_osd_scrub_start(dev, start);
- if (rc == -EALREADY) {
- it->ooi_cache.ooc_pos_preload = scrub->os_pos_current - 1;
- } else if (rc < 0) {
+ if (rc < 0 && rc != -EALREADY) {
dev->od_otable_it = NULL;
OBD_FREE_PTR(it);
- GOTO(out, it = ERR_PTR(-EALREADY));
- } else {
- it->ooi_cache.ooc_pos_preload = scrub->os_pos_current;
+ GOTO(out, it = ERR_PTR(rc));
}
+ it->ooi_cache.ooc_pos_preload = scrub->os_pos_current;
+
GOTO(out, it);
out:
OBD_FREE_PTR(it);
}
-/**
- * XXX: Temporary used to notify otable iteration to be paused.
- */
-static void osd_otable_it_put(const struct lu_env *env, struct dt_it *di)
+static int osd_otable_it_get(const struct lu_env *env,
+ struct dt_it *di, const struct dt_key *key)
{
- struct osd_device *dev = ((struct osd_otable_it *)di)->ooi_dev;
-
- /* od_otable_mutex: prevent curcurrent init/fini */
- mutex_lock(&dev->od_otable_mutex);
- dev->od_scrub.os_paused = 1;
- mutex_unlock(&dev->od_otable_mutex);
+ return 0;
}
/**
- * Set the OSD layer iteration start position as the specified key.
+ * It is hack here:
*
- * The LFSCK out of OSD layer does not know the detail of the key, so if there
- * are several keys, they cannot be compared out of OSD, so call "::get()" for
- * each key, and OSD will select the smallest one by itself.
+ * Sometimes the otable-based iteration driver (LFSCK) may be blocked in OSD
+ * layer when someone wants to stop/pause the iteration. Under such case, we
+ * need some mechanism to notify the event and wakeup the blocker.
*/
-static int osd_otable_it_get(const struct lu_env *env,
- struct dt_it *di, const struct dt_key *key)
+static void osd_otable_it_put(const struct lu_env *env, struct dt_it *di)
{
- struct osd_otable_it *it = (struct osd_otable_it *)di;
- struct osd_otable_cache *ooc = &it->ooi_cache;
- const char *str = (const char *)key;
- __u32 ino;
- ENTRY;
-
- /* Forbid to set iteration position after iteration started. */
- if (it->ooi_user_ready)
- RETURN(-EPERM);
-
- if (str[0] == '\0')
- RETURN(-EINVAL);
-
- if (sscanf(str, "%u", &ino) <= 0)
- RETURN(-EINVAL);
+ struct osd_otable_it *it = (struct osd_otable_it *)di;
+ struct osd_device *dev = it->ooi_dev;
- /* Skip the one that has been processed last time. */
- if (ooc->ooc_pos_preload > ++ino)
- ooc->ooc_pos_preload = ino;
+ /* od_otable_mutex: prevent curcurrent init/fini */
+ mutex_lock(&dev->od_otable_mutex);
+ if (it->ooi_pid == cfs_curproc_pid()) {
+ dev->od_scrub.os_paused = 1;
+ } else {
+ struct ptlrpc_thread *thread = &dev->od_scrub.os_thread;
- RETURN(0);
+ it->ooi_stopping = 1;
+ if (it->ooi_waiting)
+ cfs_waitq_broadcast(&thread->t_ctl_waitq);
+ }
+ mutex_unlock(&dev->od_otable_mutex);
}
static int osd_otable_it_next(const struct lu_env *env, struct dt_it *di)
it->ooi_waiting = 1;
l_wait_event(thread->t_ctl_waitq,
ooc->ooc_pos_preload < scrub->os_pos_current ||
- !thread_is_running(thread),
+ !thread_is_running(thread) ||
+ it->ooi_stopping,
&lwi);
it->ooi_waiting = 0;
if (!thread_is_running(thread) && !it->ooi_used_outside)
RETURN(1);
+ if (it->ooi_stopping)
+ RETURN(0);
+
rc = osd_otable_it_preload(env, it);
if (rc >= 0)
goto again;
static struct dt_key *osd_otable_it_key(const struct lu_env *env,
const struct dt_it *di)
{
- struct osd_otable_it *it = (struct osd_otable_it *)di;
- struct osd_otable_cache *ooc = &it->ooi_cache;
-
- sprintf(it->ooi_key, "%u",
- ooc->ooc_cache[ooc->ooc_consumer_idx].oic_lid.oii_ino);
- return (struct dt_key *)it->ooi_key;
+ return NULL;
}
static int osd_otable_it_key_size(const struct lu_env *env,
const struct dt_it *di)
{
- return sizeof(((struct osd_otable_it *)di)->ooi_key);
+ return sizeof(__u64);
}
static int osd_otable_it_rec(const struct lu_env *env, const struct dt_it *di,
return 0;
}
+static __u64 osd_otable_it_store(const struct lu_env *env,
+ const struct dt_it *di)
+{
+ struct osd_otable_it *it = (struct osd_otable_it *)di;
+ struct osd_otable_cache *ooc = &it->ooi_cache;
+ __u64 hash;
+
+ if (it->ooi_user_ready)
+ hash = ooc->ooc_pos_preload;
+ else
+ hash = ooc->ooc_cache[ooc->ooc_consumer_idx].oic_lid.oii_ino;
+ return hash;
+}
+
+/**
+ * Set the OSD layer iteration start position as the specified hash.
+ */
static int osd_otable_it_load(const struct lu_env *env,
const struct dt_it *di, __u64 hash)
{
struct osd_device *dev = it->ooi_dev;
struct osd_otable_cache *ooc = &it->ooi_cache;
struct osd_scrub *scrub = &dev->od_scrub;
+ int rc;
+ ENTRY;
+ /* Forbid to set iteration position after iteration started. */
if (it->ooi_user_ready)
- return 0;
+ RETURN(-EPERM);
+
+ if (hash > OSD_OTABLE_MAX_HASH)
+ hash = OSD_OTABLE_MAX_HASH;
+
+ /* Skip the one that has been processed last time. */
+ if (ooc->ooc_pos_preload > hash)
+ ooc->ooc_pos_preload = hash;
if (ooc->ooc_pos_preload <= LDISKFS_FIRST_INO(osd_sb(dev)))
ooc->ooc_pos_preload = LDISKFS_FIRST_INO(osd_sb(dev)) + 1;
+
it->ooi_user_ready = 1;
if (!scrub->os_full_speed)
cfs_waitq_broadcast(&scrub->os_thread.t_ctl_waitq);
/* Unplug OSD layer iteration by the first next() call. */
- return osd_otable_it_next(env, (struct dt_it *)it);
+ rc = osd_otable_it_next(env, (struct dt_it *)it);
+
+ RETURN(rc);
+}
+
+static int osd_otable_it_key_rec(const struct lu_env *env,
+ const struct dt_it *di, void *key_rec)
+{
+ return 0;
}
const struct dt_index_operations osd_otable_ops = {
.dio_it = {
.init = osd_otable_it_init,
.fini = osd_otable_it_fini,
- .put = osd_otable_it_put,
.get = osd_otable_it_get,
+ .put = osd_otable_it_put,
.next = osd_otable_it_next,
- .key = osd_otable_it_key,
+ .key = osd_otable_it_key,
.key_size = osd_otable_it_key_size,
.rec = osd_otable_it_rec,
+ .store = osd_otable_it_store,
.load = osd_otable_it_load,
+ .key_rec = osd_otable_it_key_rec,
}
};
git://git.whamcloud.com / fs / lustre-release.git / commitdiff