Received: by 2002:a5d:9c59:0:0:0:0:0 with SMTP id 25csp2280622iof; Wed, 8 Jun 2022 01:17:17 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx3IBk+Rrj7CJUDRJsbVAxJDaKydhhWRJING2UvLWQXL6DKvomJwTtIxOkE8wdE0Xxu0pgt X-Received: by 2002:a17:902:bb90:b0:163:ad4c:624b with SMTP id m16-20020a170902bb9000b00163ad4c624bmr32641625pls.87.1654676237771; Wed, 08 Jun 2022 01:17:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1654676237; cv=none; d=google.com; s=arc-20160816; b=R/ECSjZ1EBgPWHvsv5GtnzW0ep75MsxuL30YmNUfukfJpykngtSRG1knB4qvJJhbge 855JivRz5sdV0v6i1KeXgAcSGg3KzU+KHDVwCd1q6EgtJgQpGep2zEyj9oo6TkHEed9k HxPUs4tDibboWcBvq7f0rI5y7bSBWE7IVhYlCkzUHhsFKHJ+qSKRMnxUrX6VWsqMYsgl +eazQMGCRZ0Cm1s/pTJgjBAellWebaYxhRjCwr3j8eR2HTzrjsu9utkexn24mLR8oEKm 1FkFuYLuWslBYR2xnrSughH+B0LYlBzigqY6LUXG+YgAHY1FAsvixss9Dgqp4hcf6xdU HYGg== 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 :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=7W3dZVF7ZmE6LwBwnu3a7+K/3YBMwu7STkmwbgOjkWI=; b=efuwk18VZC/qvxDt7H/aMc22zmcxG43tcAriIXz92KL68W7PhvyHv4AJWSDVO++sRh +/WqtTzxdbcT23ykB9/9v91JlQO19Ob/AvNoapga9XQxgD16e8dJY8ZEzXHJfLLgNGjg CMVQDHm068S98/Lk9wm9Yp9q92h+ieQabLDIg6iMCvlOlw6XSm5awOCV/Z5YZoQerrEk 9uGw19pFP6aswTTkhamtiBl54iNX0+IAMw1N3b33qIBvfl6LYpfRGXwdcsF5WEBZjizP jDR8c0jS2tU+Z3pFPCGnd1JA7C9R8Dl+tLYNI1T2jhOy4ofh0KztSAEpsYt4lUoyDCZ3 SNOA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=yj7gN2Gx; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from lindbergh.monkeyblade.net (lindbergh.monkeyblade.net. [2620:137:e000::1:18]) by mx.google.com with ESMTPS id c14-20020a63ef4e000000b003c511f50338si26305624pgk.848.2022.06.08.01.17.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 08 Jun 2022 01:17:17 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:18 as permitted sender) client-ip=2620:137:e000::1:18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=yj7gN2Gx; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 67CE33A4829; Wed, 8 Jun 2022 00:47:43 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1382289AbiFGWaC (ORCPT + 99 others); Tue, 7 Jun 2022 18:30:02 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54462 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1380819AbiFGVRA (ORCPT ); Tue, 7 Jun 2022 17:17:00 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CCF4014D11; Tue, 7 Jun 2022 11:57:45 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 6A6156156D; Tue, 7 Jun 2022 18:57:45 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 74836C385A2; Tue, 7 Jun 2022 18:57:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1654628264; bh=llGja+X4n31hJKn0deRxlhzf0jQ73Msyq0QGEx0Miko=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=yj7gN2GxexagHeJiuI1KL5CTz4Op8ZSJxvbkRF5zfy/ygmPE6I+C3GckdHS0D91HI DidBllu95RduezUnrCm0mkz8dcpzlW1L0olEIZHitmf/JaN1+q4PzsxHKGxotju4mW NeYcnF7le05UNGAZID2Hl/V2Sh5s23seFeLPrUlk= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Chuansheng Liu , Thomas Zimmermann , Geert Uytterhoeven , Javier Martinez Canillas , Sasha Levin Subject: [PATCH 5.18 266/879] fbdev: defio: fix the pagelist corruption Date: Tue, 7 Jun 2022 18:56:24 +0200 Message-Id: <20220607165010.570589106@linuxfoundation.org> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220607165002.659942637@linuxfoundation.org> References: <20220607165002.659942637@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-3.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RDNS_NONE,SPF_HELO_NONE,T_SCC_BODY_TEXT_LINE 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 From: Chuansheng Liu [ Upstream commit 856082f021a28221db2c32bd0531614a8382be67 ] Easily hit the below list corruption: == list_add corruption. prev->next should be next (ffffffffc0ceb090), but was ffffec604507edc8. (prev=ffffec604507edc8). WARNING: CPU: 65 PID: 3959 at lib/list_debug.c:26 __list_add_valid+0x53/0x80 CPU: 65 PID: 3959 Comm: fbdev Tainted: G U RIP: 0010:__list_add_valid+0x53/0x80 Call Trace: fb_deferred_io_mkwrite+0xea/0x150 do_page_mkwrite+0x57/0xc0 do_wp_page+0x278/0x2f0 __handle_mm_fault+0xdc2/0x1590 handle_mm_fault+0xdd/0x2c0 do_user_addr_fault+0x1d3/0x650 exc_page_fault+0x77/0x180 ? asm_exc_page_fault+0x8/0x30 asm_exc_page_fault+0x1e/0x30 RIP: 0033:0x7fd98fc8fad1 == Figure out the race happens when one process is adding &page->lru into the pagelist tail in fb_deferred_io_mkwrite(), another process is re-initializing the same &page->lru in fb_deferred_io_fault(), which is not protected by the lock. This fix is to init all the page lists one time during initialization, it not only fixes the list corruption, but also avoids INIT_LIST_HEAD() redundantly. V2: change "int i" to "unsigned int i" (Geert Uytterhoeven) Signed-off-by: Chuansheng Liu Fixes: 105a940416fc ("fbdev/defio: Early-out if page is already enlisted") Cc: Thomas Zimmermann Cc: Geert Uytterhoeven Reviewed-by: Javier Martinez Canillas Reviewed-by: Thomas Zimmermann Signed-off-by: Thomas Zimmermann Link: https://patchwork.freedesktop.org/patch/msgid/20220318005003.51810-1-chuansheng.liu@intel.com Signed-off-by: Sasha Levin --- drivers/video/fbdev/core/fb_defio.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/drivers/video/fbdev/core/fb_defio.c b/drivers/video/fbdev/core/fb_defio.c index 842c66b3e33d..6aaf6d0abf39 100644 --- a/drivers/video/fbdev/core/fb_defio.c +++ b/drivers/video/fbdev/core/fb_defio.c @@ -59,7 +59,6 @@ static vm_fault_t fb_deferred_io_fault(struct vm_fault *vmf) printk(KERN_ERR "no mapping available\n"); BUG_ON(!page->mapping); - INIT_LIST_HEAD(&page->lru); page->index = vmf->pgoff; vmf->page = page; @@ -213,6 +212,8 @@ static void fb_deferred_io_work(struct work_struct *work) void fb_deferred_io_init(struct fb_info *info) { struct fb_deferred_io *fbdefio = info->fbdefio; + struct page *page; + unsigned int i; BUG_ON(!fbdefio); mutex_init(&fbdefio->lock); @@ -220,6 +221,12 @@ void fb_deferred_io_init(struct fb_info *info) INIT_LIST_HEAD(&fbdefio->pagelist); if (fbdefio->delay == 0) /* set a default of 1 s */ fbdefio->delay = HZ; + + /* initialize all the page lists one time */ + for (i = 0; i < info->fix.smem_len; i += PAGE_SIZE) { + page = fb_deferred_io_page(info, i); + INIT_LIST_HEAD(&page->lru); + } } EXPORT_SYMBOL_GPL(fb_deferred_io_init); -- 2.35.1