From patchwork Thu Sep 27 21:15:27 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Alex Xu (Hello71)" X-Patchwork-Id: 10618579 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 1031415A6 for ; Thu, 27 Sep 2018 21:15:38 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id EC1302B302 for ; Thu, 27 Sep 2018 21:15:37 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id DEA422B67A; Thu, 27 Sep 2018 21:15:37 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-3.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 78B002B302 for ; Thu, 27 Sep 2018 21:15:37 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 8801C8E0005; Thu, 27 Sep 2018 17:15:36 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 8303B8E0001; Thu, 27 Sep 2018 17:15:36 -0400 (EDT) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 720168E0005; Thu, 27 Sep 2018 17:15:36 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-qt1-f199.google.com (mail-qt1-f199.google.com [209.85.160.199]) by kanga.kvack.org (Postfix) with ESMTP id 4642A8E0001 for ; Thu, 27 Sep 2018 17:15:36 -0400 (EDT) Received: by mail-qt1-f199.google.com with SMTP id g23-v6so2457702qtq.13 for ; Thu, 27 Sep 2018 14:15:36 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:dkim-signature:date:from:subject:to:cc :references:in-reply-to:user-agent:message-id:mime-version :content-transfer-encoding; bh=BHUCGebeB0Kbn5Sr/q3u+Ga0rAk709Yak3bFRcDeCWE=; b=WjGqXtdyxoaPFEA6Qo3PrDLypSIBD7cH2pMudYZYHzft+hHKj6le1EPjBwad51DQLK h/EAc7Gydfbtshl/jX3bBQFWoq3fkZhs9wsB7dmRlFv/l3aXKSJDtr1/UIJGKTttZgLT S7VIdhCZ8opxFoE2EoOxbww9ipsBe6TGPo2IHqD8uNp+L6YxucMPi5cL8OYRvbXNVGaM 2j1XQJZkVwU6QGmrdCIuPjztCcv2sZ1CyU5xO8IVH1snHKbBvwVTjvMRQzyFAj5uijen j7v/gJE7zDWbhCaELB9ibkaDOddGTKNpm5m6d5RRgjEAJkeO7SsIY/YTohEgdqr07CrI 8tjg== X-Gm-Message-State: ABuFfog9RsdCiqKgdpkMLYOiVHhpdMrtsbXSUBmfA62/2T7viR3Yx83P b4v1sKQCYyIhbAoOOVeSwEy7ceZlaG6GjSUoiPp0gp8HzSmKiz3Se+i3jiL2R5cgLQ5011iNBdQ KQeKFOtJci45MJLM+K7sDt47JMy82bxLwYN7Zn4DQ/yuW/Zsu/+IVBVflNAYGH0nbtw== X-Received: by 2002:a0c:c119:: with SMTP id f25-v6mr8798018qvh.219.1538082936077; Thu, 27 Sep 2018 14:15:36 -0700 (PDT) X-Google-Smtp-Source: ACcGV61N+xidef3tNu/CJhyuguLdpazj4Q5V7l69ZJD5OyNdNc/UxoCkigxMODf0seI6r7S6YPFw X-Received: by 2002:a0c:c119:: with SMTP id f25-v6mr8797993qvh.219.1538082935580; Thu, 27 Sep 2018 14:15:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1538082935; cv=none; d=google.com; s=arc-20160816; b=FJlkuzbO8+EXnfUI32eoL2QRJmDTd2sxYaZfjOHAE1Rrka4WMDqXXpXeoDyiTZEfkD Q1aFVzqnL9oYInX6Zv0B9+TV1f/Pb/FFCiw3C7qvpTOaRlo+mzfkfB4m3KOVj33wb4sP DSfLVSpndkbdTdIJJ/SEOQ1cdmXF0tO5EqQ9O4LqVo0G3nS6DUS5Heg7sIlu+FLDMqgN bdgC/nLS22uo5ummdwNBxuQNTpVhuvrIMYPyW8rCmXA924HmZJ3Dh1E/tWh6/SWaO+UT HU4uL8FCPJThPTA5HYu7L5mSyCAHSeRos2SCrqred3kLGkyKG46twkhpnUlNy+lqQQIy BE2Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:message-id:user-agent :in-reply-to:references:cc:to:subject:from:date:dkim-signature; bh=BHUCGebeB0Kbn5Sr/q3u+Ga0rAk709Yak3bFRcDeCWE=; b=rOf9+HpDkbaLX3y4/DYTKviO6qJ34txL1SIIJTCw8uhqtfTjRuLRmOH0nsrpVqbLdP ul5MkivO/SQn91edWC5LYQXwdoNNB06ATwtcIljaT6Qsc6XQwDoQaBcxK0kRq33mg+Eo 6LBRslVPUf/TAw12Q61Q8SWt0LNya1MzhXfWpv8YXEB/H/wbAk6m1xG2HFYYpAws2jSK Teih66NROh5yZ7ReRpccguoSL9TiuRKn8tqEdvOqHjxrIz3HM0MTCB+felHDjiNc0lT0 gh4pwHKFxvdQjbLoBSFUFMIY9SnWQp7RnM+rsRAUaWZYPBmeVauPa/KkU6/fc0z+5hKg nbng== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@yahoo.ca header.s=s2048 header.b=LoGVoJxf; spf=pass (google.com: domain of alex_y_xu@yahoo.ca designates 74.6.130.42 as permitted sender) smtp.mailfrom=alex_y_xu@yahoo.ca; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=yahoo.ca Received: from sonic308-3.consmr.mail.bf2.yahoo.com (sonic308-3.consmr.mail.bf2.yahoo.com. [74.6.130.42]) by mx.google.com with ESMTPS id x194-v6si2006585qkb.211.2018.09.27.14.15.35 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 27 Sep 2018 14:15:35 -0700 (PDT) Received-SPF: pass (google.com: domain of alex_y_xu@yahoo.ca designates 74.6.130.42 as permitted sender) client-ip=74.6.130.42; Authentication-Results: mx.google.com; dkim=pass header.i=@yahoo.ca header.s=s2048 header.b=LoGVoJxf; spf=pass (google.com: domain of alex_y_xu@yahoo.ca designates 74.6.130.42 as permitted sender) smtp.mailfrom=alex_y_xu@yahoo.ca; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=yahoo.ca DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.ca; s=s2048; t=1538082935; bh=BHUCGebeB0Kbn5Sr/q3u+Ga0rAk709Yak3bFRcDeCWE=; h=Date:From:Subject:To:Cc:References:In-Reply-To:From:Subject; b=LoGVoJxfrxmEOqKBepeBcoRvYmLli1YkzSR0WadVyc/9J253j9SUowhkk4kyVUyIbl0wII5KBNrv49SLb0pmU/osRcluMx0J9zF2QtpY3bE3WlRmcrFXGYoA9i10ggCqeIkzVr+jRgj39okA3Wkv2lZuT6WHxaufyigutitKp/ccpOD+3dlgRMSxXOvwrAj7rZblR7CdGemqtaebFjrHxhJin5fEeWzz3EKb0+imqLmDUGp+8ZEJN/t05Z4tGwRiT9jt+7oipdjyKVadmE/+wXdF0MHAPGvZ7lazXSsAQF//HAXFxBp1Fkl67eiSD77AMXzoOWcUfeFwQA2c07x6/g== X-YMail-OSG: A7cFwU8VM1lmI97hCYneR_2l1Q59PYukx4rxsp7PqU26b5l2ebHKcz7c4uOjNJ1 j.4quA1OCdqRmojslr01rCi.NRKEKnVVSNJs1CaSb0VdSwUHJOAc7Dk45XUkxfHkoVxy75Q90GDM CLtjdihaWgCU1gDsblH.rFcPQJIup5n3s3FGLtgziFooCIxXhhnTkVmO6JYPNliPBsnxMLZUz_K_ XLjsPWBrwBzw8YLDv8wLUhyehSs54vpycLE.IMgAR61jMQJT5oHKnxDupMMhcqEI5ih6jQUKtFU6 6QvE3y38NYMpump0kOwUX.Uk2GVNf1QbH1b3nKV1FysyKAv2FOyrLzsu_Ef_fkw5l6R6a_EjqiJg J7OrX8NN2KsTncyfRlUeD6WzNeDgRrMBcCv13hrPOrk_9CzeEsexNVDIpZPGCdggGqbOitsviQSS bANJkzsRX.WgPHE76capOACIQtXkMi2CJxu2s75v_IsXWg.GYfOEYg4ej_FkeQdB9Cn3J3x.NlzS oQ.VGaHZCC0ptofFplP6miAs2MBI4VgQI1CPl3In2Xiae8X89sz_NQfYX_d3NbISJWRNR648yJ9V Oqu_cuhTQAIQyJq2h4VL8ZEqot7VCAIONyhl1yOBhBN59NHlbMOVj4QZRl_HVLjIIlUmL_FMFLYx 027N5cBjJqoviuJN6t4d4uSn40hmDSJtOKdmlGtyU0H4dH9N6VjHuwe4v2gmLsdff52bzJOq3dJe w6YZP2vpOkI5iJj6vXBQFv_YOyjQ3MDoKEKyggvwhneT0Nv22dz95ie.ZmS8XMsEmPjnR3FY47rl i9Xu6CrG6d83NGnwilykKmWdoDNT07IhDYhik0y23E0RQyl7wwmF1AsAgPcoDIyPaDBled1RWqJv Sq2lCaKdecZuVAlqEo0HRlYtzUXRtqVZgxfqBhWRpifaNElUp.Dbai2A.LT2G3NYoi6xE2Jfsxi1 bwpKGPBRZVsGAzYZY9UXqTt8L6zvqdqN42nvoTUulIC4etabbIj7e4Mnvg7V0Gig5t1CQhPjjpeO G9zSyyzzXMo85u7aG Received: from sonic.gate.mail.ne1.yahoo.com by sonic308.consmr.mail.bf2.yahoo.com with HTTP; Thu, 27 Sep 2018 21:15:35 +0000 Received: from pink.alxu.ca (EHLO localhost) ([198.98.62.56]) by smtp405.mail.bf1.yahoo.com (Oath Hermes SMTP Server) with ESMTPA ID 25f9d54bd857af37af9792a99e179ceb; Thu, 27 Sep 2018 21:15:32 +0000 (UTC) Date: Thu, 27 Sep 2018 17:15:27 -0400 From: "Alex Xu (Hello71)" Subject: [PATCH v2] mm: fix z3fold warnings on CONFIG_SMP=n To: Dan Streetman , linux-mm@kvack.org Cc: linux-kernel@vger.kernel.org References: <1538079759.qxp8zh3nwh.astroid@alex-archsus.none> <153808275043.724.15980761008814866300@pink.alxu.ca> In-Reply-To: <153808275043.724.15980761008814866300@pink.alxu.ca> User-Agent: astroid/0.13.0 (https://github.com/astroidmail/astroid) Message-Id: <1538082779.246sm0vb2p.astroid@alex-archsus.none> MIME-Version: 1.0 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: X-Virus-Scanned: ClamAV using ClamSMTP Spinlocks are always lockable on UP systems, even if they were just locked. Cc: Dan Streetman Signed-off-by: Alex Xu (Hello71) Acked-by: Dan Streetman Acked-by: Vitaly Wool Acked-by: Dan Streetman <ddstreet@ieee.org>

