Commit: 2bf54d392864557c5fbe6ddd97e53e05cc08a283 - system-coremmmm (git)

system/corennnnn

Commit MetaInfo

• Revision: 2bf54d392864557c5fbe6ddd97e53e05cc08a283 (tree)
• Zeit: 2016-09-04 08:46:00
• Autor: Sultan Qasim Khan <sultanqasim@gmai...>
• Commiter: Steve Kondik

Log Message

fs_mgr: zram: allow specifying stream count

This parameter allows specifying the number of parallel streams
to be used in compression and decompression. This option was added
in Linux 3.15, so it is not very common among devices currently on
the market, but it has been backported to some kernels. This option
must be set before zRAM is activated, as the kernel does not allow
switching from single stream to multistream compression once zRAM
is active.

Change-Id: I3f5ad96a65b3b4a6915d2700c398a236ea8931b0

Ändern Zusammenfassung

• modified: fs_mgr/fs_mgr.c
• modified: fs_mgr/fs_mgr_fstab.c
• modified: fs_mgr/fs_mgr_priv.h
• modified: fs_mgr/include/fs_mgr.h

Diff

--- a/fs_mgr/fs_mgr.c
+++ b/fs_mgr/fs_mgr.c
@@ -61,6 +61,7 @@
 #define FSCK_LOG_FILE   "/dev/fscklogs/log"
 
 #define ZRAM_CONF_DEV   "/sys/block/zram0/disksize"
+#define ZRAM_STREAMS    "/sys/block/zram0/max_comp_streams"
 
 #define ARRAY_SIZE(a) (sizeof(a) / sizeof(*(a)))
 
@@ -882,6 +883,14 @@ int fs_mgr_swapon_all(struct fstab *fstab)
              */
             FILE *zram_fp;
 
+            /* The stream count parameter is only available on new kernels.
+             * It must be set before the disk size. */
+            zram_fp = fopen(ZRAM_STREAMS, "r+");
+            if (zram_fp) {
+                fprintf(zram_fp, "%d\n", fstab->recs[i].zram_streams);
+                fclose(zram_fp);
+            }
+
             zram_fp = fopen(ZRAM_CONF_DEV, "r+");
             if (zram_fp == NULL) {
                 ERROR("Unable to open zram conf device %s\n", ZRAM_CONF_DEV);

--- a/fs_mgr/fs_mgr_fstab.c
+++ b/fs_mgr/fs_mgr_fstab.c
@@ -32,6 +32,7 @@ struct fs_mgr_flag_values {
     int partnum;
     int swap_prio;
     unsigned int zram_size;
+    unsigned int zram_streams;
 };
 
 struct flag_list {
@@ -77,6 +78,7 @@ static struct flag_list fs_mgr_flags[] = {
     { "formattable", MF_FORMATTABLE },
     { "slotselect",  MF_SLOTSELECT },
     { "nofail",      MF_NOFAIL },
+    { "zramstreams=",MF_ZRAMSTREAMS },
     { "defaults",    0 },
     { 0,             0 },
 };
@@ -109,6 +111,7 @@ static int parse_flags(char *flags, struct flag_list *fl,
         memset(flag_vals, 0, sizeof(*flag_vals));
         flag_vals->partnum = -1;
         flag_vals->swap_prio = -1; /* negative means it wasn't specified. */
+        flag_vals->zram_streams = 1;
     }
 
     /* initialize fs_options to the null string */
@@ -186,6 +189,8 @@ static int parse_flags(char *flags, struct flag_list *fl,
                         flag_vals->zram_size = calculate_zram_size(val);
                     else
                         flag_vals->zram_size = val;
+                } else if ((fl[i].flag == MF_ZRAMSTREAMS) && flag_vals) {
+                    flag_vals->zram_streams = strtoll(strchr(p, '=') + 1, NULL, 0);
                 }
                 break;
             }
@@ -337,6 +342,7 @@ struct fstab *fs_mgr_read_fstab(const char *fstab_path)
         fstab->recs[cnt].partnum = flag_vals.partnum;
         fstab->recs[cnt].swap_prio = flag_vals.swap_prio;
         fstab->recs[cnt].zram_size = flag_vals.zram_size;
+        fstab->recs[cnt].zram_streams = flag_vals.zram_streams;
         cnt++;
     }
     /* If an A/B partition, modify block device to be the real block device */

--- a/fs_mgr/fs_mgr_priv.h
+++ b/fs_mgr/fs_mgr_priv.h
@@ -84,6 +84,7 @@ __BEGIN_DECLS
 #define MF_SLOTSELECT   0x8000
 #define MF_FORCEFDEORFBE 0x10000
 #define MF_NOFAIL       0x40000
+#define MF_ZRAMSTREAMS  0x80000
 
 #define DM_BUF_SIZE 4096
 

--- a/fs_mgr/include/fs_mgr.h
+++ b/fs_mgr/include/fs_mgr.h
@@ -65,6 +65,7 @@ struct fstab_rec {
     int partnum;
     int swap_prio;
     unsigned int zram_size;
+    unsigned int zram_streams;
 };
 
 // Callback function for verity status