Received: by 2002:a05:6358:4e97:b0:b3:742d:4702 with SMTP id ce23csp2341119rwb; Mon, 15 Aug 2022 03:49:22 -0700 (PDT) X-Google-Smtp-Source: AA6agR7W7xboywsg2TXhjto99D8lNWGmyRqsdvEJyjBts5bafLQp9EawVXd9NHYF3wQI6IDHgCog X-Received: by 2002:a17:907:3f24:b0:730:b83d:3a20 with SMTP id hq36-20020a1709073f2400b00730b83d3a20mr10291379ejc.271.1660560562695; Mon, 15 Aug 2022 03:49:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1660560562; cv=none; d=google.com; s=arc-20160816; b=KCODP0EWIkxfRmyQNFpVMgKH4TcRKB8lCErvZA/TRsLFsTKDV5xb60GKuFXVvRVeMx DD0G6yej1NnRGL+Vg3jiJmgZhi/NozqutQO2oM7McDa9Gmiz8ftWWLEctCu0kUTv5DlF 0atRxBcPvO4fPHgNGZCJMIQQsqEHeE8wVjWCE94HNgWjcuUvbQUB1CEqaaVMa7UOtTms sM7cRUq4Q6IWYuyY3LH5LM6zJ5ik+6hXPNZSrQkD2Ni0aHFG8b0RKdXzihYjtRgM/n2d WeNtO8kCLhK3uKAten24fliaaJdMF2mTeUCtEGN3DqWDLmJFLVKxKFEwVimr4AOQhTMn uwew== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:in-reply-to:content-disposition:mime-version :references:message-id:subject:cc:to:from:date:dkim-signature :dkim-signature; bh=2Exku+wXrQsKISLBaDqfxMSmFxIXd4YlKWcKQpRTjmQ=; b=q0/sBBtBmvDszTrT3zKrD68a4aTZXNIiWnTGyVSlaSrKx39YmNAGFuAOA4Glsi7T/p xkmZKML19cp7m87oSTE2tdb2yTcj8nDVslnlI7V9+YcZYARzNwFPWAXUSS/AHTLmIM9+ KNUdMgf8ClBIrfeIa0FgZK1CTzILaO9AMNsk65Pkn3an0bm4PLM9hkxxBfELeNOyKKQe bchPncOVHQRxX8j/oMTLW0XJqeYl4Bk0xVJO0neIHsezfniF6xzh7uGLXBtimHZvPShb 2kGbRUEX5GDkGRzpJUDr1cM11w/q9sLt45n/ujU2OYKEFv4CkdqXuSiSwSgrY6exItJd wGRQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@suse.cz header.s=susede2_rsa header.b=uVFV44cM; dkim=neutral (no key) header.i=@suse.cz header.b=SwnKm0WY; 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 Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id di18-20020a170906731200b007263a6115adsi7103465ejc.893.2022.08.15.03.48.56; Mon, 15 Aug 2022 03:49:22 -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=@suse.cz header.s=susede2_rsa header.b=uVFV44cM; dkim=neutral (no key) header.i=@suse.cz header.b=SwnKm0WY; 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S242412AbiHOKl2 (ORCPT + 99 others); Mon, 15 Aug 2022 06:41:28 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58712 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S242410AbiHOKl0 (ORCPT ); Mon, 15 Aug 2022 06:41:26 -0400 Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.220.28]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7E1AE220FE; Mon, 15 Aug 2022 03:41:25 -0700 (PDT) Received: from relay2.suse.de (relay2.suse.de [149.44.160.134]) by smtp-out1.suse.de (Postfix) with ESMTP id 053F434EE2; Mon, 15 Aug 2022 10:41:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_rsa; t=1660560084; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=2Exku+wXrQsKISLBaDqfxMSmFxIXd4YlKWcKQpRTjmQ=; b=uVFV44cMn3FLComwW2bqAJsoGdYTA6vzO3gmsaVZh1D3iuqHGMGlhDLVDrUnEq7tMuSvKz Rc1fwyODxbA1BOTi57h0xbmgC44Mfrbb9XX8f5dqniFHIQZ+b2jkreEdiY7KLRVcHwSOkI gKoxW0dPFJ3um5Pa6UOLJQmgNnCmL7Y= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_ed25519; t=1660560084; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=2Exku+wXrQsKISLBaDqfxMSmFxIXd4YlKWcKQpRTjmQ=; b=SwnKm0WYR1BkHsWQSbSSMTLmloCNHqn+dmSUf9taFKebvKDRyv5bd7zUNEa0NDElfI8GFq z3ViZp3AdYUj90Dg== Received: from quack3.suse.cz (unknown [10.100.224.230]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by relay2.suse.de (Postfix) with ESMTPS id 9380C2C1B9; Mon, 15 Aug 2022 10:41:23 +0000 (UTC) Received: by quack3.suse.cz (Postfix, from userid 1000) id 2D1E8A066A; Mon, 15 Aug 2022 12:41:22 +0200 (CEST) Date: Mon, 15 Aug 2022 12:41:22 +0200 From: Jan Kara To: Khazhismel Kumykov Cc: Alexander Viro , Andrew Morton , "Matthew Wilcox (Oracle)" , Jan Kara , linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, linux-mm@kvack.org, Khazhismel Kumykov Subject: Re: [PATCH v2] writeback: avoid use-after-free after removing device Message-ID: <20220815104122.2sr4s2nkevdmcrug@quack3> References: <20220729215123.1998585-1-khazhy@google.com> <20220801155034.3772543-1-khazhy@google.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20220801155034.3772543-1-khazhy@google.com> X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,SPF_HELO_NONE, SPF_PASS,T_SCC_BODY_TEXT_LINE 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 On Mon 01-08-22 08:50:34, Khazhismel Kumykov wrote: > When a disk is removed, bdi_unregister gets called to stop further > writeback and wait for associated delayed work to complete. However, > wb_inode_writeback_end() may schedule bandwidth estimation dwork after > this has completed, which can result in the timer attempting to access > the just freed bdi_writeback. > > Fix this by checking if the bdi_writeback is alive, similar to when > scheduling writeback work. > > Since this requires wb->work_lock, and wb_inode_writeback_end() may get > called from interrupt, switch wb->work_lock to an irqsafe lock. > > Fixes: 45a2966fd641 ("writeback: fix bandwidth estimate for spiky workload") > Signed-off-by: Khazhismel Kumykov Looks good to me. Feel free to add: Reviewed-by: Jan Kara Honza > --- > fs/fs-writeback.c | 12 ++++++------ > mm/backing-dev.c | 10 +++++----- > mm/page-writeback.c | 6 +++++- > 3 files changed, 16 insertions(+), 12 deletions(-) > > v2: made changelog a bit more verbose > > diff --git a/fs/fs-writeback.c b/fs/fs-writeback.c > index 05221366a16d..08a1993ab7fd 100644 > --- a/fs/fs-writeback.c > +++ b/fs/fs-writeback.c > @@ -134,10 +134,10 @@ static bool inode_io_list_move_locked(struct inode *inode, > > static void wb_wakeup(struct bdi_writeback *wb) > { > - spin_lock_bh(&wb->work_lock); > + spin_lock_irq(&wb->work_lock); > if (test_bit(WB_registered, &wb->state)) > mod_delayed_work(bdi_wq, &wb->dwork, 0); > - spin_unlock_bh(&wb->work_lock); > + spin_unlock_irq(&wb->work_lock); > } > > static void finish_writeback_work(struct bdi_writeback *wb, > @@ -164,7 +164,7 @@ static void wb_queue_work(struct bdi_writeback *wb, > if (work->done) > atomic_inc(&work->done->cnt); > > - spin_lock_bh(&wb->work_lock); > + spin_lock_irq(&wb->work_lock); > > if (test_bit(WB_registered, &wb->state)) { > list_add_tail(&work->list, &wb->work_list); > @@ -172,7 +172,7 @@ static void wb_queue_work(struct bdi_writeback *wb, > } else > finish_writeback_work(wb, work); > > - spin_unlock_bh(&wb->work_lock); > + spin_unlock_irq(&wb->work_lock); > } > > /** > @@ -2082,13 +2082,13 @@ static struct wb_writeback_work *get_next_work_item(struct bdi_writeback *wb) > { > struct wb_writeback_work *work = NULL; > > - spin_lock_bh(&wb->work_lock); > + spin_lock_irq(&wb->work_lock); > if (!list_empty(&wb->work_list)) { > work = list_entry(wb->work_list.next, > struct wb_writeback_work, list); > list_del_init(&work->list); > } > - spin_unlock_bh(&wb->work_lock); > + spin_unlock_irq(&wb->work_lock); > return work; > } > > diff --git a/mm/backing-dev.c b/mm/backing-dev.c > index 95550b8fa7fe..de65cb1e5f76 100644 > --- a/mm/backing-dev.c > +++ b/mm/backing-dev.c > @@ -260,10 +260,10 @@ void wb_wakeup_delayed(struct bdi_writeback *wb) > unsigned long timeout; > > timeout = msecs_to_jiffies(dirty_writeback_interval * 10); > - spin_lock_bh(&wb->work_lock); > + spin_lock_irq(&wb->work_lock); > if (test_bit(WB_registered, &wb->state)) > queue_delayed_work(bdi_wq, &wb->dwork, timeout); > - spin_unlock_bh(&wb->work_lock); > + spin_unlock_irq(&wb->work_lock); > } > > static void wb_update_bandwidth_workfn(struct work_struct *work) > @@ -334,12 +334,12 @@ static void cgwb_remove_from_bdi_list(struct bdi_writeback *wb); > static void wb_shutdown(struct bdi_writeback *wb) > { > /* Make sure nobody queues further work */ > - spin_lock_bh(&wb->work_lock); > + spin_lock_irq(&wb->work_lock); > if (!test_and_clear_bit(WB_registered, &wb->state)) { > - spin_unlock_bh(&wb->work_lock); > + spin_unlock_irq(&wb->work_lock); > return; > } > - spin_unlock_bh(&wb->work_lock); > + spin_unlock_irq(&wb->work_lock); > > cgwb_remove_from_bdi_list(wb); > /* > diff --git a/mm/page-writeback.c b/mm/page-writeback.c > index 55c2776ae699..3c34db15cf70 100644 > --- a/mm/page-writeback.c > +++ b/mm/page-writeback.c > @@ -2867,6 +2867,7 @@ static void wb_inode_writeback_start(struct bdi_writeback *wb) > > static void wb_inode_writeback_end(struct bdi_writeback *wb) > { > + unsigned long flags; > atomic_dec(&wb->writeback_inodes); > /* > * Make sure estimate of writeback throughput gets updated after > @@ -2875,7 +2876,10 @@ static void wb_inode_writeback_end(struct bdi_writeback *wb) > * that if multiple inodes end writeback at a similar time, they get > * batched into one bandwidth update. > */ > - queue_delayed_work(bdi_wq, &wb->bw_dwork, BANDWIDTH_INTERVAL); > + spin_lock_irqsave(&wb->work_lock, flags); > + if (test_bit(WB_registered, &wb->state)) > + queue_delayed_work(bdi_wq, &wb->bw_dwork, BANDWIDTH_INTERVAL); > + spin_unlock_irqrestore(&wb->work_lock, flags); > } > > bool __folio_end_writeback(struct folio *folio) > -- > 2.37.1.455.g008518b4e5-goog > -- Jan Kara SUSE Labs, CR