Whamcloud - gitweb
EX-8270 ptlrpc: rename 'epp' to 'ppp'
authorPatrick Farrell <pfarrell@whamcloud.com>
Sat, 16 Sep 2023 04:04:26 +0000 (00:04 -0400)
committerAndreas Dilger <adilger@whamcloud.com>
Fri, 22 Sep 2023 23:53:34 +0000 (23:53 +0000)
Finish removing 'encryption' from page pool names except
for the module parameter, which is exposed in configuration
and so can't be changed.

Test-Parameters: trivial
Signed-off-by: Patrick Farrell <pfarrell@whamcloud.com>
Change-Id: I1c14f6cf8cf1a19d89b5a7787aac1b67203866d3
Reviewed-on: https://review.whamcloud.com/c/ex/lustre-release/+/52431
Tested-by: jenkins <devops@whamcloud.com>
Tested-by: Maloo <maloo@whamcloud.com>
Reviewed-by: Andreas Dilger <adilger@whamcloud.com>
lustre/ptlrpc/sec_bulk.c

index 8a28056..abcc666 100644 (file)
@@ -74,16 +74,16 @@ MODULE_PARM_DESC(enc_pool_max_memory_mb,
 #define CACHE_QUIESCENT_PERIOD  (20)
 
 static struct ptlrpc_page_pool {
-       unsigned long epp_max_pages;   /* maximum pages can hold, const */
-       unsigned int epp_max_pools;   /* number of pools, const */
+       unsigned long ppp_max_pages;   /* maximum pages can hold, const */
+       unsigned int ppp_max_pools;   /* number of pools, const */
 
        /*
         * wait queue in case of not enough free pages.
         */
-       wait_queue_head_t epp_waitq;   /* waiting threads */
-       unsigned int epp_waitqlen;    /* wait queue length */
-       unsigned long epp_pages_short; /* # of pages wanted of in-q users */
-       unsigned int epp_growing:1;   /* during adding pages */
+       wait_queue_head_t ppp_waitq;   /* waiting threads */
+       unsigned int ppp_waitqlen;    /* wait queue length */
+       unsigned long ppp_pages_short; /* # of pages wanted of in-q users */
+       unsigned int ppp_growing:1;   /* during adding pages */
 
        /*
         * indicating how idle the pools are, from 0 to MAX_IDLE_IDX
@@ -92,32 +92,32 @@ static struct ptlrpc_page_pool {
         * is idled for a while but the idle_idx might still be low if no
         * activities happened in the pools.
         */
-       unsigned long epp_idle_idx;
+       unsigned long ppp_idle_idx;
 
        /* last shrink time due to mem tight */
-       time64_t epp_last_shrink;
-       time64_t epp_last_access;
+       time64_t ppp_last_shrink;
+       time64_t ppp_last_access;
 
        /* in-pool pages bookkeeping */
-       spinlock_t epp_lock; /* protect following fields */
-       unsigned long epp_total_pages; /* total pages in pools */
-       unsigned long epp_free_pages;  /* current pages available */
+       spinlock_t ppp_lock; /* protect following fields */
+       unsigned long ppp_total_pages; /* total pages in pools */
+       unsigned long ppp_free_pages;  /* current pages available */
 
        /* statistics */
-       unsigned long epp_st_max_pages;      /* # of pages ever reached */
-       unsigned int epp_st_grows;          /* # of grows */
-       unsigned int epp_st_grow_fails;     /* # of add pages failures */
-       unsigned int epp_st_shrinks;        /* # of shrinks */
-       unsigned long epp_st_access;         /* # of access */
-       unsigned long epp_st_missings;       /* # of cache missing */
-       unsigned long epp_st_lowfree;        /* lowest free pages reached */
-       unsigned int epp_st_max_wqlen;      /* highest waitqueue length */
-       ktime_t epp_st_max_wait; /* in nanoseconds */
-       unsigned long epp_st_outofmem; /* # of out of mem requests */
+       unsigned long ppp_st_max_pages;      /* # of pages ever reached */
+       unsigned int ppp_st_grows;          /* # of grows */
+       unsigned int ppp_st_grow_fails;     /* # of add pages failures */
+       unsigned int ppp_st_shrinks;        /* # of shrinks */
+       unsigned long ppp_st_access;         /* # of access */
+       unsigned long ppp_st_missings;       /* # of cache missing */
+       unsigned long ppp_st_lowfree;        /* lowest free pages reached */
+       unsigned int ppp_st_max_wqlen;      /* highest waitqueue length */
+       ktime_t ppp_st_max_wait; /* in nanoseconds */
+       unsigned long ppp_st_outofmem; /* # of out of mem requests */
        /*
         * pointers to pools, may be vmalloc'd
         */
-       void ***epp_pools;
+       void ***ppp_pools;
        /*
         * memory shrinker
         */
@@ -130,7 +130,7 @@ static struct ptlrpc_page_pool {
  */
 int encrypt_page_pools_seq_show(struct seq_file *m, void *v)
 {
-       spin_lock(&page_pools[PAGES_POOL]->epp_lock);
+       spin_lock(&page_pools[PAGES_POOL]->ppp_lock);
        seq_printf(m, "physical pages:          %lu\n"
                "pages per pool:          %lu\n"
                "max pages:               %lu\n"
@@ -151,24 +151,24 @@ int encrypt_page_pools_seq_show(struct seq_file *m, void *v)
                "max wait time ms:        %lld\n"
                "out of mem:              %lu\n",
                cfs_totalram_pages(), PAGES_PER_POOL,
-               page_pools[PAGES_POOL]->epp_max_pages,
-               page_pools[PAGES_POOL]->epp_max_pools,
-               page_pools[PAGES_POOL]->epp_total_pages,
-               page_pools[PAGES_POOL]->epp_free_pages,
-               page_pools[PAGES_POOL]->epp_idle_idx,
-               ktime_get_seconds() - page_pools[PAGES_POOL]->epp_last_shrink,
-               ktime_get_seconds() - page_pools[PAGES_POOL]->epp_last_access,
-               page_pools[PAGES_POOL]->epp_st_max_pages,
-               page_pools[PAGES_POOL]->epp_st_grows,
-               page_pools[PAGES_POOL]->epp_st_grow_fails,
-               page_pools[PAGES_POOL]->epp_st_shrinks,
-               page_pools[PAGES_POOL]->epp_st_access,
-               page_pools[PAGES_POOL]->epp_st_missings,
-               page_pools[PAGES_POOL]->epp_st_lowfree,
-               page_pools[PAGES_POOL]->epp_st_max_wqlen,
-               ktime_to_ms(page_pools[PAGES_POOL]->epp_st_max_wait),
-               page_pools[PAGES_POOL]->epp_st_outofmem);
-       spin_unlock(&page_pools[PAGES_POOL]->epp_lock);
+               page_pools[PAGES_POOL]->ppp_max_pages,
+               page_pools[PAGES_POOL]->ppp_max_pools,
+               page_pools[PAGES_POOL]->ppp_total_pages,
+               page_pools[PAGES_POOL]->ppp_free_pages,
+               page_pools[PAGES_POOL]->ppp_idle_idx,
+               ktime_get_seconds() - page_pools[PAGES_POOL]->ppp_last_shrink,
+               ktime_get_seconds() - page_pools[PAGES_POOL]->ppp_last_access,
+               page_pools[PAGES_POOL]->ppp_st_max_pages,
+               page_pools[PAGES_POOL]->ppp_st_grows,
+               page_pools[PAGES_POOL]->ppp_st_grow_fails,
+               page_pools[PAGES_POOL]->ppp_st_shrinks,
+               page_pools[PAGES_POOL]->ppp_st_access,
+               page_pools[PAGES_POOL]->ppp_st_missings,
+               page_pools[PAGES_POOL]->ppp_st_lowfree,
+               page_pools[PAGES_POOL]->ppp_st_max_wqlen,
+               ktime_to_ms(page_pools[PAGES_POOL]->ppp_st_max_wait),
+               page_pools[PAGES_POOL]->ppp_st_outofmem);
+       spin_unlock(&page_pools[PAGES_POOL]->ppp_lock);
 
        return 0;
 }
@@ -189,9 +189,9 @@ int page_pools_seq_show(struct seq_file *m, void *v)
 
        for (pool_index = 0; pool_index < POOLS_COUNT; pool_index++) {
                pool = page_pools[pool_index];
-               if (!pool->epp_st_access)
+               if (!pool->ppp_st_access)
                        continue;
-               spin_lock(&pool->epp_lock);
+               spin_lock(&pool->ppp_lock);
                seq_printf(m, "  pool_%luk:\n"
                           "    max_pages: %lu\n"
                           "    max_pools: %u\n"
@@ -212,25 +212,25 @@ int page_pools_seq_show(struct seq_file *m, void *v)
                           "    out_of_mem: %lu\n",
                           (pool_index ? ELEMENT_SIZE(pool_index - 10) :
                           PAGE_SIZE >> 10),
-                          pool->epp_max_pages,
-                          pool->epp_max_pools,
-                          pool->epp_total_pages,
-                          pool->epp_free_pages,
-                          pool->epp_idle_idx,
-                          ktime_get_seconds() - pool->epp_last_shrink,
-                          ktime_get_seconds() - pool->epp_last_access,
-                          pool->epp_st_max_pages,
-                          pool->epp_st_grows,
-                          pool->epp_st_grow_fails,
-                          pool->epp_st_shrinks,
-                          pool->epp_st_access,
-                          pool->epp_st_missings,
-                          pool->epp_st_lowfree,
-                          pool->epp_st_max_wqlen,
-                          ktime_to_ms(pool->epp_st_max_wait),
-                          pool->epp_st_outofmem);
-
-               spin_unlock(&pool->epp_lock);
+                          pool->ppp_max_pages,
+                          pool->ppp_max_pools,
+                          pool->ppp_total_pages,
+                          pool->ppp_free_pages,
+                          pool->ppp_idle_idx,
+                          ktime_get_seconds() - pool->ppp_last_shrink,
+                          ktime_get_seconds() - pool->ppp_last_access,
+                          pool->ppp_st_max_pages,
+                          pool->ppp_st_grows,
+                          pool->ppp_st_grow_fails,
+                          pool->ppp_st_shrinks,
+                          pool->ppp_st_access,
+                          pool->ppp_st_missings,
+                          pool->ppp_st_lowfree,
+                          pool->ppp_st_max_wqlen,
+                          ktime_to_ms(pool->ppp_st_max_wait),
+                          pool->ppp_st_outofmem);
+
+               spin_unlock(&pool->ppp_lock);
        }
        return 0;
 }
