tmakin/ack-tegra
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "ANDROID: block: Make sub_page_limit_queues available in debugfs"

Browse Source 
This reverts commit d1e8cd1f03.

Bug: 399192075

Changes related to ANDROID's implementation of small segment size for
block device are being reverted in order to backport upstream accepted
solution at
https://lore.kernel.org/linux-block/20250225022141.2154581-1-ming.lei@redhat.com/

Change-Id: Ia9de7440ab2a8e38b88601cbcad05efcf65e1470
Signed-off-by: Sandeep Dhavale <dhavale@google.com>
This commit is contained in:
Sandeep Dhavale
2025-03-04 14:15:25 -08:00
committed by Carlos Llamas
parent 26d22cc349
commit b7ae5355b0
5 changed files with 1 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
block/blk-core.c
-2
View File
@@ -45,7 +45,6 @@
#include <trace/events/block.h>
#include "blk.h"
#include "blk-mq-debugfs.h"
#include "blk-mq-sched.h"
#include "blk-pm.h"
#include "blk-cgroup.h"
@@ -1281,7 +1280,6 @@ int __init blk_dev_init(void)
blk_requestq_cachep = KMEM_CACHE(request_queue, SLAB_PANIC);
blk_debugfs_root = debugfs_create_dir("block", NULL);
blk_mq_debugfs_init();
return 0;
}
block/blk-mq-debugfs.c
-8
View File
@@ -829,11 +829,3 @@ void blk_mq_debugfs_unregister_sched_hctx(struct blk_mq_hw_ctx *hctx)
debugfs_remove_recursive(hctx->sched_debugfs_dir);
hctx->sched_debugfs_dir = NULL;
}
DEFINE_DEBUGFS_ATTRIBUTE(blk_sub_page_limit_queues_fops,
blk_sub_page_limit_queues_get, NULL, "%llu\n");
void blk_mq_debugfs_init(void)
{
debugfs_create_file("sub_page_limit_queues", 0400, blk_debugfs_root,
NULL, &blk_sub_page_limit_queues_fops);
}
block/blk-mq-debugfs.h
-5
View File
@@ -17,7 +17,6 @@ struct blk_mq_debugfs_attr {
const struct seq_operations *seq_ops;
};
void blk_mq_debugfs_init(void);
int __blk_mq_debugfs_rq_show(struct seq_file *m, struct request *rq);
int blk_mq_debugfs_rq_show(struct seq_file *m, void *v);
@@ -37,10 +36,6 @@ void blk_mq_debugfs_unregister_sched_hctx(struct blk_mq_hw_ctx *hctx);
void blk_mq_debugfs_register_rqos(struct rq_qos *rqos);
void blk_mq_debugfs_unregister_rqos(struct rq_qos *rqos);
#else
static inline void blk_mq_debugfs_init(void)
{
}
static inline void blk_mq_debugfs_register(struct request_queue *q)
{
}
block/blk-settings.c
-8
View File
@@ -225,14 +225,6 @@ unsupported:
lim->atomic_write_unit_max = 0;
}
/* For debugfs. */
int blk_sub_page_limit_queues_get(void *data, u64 *val)
{
*val = READ_ONCE(blk_nr_sub_page_limit_queues);
return 0;
}
/**
* blk_enable_sub_page_limits - enable support for limits below the page size
* @lim: request queue limits for which to enable support of these features.
block/blk.h
+1 -1
View File
@@ -44,12 +44,12 @@ bool __blk_freeze_queue_start(struct request_queue *q,
int __bio_queue_enter(struct request_queue *q, struct bio *bio);
void submit_bio_noacct_nocheck(struct bio *bio);
void bio_await_chain(struct bio *bio);
static inline bool blk_queue_sub_page_limits(const struct queue_limits *lim)
{
return static_branch_unlikely(&blk_sub_page_limits) &&
lim->sub_page_limits;
}
int blk_sub_page_limit_queues_get(void *data, u64 *val);
void blk_disable_sub_page_limits(struct queue_limits *q);
static inline bool blk_try_enter_queue(struct request_queue *q, bool pm)
{