From patchwork Fri Jun 22 15:12:20 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sebastian Andrzej Siewior X-Patchwork-Id: 10482395 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 2353460230 for ; Fri, 22 Jun 2018 15:12:40 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 213E1289A2 for ; Fri, 22 Jun 2018 15:12:40 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 15F0C28BB0; Fri, 22 Jun 2018 15:12:40 +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=-2.9 required=2.0 tests=BAYES_00, 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 B2FB7289A2 for ; Fri, 22 Jun 2018 15:12:39 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 989746B000C; Fri, 22 Jun 2018 11:12:36 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 9105E6B000D; Fri, 22 Jun 2018 11:12: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 7B4E66B000E; Fri, 22 Jun 2018 11:12:36 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-wr0-f197.google.com (mail-wr0-f197.google.com [209.85.128.197]) by kanga.kvack.org (Postfix) with ESMTP id 23CFF6B000C for ; Fri, 22 Jun 2018 11:12:36 -0400 (EDT) Received: by mail-wr0-f197.google.com with SMTP id k2-v6so4708648wrp.14 for ; Fri, 22 Jun 2018 08:12:36 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-original-authentication-results:x-gm-message-state:from:to:cc :subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=sNY2gehGUSWIslT/6EeVKZq7Ddy0gqFi2WnJDy/p2fA=; b=cHtdysV7euYCg8cxwjcHewfVm7DCDhOj2F/yI7ZGulF9GEglmH6DJbAh/3VvfXEkLa OLw3NA5nj8FyBRGxg3V8lzEJesBprlHOXvbLhEZByXXd95GE/ZCfpgW8J7/IT8o6hhrb Y2djY2snUgb84ZNvWYGK+GXjigwA3cXGly0LWZUHdeU/bjZK/vFmAo2MmFHSHiCdEgKT uVSEplOnNpIc5Q7arXkv6NEfJ5X9QZtfhKZpfLkr69XsS2f7t0iUYviE2VAdjFMG1w7W HIimbmfqm86uq8CpFpNJ9klXbGvUY3r5WXl8KUbxBeENP+rLfLjyyKUsXy+WEKoC8Cfy dWmg== X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of bigeasy@linutronix.de designates 2a01:7a0:2:106d:700::1 as permitted sender) smtp.mailfrom=bigeasy@linutronix.de X-Gm-Message-State: APt69E2C2c6QL0trwKR+loQ/7djGTophjoLQ/HgIKnChX6UJG/CFEwup 36q3e6FRS3yJwwJcT6b3qnaw2pgcabno57di+7y55ZvcPWLr3UHEod+2KVL+I/JOSCMMwdSlFTI e2l4dxj+SlZ5dupUvv8alfNL0rBMwaSJRlcB1gJi3MECeZuk/BVsWwkVH0zyysQbHcQ== X-Received: by 2002:a1c:5e90:: with SMTP id s138-v6mr2143221wmb.96.1529680355724; Fri, 22 Jun 2018 08:12:35 -0700 (PDT) X-Google-Smtp-Source: ADUXVKKrVVa5Ffmj3wRd7qxMDxLsPe/0x7hJd34Li8aGiY3JUEvHi99A/VkncqdD60lUFkmYBL7L X-Received: by 2002:a1c:5e90:: with SMTP id s138-v6mr2143180wmb.96.1529680354943; Fri, 22 Jun 2018 08:12:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1529680354; cv=none; d=google.com; s=arc-20160816; b=E3pb8JezPCnB6RQxH3LAn3LKvfVHDPAMoFpmVZWZ90L7ySBbl7Z1ZntdgGsozN4bI4 10Qv6WZ1leJ06zG9mKJpbopU+ax7JVnGzbPNYPFJPkttH5Fk1sGD4GOBPMMM3etgImyM PjbgmsG2zqawVQbXPzQ5s6GzRC9D/HGojW1c68Fldp13Qza8OTZNlyUSdJmfacN7cDpw IfUFIoim1jWQ7j2xWJr6Tq++5xaXucBmgac2y3wFtAKDghiDA+QwynvVNXD+JMRJf5Pn ee/l0o+r/XlyVgcQIHYh6m6NR5X8jqvfNxCciRc5UymBGvRVLui9Ibo3vcVVo52T/HcP xFPA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:arc-authentication-results; bh=sNY2gehGUSWIslT/6EeVKZq7Ddy0gqFi2WnJDy/p2fA=; b=G/FiQ0ECTuwCXInMJ1YSZl8j+7wUSbhOwfIgOybAnjAUn6F+yQBn5ab9nDTH5TKCH7 DxWtsjkIIAe9x4OTymJgvB1mxSaxHKfMqhd0TF9S/TjFCH3ER1QPCpqRWpbQVEvZqLE6 KuY9e7w4ErR/94HUWaAg1NIooFjvJ3SIeRtcHp3Npz+5xM5DRcFT3vvEYRiqVvaDX4QW fu2d0SzWzKR0vzZnc4uJpRtybh0dNPm/1JKQgBgRkKH2DM9iXJ+q21dtd6OQaTDc1IFQ NhnSUtUnyIa2SuXgUn9fhJGCW7m8kVPdWQRp8uPLHq0e4DMOo+l22derXGEf3FXi551A eP/w== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of bigeasy@linutronix.de designates 2a01:7a0:2:106d:700::1 as permitted sender) smtp.mailfrom=bigeasy@linutronix.de Received: from Galois.linutronix.de (Galois.linutronix.de. [2a01:7a0:2:106d:700::1]) by mx.google.com with ESMTPS id 126-v6si1220271wmg.214.2018.06.22.08.12.34 for (version=TLS1_2 cipher=AES128-SHA bits=128/128); Fri, 22 Jun 2018 08:12:34 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of bigeasy@linutronix.de designates 2a01:7a0:2:106d:700::1 as permitted sender) client-ip=2a01:7a0:2:106d:700::1; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of bigeasy@linutronix.de designates 2a01:7a0:2:106d:700::1 as permitted sender) smtp.mailfrom=bigeasy@linutronix.de Received: from localhost ([127.0.0.1] helo=bazinga.breakpoint.cc) by Galois.linutronix.de with esmtp (Exim 4.80) (envelope-from ) id 1fWNjl-0007Dp-1T; Fri, 22 Jun 2018 17:12:33 +0200 From: Sebastian Andrzej Siewior To: linux-mm@kvack.org Cc: tglx@linutronix.de, Andrew Morton , Sebastian Andrzej Siewior Subject: [PATCH 2/3] mm: workingset: make shadow_lru_isolate() use locking suffix Date: Fri, 22 Jun 2018 17:12:20 +0200 Message-Id: <20180622151221.28167-3-bigeasy@linutronix.de> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20180622151221.28167-1-bigeasy@linutronix.de> References: <20180622151221.28167-1-bigeasy@linutronix.de> 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 shadow_lru_isolate() disables interrupts and acquires a lock. It could use spin_lock_irq() instead. It also uses local_irq_enable() while it could use spin_unlock_irq()/xa_unlock_irq(). Use proper suffix for lock/unlock in order to enable/disable interrupts during release/acquire of a lock. Signed-off-by: Sebastian Andrzej Siewior --- mm/workingset.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/mm/workingset.c b/mm/workingset.c index ed8151180899..529480c21f93 100644 --- a/mm/workingset.c +++ b/mm/workingset.c @@ -431,7 +431,7 @@ static enum lru_status shadow_lru_isolate(struct list_head *item, /* Coming from the list, invert the lock order */ if (!xa_trylock(&mapping->i_pages)) { - spin_unlock(lru_lock); + spin_unlock_irq(lru_lock); ret = LRU_RETRY; goto out; } @@ -469,13 +469,11 @@ static enum lru_status shadow_lru_isolate(struct list_head *item, workingset_lookup_update(mapping)); out_invalid: - xa_unlock(&mapping->i_pages); + xa_unlock_irq(&mapping->i_pages); ret = LRU_REMOVED_RETRY; out: - local_irq_enable(); cond_resched(); - local_irq_disable(); - spin_lock(lru_lock); + spin_lock_irq(lru_lock); return ret; }