@@ -242,34 +242,34 @@ static void pools_release_free_pages(long npages, unsigned int pool_idx)
        struct ptlrpc_page_pool *pool = page_pools[pool_idx];
 
        LASSERT(npages > 0);
-       LASSERT(npages <= pool->epp_free_pages);
-       LASSERT(pool->epp_free_pages <= pool->epp_total_pages);
+       LASSERT(npages <= pool->ppp_free_pages);
+       LASSERT(pool->ppp_free_pages <= pool->ppp_total_pages);
 
        /* max pool index before the release */
-       p_idx_max2 = (pool->epp_total_pages - 1) / PAGES_PER_POOL;
+       p_idx_max2 = (pool->ppp_total_pages - 1) / PAGES_PER_POOL;
 
-       pool->epp_free_pages -= npages;
-       pool->epp_total_pages -= npages;
+       pool->ppp_free_pages -= npages;
+       pool->ppp_total_pages -= npages;
 
        /* max pool index after the release */
-       p_idx_max1 = pool->epp_total_pages == 0 ? -1 :
-               ((pool->epp_total_pages - 1) / PAGES_PER_POOL);
+       p_idx_max1 = pool->ppp_total_pages == 0 ? -1 :
+               ((pool->ppp_total_pages - 1) / PAGES_PER_POOL);
 
