crypto: acomp - Simplify folio handling

Rather than storing the folio as is and handling it later, convert
it to a scatterlist right away.

Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>

diff --git a/crypto/acompress.c b/crypto/acompress.c
index 530b9bfd03a51090fe10b83c66cb9ca44c991b3d..674325ecefbc53e6c99e53269020e47ffc595781 100644 (file)
--- a/crypto/acompress.c
+++ b/crypto/acompress.c
@@ -33,9 +33,7 @@ struct crypto_scomp;
 enum {
        ACOMP_WALK_SLEEP = 1 << 0,
        ACOMP_WALK_SRC_LINEAR = 1 << 1,
-       ACOMP_WALK_SRC_FOLIO = 1 << 2,
-       ACOMP_WALK_DST_LINEAR = 1 << 3,
-       ACOMP_WALK_DST_FOLIO = 1 << 4,
+       ACOMP_WALK_DST_LINEAR = 1 << 2,
 };
 
 static const struct crypto_type crypto_acomp_type;
@@ -195,12 +193,8 @@ static void acomp_reqchain_virt(struct acomp_req *req)
 
        if (state->flags & CRYPTO_ACOMP_REQ_SRC_VIRT)
                acomp_request_set_src_dma(req, state->src, slen);
-       else if (state->flags & CRYPTO_ACOMP_REQ_SRC_FOLIO)
-               acomp_request_set_src_folio(req, state->sfolio, req->soff, slen);
        if (state->flags & CRYPTO_ACOMP_REQ_DST_VIRT)
                acomp_request_set_dst_dma(req, state->dst, dlen);
-       else if (state->flags & CRYPTO_ACOMP_REQ_DST_FOLIO)
-               acomp_request_set_dst_folio(req, state->dfolio, req->doff, dlen);
 }
 
 static void acomp_virt_to_sg(struct acomp_req *req)
@@ -208,9 +202,7 @@ static void acomp_virt_to_sg(struct acomp_req *req)
        struct acomp_req_chain *state = &req->chain;
 
        state->flags = req->base.flags & (CRYPTO_ACOMP_REQ_SRC_VIRT |
-                                         CRYPTO_ACOMP_REQ_DST_VIRT |
-                                         CRYPTO_ACOMP_REQ_SRC_FOLIO |
-                                         CRYPTO_ACOMP_REQ_DST_FOLIO);
+                                         CRYPTO_ACOMP_REQ_DST_VIRT);
 
        if (acomp_request_src_isvirt(req)) {
                unsigned int slen = req->slen;
@@ -219,16 +211,6 @@ static void acomp_virt_to_sg(struct acomp_req *req)
                state->src = svirt;
                sg_init_one(&state->ssg, svirt, slen);
                acomp_request_set_src_sg(req, &state->ssg, slen);
-       } else if (acomp_request_src_isfolio(req)) {
-               struct folio *folio = req->sfolio;
-               unsigned int slen = req->slen;
-               size_t off = req->soff;
-
-               state->sfolio = folio;
-               sg_init_table(&state->ssg, 1);
-               sg_set_page(&state->ssg, folio_page(folio, off / PAGE_SIZE),
-                           slen, off % PAGE_SIZE);
-               acomp_request_set_src_sg(req, &state->ssg, slen);
        }
 
        if (acomp_request_dst_isvirt(req)) {
@@ -238,16 +220,6 @@ static void acomp_virt_to_sg(struct acomp_req *req)
                state->dst = dvirt;
                sg_init_one(&state->dsg, dvirt, dlen);
                acomp_request_set_dst_sg(req, &state->dsg, dlen);
-       } else if (acomp_request_dst_isfolio(req)) {
-               struct folio *folio = req->dfolio;
-               unsigned int dlen = req->dlen;
-               size_t off = req->doff;
-
-               state->dfolio = folio;
-               sg_init_table(&state->dsg, 1);
-               sg_set_page(&state->dsg, folio_page(folio, off / PAGE_SIZE),
-                           dlen, off % PAGE_SIZE);
-               acomp_request_set_src_sg(req, &state->dsg, dlen);
        }
 }
 
