From patchwork Mon Feb 27 15:12:52 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Breno Leitao X-Patchwork-Id: 13153766 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id DB79BC64ED8 for ; Mon, 27 Feb 2023 15:13:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230063AbjB0PNK (ORCPT ); Mon, 27 Feb 2023 10:13:10 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55042 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230015AbjB0PNJ (ORCPT ); Mon, 27 Feb 2023 10:13:09 -0500 Received: from mail-wr1-f41.google.com (mail-wr1-f41.google.com [209.85.221.41]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 63BF74ECD; Mon, 27 Feb 2023 07:13:07 -0800 (PST) Received: by mail-wr1-f41.google.com with SMTP id j2so6574382wrh.9; Mon, 27 Feb 2023 07:13:07 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=DEt0UyjW94h97HaGj5hCvZIS0SbSF+yQHOcOYLjMZlk=; b=ZGKOFWqJ4OK88srj8QPSeVg5ByiWq1/pPRor94YAaPQ8UdnEdVcmh/0rfu8Hb8xROD lRe1dyDL+l6mgMQ5SgIUzV/k5kk8eQzJjjhrJ3S4NC6dweitPlown8EOf2z+hCDTKdKa 8bnTjf7Be8pSU211pcpG5uB1IJFFsIkgP1W2oJn/LOmJQHqhpYtkjuzr4y2UhR3511Gp DSzSCNBZ+MMVSS4NafAGIsGjbdr6Yvvv9h6VWv1JZOfO9KPKxjsbf+1qj4HH7rxuSEdu NkDDr4N7AaWISGCg4Ma5tLyCJle05yikP0ZuJUwtIW33x7C0+pRyCDWHZ8fGggoymgfD q/Ow== X-Gm-Message-State: AO0yUKX1baB3yQVieIcbV08/b8unQr6YopuvRe1xbL+7urAHcvZ5agjN qBdtXxIzylCUwvKxuBDK4PI= X-Google-Smtp-Source: AK7set82FxfzNHpde/dr0/OPuEYHHUAX528+10n/AkMYqmsKiYgbh3W2A9W/sJb6NdVhwT7/OHgmig== X-Received: by 2002:adf:df87:0:b0:2c5:8c03:573f with SMTP id z7-20020adfdf87000000b002c58c03573fmr20262368wrl.31.1677510785933; Mon, 27 Feb 2023 07:13:05 -0800 (PST) Received: from localhost (fwdproxy-cln-012.fbsv.net. [2a03:2880:31ff:c::face:b00c]) by smtp.gmail.com with ESMTPSA id w15-20020adfee4f000000b002be5bdbe40csm7314510wro.27.2023.02.27.07.13.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 Feb 2023 07:13:05 -0800 (PST) From: Breno Leitao To: axboe@kernel.dk, tj@kernel.org, cgroups@vger.kernel.org, linux-block@vger.kernel.org, hch@lst.de Cc: josef@toxicpanda.com, aherrmann@suse.de, mkoutny@suse.com, linux-kernel@vger.kernel.org, leit@fb.com Subject: [PATCH v3] blk-iocost: Pass gendisk to ioc_refresh_params Date: Mon, 27 Feb 2023 07:12:52 -0800 Message-Id: <20230227151252.1411499-1-leitao@debian.org> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-block@vger.kernel.org Current kernel (d2980d8d826554fa6981d621e569a453787472f8) crashes when blk_iocost_init for `nvme1` disk. BUG: kernel NULL pointer dereference, address: 0000000000000050 #PF: supervisor read access in kernel mode #PF: error_code(0x0000) - not-present page blk_iocost_init (include/asm-generic/qspinlock.h:128 include/linux/spinlock.h:203 include/linux/spinlock_api_smp.h:158 include/linux/spinlock.h:400 block/blk-iocost.c:2884) ioc_qos_write (block/blk-iocost.c:3198) ? kretprobe_perf_func (kernel/trace/trace_kprobe.c:1566) ? kernfs_fop_write_iter (include/linux/slab.h:584 fs/kernfs/file.c:311) ? __kmem_cache_alloc_node (mm/slab.h:? mm/slub.c:3452 mm/slub.c:3491) ? _copy_from_iter (arch/x86/include/asm/uaccess_64.h:46 arch/x86/include/asm/uaccess_64.h:52 lib/iov_iter.c:183 lib/iov_iter.c:628) ? kretprobe_dispatcher (kernel/trace/trace_kprobe.c:1693) cgroup_file_write (kernel/cgroup/cgroup.c:4061) kernfs_fop_write_iter (fs/kernfs/file.c:334) vfs_write (include/linux/fs.h:1849 fs/read_write.c:491 fs/read_write.c:584) ksys_write (fs/read_write.c:637) do_syscall_64 (arch/x86/entry/common.c:50 arch/x86/entry/common.c:80) entry_SYSCALL_64_after_hwframe (arch/x86/entry/entry_64.S:120) This happens because ioc_refresh_params() is being called without a properly initialized ioc->rqos, which is happening later in the callee side. ioc_refresh_params() -> ioc_autop_idx() tries to access ioc->rqos.disk->queue but ioc->rqos.disk is NULL, causing the BUG above. Create a function that is similar to ioc_refresh_params() but where the "struct gendisk" could be passed as an explicit argument. This function will be called when ioc->rqos.disk could not be trusted. Fixes: ce57b558604e ("blk-rq-qos: make rq_qos_add and rq_qos_del more useful") Signed-off-by: Breno Leitao Reviewed-by: Christoph Hellwig --- block/blk-iocost.c | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) --- Changelog v1->v2: Pass the struct request_queue explictly to ioc_refresh_params() v2->v3: Use struct gendisk instead of struct request_queue diff --git a/block/blk-iocost.c b/block/blk-iocost.c index ff534e9d92dc..9d24ddaf301d 100644 --- a/block/blk-iocost.c +++ b/block/blk-iocost.c @@ -800,7 +800,7 @@ static void ioc_refresh_period_us(struct ioc *ioc) ioc_refresh_margins(ioc); } -static int ioc_autop_idx(struct ioc *ioc) +static int ioc_autop_idx(struct ioc *ioc, struct gendisk *disk) { int idx = ioc->autop_idx; const struct ioc_params *p = &autop[idx]; @@ -808,11 +808,11 @@ static int ioc_autop_idx(struct ioc *ioc) u64 now_ns; /* rotational? */ - if (!blk_queue_nonrot(ioc->rqos.disk->queue)) + if (!blk_queue_nonrot(disk->queue)) return AUTOP_HDD; /* handle SATA SSDs w/ broken NCQ */ - if (blk_queue_depth(ioc->rqos.disk->queue) == 1) + if (blk_queue_depth(disk->queue) == 1) return AUTOP_SSD_QD1; /* use one of the normal ssd sets */ @@ -901,14 +901,19 @@ static void ioc_refresh_lcoefs(struct ioc *ioc) &c[LCOEF_WPAGE], &c[LCOEF_WSEQIO], &c[LCOEF_WRANDIO]); } -static bool ioc_refresh_params(struct ioc *ioc, bool force) +/* + * struct gendisk is required as an argument because ioc->rqos.disk + * might not be properly initialized + */ +static bool _ioc_refresh_params(struct ioc *ioc, bool force, + struct gendisk *disk) { const struct ioc_params *p; int idx; lockdep_assert_held(&ioc->lock); - idx = ioc_autop_idx(ioc); + idx = ioc_autop_idx(ioc, disk); p = &autop[idx]; if (idx == ioc->autop_idx && !force) @@ -939,6 +944,11 @@ static bool ioc_refresh_params(struct ioc *ioc, bool force) return true; } +static bool ioc_refresh_params(struct ioc *ioc, bool force) +{ + return _ioc_refresh_params(ioc, force, ioc->rqos.disk); +} + /* * When an iocg accumulates too much vtime or gets deactivated, we throw away * some vtime, which lowers the overall device utilization. As the exact amount @@ -2880,7 +2890,7 @@ static int blk_iocost_init(struct gendisk *disk) spin_lock_irq(&ioc->lock); ioc->autop_idx = AUTOP_INVALID; - ioc_refresh_params(ioc, true); + _ioc_refresh_params(ioc, true, disk); spin_unlock_irq(&ioc->lock); /*