-       p_idx = pool->epp_free_pages / PAGES_PER_POOL;
-       g_idx = pool->epp_free_pages % PAGES_PER_POOL;
-       LASSERT(pool->epp_pools[p_idx]);
+       p_idx = pool->ppp_free_pages / PAGES_PER_POOL;
+       g_idx = pool->ppp_free_pages % PAGES_PER_POOL;
+       LASSERT(pool->ppp_pools[p_idx]);
 
        while (npages--) {
-               LASSERT(pool->epp_pools[p_idx]);
-               LASSERT(pool->epp_pools[p_idx][g_idx] != NULL);
+               LASSERT(pool->ppp_pools[p_idx]);
+               LASSERT(pool->ppp_pools[p_idx][g_idx] != NULL);
 
                if (pool_idx == PAGES_POOL)
-                       __free_page(pool->epp_pools[p_idx][g_idx]);
+                       __free_page(pool->ppp_pools[p_idx][g_idx]);
                else
-                       OBD_FREE_LARGE(pool->epp_pools[p_idx][g_idx],
+                       OBD_FREE_LARGE(pool->ppp_pools[p_idx][g_idx],
                                       ELEMENT_SIZE(pool_idx));
 
-               pool->epp_pools[p_idx][g_idx] = NULL;
+               pool->ppp_pools[p_idx][g_idx] = NULL;
 
                if (++g_idx == PAGES_PER_POOL) {
                        p_idx++;
@@ -279,9 +279,9 @@ static void pools_release_free_pages(long npages, unsigned int pool_idx)
 
        /* free unused pools */
        while (p_idx_max1 < p_idx_max2) {
-               LASSERT(pool->epp_pools[p_idx_max2]);
-               OBD_FREE(pool->epp_pools[p_idx_max2], PAGE_SIZE);
-               pool->epp_pools[p_idx_max2] = NULL;
+               LASSERT(pool->ppp_pools[p_idx_max2]);
+               OBD_FREE(pool->ppp_pools[p_idx_max2], PAGE_SIZE);
+               pool->ppp_pools[p_idx_max2] = NULL;
                p_idx_max2--;
        }
 }
@@ -300,18 +300,18 @@ static unsigned long pools_shrink_count(struct shrinker *s,
         * if no pool access for a long time, we consider it's fully
         * idle. A little race here is fine.
         */
-       if (unlikely(ktime_get_seconds() - pool->epp_last_access >
+       if (unlikely(ktime_get_seconds() - pool->ppp_last_access >
                     CACHE_QUIESCENT_PERIOD)) {
-               spin_lock(&pool->epp_lock);
-               pool->epp_idle_idx = IDLE_IDX_MAX;
-               spin_unlock(&pool->epp_lock);
+               spin_lock(&pool->ppp_lock);
+               pool->ppp_idle_idx = IDLE_IDX_MAX;
+               spin_unlock(&pool->ppp_lock);
        }
 
-       LASSERT(pool->epp_idle_idx <= IDLE_IDX_MAX);
+       LASSERT(pool->ppp_idle_idx <= IDLE_IDX_MAX);
 
-       return (pool->epp_free_pages <= PTLRPC_MAX_BRW_PAGES) ? 0 :
-               (pool->epp_free_pages - PTLRPC_MAX_BRW_PAGES) *
-               (IDLE_IDX_MAX - pool->epp_idle_idx) / IDLE_IDX_MAX;
+       return (pool->ppp_free_pages <= PTLRPC_MAX_BRW_PAGES) ? 0 :
+               (pool->ppp_free_pages - PTLRPC_MAX_BRW_PAGES) *
+               (IDLE_IDX_MAX - pool->ppp_idle_idx) / IDLE_IDX_MAX;
 }
 
 /*
@@ -324,34 +324,34 @@ static unsigned long pools_shrink_scan(struct shrinker *s,
        unsigned int pool_index = SEEKS_TO_INDEX(s);
        struct ptlrpc_page_pool *pool = page_pools[pool_index];
 
-       spin_lock(&pool->epp_lock);
-       if (pool->epp_free_pages <= PTLRPC_MAX_BRW_PAGES)
+       spin_lock(&pool->ppp_lock);
+       if (pool->ppp_free_pages <= PTLRPC_MAX_BRW_PAGES)
                sc->nr_to_scan = 0;
        else
                sc->nr_to_scan = min_t(unsigned long, sc->nr_to_scan,
-                             pool->epp_free_pages - PTLRPC_MAX_BRW_PAGES);
+                             pool->ppp_free_pages - PTLRPC_MAX_BRW_PAGES);
        if (sc->nr_to_scan > 0) {
                pools_release_free_pages(sc->nr_to_scan, pool_index);
                CDEBUG(D_SEC, "released %ld pages, %ld left\n",
-                      (long)sc->nr_to_scan, pool->epp_free_pages);
+                      (long)sc->nr_to_scan, pool->ppp_free_pages);
 
-               pool->epp_st_shrinks++;
-               pool->epp_last_shrink = ktime_get_seconds();
+               pool->ppp_st_shrinks++;
+               pool->ppp_last_shrink = ktime_get_seconds();
        }
-       spin_unlock(&pool->epp_lock);
+       spin_unlock(&pool->ppp_lock);
 
        /*
         * if no pool access for a long time, we consider it's fully idle.
         * a little race here is fine.
         */
-       if (unlikely(ktime_get_seconds() - pool->epp_last_access >
+       if (unlikely(ktime_get_seconds() - pool->ppp_last_access >
                     CACHE_QUIESCENT_PERIOD)) {
-               spin_lock(&pool->epp_lock);
-               pool->epp_idle_idx = IDLE_IDX_MAX;
-               spin_unlock(&pool->epp_lock);
+               spin_lock(&pool->ppp_lock);
+               pool->ppp_idle_idx = IDLE_IDX_MAX;
+               spin_unlock(&pool->ppp_lock);
        }
 
-       LASSERT(pool->epp_idle_idx <= IDLE_IDX_MAX);
+       LASSERT(pool->ppp_idle_idx <= IDLE_IDX_MAX);
 
        return sc->nr_to_scan;
 }
@@ -421,11 +421,11 @@ static void pools_insert(void ***pools, int npools, int npages,
        struct ptlrpc_page_pool *page_pool = page_pools[pool_idx];
 
        LASSERT(npages > 0);
-       LASSERT(page_pool->epp_total_pages+npages <= page_pool->epp_max_pages);
+       LASSERT(page_pool->ppp_total_pages+npages <= page_pool->ppp_max_pages);
        LASSERT(npages_to_npools(npages) == npools);
-       LASSERT(page_pool->epp_growing);
+       LASSERT(page_pool->ppp_growing);
 
-       spin_lock(&page_pool->epp_lock);
+       spin_lock(&page_pool->ppp_lock);
 
        /*
         * (1) fill all the free slots of current pools.
@@ -434,21 +434,21 @@ static void pools_insert(void ***pools, int npools, int npages,
         * free slots are those left by rent pages, and the extra ones with
         * index >= total_pages, locate at the tail of last pool.
         */
-       freeslot = page_pool->epp_total_pages % PAGES_PER_POOL;
+       freeslot = page_pool->ppp_total_pages % PAGES_PER_POOL;
        if (freeslot != 0)
                freeslot = PAGES_PER_POOL - freeslot;
-       freeslot += page_pool->epp_total_pages - page_pool->epp_free_pages;
+       freeslot += page_pool->ppp_total_pages - page_pool->ppp_free_pages;
 
-       op_idx = page_pool->epp_free_pages / PAGES_PER_POOL;
-       og_idx = page_pool->epp_free_pages % PAGES_PER_POOL;
+       op_idx = page_pool->ppp_free_pages / PAGES_PER_POOL;
+       og_idx = page_pool->ppp_free_pages % PAGES_PER_POOL;
        np_idx = npools - 1;
        ng_idx = (npages - 1) % PAGES_PER_POOL;
 
        while (freeslot) {
-               LASSERT(page_pool->epp_pools[op_idx][og_idx] == NULL);
+               LASSERT(page_pool->ppp_pools[op_idx][og_idx] == NULL);
                LASSERT(pools[np_idx][ng_idx] != NULL);
 
-               page_pool->epp_pools[op_idx][og_idx] = pools[np_idx][ng_idx];
+               page_pool->ppp_pools[op_idx][og_idx] = pools[np_idx][ng_idx];
                pools[np_idx][ng_idx] = NULL;
 
                freeslot--;
@@ -468,19 +468,19 @@ static void pools_insert(void ***pools, int npools, int npages,
        /*
         * (2) add pools if needed.
         */
-       cur_npools = (page_pool->epp_total_pages + PAGES_PER_POOL - 1) /
+       cur_npools = (page_pool->ppp_total_pages + PAGES_PER_POOL - 1) /
                      PAGES_PER_POOL;
-       end_npools = (page_pool->epp_total_pages + npages +
+       end_npools = (page_pool->ppp_total_pages + npages +
                      PAGES_PER_POOL - 1) / PAGES_PER_POOL;
-       LASSERT(end_npools <= page_pool->epp_max_pools);
+       LASSERT(end_npools <= page_pool->ppp_max_pools);
 
        np_idx = 0;
        while (cur_npools < end_npools) {
-               LASSERT(page_pool->epp_pools[cur_npools] == NULL);
+               LASSERT(page_pool->ppp_pools[cur_npools] == NULL);
                LASSERT(np_idx < npools);
                LASSERT(pools[np_idx] != NULL);
 
-               page_pool->epp_pools[cur_npools++] = pools[np_idx];
+               page_pool->ppp_pools[cur_npools++] = pools[np_idx];
                pools[np_idx++] = NULL;
        }
 
@@ -495,17 +495,17 @@ static void pools_insert(void ***pools, int npools, int npages,
                pools[np_idx++] = NULL;
        }
 
-       page_pool->epp_total_pages += npages;
-       page_pool->epp_free_pages += npages;
-       page_pool->epp_st_lowfree = page_pool->epp_free_pages;
+       page_pool->ppp_total_pages += npages;
+       page_pool->ppp_free_pages += npages;
+       page_pool->ppp_st_lowfree = page_pool->ppp_free_pages;
 
-       if (page_pool->epp_total_pages > page_pool->epp_st_max_pages)
-               page_pool->epp_st_max_pages = page_pool->epp_total_pages;
+       if (page_pool->ppp_total_pages > page_pool->ppp_st_max_pages)
+               page_pool->ppp_st_max_pages = page_pool->ppp_total_pages;
 
        CDEBUG(D_SEC, "add %d pages to total %lu\n", npages,
-              page_pool->epp_total_pages);
+              page_pool->ppp_total_pages);
 
-       spin_unlock(&page_pool->epp_lock);
+       spin_unlock(&page_pool->ppp_lock);
 }
 
 #define POOL_INIT_SIZE (PTLRPC_MAX_BRW_SIZE / 4)
@@ -526,11 +526,11 @@ static int pool_add_pages(int npages, int pool_index)
 
        mutex_lock(&page_pool->add_pages_mutex);
 
-       if (npages + page_pool->epp_total_pages > page_pool->epp_max_pages)
-               npages = page_pool->epp_max_pages - page_pool->epp_total_pages;
+       if (npages + page_pool->ppp_total_pages > page_pool->ppp_max_pages)
+               npages = page_pool->ppp_max_pages - page_pool->ppp_total_pages;
        LASSERT(npages > 0);
 
-       page_pool->epp_st_grows++;
+       page_pool->ppp_st_grows++;
 
        npools = npages_to_npools(npages);
        OBD_ALLOC_PTR_ARRAY(pools, npools);
@@ -569,7 +569,7 @@ out_pools:
        }
 out:
        if (rc) {
-               page_pool->epp_st_grow_fails++;
+               page_pool->ppp_st_grow_fails++;
                CERROR("Failed to allocate %d pages\n", npages);
        }
 
@@ -579,11 +579,11 @@ out:
 
 static inline void pools_wakeup(unsigned int pool)
 {
-       assert_spin_locked(&page_pools[pool]->epp_lock);
+       assert_spin_locked(&page_pools[pool]->ppp_lock);
 
        /* waitqueue_active */
-       if (unlikely(waitqueue_active(&page_pools[pool]->epp_waitq)))
-               wake_up_all(&page_pools[pool]->epp_waitq);
+       if (unlikely(waitqueue_active(&page_pools[pool]->ppp_waitq)))
+               wake_up_all(&page_pools[pool]->ppp_waitq);
 }
 
 static int pools_should_grow(int page_needed, time64_t now,
@@ -593,13 +593,13 @@ static int pools_should_grow(int page_needed, time64_t now,
         * don't grow if someone else is growing the pools right now,
         * or the pools has reached its full capacity
         */
-       if (page_pools[pool_index]->epp_growing ||
-           page_pools[pool_index]->epp_total_pages ==
-           page_pools[pool_index]->epp_max_pages)
+       if (page_pools[pool_index]->ppp_growing ||
+           page_pools[pool_index]->ppp_total_pages ==
+           page_pools[pool_index]->ppp_max_pages)
                return 0;
 
        /* if total pages is not enough, we need to grow */
-       if (page_pools[pool_index]->epp_total_pages < page_needed)
+       if (page_pools[pool_index]->ppp_total_pages < page_needed)
                return 1;
 
        /*
@@ -622,7 +622,7 @@ static int pools_should_grow(int page_needed, time64_t now,
  */
 int sptlrpc_pool_get_free_pages(unsigned int pool)
 {
-       return page_pools[pool]->epp_free_pages;
+       return page_pools[pool]->ppp_free_pages;
 }
 EXPORT_SYMBOL(sptlrpc_pool_get_free_pages);
 
@@ -631,8 +631,8 @@ EXPORT_SYMBOL(sptlrpc_pool_get_free_pages);
  */
 int __pool_is_at_full_capacity(unsigned int pool)
 {
-       return (page_pools[pool]->epp_total_pages ==
-               page_pools[pool]->epp_max_pages);
+       return (page_pools[pool]->ppp_total_pages ==
+               page_pools[pool]->ppp_max_pages);
 }
 
 /*
@@ -681,52 +681,52 @@ static inline int __sptlrpc_pool_get_pages(void *array, unsigned int count,
        if (pool_idx != PAGES_POOL)
                count = 1;
 
-       if (!array || count <= 0 || count > page_pool->epp_max_pages)
+       if (!array || count <= 0 || count > page_pool->ppp_max_pages)
                return -EINVAL;
 
-       spin_lock(&page_pool->epp_lock);
+       spin_lock(&page_pool->ppp_lock);
 
-       page_pool->epp_st_access++;
+       page_pool->ppp_st_access++;
 again:
-       if (unlikely(page_pool->epp_free_pages < count)) {
+       if (unlikely(page_pool->ppp_free_pages < count)) {
                if (tick_ns == 0)
                        tick_ns = ktime_get_ns();
 
                now = ktime_get_real_seconds();
 
-               page_pool->epp_st_missings++;
-               page_pool->epp_pages_short += count;
+               page_pool->ppp_st_missings++;
+               page_pool->ppp_pages_short += count;
 
                if (pools_should_grow(count, now, pool_idx)) {
-                       page_pool->epp_growing = 1;
+                       page_pool->ppp_growing = 1;
 
-                       spin_unlock(&page_pool->epp_lock);
-                       CDEBUG(D_SEC, "epp_pages_short: %lu\n",
-                              page_pool->epp_pages_short);
+                       spin_unlock(&page_pool->ppp_lock);
+                       CDEBUG(D_SEC, "ppp_pages_short: %lu\n",
+                              page_pool->ppp_pages_short);
                        pool_add_pages(8, pool_idx);
-                       spin_lock(&page_pool->epp_lock);
+                       spin_lock(&page_pool->ppp_lock);
 
-                       page_pool->epp_growing = 0;
+                       page_pool->ppp_growing = 0;
 
                        pools_wakeup(pool_idx);
                } else {
-                       if (page_pool->epp_growing) {
-                               if (++page_pool->epp_waitqlen >
-                                   page_pool->epp_st_max_wqlen)
-                                       page_pool->epp_st_max_wqlen =
-                                               page_pool->epp_waitqlen;
+                       if (page_pool->ppp_growing) {
+                               if (++page_pool->ppp_waitqlen >
+                                   page_pool->ppp_st_max_wqlen)
+                                       page_pool->ppp_st_max_wqlen =
+                                               page_pool->ppp_waitqlen;
 
                                set_current_state(TASK_UNINTERRUPTIBLE);
                                init_wait(&waitlink);
-                               add_wait_queue(&page_pool->epp_waitq,
+                               add_wait_queue(&page_pool->ppp_waitq,
                                               &waitlink);
 
-                               spin_unlock(&page_pool->epp_lock);
+                               spin_unlock(&page_pool->ppp_lock);
                                schedule();
-                               remove_wait_queue(&page_pool->epp_waitq,
+                               remove_wait_queue(&page_pool->ppp_waitq,
                                                  &waitlink);
-                               spin_lock(&page_pool->epp_lock);
-                               page_pool->epp_waitqlen--;
+                               spin_lock(&page_pool->ppp_lock);
+                               page_pool->ppp_waitqlen--;
                        } else {
                                /*
                                 * ptlrpcd thread should not sleep in that
@@ -734,14 +734,14 @@ again:
                                 * Instead, return -ENOMEM so that upper layers
                                 * will put request back in queue.
                                 */
-                               page_pool->epp_st_outofmem++;
+                               page_pool->ppp_st_outofmem++;
                                GOTO(out_unlock, rc = -ENOMEM);
                        }
                }
 
-               if (page_pool->epp_pages_short < count)
+               if (page_pool->ppp_pages_short < count)
                        GOTO(out_unlock, rc = -EPROTO);
-               page_pool->epp_pages_short -= count;
+               page_pool->ppp_pages_short -= count;
 
                this_idle = 0;
                goto again;
@@ -751,23 +751,23 @@ again:
        if (unlikely(tick_ns)) {
                ktime_t tick = ktime_sub_ns(ktime_get(), tick_ns);
 
-               if (ktime_after(tick, page_pool->epp_st_max_wait))
-                       page_pool->epp_st_max_wait = tick;
+               if (ktime_after(tick, page_pool->ppp_st_max_wait))
+                       page_pool->ppp_st_max_wait = tick;
        }
 
        /* proceed with rest of allocation */
-       page_pool->epp_free_pages -= count;
+       page_pool->ppp_free_pages -= count;
 
-       p_idx = page_pool->epp_free_pages / PAGES_PER_POOL;
-       g_idx = page_pool->epp_free_pages % PAGES_PER_POOL;
+       p_idx = page_pool->ppp_free_pages / PAGES_PER_POOL;
+       g_idx = page_pool->ppp_free_pages % PAGES_PER_POOL;
 
        for (i = 0; i < count; i++) {
                void **pagep = page_from(array, i);
 
-               if (page_pool->epp_pools[p_idx][g_idx] == NULL)
+               if (page_pool->ppp_pools[p_idx][g_idx] == NULL)
                        GOTO(out_unlock, rc = -EPROTO);
-               *pagep = page_pool->epp_pools[p_idx][g_idx];
-               page_pool->epp_pools[p_idx][g_idx] = NULL;
+               *pagep = page_pool->ppp_pools[p_idx][g_idx];
+               page_pool->ppp_pools[p_idx][g_idx] = NULL;
 
                if (++g_idx == PAGES_PER_POOL) {
                        p_idx++;
@@ -775,25 +775,25 @@ again:
                }
        }
 
-       if (page_pool->epp_free_pages < page_pool->epp_st_lowfree)
-               page_pool->epp_st_lowfree =
-                       page_pool->epp_free_pages;
+       if (page_pool->ppp_free_pages < page_pool->ppp_st_lowfree)
+               page_pool->ppp_st_lowfree =
+                       page_pool->ppp_free_pages;
 
        /*
         * new idle index = (old * weight + new) / (weight + 1)
         */
        if (this_idle == -1) {
-               this_idle = page_pool->epp_free_pages * IDLE_IDX_MAX /
-                       page_pool->epp_total_pages;
+               this_idle = page_pool->ppp_free_pages * IDLE_IDX_MAX /
+                       page_pool->ppp_total_pages;
        }
-       page_pool->epp_idle_idx = (page_pool->epp_idle_idx *
+       page_pool->ppp_idle_idx = (page_pool->ppp_idle_idx *
                        IDLE_IDX_WEIGHT + this_idle) /
                        (IDLE_IDX_WEIGHT + 1);
 
-       page_pool->epp_last_access = ktime_get_seconds();
+       page_pool->ppp_last_access = ktime_get_seconds();
 
 out_unlock:
-       spin_unlock(&page_pool->epp_lock);
+       spin_unlock(&page_pool->ppp_lock);
        return rc;
 }
 
@@ -802,7 +802,7 @@ int sptlrpc_pool_get_desc_pages(struct ptlrpc_bulk_desc *desc)
        int rc;
 
        LASSERT(desc->bd_iov_count > 0);
-       LASSERT(desc->bd_iov_count <= page_pools[PAGES_POOL]->epp_max_pages);
+       LASSERT(desc->bd_iov_count <= page_pools[PAGES_POOL]->ppp_max_pages);
 
        /* resent bulk, enc iov might have been allocated previously */
        if (desc->bd_enc_vec != NULL)
@@ -859,35 +859,35 @@ static int __sptlrpc_pool_put_pages(void *array, unsigned int count,
        page_pool = page_pools[pool_idx];
        LASSERTF(page_pool != NULL, "count %u, pool %u\n", count, pool_idx);
 
-       spin_lock(&page_pool->epp_lock);
+       spin_lock(&page_pool->ppp_lock);
 
-       p_idx = page_pool->epp_free_pages / PAGES_PER_POOL;
-       g_idx = page_pool->epp_free_pages % PAGES_PER_POOL;
+       p_idx = page_pool->ppp_free_pages / PAGES_PER_POOL;
+       g_idx = page_pool->ppp_free_pages % PAGES_PER_POOL;
 
-       if (page_pool->epp_free_pages + count > page_pool->epp_total_pages)
+       if (page_pool->ppp_free_pages + count > page_pool->ppp_total_pages)
                GOTO(out_unlock, rc = -EPROTO);
-       if (!page_pool->epp_pools[p_idx])
+       if (!page_pool->ppp_pools[p_idx])
                GOTO(out_unlock, rc = -EPROTO);
 
        for (i = 0; i < count; i++) {
                void **pagep = page_from(array, i);
 
                if (!*pagep ||
-                   page_pool->epp_pools[p_idx][g_idx] != NULL)
+                   page_pool->ppp_pools[p_idx][g_idx] != NULL)
                        GOTO(out_unlock, rc = -EPROTO);
 
-               page_pool->epp_pools[p_idx][g_idx] = *pagep;
+               page_pool->ppp_pools[p_idx][g_idx] = *pagep;
                if (++g_idx == PAGES_PER_POOL) {
                        p_idx++;
                        g_idx = 0;
                }
        }
 
-       page_pool->epp_free_pages += count;
+       page_pool->ppp_free_pages += count;
        pools_wakeup(pool_idx);
 
 out_unlock:
-       spin_unlock(&page_pool->epp_lock);
+       spin_unlock(&page_pool->ppp_lock);
        return rc;
 }
 
@@ -942,22 +942,22 @@ int sptlrpc_pool_add_user(void)
 {
        int need_grow = 0;
 
-       spin_lock(&page_pools[PAGES_POOL]->epp_lock);
-       if (page_pools[PAGES_POOL]->epp_growing == 0 &&
-               page_pools[PAGES_POOL]->epp_total_pages == 0) {
-               page_pools[PAGES_POOL]->epp_growing = 1;
+       spin_lock(&page_pools[PAGES_POOL]->ppp_lock);
+       if (page_pools[PAGES_POOL]->ppp_growing == 0 &&
+               page_pools[PAGES_POOL]->ppp_total_pages == 0) {
+               page_pools[PAGES_POOL]->ppp_growing = 1;
                need_grow = 1;
        }
-       spin_unlock(&page_pools[PAGES_POOL]->epp_lock);
+       spin_unlock(&page_pools[PAGES_POOL]->ppp_lock);
 
 
        if (need_grow) {
                pool_add_pages(PTLRPC_MAX_BRW_PAGES * 2, PAGES_POOL);
 
-               spin_lock(&page_pools[PAGES_POOL]->epp_lock);
-               page_pools[PAGES_POOL]->epp_growing = 0;
+               spin_lock(&page_pools[PAGES_POOL]->ppp_lock);
+               page_pools[PAGES_POOL]->ppp_growing = 0;
                pools_wakeup(PAGES_POOL);
-               spin_unlock(&page_pools[PAGES_POOL]->epp_lock);
+               spin_unlock(&page_pools[PAGES_POOL]->ppp_lock);
        }
        return 0;
 }
@@ -971,20 +971,20 @@ EXPORT_SYMBOL(sptlrpc_pool_del_user);
 
 static inline void pools_alloc(struct ptlrpc_page_pool *pool)
 {
-       LASSERT(pool->epp_max_pools);
-       OBD_ALLOC_LARGE(pool->epp_pools,
-                       pool->epp_max_pools *
-                       sizeof(*pool->epp_pools));
+       LASSERT(pool->ppp_max_pools);
+       OBD_ALLOC_LARGE(pool->ppp_pools,
+                       pool->ppp_max_pools *
+                       sizeof(*pool->ppp_pools));
 }
 
 static inline void pools_free(unsigned int i)
 {
-       LASSERT(page_pools[i]->epp_max_pools);
-       LASSERT(page_pools[i]->epp_pools);
+       LASSERT(page_pools[i]->ppp_max_pools);
+       LASSERT(page_pools[i]->ppp_pools);
 
-       OBD_FREE_LARGE(page_pools[i]->epp_pools,
-                      page_pools[i]->epp_max_pools *
-                      sizeof(*page_pools[i]->epp_pools));
+       OBD_FREE_LARGE(page_pools[i]->ppp_pools,
+                      page_pools[i]->ppp_max_pools *
+                      sizeof(*page_pools[i]->ppp_pools));
 }
 
 int sptlrpc_pool_init(void)
@@ -1003,26 +1003,26 @@ int sptlrpc_pool_init(void)
                        GOTO(fail, rc = -ENOMEM);
 
                pool = page_pools[pool_index];
-               pool->epp_max_pages =
+               pool->ppp_max_pages =
                        cfs_totalram_pages() / POOLS_COUNT;
                if (enc_pool_max_memory_mb > 0 &&
                    enc_pool_max_memory_mb <= (cfs_totalram_pages() >> mult))
-                       pool->epp_max_pages =
+                       pool->ppp_max_pages =
                                enc_pool_max_memory_mb << mult;
 
-               pool->epp_max_pools =
-                       npages_to_npools(pool->epp_max_pages);
+               pool->ppp_max_pools =
+                       npages_to_npools(pool->ppp_max_pages);
 
-               init_waitqueue_head(&pool->epp_waitq);
-               pool->epp_last_shrink = ktime_get_seconds();
-               pool->epp_last_access = ktime_get_seconds();
+               init_waitqueue_head(&pool->ppp_waitq);
+               pool->ppp_last_shrink = ktime_get_seconds();
+               pool->ppp_last_access = ktime_get_seconds();
 
-               spin_lock_init(&pool->epp_lock);
-               pool->epp_st_max_wait = ktime_set(0, 0);
+               spin_lock_init(&pool->ppp_lock);
+               pool->ppp_st_max_wait = ktime_set(0, 0);
 
                pools_alloc(pool);
                CDEBUG(D_SEC, "Allocated pool %i\n", pool_index);
-               if (pool->epp_pools == NULL)
+               if (pool->ppp_pools == NULL)
                        GOTO(fail, rc = -ENOMEM);
 #ifdef HAVE_SHRINKER_COUNT
                pool->pool_shrinker.count_objects = pools_shrink_count;
@@ -1045,7 +1045,7 @@ fail:
                pool = page_pools[pool_index];
                if (pool) {
                        unregister_shrinker(&pool->pool_shrinker);
-                       if (pool->epp_pools) 
+                       if (pool->ppp_pools) 
                                pools_free(pool_index);
                        OBD_FREE(pool, sizeof(**page_pools));
                }
@@ -1064,28 +1064,28 @@ void sptlrpc_pool_fini(void)
        for (pool_index = 0; pool_index < POOLS_COUNT; pool_index++) {
                pool = page_pools[pool_index];
                unregister_shrinker(&pool->pool_shrinker);
-               LASSERT(pool->epp_pools);
-               LASSERT(pool->epp_total_pages == pool->epp_free_pages);
+               LASSERT(pool->ppp_pools);
+               LASSERT(pool->ppp_total_pages == pool->ppp_free_pages);
 
-               npools = npages_to_npools(pool->epp_total_pages);
-               cleaned = pools_cleanup(pool->epp_pools,
+               npools = npages_to_npools(pool->ppp_total_pages);
+               cleaned = pools_cleanup(pool->ppp_pools,
                                            npools, pool_index);
-               LASSERT(cleaned == pool->epp_total_pages);
+               LASSERT(cleaned == pool->ppp_total_pages);
 
                pools_free(pool_index);
 
-               if (pool->epp_st_access > 0) {
+               if (pool->ppp_st_access > 0) {
                        CDEBUG(D_SEC,
                               "max pages %lu, grows %u, grow fails %u, shrinks %u, access %lu, missing %lu, max qlen %u, max wait ms %lld, out of mem %lu\n",
-                              pool->epp_st_max_pages,
-                              pool->epp_st_grows,
-                              pool->epp_st_grow_fails,
-                              pool->epp_st_shrinks,
-                              pool->epp_st_access,
-                              pool->epp_st_missings,
-                              pool->epp_st_max_wqlen,
-                              ktime_to_ms(pool->epp_st_max_wait),
-                              pool->epp_st_outofmem);
+                              pool->ppp_st_max_pages,
+                              pool->ppp_st_grows,
+                              pool->ppp_st_grow_fails,
+                              pool->ppp_st_shrinks,
+                              pool->ppp_st_access,
+                              pool->ppp_st_missings,
+                              pool->ppp_st_max_wqlen,
+                              ktime_to_ms(pool->ppp_st_max_wait),
+                              pool->ppp_st_outofmem);
                }
 
                OBD_FREE(pool, sizeof(**page_pools));