@@ -579,18 +551,8 @@ int acomp_walk_virt(struct acomp_walk *__restrict walk,
                walk->flags |= ACOMP_WALK_SLEEP;
        if ((req->base.flags & CRYPTO_ACOMP_REQ_SRC_VIRT))
                walk->flags |= ACOMP_WALK_SRC_LINEAR;
-       else if ((req->base.flags & CRYPTO_ACOMP_REQ_SRC_FOLIO)) {
-               src = &req->chain.ssg;
-               sg_init_table(src, 1);
-               sg_set_folio(src, req->sfolio, walk->slen, req->soff);
-       }
        if ((req->base.flags & CRYPTO_ACOMP_REQ_DST_VIRT))
                walk->flags |= ACOMP_WALK_DST_LINEAR;
-       else if ((req->base.flags & CRYPTO_ACOMP_REQ_DST_FOLIO)) {
-               dst = &req->chain.dsg;
-               sg_init_table(dst, 1);
-               sg_set_folio(dst, req->dfolio, walk->dlen, req->doff);
-       }
 
        if ((walk->flags & ACOMP_WALK_SRC_LINEAR)) {
                walk->in.sg = (void *)req->svirt;

diff --git a/crypto/scompress.c b/crypto/scompress.c
index 7ade3f2fee7e26dd473174b50cac6304db692a37..c330b81bc5a6bf25700724fcdfeea2e5a0e760b5 100644 (file)
--- a/crypto/scompress.c
+++ b/crypto/scompress.c
@@ -193,10 +193,7 @@ static int scomp_acomp_comp_decomp(struct acomp_req *req, int dir)
        if (dst_isvirt)
                dst = req->dvirt;
        else {
-               if (acomp_request_dst_isfolio(req)) {
-                       dpage = folio_page(req->dfolio, 0);
-                       doff = req->doff;
-               } else if (dlen <= req->dst->length) {
+               if (dlen <= req->dst->length) {
                        dpage = sg_page(req->dst);
                        doff = req->dst->offset;
                } else
@@ -218,10 +215,7 @@ static int scomp_acomp_comp_decomp(struct acomp_req *req, int dir)
        else {
                src = NULL;
                do {
-                       if (acomp_request_src_isfolio(req)) {
-                               spage = folio_page(req->sfolio, 0);
-                               soff = req->soff;
-                       } else if (slen <= req->src->length) {
+                       if (slen <= req->src->length) {
                                spage = sg_page(req->src);
                                soff = req->src->offset;
                        } else

diff --git a/include/crypto/acompress.h b/include/crypto/acompress.h
index 96ec0090a85559b440a67f89d3c87f9e7fd13c68..1b30290d63805da4fb1e6cd765252405f55df338 100644 (file)
--- a/include/crypto/acompress.h
+++ b/include/crypto/acompress.h
@@ -32,17 +32,10 @@
 /* Set this bit for if virtual address destination cannot be used for DMA. */
 #define CRYPTO_ACOMP_REQ_DST_NONDMA    0x00000010
 
-/* Set this bit if source is a folio. */
-#define CRYPTO_ACOMP_REQ_SRC_FOLIO     0x00000020
-
-/* Set this bit if destination is a folio. */
-#define CRYPTO_ACOMP_REQ_DST_FOLIO     0x00000040
-
 /* Private flags that should not be touched by the user. */
 #define CRYPTO_ACOMP_REQ_PRIVATE \
        (CRYPTO_ACOMP_REQ_SRC_VIRT | CRYPTO_ACOMP_REQ_SRC_NONDMA | \
-        CRYPTO_ACOMP_REQ_DST_VIRT | CRYPTO_ACOMP_REQ_DST_NONDMA | \
-        CRYPTO_ACOMP_REQ_SRC_FOLIO | CRYPTO_ACOMP_REQ_DST_FOLIO)
+        CRYPTO_ACOMP_REQ_DST_VIRT | CRYPTO_ACOMP_REQ_DST_NONDMA)
 
 #define CRYPTO_ACOMP_DST_MAX           131072
 
@@ -84,10 +77,6 @@ struct acomp_req_chain {
  * @dst:       Destination scatterlist
  * @svirt:     Source virtual address
  * @dvirt:     Destination virtual address
- * @sfolio:    Source folio
- * @soff:      Source folio offset
- * @dfolio:    Destination folio
- * @doff:      Destination folio offset
  * @slen:      Size of the input buffer
  * @dlen:      Size of the output buffer and number of bytes produced
  * @chain:     Private API code data, do not use
@@ -98,15 +87,11 @@ struct acomp_req {
        union {
                struct scatterlist *src;
                const u8 *svirt;
-               struct folio *sfolio;
        };
        union {
                struct scatterlist *dst;
                u8 *dvirt;
-               struct folio *dfolio;
        };
-       size_t soff;
-       size_t doff;
        unsigned int slen;
        unsigned int dlen;
 
@@ -373,8 +358,6 @@ static inline void acomp_request_set_params(struct acomp_req *req,
 
        req->base.flags &= ~(CRYPTO_ACOMP_REQ_SRC_VIRT |
                             CRYPTO_ACOMP_REQ_SRC_NONDMA |
-                            CRYPTO_ACOMP_REQ_SRC_FOLIO |
-                            CRYPTO_ACOMP_REQ_DST_FOLIO |
                             CRYPTO_ACOMP_REQ_DST_VIRT |
                             CRYPTO_ACOMP_REQ_DST_NONDMA);
 }
@@ -397,7 +380,6 @@ static inline void acomp_request_set_src_sg(struct acomp_req *req,
 
        req->base.flags &= ~CRYPTO_ACOMP_REQ_SRC_NONDMA;
        req->base.flags &= ~CRYPTO_ACOMP_REQ_SRC_VIRT;
-       req->base.flags &= ~CRYPTO_ACOMP_REQ_SRC_FOLIO;
 }
 
 /**
@@ -417,7 +399,6 @@ static inline void acomp_request_set_src_dma(struct acomp_req *req,
        req->slen = slen;
 
        req->base.flags &= ~CRYPTO_ACOMP_REQ_SRC_NONDMA;
-       req->base.flags &= ~CRYPTO_ACOMP_REQ_SRC_FOLIO;
        req->base.flags |= CRYPTO_ACOMP_REQ_SRC_VIRT;
 }
 
@@ -438,7 +419,6 @@ static inline void acomp_request_set_src_nondma(struct acomp_req *req,
        req->svirt = src;
        req->slen = slen;
 
-       req->base.flags &= ~CRYPTO_ACOMP_REQ_SRC_FOLIO;
        req->base.flags |= CRYPTO_ACOMP_REQ_SRC_NONDMA;
        req->base.flags |= CRYPTO_ACOMP_REQ_SRC_VIRT;
 }
@@ -457,13 +437,9 @@ static inline void acomp_request_set_src_folio(struct acomp_req *req,
                                               struct folio *folio, size_t off,
                                               unsigned int len)
 {
-       req->sfolio = folio;
-       req->soff = off;
-       req->slen = len;
-
-       req->base.flags &= ~CRYPTO_ACOMP_REQ_SRC_NONDMA;
-       req->base.flags &= ~CRYPTO_ACOMP_REQ_SRC_VIRT;
-       req->base.flags |= CRYPTO_ACOMP_REQ_SRC_FOLIO;
+       sg_init_table(&req->chain.ssg, 1);
+       sg_set_folio(&req->chain.ssg, folio, len, off);
+       acomp_request_set_src_sg(req, &req->chain.ssg, len);
 }
 
 /**
@@ -484,7 +460,6 @@ static inline void acomp_request_set_dst_sg(struct acomp_req *req,
 
        req->base.flags &= ~CRYPTO_ACOMP_REQ_DST_NONDMA;
        req->base.flags &= ~CRYPTO_ACOMP_REQ_DST_VIRT;
-       req->base.flags &= ~CRYPTO_ACOMP_REQ_DST_FOLIO;
 }
 
 /**
@@ -504,7 +479,6 @@ static inline void acomp_request_set_dst_dma(struct acomp_req *req,
        req->dlen = dlen;
 
        req->base.flags &= ~CRYPTO_ACOMP_REQ_DST_NONDMA;
-       req->base.flags &= ~CRYPTO_ACOMP_REQ_DST_FOLIO;
        req->base.flags |= CRYPTO_ACOMP_REQ_DST_VIRT;
 }
 
@@ -524,7 +498,6 @@ static inline void acomp_request_set_dst_nondma(struct acomp_req *req,
        req->dvirt = dst;
        req->dlen = dlen;
 
-       req->base.flags &= ~CRYPTO_ACOMP_REQ_DST_FOLIO;
        req->base.flags |= CRYPTO_ACOMP_REQ_DST_NONDMA;
        req->base.flags |= CRYPTO_ACOMP_REQ_DST_VIRT;
 }
@@ -543,13 +516,9 @@ static inline void acomp_request_set_dst_folio(struct acomp_req *req,
                                               struct folio *folio, size_t off,
                                               unsigned int len)
 {
-       req->dfolio = folio;
-       req->doff = off;
-       req->dlen = len;
-
-       req->base.flags &= ~CRYPTO_ACOMP_REQ_DST_NONDMA;
-       req->base.flags &= ~CRYPTO_ACOMP_REQ_DST_VIRT;
-       req->base.flags |= CRYPTO_ACOMP_REQ_DST_FOLIO;
+       sg_init_table(&req->chain.dsg, 1);
+       sg_set_folio(&req->chain.dsg, folio, len, off);
+       acomp_request_set_dst_sg(req, &req->chain.dsg, len);
 }
 
 /**

diff --git a/include/crypto/internal/acompress.h b/include/crypto/internal/acompress.h
index b51d66633935a9769ae0b4fbc060584fb310a818..d6d53c7696fd7a05359f9e9b2daf409b3a438360 100644 (file)
--- a/include/crypto/internal/acompress.h
+++ b/include/crypto/internal/acompress.h
@@ -154,9 +154,7 @@ void crypto_unregister_acomps(struct acomp_alg *algs, int count);
 static inline bool acomp_request_issg(struct acomp_req *req)
 {
        return !(req->base.flags & (CRYPTO_ACOMP_REQ_SRC_VIRT |
-                                   CRYPTO_ACOMP_REQ_DST_VIRT |
-                                   CRYPTO_ACOMP_REQ_SRC_FOLIO |
-                                   CRYPTO_ACOMP_REQ_DST_FOLIO));
+                                   CRYPTO_ACOMP_REQ_DST_VIRT));
 }
 
 static inline bool acomp_request_src_isvirt(struct acomp_req *req)
@@ -191,16 +189,6 @@ static inline bool acomp_request_isnondma(struct acomp_req *req)
                                  CRYPTO_ACOMP_REQ_DST_NONDMA);
 }
 
-static inline bool acomp_request_src_isfolio(struct acomp_req *req)
-{
-       return req->base.flags & CRYPTO_ACOMP_REQ_SRC_FOLIO;
-}
-
-static inline bool acomp_request_dst_isfolio(struct acomp_req *req)
-{
-       return req->base.flags & CRYPTO_ACOMP_REQ_DST_FOLIO;
-}
-
 static inline bool crypto_acomp_req_chain(struct crypto_acomp *tfm)
 {
        return crypto_tfm_req_chain(&tfm->base);
@@ -250,8 +238,6 @@ static inline struct acomp_req *acomp_fbreq_on_stack_init(
        req->dst = old->dst;
        req->slen = old->slen;
        req->dlen = old->dlen;
-       req->soff = old->soff;
-       req->doff = old->doff;
 
        return req;
 }