Add support for caching, to reduce FLASH wear when writing using small blocksizes. As we also don't care anymore about heads and tails in case of partial writes, this greatly simplifies the code for handling writes. Note: We don't bother caching reads smaller than the FLASH chunk size (256 KiB).
Showing the changes to drivers/char/ps3flash.c (1 of 1 file). Show all
Unified · Split
| @@ -33,13 +33,16 @@ · 32 unmodified lines | ||
| 33 | 33 | |
| 34 | 34 | struct ps3flash_private { |
| 35 | 35 | struct mutex mutex; /* Bounce buffer mutex */ |
| 36 | + u64 chunk_sectors; | |
| 37 | + int tag; /* Start sector of buffer, -1 if invalid */ | |
| 38 | + bool dirty; | |
| 36 | 39 | }; |
| 37 | 40 | |
| 38 | 41 | static struct ps3_storage_device *ps3flash_dev; |
| 39 | 42 | |
| 40 | −static ssize_t ps3flash_read_write_sectors(struct ps3_storage_device *dev, | |
| 41 | − u64 lpar, u64 start_sector, | |
| 42 | − u64 sectors, int write) | |
| 43 | +static int ps3flash_read_write_sectors(struct ps3_storage_device *dev, | |
| 44 | + u64 lpar, u64 start_sector, u64 sectors, | |
| 45 | + int write) | |
| 43 | 46 | { |
| 44 | 47 | u64 res = ps3stor_read_write_sectors(dev, lpar, start_sector, sectors, |
| 45 | 48 | write); |
| @@ -48,33 +51,55 @@ static ssize_t ps3flash_read_write_sectors(struct ps3_storage_device *dev, · 2 unmodified lines | ||
| 48 | 51 | __LINE__, write ? "write" : "read", res); |
| 49 | 52 | return -EIO; |
| 50 | 53 | } |
| 51 | − return sectors; | |
| 54 | + return 0; | |
| 52 | 55 | } |
| 53 | 56 | |
| 54 | −static ssize_t ps3flash_read_sectors(struct ps3_storage_device *dev, | |
| 55 | − u64 start_sector, u64 sectors, | |
| 56 | − unsigned int sector_offset) | |
| 57 | +static int ps3flash_writeback(struct ps3_storage_device *dev) | |
| 57 | 58 | { |
| 58 | − u64 max_sectors, lpar; | |
| 59 | + struct ps3flash_private *priv = ps3_system_bus_get_drvdata(&dev->sbd); | |
| 60 | + int res; | |
| 59 | 61 | |
| 60 | − max_sectors = dev->bounce_size / dev->blk_size; | |
| 61 | − if (sectors > max_sectors) { | |
| 62 | − dev_dbg(&dev->sbd.core, "%s:%u Limiting sectors to %llu\n", | |
| 63 | − __func__, __LINE__, max_sectors); | |
| 64 | − sectors = max_sectors; | |
| 65 | − } | |
| 62 | + if (!priv->dirty || priv->tag < 0) | |
| 63 | + return 0; | |
| 64 | + | |
| 65 | + res = ps3flash_read_write_sectors(dev, dev->bounce_lpar, priv->tag, | |
| 66 | + priv->chunk_sectors, 1); | |
| 67 | + if (res) | |
| 68 | + return res; | |
| 66 | 69 | |
| 67 | − lpar = dev->bounce_lpar + sector_offset * dev->blk_size; | |
| 68 | − return ps3flash_read_write_sectors(dev, lpar, start_sector, sectors, | |
| 69 | − 0); | |
| 70 | + priv->dirty = false; | |
| 71 | + return 0; | |
| 70 | 72 | } |
| 71 | 73 | |
| 72 | −static ssize_t ps3flash_write_chunk(struct ps3_storage_device *dev, | |
| 73 | − u64 start_sector) | |
| 74 | +static int ps3flash_fetch(struct ps3_storage_device *dev, u64 start_sector, | |
| 75 | + u64 sectors) | |
| 74 | 76 | { |
| 75 | − u64 sectors = dev->bounce_size / dev->blk_size; | |
| 76 | − return ps3flash_read_write_sectors(dev, dev->bounce_lpar, start_sector, | |
| 77 | − sectors, 1); | |
| 77 | + struct ps3flash_private *priv = ps3_system_bus_get_drvdata(&dev->sbd); | |
| 78 | + unsigned int tag, offset; | |
| 79 | + u64 lpar; | |
| 80 | + int res; | |
| 81 | + | |
| 82 | + offset = start_sector % priv->chunk_sectors; | |
| 83 | + tag = start_sector - offset; | |
| 84 | + if (tag == priv->tag) | |
| 85 | + return 0; | |
| 86 | + | |
| 87 | + res = ps3flash_writeback(dev); | |
| 88 | + if (res) | |
| 89 | + return res; | |
| 90 | + | |
| 91 | + priv->tag = -1; | |
| 92 | + | |
| 93 | + lpar = dev->bounce_lpar + offset * dev->blk_size; | |
| 94 | + res = ps3flash_read_write_sectors(dev, lpar, start_sector, sectors, 0); | |
| 95 | + if (res) | |
| 96 | + return res; | |
| 97 | + | |
| 98 | + /* We don't bother caching reads smaller than the chunk size */ | |
| 99 | + if (sectors == priv->chunk_sectors) | |
| 100 | + priv->tag = tag; | |
| 101 | + | |
| 102 | + return 0; | |
| 78 | 103 | } |
| 79 | 104 | |
| 80 | 105 | static loff_t ps3flash_llseek(struct file *file, loff_t offset, int origin) |
| @@ -109,8 +134,8 @@ static ssize_t ps3flash_read(char __user *userbuf, void *kernelbuf, · 28 unmodified lines | ||
| 109 | 134 | { |
| 110 | 135 | struct ps3_storage_device *dev = ps3flash_dev; |
| 111 | 136 | struct ps3flash_private *priv = ps3_system_bus_get_drvdata(&dev->sbd); |
| 112 | − u64 size, start_sector, end_sector, offset; | |
| 113 | − ssize_t sectors_read; | |
| 137 | + u64 size, start_sector, end_sector, offset, sectors; | |
| 138 | + int res; | |
| 114 | 139 | size_t remaining, n; |
| 115 | 140 | const void *src; |
| 116 | 141 | |
| @@ -130,30 +155,29 @@ static ssize_t ps3flash_read(char __user *userbuf, void *kernelbuf, · 13 unmodified lines | ||
| 130 | 155 | } |
| 131 | 156 | |
| 132 | 157 | start_sector = *pos / dev->blk_size; |
| 133 | − offset = *pos % dev->blk_size; | |
| 158 | + offset = *pos % dev->bounce_size; | |
| 134 | 159 | end_sector = DIV_ROUND_UP(*pos + count, dev->blk_size); |
| 135 | 160 | |
| 136 | 161 | remaining = count; |
| 137 | 162 | do { |
| 163 | + sectors = min(end_sector - start_sector, | |
| 164 | + priv->chunk_sectors - | |
| 165 | + start_sector % priv->chunk_sectors); | |
| 166 | + | |
| 138 | 167 | mutex_lock(&priv->mutex); |
| 139 | 168 | |
| 140 | − sectors_read = ps3flash_read_sectors(dev, start_sector, | |
| 141 | − end_sector-start_sector, | |
| 142 | − 0); | |
| 143 | − if (sectors_read < 0) { | |
| 144 | − mutex_unlock(&priv->mutex); | |
| 169 | + res = ps3flash_fetch(dev, start_sector, sectors); | |
| 170 | + if (res) | |
| 145 | 171 | goto fail; |
| 146 | − } | |
| 147 | 172 | |
| 148 | − n = min_t(u64, remaining, sectors_read*dev->blk_size-offset); | |
| 149 | − src = dev->bounce_buf+offset; | |
| 173 | + n = min_t(u64, remaining, dev->bounce_size - offset); | |
| 174 | + src = dev->bounce_buf + offset; | |
| 150 | 175 | dev_dbg(&dev->sbd.core, |
| 151 | 176 | "%s:%u: copy %lu bytes from 0x%p to U0x%p/K0x%p\n", |
| 152 | 177 | __func__, __LINE__, n, src, userbuf, kernelbuf); |
| 153 | 178 | if (userbuf) { |
| 154 | 179 | if (copy_to_user(userbuf, src, n)) { |
| 155 | − mutex_unlock(&priv->mutex); | |
| 156 | − sectors_read = -EFAULT; | |
| 180 | + res = -EFAULT; | |
| 157 | 181 | goto fail; |
| 158 | 182 | } |
| 159 | 183 | userbuf += n; |
| @@ -167,14 +191,15 @@ static ssize_t ps3flash_read(char __user *userbuf, void *kernelbuf, · 7 unmodified lines | ||
| 167 | 191 | |
| 168 | 192 | *pos += n; |
| 169 | 193 | remaining -= n; |
| 170 | − start_sector += sectors_read; | |
| 194 | + start_sector += sectors; | |
| 171 | 195 | offset = 0; |
| 172 | 196 | } while (remaining > 0); |
| 173 | 197 | |
| 174 | 198 | return count; |
| 175 | 199 | |
| 176 | 200 | fail: |
| 177 | − return sectors_read; | |
| 201 | + mutex_unlock(&priv->mutex); | |
| 202 | + return res; | |
| 178 | 203 | } |
| 179 | 204 | |
| 180 | 205 | static ssize_t ps3flash_write(const char __user *userbuf, |
| @@ -182,11 +207,9 @@ static ssize_t ps3flash_write(const char __user *userbuf, · 1 unmodified line | ||
| 182 | 207 | { |
| 183 | 208 | struct ps3_storage_device *dev = ps3flash_dev; |
| 184 | 209 | struct ps3flash_private *priv = ps3_system_bus_get_drvdata(&dev->sbd); |
| 185 | − u64 size, chunk_sectors, start_write_sector, end_write_sector, | |
| 186 | − end_read_sector, start_read_sector, head, tail, offset; | |
| 187 | − ssize_t res; | |
| 210 | + u64 size, sector, offset; | |
| 211 | + int res = 0; | |
| 188 | 212 | size_t remaining, n; |
| 189 | − unsigned int sec_off; | |
| 190 | 213 | void *dst; |
| 191 | 214 | |
| 192 | 215 | dev_dbg(&dev->sbd.core, |
| @@ -204,71 +227,23 @@ static ssize_t ps3flash_write(const char __user *userbuf, · 11 unmodified lines | ||
| 204 | 227 | count = size - *pos; |
| 205 | 228 | } |
| 206 | 229 | |
| 207 | − chunk_sectors = dev->bounce_size / dev->blk_size; | |
| 208 | − | |
| 209 | − start_write_sector = *pos / dev->bounce_size * chunk_sectors; | |
| 230 | + sector = *pos / dev->bounce_size * priv->chunk_sectors; | |
| 210 | 231 | offset = *pos % dev->bounce_size; |
| 211 | − end_write_sector = DIV_ROUND_UP(*pos + count, dev->bounce_size) * | |
| 212 | − chunk_sectors; | |
| 213 | − | |
| 214 | − end_read_sector = DIV_ROUND_UP(*pos, dev->blk_size); | |
| 215 | − start_read_sector = (*pos + count) / dev->blk_size; | |
| 216 | − | |
| 217 | − /* | |
| 218 | − * As we have to write in 256 KiB chunks, while we can read in blk_size | |
| 219 | − * (usually 512 bytes) chunks, we perform the following steps: | |
| 220 | − * 1. Read from start_write_sector to end_read_sector ("head") | |
| 221 | − * 2. Read from start_read_sector to end_write_sector ("tail") | |
| 222 | − * 3. Copy data to buffer | |
| 223 | − * 4. Write from start_write_sector to end_write_sector | |
| 224 | − * All of this is complicated by using only one 256 KiB bounce buffer. | |
| 225 | − */ | |
| 226 | − | |
| 227 | − head = end_read_sector - start_write_sector; | |
| 228 | − tail = end_write_sector - start_read_sector; | |
| 229 | 232 | |
| 230 | 233 | remaining = count; |
| 231 | 234 | do { |
| 235 | + n = min_t(u64, remaining, dev->bounce_size - offset); | |
| 236 | + | |
| 232 | 237 | mutex_lock(&priv->mutex); |
| 233 | 238 | |
| 234 | − if (end_read_sector >= start_read_sector) { | |
| 235 | − /* Merge head and tail */ | |
| 236 | − dev_dbg(&dev->sbd.core, | |
| 237 | − "Merged head and tail: %llu sectors at %llu\n", | |
| 238 | − chunk_sectors, start_write_sector); | |
| 239 | − res = ps3flash_read_sectors(dev, start_write_sector, | |
| 240 | − chunk_sectors, 0); | |
| 241 | − if (res < 0) | |
| 242 | − goto fail; | |
| 243 | − } else { | |
| 244 | − if (head) { | |
| 245 | − /* Read head */ | |
| 246 | − dev_dbg(&dev->sbd.core, | |
| 247 | − "head: %llu sectors at %llu\n", head, | |
| 248 | − start_write_sector); | |
| 249 | − res = ps3flash_read_sectors(dev, | |
| 250 | − start_write_sector, | |
| 251 | − head, 0); | |
| 252 | − if (res < 0) | |
| 253 | − goto fail; | |
| 254 | − } | |
| 255 | − if (start_read_sector < | |
| 256 | − start_write_sector+chunk_sectors) { | |
| 257 | − /* Read tail */ | |
| 258 | − dev_dbg(&dev->sbd.core, | |
| 259 | − "tail: %llu sectors at %llu\n", tail, | |
| 260 | − start_read_sector); | |
| 261 | − sec_off = start_read_sector-start_write_sector; | |
| 262 | − res = ps3flash_read_sectors(dev, | |
| 263 | − start_read_sector, | |
| 264 | − tail, sec_off); | |
| 265 | − if (res < 0) | |
| 266 | − goto fail; | |
| 267 | − } | |
| 268 | − } | |
| 239 | + if (n != dev->bounce_size) | |
| 240 | + res = ps3flash_fetch(dev, sector, priv->chunk_sectors); | |
| 241 | + else if (sector != priv->tag) | |
| 242 | + res = ps3flash_writeback(dev); | |
| 243 | + if (res) | |
| 244 | + goto fail; | |
| 269 | 245 | |
| 270 | − n = min_t(u64, remaining, dev->bounce_size-offset); | |
| 271 | − dst = dev->bounce_buf+offset; | |
| 246 | + dst = dev->bounce_buf + offset; | |
| 272 | 247 | dev_dbg(&dev->sbd.core, |
| 273 | 248 | "%s:%u: copy %lu bytes from U0x%p/K0x%p to 0x%p\n", |
| 274 | 249 | __func__, __LINE__, n, userbuf, kernelbuf, dst); |
| @@ -284,16 +259,14 @@ static ssize_t ps3flash_write(const char __user *userbuf, · 9 unmodified lines | ||
| 284 | 259 | kernelbuf += n; |
| 285 | 260 | } |
| 286 | 261 | |
| 287 | − res = ps3flash_write_chunk(dev, start_write_sector); | |
| 288 | − if (res < 0) | |
| 289 | − goto fail; | |
| 262 | + priv->tag = sector; | |
| 263 | + priv->dirty = true; | |
| 290 | 264 | |
| 291 | 265 | mutex_unlock(&priv->mutex); |
| 292 | 266 | |
| 293 | 267 | *pos += n; |
| 294 | 268 | remaining -= n; |
| 295 | − start_write_sector += chunk_sectors; | |
| 296 | − head = 0; | |
| 269 | + sector += priv->chunk_sectors; | |
| 297 | 270 | offset = 0; |
| 298 | 271 | } while (remaining > 0); |
| 299 | 272 | |
| @@ -324,9 +297,31 @@ static ssize_t ps3flash_kernel_read(void *buf, size_t count, loff_t pos) · 24 unmodified lines | ||
| 324 | 297 | static ssize_t ps3flash_kernel_write(const void *buf, size_t count, |
| 325 | 298 | loff_t pos) |
| 326 | 299 | { |
| 327 | − return ps3flash_write(NULL, buf, count, &pos); | |
| 300 | + ssize_t res; | |
| 301 | + int wb; | |
| 302 | + | |
| 303 | + res = ps3flash_write(NULL, buf, count, &pos); | |
| 304 | + if (res < 0) | |
| 305 | + return res; | |
| 306 | + | |
| 307 | + /* Make kernel writes synchronous */ | |
| 308 | + wb = ps3flash_writeback(ps3flash_dev); | |
| 309 | + if (wb) | |
| 310 | + return wb; | |
| 311 | + | |
| 312 | + return res; | |
| 328 | 313 | } |
| 329 | 314 | |
| 315 | +static int ps3flash_flush(struct file *file, fl_owner_t id) | |
| 316 | +{ | |
| 317 | + return ps3flash_writeback(ps3flash_dev); | |
| 318 | +} | |
| 319 | + | |
| 320 | +static int ps3flash_fsync(struct file *file, struct dentry *dentry, | |
| 321 | + int datasync) | |
| 322 | +{ | |
| 323 | + return ps3flash_writeback(ps3flash_dev); | |
| 324 | +} | |
| 330 | 325 | |
| 331 | 326 | static irqreturn_t ps3flash_interrupt(int irq, void *data) |
| 332 | 327 | { |
| @@ -356,6 +351,8 @@ static const struct file_operations ps3flash_fops = { · 23 unmodified lines | ||
| 356 | 351 | .llseek = ps3flash_llseek, |
| 357 | 352 | .read = ps3flash_user_read, |
| 358 | 353 | .write = ps3flash_user_write, |
| 354 | + .flush = ps3flash_flush, | |
| 355 | + .fsync = ps3flash_fsync, | |
| 359 | 356 | }; |
| 360 | 357 | |
| 361 | 358 | static const struct ps3_os_area_flash_ops ps3flash_kernel_ops = { |
| @@ -411,9 +408,11 @@ static int __devinit ps3flash_probe(struct ps3_system_bus_device *_dev) · 49 unmodified lines | ||
| 411 | 408 | |
| 412 | 409 | ps3_system_bus_set_drvdata(&dev->sbd, priv); |
| 413 | 410 | mutex_init(&priv->mutex); |
| 411 | + priv->tag = -1; | |
| 414 | 412 | |
| 415 | 413 | dev->bounce_size = ps3flash_bounce_buffer.size; |
| 416 | 414 | dev->bounce_buf = ps3flash_bounce_buffer.address; |
| 415 | + priv->chunk_sectors = dev->bounce_size / dev->blk_size; | |
| 417 | 416 | |
| 418 | 417 | error = ps3stor_setup(dev, ps3flash_interrupt); |
| 419 | 418 | if (error) |