Acked-by: Vitaly Wool <vitalywool@gmail.com>
--- mm/z3fold.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/mm/z3fold.c b/mm/z3fold.c index 4b366d181..2e8d268ac 100644 --- a/mm/z3fold.c +++ b/mm/z3fold.c @@ -277,7 +277,7 @@ static void release_z3fold_page_locked(struct kref *ref) { struct z3fold_header *zhdr = container_of(ref, struct z3fold_header, refcount); - WARN_ON(z3fold_page_trylock(zhdr)); + WARN_ON_SMP(z3fold_page_trylock(zhdr)); __release_z3fold_page(zhdr, true); } @@ -289,7 +289,7 @@ static void release_z3fold_page_locked_list(struct kref *ref) list_del_init(&zhdr->buddy); spin_unlock(&zhdr->pool->lock); - WARN_ON(z3fold_page_trylock(zhdr)); + WARN_ON_SMP(z3fold_page_trylock(zhdr)); __release_z3fold_page(zhdr, true); } @@ -403,7 +403,7 @@ static void do_compact_page(struct z3fold_header *zhdr, bool locked) page = virt_to_page(zhdr); if (locked) - WARN_ON(z3fold_page_trylock(zhdr)); + WARN_ON_SMP(z3fold_page_trylock(zhdr)); else z3fold_page_lock(zhdr); if (WARN_ON(!test_and_clear_bit(NEEDS_COMPACTING, &page->private))) {