From patchwork Thu Nov 3 01:39:37 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khazhismel Kumykov X-Patchwork-Id: 14587 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp262350wru; Wed, 2 Nov 2022 19:00:27 -0700 (PDT) X-Google-Smtp-Source: AMsMyM73//tJKyflpT1GWB3Q41z+Nszn9MyWW/JIV6jxDHidlpbrS7LhYTabMr69QLR3F5BUtYiS X-Received: by 2002:a17:907:72c3:b0:792:56d7:285a with SMTP id du3-20020a17090772c300b0079256d7285amr26273134ejc.597.1667440827552; Wed, 02 Nov 2022 19:00:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1667440827; cv=none; d=google.com; s=arc-20160816; b=Mh9HrPMu3qt6m7U6+8dVibeYNwkk+9vJonaqrARDSJPJPP74TA9upYmVE8gmfmCtdD tQL4ZvPg1IVX0wRW7qtt8Ei9jpAHeRsE5wxVst2rKOhRrKaChvquAaRpeeobwNCRr5fz Fj95T8+7RLAWsBAvjceZlaP4e8PBzDX6nMs7vYLH5bxev5iUsDKqzGxtg/4WIWJ5TWUI T9tltTfNjjNQmT3ABaAYiZIuv45Wxnun1YYvhCTMRsN/agjKwA0GORbJvz2qS2TcVnqG WDDs0MZfFf4ZQkh8uSTTFQk+vMJvaIz3q53mjGduTDpIjJl70Nj/VtT8YDBxAZVvsSbJ 5eww== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=EvT5dgXSYKBpxcVTYD1qf8cSHTUWaJZF8xGQfaZD+ZU=; b=oHG/rKhVVkZbQ5gbiArxYT4KqrdSdLwqtWOTRVEHu6nImCMqxPbQ9s3bvUrMaOvCzp i34UZqiq2yOVeGocwL3ikoLksJwtACUonVW5ljAEj1i+JhRXDupOkumNNfk1RHBPEaRY 8QhzdTpluCECVsRyVf+rJCx77P27K99xfTWNh8RqKHCX4ddk/PK7m8AfWe5BLSpi7Keb vV6i95w0PK1wW8PNwiy2QxXxN8so3hT8pXqvbAlB2doj2pFCx/Uy1ZZgGzRvL/s0Pzjc nV8Yf8fbda9FLbyVVHHRi0TAYyYfN2Uyw9JP3+I3wr/+mtnJ2qjO52rlUDPkjUZ/zO/L tA7Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b="a/RROOv1"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=chromium.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id ca7-20020aa7cd67000000b0045caa8bf80bsi15232098edb.307.2022.11.02.19.00.01; Wed, 02 Nov 2022 19:00:27 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b="a/RROOv1"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=chromium.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230303AbiKCBki (ORCPT + 99 others); Wed, 2 Nov 2022 21:40:38 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44118 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229459AbiKCBkf (ORCPT ); Wed, 2 Nov 2022 21:40:35 -0400 Received: from mail-pl1-x62e.google.com (mail-pl1-x62e.google.com [IPv6:2607:f8b0:4864:20::62e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 09F441114D for ; Wed, 2 Nov 2022 18:40:34 -0700 (PDT) Received: by mail-pl1-x62e.google.com with SMTP id v17so555954plo.1 for ; Wed, 02 Nov 2022 18:40:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=EvT5dgXSYKBpxcVTYD1qf8cSHTUWaJZF8xGQfaZD+ZU=; b=a/RROOv1Lf+Wm2fr9D3eQRp6ISUL4AOlQae9HPGthkEBzMVudH/Ngx9bXGynny5St8 g0gYbfl3i3N9mbrpII9cqdelc6e1jWDzwrnmemcXg1eQTOPVbzFlUqRFvUfpWh4Ma511 97Sta3HSo6BKDK7nmnjJrX5BWxK3RqZtOqATk= 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=EvT5dgXSYKBpxcVTYD1qf8cSHTUWaJZF8xGQfaZD+ZU=; b=opeFk1AxNcC3bBrLKCxzm13aauOiJg84aTocKzcatr7dlBIhUc+E++RRzkxhC/ofiM tUYze0b+/PpqbuY+r1hyQlSg6GkhTRvJo63sMO8Wie4uWT3Q9CcTQ22OcfATf6o6SARr vVltvkq6HRp+L+dLYZQNMj41lef279ylqaDNbFZUIZYrgNnToiaRFNkxqxwByF8fFcV/ ncP9yUqYtbdj8mRO4AdsibNuOntJzaZ0u/cQ1n3phENNa8QrtEEOOEyTGRw8sr6xr4Ji PoTXzAWUTpmmB8QqBt49Wydxx+IHUJZq6d2dpoLADFwE9TbHvhcNQWYyPzl0C8OrJYjo CCyA== X-Gm-Message-State: ACrzQf2b5OaqGNclKfW+MMCc/WH3Gj8xVXdjxs7kqGJvLJvBYLj9S0CN CntG+6rMyhtZ1Iw1o6LOJ5l/bA== X-Received: by 2002:a17:90a:2a02:b0:214:247a:c185 with SMTP id i2-20020a17090a2a0200b00214247ac185mr8234172pjd.226.1667439633589; Wed, 02 Nov 2022 18:40:33 -0700 (PDT) Received: from khazhy-linux.svl.corp.google.com ([2620:15c:2d4:203:1464:23cb:dead:55d3]) by smtp.gmail.com with ESMTPSA id x8-20020a17090abc8800b0020ad86f4c54sm2091370pjr.16.2022.11.02.18.40.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 02 Nov 2022 18:40:33 -0700 (PDT) From: Khazhismel Kumykov X-Google-Original-From: Khazhismel Kumykov To: Paolo Valente , Jens Axboe Cc: linux-block@vger.kernel.org, linux-kernel@vger.kernel.org, Khazhismel Kumykov Subject: [RFC PATCH] bfq: fix waker_bfqq inconsistency crash Date: Wed, 2 Nov 2022 18:39:37 -0700 Message-Id: <20221103013937.603626-1-khazhy@google.com> X-Mailer: git-send-email 2.38.1.273.g43a17bfeac-goog MIME-Version: 1.0 X-Spam-Status: No, score=-3.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1748438433438530545?= X-GMAIL-MSGID: =?utf-8?q?1748438433438530545?= This fixes crashes in bfq_add_bfqq_busy due to waker_bfqq being NULL, but woken_list_node still being hashed. This would happen when bfq_init_rq() expects a brand new allocated queue to be returned from bfq_get_bfqq_handle_split() and unconditionally updates waker_bfqq without resetting woken_list_node. Since we can always return oom_bfqq when attempting to allocate, we cannot assume waker_bfqq starts as NULL. We must either reset woken_list_node, or avoid setting woken_list at all for oom_bfqq - opt to do the former. Crashes would have a stacktrace like: [160595.656560] bfq_add_bfqq_busy+0x110/0x1ec [160595.661142] bfq_add_request+0x6bc/0x980 [160595.666602] bfq_insert_request+0x8ec/0x1240 [160595.671762] bfq_insert_requests+0x58/0x9c [160595.676420] blk_mq_sched_insert_request+0x11c/0x198 [160595.682107] blk_mq_submit_bio+0x270/0x62c [160595.686759] __submit_bio_noacct_mq+0xec/0x178 [160595.691926] submit_bio+0x120/0x184 [160595.695990] ext4_mpage_readpages+0x77c/0x7c8 [160595.701026] ext4_readpage+0x60/0xb0 [160595.705158] filemap_read_page+0x54/0x114 [160595.711961] filemap_fault+0x228/0x5f4 [160595.716272] do_read_fault+0xe0/0x1f0 [160595.720487] do_fault+0x40/0x1c8 Tested by injecting random failures into bfq_get_queue, crashes go away completely. Fixes: 8ef3fc3a043c ("block, bfq: make shared queues inherit wakers") Signed-off-by: Khazhismel Kumykov --- RFC mainly because it's not clear to me the best policy here - but the patch is tested and fixes a real crash we started seeing in 5.15 This is following up my ramble over at https://lore.kernel.org/lkml/CACGdZYLMnfcqwbAXDx+x9vUOMn2cz55oc+8WySBS3J2Xd_q7Lg@mail.gmail.com/ block/bfq-iosched.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/block/bfq-iosched.c b/block/bfq-iosched.c index 7ea427817f7f..5d2861119d20 100644 --- a/block/bfq-iosched.c +++ b/block/bfq-iosched.c @@ -6793,7 +6793,12 @@ static struct bfq_queue *bfq_init_rq(struct request *rq) * reset. So insert new_bfqq into the * woken_list of the waker. See * bfq_check_waker for details. + * + * Also, if we got oom_bfqq, we must check if + * it's already in a woken_list */ + if (unlikely(!hlist_unhashed(&bfqq->woken_list_node))) + hlist_del_init(&bfqq->woken_list_node); if (bfqq->waker_bfqq) hlist_add_head(&bfqq->woken_list_node, &bfqq->waker_bfqq->woken_list); From patchwork Tue Nov 8 18:10:30 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khazhismel Kumykov X-Patchwork-Id: 17151 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp2869360wru; Tue, 8 Nov 2022 10:14:36 -0800 (PST) X-Google-Smtp-Source: AA0mqf6YaR9MZklVdDyONjoFFsSiFE8sOWUVT0tQ/t/0G5XnH7lUg5MjOEquAHAcjc+v8A7ANhG+ X-Received: by 2002:a17:902:f70f:b0:188:6862:5917 with SMTP id h15-20020a170902f70f00b0018868625917mr23254329plo.129.1667931276304; Tue, 08 Nov 2022 10:14:36 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1667931276; cv=none; d=google.com; s=arc-20160816; b=kbLy+D4vb1OKrHikuAcsYDe49C0rniGA1LfWp3Hl4n0+RJRWoAHyQ5PaWJQFR0EL/h 5sCENGc+9L5Bl0XcGztc8ip/2AqpblPxMLfxEBnw27q6npQaZ85QvBn88SUsKRvOd/yL TPOQ8r6fdFSD3qJyrj/iWeEWtlXtbt4RQgS4iIO5XYvPG8xUctkuIioDzRMtjvMezOBe jzwU7cFpvtdFtldFx1mzkppuyBvfCAAlqvEVedTIv1/6fKnp33LZOlOffG7CbQsafW/s syu5ObeeWTGQIHbThfhT1h+QnIy6RDZk9VXfdhM4T7/SWpqZYCOfrZOsVnH6ok9i/W1+ iceA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=doefm16lSnPXsJmoD4HfwCSvjxjKuEr5Qsn95UJjEvs=; b=0+oD30+5SD5/e/ntlKfeGcgI54AN99s75h8jU2GLI4K6/538JVxrdnye8T5iZvlHM7 Dq0SzJBzP9kDJTwyNiXkwys6oU7PxIPiqfI/0+X0Eh0fiO3IZXH8+Sm3Bpu2jm5WKk0F Bmfzcm/NqlaI5POKNLDlQqnG8VtfDNd0Kpj4apXtnlR9wJojwVOZrIG2NZcVd+fh/0Rm aGDUGMONBTeg2R3OteQrwKeEPqnDG92v3dEwCfGBNcarb+nQ/pIxSqwGHtnbBtOVnfnW E1GLHJmLwJ/cKheJEr/NHWoT+wnc4WeqaYU5/AqwA6SMywNI/dit7ofOzLqIZir3xuMD vaBw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=iWqJN2aT; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=chromium.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id f35-20020a17090a28a600b002142213dedasi15894154pjd.40.2022.11.08.10.14.21; Tue, 08 Nov 2022 10:14:36 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=iWqJN2aT; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=chromium.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234752AbiKHSK5 (ORCPT + 99 others); Tue, 8 Nov 2022 13:10:57 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59112 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234617AbiKHSKv (ORCPT ); Tue, 8 Nov 2022 13:10:51 -0500 Received: from mail-pj1-x102b.google.com (mail-pj1-x102b.google.com [IPv6:2607:f8b0:4864:20::102b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9C25153EE5 for ; Tue, 8 Nov 2022 10:10:48 -0800 (PST) Received: by mail-pj1-x102b.google.com with SMTP id m14-20020a17090a3f8e00b00212dab39bcdso18649596pjc.0 for ; Tue, 08 Nov 2022 10:10:48 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=doefm16lSnPXsJmoD4HfwCSvjxjKuEr5Qsn95UJjEvs=; b=iWqJN2aTT85XOWY8kqWAzz6nDxz79xyLSl9V9Go+paQEpkuEzdzQQJ0UrLhmGmD/IB mZtuMuH1CGWHSYGAThg7Xm282vcRJlk45sKx07CmtvpsiXsV3YHnrkTXuiu1C4HRwuyR Lz0jPfUPhf0DogtOkredrzdlTfzSCGY7HuqBc= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=doefm16lSnPXsJmoD4HfwCSvjxjKuEr5Qsn95UJjEvs=; b=Wf+BtMgZfpPaCQv1gXhrhK2K5nHNhGfz/mQj/SXqs99iMFXHu8yW/9MAMp48Szfg6R /yiUNH3UFdkfRQ0Unmql7+yGQFdBDHzleBcxachp+NCSsRvj0Zha+J9Gntj9WKCIYJbc AsV8TOgAGmI3qrQI7c9dM+E+LDcBnaR+GC9eil6g+x55zzFhKtEsdhdpd5K6Fpe3UjMD GSxMkZ4/gov2/Un3gaWLQBy7g+4SzuX1PSry1Ai5PMuxKyhi64gb8K+21kht7IaclFoG eMgdKpfWF4djSpuBeSdqj1q02oD/cb+wk62FjRlUtR8Pbx+6w6qTSdvgqAAaCrP+TDu1 vbdQ== X-Gm-Message-State: ACrzQf1VqfjPeDpvGGKZGu8EjOX/oO2KK2vuvaS5mXR/L78OEpPKyhJH QBNjU2MtmcOHHlq1o+n2FjwKPw== X-Received: by 2002:a17:90a:c592:b0:213:9c65:b78f with SMTP id l18-20020a17090ac59200b002139c65b78fmr57515431pjt.14.1667931048089; Tue, 08 Nov 2022 10:10:48 -0800 (PST) Received: from khazhy-linux.svl.corp.google.com ([2620:15c:2d4:203:21f:525:beef:f928]) by smtp.gmail.com with ESMTPSA id h3-20020a63df43000000b0046fd180640asm6048754pgj.24.2022.11.08.10.10.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 08 Nov 2022 10:10:47 -0800 (PST) From: Khazhismel Kumykov X-Google-Original-From: Khazhismel Kumykov To: Paolo Valente , Jens Axboe Cc: linux-block@vger.kernel.org, linux-kernel@vger.kernel.org, Yu Kuai , Jan Kara , Khazhismel Kumykov Subject: [PATCH 2/2] bfq: ignore oom_bfqq in bfq_check_waker Date: Tue, 8 Nov 2022 10:10:30 -0800 Message-Id: <20221108181030.1611703-2-khazhy@google.com> X-Mailer: git-send-email 2.38.1.431.g37b22c650d-goog In-Reply-To: <20221108181030.1611703-1-khazhy@google.com> References: <20221103013937.603626-1-khazhy@google.com> <20221108181030.1611703-1-khazhy@google.com> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1748952706162358899?= X-GMAIL-MSGID: =?utf-8?q?1748952706162358899?= oom_bfqq is just a fallback bfqq, so shouldn't be used with waker detection. Suggested-by: Jan Kara Signed-off-by: Khazhismel Kumykov Reviewed-by: Jan Kara --- block/bfq-iosched.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/block/bfq-iosched.c b/block/bfq-iosched.c index ca04ec868c40..267baf84870f 100644 --- a/block/bfq-iosched.c +++ b/block/bfq-iosched.c @@ -2135,7 +2135,9 @@ static void bfq_check_waker(struct bfq_data *bfqd, struct bfq_queue *bfqq, if (!bfqd->last_completed_rq_bfqq || bfqd->last_completed_rq_bfqq == bfqq || bfq_bfqq_has_short_ttime(bfqq) || - now_ns - bfqd->last_completion >= 4 * NSEC_PER_MSEC) + now_ns - bfqd->last_completion >= 4 * NSEC_PER_MSEC || + bfqd->last_completed_rq_bfqq == &bfqd->oom_bfqq || + bfqq == &bfqd->oom_bfqq) return; /*