mirrors
/
linux-stable
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
1
0
Fork 0
Code Issues Releases Wiki Activity

block-6.9-20240315 

-----BEGIN PGP SIGNATURE-----
 
 iQJEBAABCAAuFiEEwPw5LcreJtl1+l5K99NY+ylx4KYFAmX0mOIQHGF4Ym9lQGtl
 cm5lbC5kawAKCRD301j7KXHgpoR8EADV/v/RrpqZ4/9XozLBumrW3hgzhTc3cB2F
 SzIsUhoSOR4CWKYewtl/yFgmIfa+Y/7WXVsPuFdmJC/b5n+qf4QwmmmY/w8Jj3MX
 3oRG5N6QcXuF2oIktWxI9+ZKdAxQHW26jFaTWzV5MAM+ldJhBtI3axtQVJX4FTIO
 swPp3hAJuLs8ezq0oYS8NImheVQTjB4gLvY35H3u7DXgdoGyEhA11u75jpiYOWKI
 wkkylav1Cnrw8liY1KBOPkgR+LHpx9eb2r26CCDZ4vXNsON310XxDnp/simC64ty
 8YCa1ju1r+LTYiFjMuaDbcDUciIIicHuwy9r2ITyhE/IcTGSvfh3uJ/eKjmiORqO
 NNsGhlCDBvEavXSxuvYy/SH7sNZDMHs3/MnE0U38rpbt9uJEx2KACk8FpHyPHr4A
 pd6OxaoCa2xg0INz/M+gEJduy633F7GBpgZ7RIpULTJ2EODlBxmSU2wsFeN0HCbz
 Q9zKqF55wCSo5XWX9GwQtjpiOgCxwCGr6rc3CuDxG7FM6yMl6f3+yoPCXfOQEDR8
 Pth5f4WYEvUc5RQGHf0W0vo1c/fqoGZ5l9zaxUuBIZbdhVTLkChUN/YrcTxO7eAp
 yVm4LmAqeAZiluEdowLgsvWdSyaYPynTCcFHXqX5bdwZWYD3u5/Pltkywfckw+G+
 DAUgGskjcA==
 =adjx
 -----END PGP SIGNATURE-----

Merge tag 'block-6.9-20240315' of git://git.kernel.dk/linux

Pull block fixes from Jens Axboe:

 - Revert of a change for mq-deadline that went into the 6.8 release,
   causing a performance regression for some (Bart)

 - Revert of the interruptible discard handling. This needs more work
   since the ioctl and fs path aren't properly split, and will happen
   for the 6.10 kernel release. For 6.9, do the minimal revert
   (Christoph)

 - Fix for an issue with the timestamp caching code (me)

 - kerneldoc fix (Jiapeng)

* tag 'block-6.9-20240315' of git://git.kernel.dk/linux:
  block: fix mismatched kerneldoc function name
  Revert "blk-lib: check for kill signal"
  Revert "block/mq-deadline: use correct way to throttling write requests"
  block: limit block time caching to in_task() context
This commit is contained in:
Linus Torvalds 2024-03-15 14:55:50 -07:00
parent c8e7699616 4c4ab8ae41
commit 277100b3d5
4 changed files with 4 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
block/blk-lib.c
View File

@ -35,26 +35,6 @@ static sector_t bio_discard_limit(struct block_device *bdev, sector_t sector)
return round_down(UINT_MAX, discard_granularity) >> SECTOR_SHIFT;
}
static void await_bio_endio(struct bio *bio)
{
complete(bio->bi_private);
bio_put(bio);
}
/*
* await_bio_chain - ends @bio and waits for every chained bio to complete
*/
static void await_bio_chain(struct bio *bio)
{
DECLARE_COMPLETION_ONSTACK_MAP(done,
bio->bi_bdev->bd_disk->lockdep_map);
bio->bi_private = &done;
bio->bi_end_io = await_bio_endio;
bio_endio(bio);
blk_wait_io(&done);
}
int __blkdev_issue_discard(struct block_device *bdev, sector_t sector,
sector_t nr_sects, gfp_t gfp_mask, struct bio **biop)
{
@ -97,10 +77,6 @@ int __blkdev_issue_discard(struct block_device *bdev, sector_t sector,
* is disabled.
*/
cond_resched();
if (fatal_signal_pending(current)) {
await_bio_chain(bio);
return -EINTR;
}
}
*biop = bio;
@ -167,10 +143,6 @@ static int __blkdev_issue_write_zeroes(struct block_device *bdev,
nr_sects -= len;
sector += len;
cond_resched();
if (fatal_signal_pending(current)) {
await_bio_chain(bio);
return -EINTR;
}
}
*biop = bio;
@ -215,10 +187,6 @@ static int __blkdev_issue_zero_pages(struct block_device *bdev,
break;
}
cond_resched();
if (fatal_signal_pending(current)) {
await_bio_chain(bio);
return -EINTR;
}
}
*biop = bio;
@ -309,7 +277,7 @@ retry:
bio_put(bio);
}
blk_finish_plug(&plug);
if (ret && ret != -EINTR && try_write_zeroes) {
if (ret && try_write_zeroes) {
if (!(flags & BLKDEV_ZERO_NOFALLBACK)) {
try_write_zeroes = false;
goto retry;
@ -361,12 +329,6 @@ int blkdev_issue_secure_erase(struct block_device *bdev, sector_t sector,
sector += len;
nr_sects -= len;
cond_resched();
if (fatal_signal_pending(current)) {
await_bio_chain(bio);
ret = -EINTR;
bio = NULL;
break;
}
}
if (bio) {
ret = submit_bio_wait(bio);

2
block/blk-settings.c
View File

@ -267,7 +267,7 @@ int queue_limits_commit_update(struct request_queue *q,
EXPORT_SYMBOL_GPL(queue_limits_commit_update);
/**
* queue_limits_commit_set - apply queue limits to queue
* queue_limits_set - apply queue limits to queue
* @q: queue to update
* @lim: limits to apply
*

2
block/blk.h
View File

@ -534,7 +534,7 @@ static inline u64 blk_time_get_ns(void)
{
struct blk_plug *plug = current->plug;
if (!plug)
if (!plug || !in_task())
return ktime_get_ns();
/*

3
block/mq-deadline.c
View File

@ -646,9 +646,8 @@ static void dd_depth_updated(struct blk_mq_hw_ctx *hctx)
struct request_queue *q = hctx->queue;
struct deadline_data *dd = q->elevator->elevator_data;
struct blk_mq_tags *tags = hctx->sched_tags;
unsigned int shift = tags->bitmap_tags.sb.shift;
dd->async_depth = max(1U, 3 * (1U << shift) / 4);
dd->async_depth = max(1UL, 3 * q->nr_requests / 4);
sbitmap_queue_min_shallow_depth(&tags->bitmap_tags, dd->async_depth);
}