From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE, SPF_PASS,URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 21454C2D0A3 for ; Mon, 9 Nov 2020 12:08:00 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 8C61920897 for ; Mon, 9 Nov 2020 12:07:59 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 8C61920897 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=huawei.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 00B266B005D; Mon, 9 Nov 2020 07:07:59 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id F22E86B0068; Mon, 9 Nov 2020 07:07:58 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id E39186B006C; Mon, 9 Nov 2020 07:07:58 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0129.hostedemail.com [216.40.44.129]) by kanga.kvack.org (Postfix) with ESMTP id AD6116B005D for ; Mon, 9 Nov 2020 07:07:58 -0500 (EST) Received: from smtpin03.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay02.hostedemail.com (Postfix) with ESMTP id 4BDAF3626 for ; Mon, 9 Nov 2020 12:07:58 +0000 (UTC) X-FDA: 77464756236.03.cream39_29158e5272ec Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin03.hostedemail.com (Postfix) with ESMTP id 25B8B28A4E9 for ; Mon, 9 Nov 2020 12:07:58 +0000 (UTC) X-HE-Tag: cream39_29158e5272ec X-Filterd-Recvd-Size: 2788 Received: from szxga01-in.huawei.com (szxga01-in.huawei.com [45.249.212.187]) by imf25.hostedemail.com (Postfix) with ESMTP for ; Mon, 9 Nov 2020 12:07:57 +0000 (UTC) Received: from dggeme752-chm.china.huawei.com (unknown [172.30.72.53]) by szxga01-in.huawei.com (SkyGuard) with ESMTP id 4CV8rh1P7LzXl1h; Mon, 9 Nov 2020 20:07:48 +0800 (CST) Received: from dggeme753-chm.china.huawei.com (10.3.19.99) by dggeme752-chm.china.huawei.com (10.3.19.98) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1913.5; Mon, 9 Nov 2020 20:07:53 +0800 Received: from dggeme753-chm.china.huawei.com ([10.7.64.70]) by dggeme753-chm.china.huawei.com ([10.7.64.70]) with mapi id 15.01.1913.007; Mon, 9 Nov 2020 20:07:53 +0800 From: linmiaohe To: Alex Shi CC: "akpm@linux-foundation.org" , "Darrick J. Wong" , Hugh Dickins , "linux-mm@kvack.org" , "linux-kernel@vger.kernel.org" Subject: Re: [REF PATCH] mm/swap: fix swapon failure Thread-Topic: [REF PATCH] mm/swap: fix swapon failure Thread-Index: Ada2j2TG6Hr9AvitT2imzesq0TetBw== Date: Mon, 9 Nov 2020 12:07:53 +0000 Message-ID: <9e184857ee9f4e5d8f176b5b511c0dc4@huawei.com> Accept-Language: zh-CN, en-US Content-Language: zh-CN X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [10.174.179.30] Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-CFilter-Loop: Reflected 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: Hi: Alex Shi wrote: > One of my VM guest has a swapon issue: > root #swapon -v -f /swap1 > swapon /swap1 > swapon: /swap1: found swap signature: version 1, page-size 4, same byte o= rder > swapon: /swap1: pagesize=3D4096, swapsize=3D1607467008, devsize=3D1607467= 008 > swapon: /swap1: swapon failed: Invalid argument > > and bisection report commit 822bca52ee7e "mm/swapfile.c: fix potential me= mory leak in sys_swapon" cause the trouble. > > Go through the context I found the exit_swap_address_space(p->type) shoul= dn't be used in good result path. So just move it to error path. > Many thanks for your patch. But I'am somehow confused as we only do the lab= el free_swap_address_space stuff in error path. And the good result path can't reach here as it just goto out before free_swap_address_space la= bel. Could you please explain it for me more detailed? Thanks again. > Fixes: 822bca52ee7e ("mm/swapfile.c: fix potential memory leak in > sys_swapon") > Signed-off-by: Alex Shi > Cc: Andrew Morton