From patchwork Mon Sep 12 19:27:51 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Roesch X-Patchwork-Id: 12974047 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 kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7DB09C6FA82 for ; Mon, 12 Sep 2022 19:28:31 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 1BB5D80008; Mon, 12 Sep 2022 15:28:31 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 16A8C80007; Mon, 12 Sep 2022 15:28:31 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 032A480008; Mon, 12 Sep 2022 15:28:30 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id E720880007 for ; Mon, 12 Sep 2022 15:28:30 -0400 (EDT) Received: from smtpin31.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id C52FEABA7C for ; Mon, 12 Sep 2022 19:28:30 +0000 (UTC) X-FDA: 79904419980.31.CCFEDBA Received: from mx0a-00082601.pphosted.com (mx0a-00082601.pphosted.com [67.231.145.42]) by imf18.hostedemail.com (Postfix) with ESMTP id 493BD1C0094 for ; Mon, 12 Sep 2022 19:28:30 +0000 (UTC) Received: from pps.filterd (m0044012.ppops.net [127.0.0.1]) by mx0a-00082601.pphosted.com (8.17.1.5/8.17.1.5) with ESMTP id 28CIm5mu004537 for ; Mon, 12 Sep 2022 12:28:29 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fb.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-transfer-encoding : content-type; s=facebook; bh=HgZUbO7apXTpfUq7KyjEgw2oorrYQGuiLIcFfxgsjkY=; b=GKze7BczTFInz/J2jfOcLFZWzLd3s4IqvoJKZyh/JIdTv7eZRq5HRoNXrLZGGHz0nPoV G+9Rafv4dTQ/veBNSflYJk7ySdlFadYEdN2dM32RaCZIsHxEuvePUVRgXNMEEgSkrGzG c5cSxRkzfVMVs4w5CgNX4rCjNFCy2su2Pxk= Received: from maileast.thefacebook.com ([163.114.130.16]) by mx0a-00082601.pphosted.com (PPS) with ESMTPS id 3jgr9smhb4-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Mon, 12 Sep 2022 12:28:29 -0700 Received: from twshared20183.05.prn5.facebook.com (2620:10d:c0a8:1b::d) by mail.thefacebook.com (2620:10d:c0a8:83::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.31; Mon, 12 Sep 2022 12:28:27 -0700 Received: by dev1180.prn1.facebook.com (Postfix, from userid 425415) id 2BB8B208523C; Mon, 12 Sep 2022 12:27:54 -0700 (PDT) From: Stefan Roesch To: , , , CC: , , , Subject: [PATCH v3 11/12] btrfs: assert nowait mode is not used for some btree search functions Date: Mon, 12 Sep 2022 12:27:51 -0700 Message-ID: <20220912192752.3785061-12-shr@fb.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220912192752.3785061-1-shr@fb.com> References: <20220912192752.3785061-1-shr@fb.com> MIME-Version: 1.0 X-FB-Internal: Safe X-Proofpoint-ORIG-GUID: knjMgDGwni0CYTXxj81nEHg1awi6I9pj X-Proofpoint-GUID: knjMgDGwni0CYTXxj81nEHg1awi6I9pj X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.205,Aquarius:18.0.895,Hydra:6.0.528,FMLib:17.11.122.1 definitions=2022-09-12_13,2022-09-12_02,2022-06-22_01 ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1663010910; a=rsa-sha256; cv=none; b=FYjIdJphAOcKgmZlNUkdqpaTtkWWixot8Ui9kJQ37g5gvxvMwBLsjEJQX9QAsZiMQn3k8m w5RL9QAR22PV5dJKrYb36bDpJbXFwVqCSiVu6oP7GSvCZTt5dJa0sTHHXDvoVlGLhq3YMw MyhG1HncXMy/m2hfqh7++Xwaa5RhRYg= ARC-Authentication-Results: i=1; imf18.hostedemail.com; dkim=pass header.d=fb.com header.s=facebook header.b=GKze7Bcz; spf=pass (imf18.hostedemail.com: domain of "prvs=025416ff2e=shr@fb.com" designates 67.231.145.42 as permitted sender) smtp.mailfrom="prvs=025416ff2e=shr@fb.com"; dmarc=pass (policy=reject) header.from=fb.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1663010910; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=HgZUbO7apXTpfUq7KyjEgw2oorrYQGuiLIcFfxgsjkY=; b=e05g4Y4KU8ODqpguaRQQvyU07EN4jeS/Di3jgrF3mU+99ojftJtIMuzJy5CIcQLy6EKLQ0 NJ2/lQxH2xE9kpUpoiOcbAkAMU7x3mII3C4BJjPr3mipZdtkuhJsrSlzLl49eTpSV4ByCH KDF9JNj50ApxENhY3cAMf/CKp6GsTUo= X-Rspamd-Queue-Id: 493BD1C0094 Authentication-Results: imf18.hostedemail.com; dkim=pass header.d=fb.com header.s=facebook header.b=GKze7Bcz; spf=pass (imf18.hostedemail.com: domain of "prvs=025416ff2e=shr@fb.com" designates 67.231.145.42 as permitted sender) smtp.mailfrom="prvs=025416ff2e=shr@fb.com"; dmarc=pass (policy=reject) header.from=fb.com X-Rspam-User: X-Rspamd-Server: rspam05 X-Stat-Signature: t4mus8zhn34kceozczdo1o8rh9kfqpzq X-HE-Tag: 1663010910-982390 X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: This adds nowait asserts to btree search functions which are not used by buffered IO and direct IO paths. Signed-off-by: Stefan Roesch --- fs/btrfs/ctree.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/fs/btrfs/ctree.c b/fs/btrfs/ctree.c index 71b238364939..d973d6702cd0 100644 --- a/fs/btrfs/ctree.c +++ b/fs/btrfs/ctree.c @@ -2164,6 +2164,7 @@ int btrfs_search_old_slot(struct btrfs_root *root, const struct btrfs_key *key, lowest_level = p->lowest_level; WARN_ON(p->nodes[0] != NULL); + ASSERT(!p->nowait); if (p->search_commit_root) { BUG_ON(time_seq); @@ -4465,6 +4466,7 @@ int btrfs_search_forward(struct btrfs_root *root, struct btrfs_key *min_key, int ret = 1; int keep_locks = path->keep_locks; + ASSERT(!path->nowait); path->keep_locks = 1; again: cur = btrfs_read_lock_root_node(root); @@ -4645,6 +4647,8 @@ int btrfs_next_old_leaf(struct btrfs_root *root, struct btrfs_path *path, int ret; int i; + ASSERT(!path->nowait); + nritems = btrfs_header_nritems(path->nodes[0]); if (nritems == 0) return 1;