Received: by 2002:a05:6902:102b:0:0:0:0 with SMTP id x11csp107663ybt; Thu, 9 Jul 2020 16:51:42 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzvQB8OXjIcfeSI+H8GUhf4Dapy5KmR94g7Jt08qiA8NqDBP8epEhOsED9SPhV8/7hLKyJ1 X-Received: by 2002:a17:906:160f:: with SMTP id m15mr53061439ejd.423.1594338702318; Thu, 09 Jul 2020 16:51:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1594338702; cv=none; d=google.com; s=arc-20160816; b=ql5S2HzF7HYSjybbKvHlYX97Iw8/563SsGRSirdFwoqGmV0HOJPs3Ca7JvkABzVg4N JWsFFEknzBsUgiA2aysbuYl30EG7Im7ocuqOI/CZEfVwF4p11xttJNcN/zUxCeVOzzNH /Z2BnVFrCGymwKMVDsgzYVCEF64XDHbhfRI78/iZys6r1bDD8YXXmYwgGKiCB4Bc8CV5 z7vQcHgxmmDRyuaYaWAUL5vqcxjENSHk8+orD4J64n64UC5tXUPby/7EyVdtA7/SV0oR MU1XsfhTXWmTY9waa3CASaFt/hUDB72WY69H381JuizDcMN21LOU5NSHilQJVfnYjNcP vr4g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:in-reply-to:content-transfer-encoding :content-disposition:mime-version:references:message-id:subject:cc :to:from:date:dkim-signature; bh=ctEHttMkp6FUozMii6/EFyFUv5WnIinWq+jCHwssyEs=; b=k95Qj3cfyyQ5KEouBAv6kj+Nri+cRV9fMQF9FsCAYgMgjUFjNIBKJRVggifH6yMs0k M7Ejk+XsliQvtONULLBfnRBQHkFCWE/7H/KSN/GRJX/ri1Ho2FSVbuV2H+mAUrzZWG0P 3KRN7t8zNQQ6mEcHCQqWi64n1Pslr8HW040c17VH6qqlnS+IEGcsrJXjdlrw5qlwGGj6 xIExnlBzRamVvMb6om7p0/hh9KdcJsbIN8aymg2/RzrNPMSX+MYYdxEBr4vTDDPchidE r9MlEEVL1cZmIZG8iOB9yDmfPhuF9enphn6ca943zvo6/+I1x3mTASqVXRdan6GEV9wK y4Aw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=CZFNAlYR; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id w23si3146878eds.47.2020.07.09.16.51.18; Thu, 09 Jul 2020 16:51:42 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=CZFNAlYR; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726581AbgGIXtl (ORCPT + 99 others); Thu, 9 Jul 2020 19:49:41 -0400 Received: from mail.kernel.org ([198.145.29.99]:49690 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726269AbgGIXtl (ORCPT ); Thu, 9 Jul 2020 19:49:41 -0400 Received: from localhost (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 2D0B62070E; Thu, 9 Jul 2020 23:49:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1594338580; bh=AzXu3c72rcQmjaWFefYfgiSM/p782Co8EQspHadBs2E=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=CZFNAlYR79C7aQjMjGPPoyc/KUEvRwf9EpYnYLiugzjAQlDJW1D6/FSz/Wx7tbmip Y7cg2Zm6mLl4gOnIbsiivv0QlzXV2O1TVRb7yBIg3TvoqJw+T+ERdgY855R81jWlpo 5A/94AlR4UfYswXBPFy1pQp2IxPAfIY0eVtxJQSU= Date: Thu, 9 Jul 2020 19:49:39 -0400 From: Sasha Levin To: Pavel Shilovsky Cc: Kernel Mailing List , Stable , Zhang Xiaoxu , Hulk Robot , Steve French , Ronnie Sahlberg , linux-cifs , samba-technical Subject: Re: [PATCH AUTOSEL 5.7 37/53] cifs: Fix double add page to memcg when cifs_readpages Message-ID: <20200709234939.GD2722994@sasha-vm> References: <20200702012202.2700645-1-sashal@kernel.org> <20200702012202.2700645-37-sashal@kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8; format=flowed Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Thu, Jul 02, 2020 at 09:08:45AM -0700, Pavel Shilovsky wrote: >ср, 1 июл. 2020 г. в 18:35, Sasha Levin : >> >> From: Zhang Xiaoxu >> >> [ Upstream commit 95a3d8f3af9b0d63b43f221b630beaab9739d13a ] >> >> When xfstests generic/451, there is an BUG at mm/memcontrol.c: >> page:ffffea000560f2c0 refcount:2 mapcount:0 mapping:000000008544e0ea >> index:0xf >> mapping->aops:cifs_addr_ops dentry name:"tst-aio-dio-cycle-write.451" >> flags: 0x2fffff80000001(locked) >> raw: 002fffff80000001 ffffc90002023c50 ffffea0005280088 ffff88815cda0210 >> raw: 000000000000000f 0000000000000000 00000002ffffffff ffff88817287d000 >> page dumped because: VM_BUG_ON_PAGE(page->mem_cgroup) >> page->mem_cgroup:ffff88817287d000 >> ------------[ cut here ]------------ >> kernel BUG at mm/memcontrol.c:2659! >> invalid opcode: 0000 [#1] SMP >> CPU: 2 PID: 2038 Comm: xfs_io Not tainted 5.8.0-rc1 #44 >> Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS ?-20190727_ >> 073836-buildvm-ppc64le-16.ppc.4 >> RIP: 0010:commit_charge+0x35/0x50 >> Code: 0d 48 83 05 54 b2 02 05 01 48 89 77 38 c3 48 c7 >> c6 78 4a ea ba 48 83 05 38 b2 02 05 01 e8 63 0d9 >> RSP: 0018:ffffc90002023a50 EFLAGS: 00010202 >> RAX: 0000000000000000 RBX: ffff88817287d000 RCX: 0000000000000000 >> RDX: 0000000000000000 RSI: ffff88817ac97ea0 RDI: ffff88817ac97ea0 >> RBP: ffffea000560f2c0 R08: 0000000000000203 R09: 0000000000000005 >> R10: 0000000000000030 R11: ffffc900020237a8 R12: 0000000000000000 >> R13: 0000000000000001 R14: 0000000000000001 R15: ffff88815a1272c0 >> FS: 00007f5071ab0800(0000) GS:ffff88817ac80000(0000) knlGS:0000000000000000 >> CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 >> CR2: 000055efcd5ca000 CR3: 000000015d312000 CR4: 00000000000006e0 >> DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 >> DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400 >> Call Trace: >> mem_cgroup_charge+0x166/0x4f0 >> __add_to_page_cache_locked+0x4a9/0x710 >> add_to_page_cache_locked+0x15/0x20 >> cifs_readpages+0x217/0x1270 >> read_pages+0x29a/0x670 >> page_cache_readahead_unbounded+0x24f/0x390 >> __do_page_cache_readahead+0x3f/0x60 >> ondemand_readahead+0x1f1/0x470 >> page_cache_async_readahead+0x14c/0x170 >> generic_file_buffered_read+0x5df/0x1100 >> generic_file_read_iter+0x10c/0x1d0 >> cifs_strict_readv+0x139/0x170 >> new_sync_read+0x164/0x250 >> __vfs_read+0x39/0x60 >> vfs_read+0xb5/0x1e0 >> ksys_pread64+0x85/0xf0 >> __x64_sys_pread64+0x22/0x30 >> do_syscall_64+0x69/0x150 >> entry_SYSCALL_64_after_hwframe+0x44/0xa9 >> RIP: 0033:0x7f5071fcb1af >> Code: Bad RIP value. >> RSP: 002b:00007ffde2cdb8e0 EFLAGS: 00000293 ORIG_RAX: 0000000000000011 >> RAX: ffffffffffffffda RBX: 00007ffde2cdb990 RCX: 00007f5071fcb1af >> RDX: 0000000000001000 RSI: 000055efcd5ca000 RDI: 0000000000000003 >> RBP: 0000000000000003 R08: 0000000000000000 R09: 0000000000000000 >> R10: 0000000000001000 R11: 0000000000000293 R12: 0000000000000001 >> R13: 000000000009f000 R14: 0000000000000000 R15: 0000000000001000 >> Modules linked in: >> ---[ end trace 725fa14a3e1af65c ]--- >> >> Since commit 3fea5a499d57 ("mm: memcontrol: convert page cache to a new >> mem_cgroup_charge() API") not cancel the page charge, the pages maybe >> double add to pagecache: >> thread1 | thread2 >> cifs_readpages >> readpages_get_pages >> add_to_page_cache_locked(head,index=n)=0 >> | readpages_get_pages >> | add_to_page_cache_locked(head,index=n+1)=0 >> add_to_page_cache_locked(head, index=n+1)=-EEXIST >> then, will next loop with list head page's >> index=n+1 and the page->mapping not NULL >> readpages_get_pages >> add_to_page_cache_locked(head, index=n+1) >> commit_charge >> VM_BUG_ON_PAGE >> >> So, we should not do the next loop when any page add to page cache >> failed. >> >> Reported-by: Hulk Robot >> Signed-off-by: Zhang Xiaoxu >> Signed-off-by: Steve French >> Acked-by: Ronnie Sahlberg >> Signed-off-by: Sasha Levin > >Hi Sasha, > >The patch description mentions the commit 3fea5a499d57 that changed >the behavior and was introduced in v5.8-rc1. I noticed that you are >targeting this patch for 4.9, 4.14, 4.19, 5.4 and 5.7 stable branches. >Are you going to backport the commit 3fea5a499d57 as well? Nope, I'll drop this one. Thanks! -- Thanks, Sasha