From mboxrd@z Thu Jan 1 00:00:00 1970 From: Thomas Gleixner Subject: [patch V3 18/29] lockdep: Remove save argument from check_prev_add() Date: Thu, 25 Apr 2019 11:45:11 +0200 Message-ID: <20190425094802.803362058@linutronix.de> References: <20190425094453.875139013@linutronix.de> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: LKML Cc: Mike Snitzer , David Airlie , Catalin Marinas , dri-devel@lists.freedesktop.org, linux-mm@kvack.org, dm-devel@redhat.com, Alexander Potapenko , Christoph Lameter , Miroslav Benes , Christoph Hellwig , Alasdair Kergon , Marek Szyprowski , linux-arch@vger.kernel.org, x86@kernel.org, kasan-dev@googlegroups.com, Johannes Thumshirn , Andrey Ryabinin , Alexey Dobriyan , intel-gfx@lists.freedesktop.org, David Rientjes , Akinobu Mita , Steven Rostedt , Josef Bacik , Mike Rapoport , Andy Lutomirski , Josh Poimboeuf List-Id: iommu@lists.linux-foundation.org VGhlcmUgaXMgb25seSBvbmUgY2FsbGVyIHdoaWNoIGhhbmRzIGluIHNhdmVfdHJhY2UgYXMgZnVu Y3Rpb24gcG9pbnRlci4KClNpZ25lZC1vZmYtYnk6IFRob21hcyBHbGVpeG5lciA8dGdseEBsaW51 dHJvbml4LmRlPgotLS0KIGtlcm5lbC9sb2NraW5nL2xvY2tkZXAuYyB8ICAgMTYgKysrKysrKyst LS0tLS0tLQogMSBmaWxlIGNoYW5nZWQsIDggaW5zZXJ0aW9ucygrKSwgOCBkZWxldGlvbnMoLSkK Ci0tLSBhL2tlcm5lbC9sb2NraW5nL2xvY2tkZXAuYworKysgYi9rZXJuZWwvbG9ja2luZy9sb2Nr ZGVwLmMKQEAgLTIxNTgsOCArMjE1OCw3IEBAIGNoZWNrX2RlYWRsb2NrKHN0cnVjdCB0YXNrX3N0 cnVjdCAqY3VyciwKICAqLwogc3RhdGljIGludAogY2hlY2tfcHJldl9hZGQoc3RydWN0IHRhc2tf c3RydWN0ICpjdXJyLCBzdHJ1Y3QgaGVsZF9sb2NrICpwcmV2LAotCSAgICAgICBzdHJ1Y3QgaGVs ZF9sb2NrICpuZXh0LCBpbnQgZGlzdGFuY2UsIHN0cnVjdCBzdGFja190cmFjZSAqdHJhY2UsCi0J ICAgICAgIGludCAoKnNhdmUpKHN0cnVjdCBzdGFja190cmFjZSAqdHJhY2UpKQorCSAgICAgICBz dHJ1Y3QgaGVsZF9sb2NrICpuZXh0LCBpbnQgZGlzdGFuY2UsIHN0cnVjdCBzdGFja190cmFjZSAq dHJhY2UpCiB7CiAJc3RydWN0IGxvY2tfbGlzdCAqdW5pbml0aWFsaXplZF92YXIodGFyZ2V0X2Vu dHJ5KTsKIAlzdHJ1Y3QgbG9ja19saXN0ICplbnRyeTsKQEAgLTIxOTksMTEgKzIxOTgsMTEgQEAg Y2hlY2tfcHJldl9hZGQoc3RydWN0IHRhc2tfc3RydWN0ICpjdXJyLAogCWlmICh1bmxpa2VseSgh cmV0KSkgewogCQlpZiAoIXRyYWNlLT5lbnRyaWVzKSB7CiAJCQkvKgotCQkJICogSWYgQHNhdmUg ZmFpbHMgaGVyZSwgdGhlIHByaW50aW5nIG1pZ2h0IHRyaWdnZXIKLQkJCSAqIGEgV0FSTiBidXQg YmVjYXVzZSBvZiB0aGUgIW5yX2VudHJpZXMgaXQgc2hvdWxkCi0JCQkgKiBub3QgZG8gYmFkIHRo aW5ncy4KKwkJCSAqIElmIHNhdmVfdHJhY2UgZmFpbHMgaGVyZSwgdGhlIHByaW50aW5nIG1pZ2h0 CisJCQkgKiB0cmlnZ2VyIGEgV0FSTiBidXQgYmVjYXVzZSBvZiB0aGUgIW5yX2VudHJpZXMgaXQK KwkJCSAqIHNob3VsZCBub3QgZG8gYmFkIHRoaW5ncy4KIAkJCSAqLwotCQkJc2F2ZSh0cmFjZSk7 CisJCQlzYXZlX3RyYWNlKHRyYWNlKTsKIAkJfQogCQlyZXR1cm4gcHJpbnRfY2lyY3VsYXJfYnVn KCZ0aGlzLCB0YXJnZXRfZW50cnksIG5leHQsIHByZXYpOwogCX0KQEAgLTIyNTMsNyArMjI1Miw3 IEBAIGNoZWNrX3ByZXZfYWRkKHN0cnVjdCB0YXNrX3N0cnVjdCAqY3VyciwKIAkJcmV0dXJuIHBy aW50X2Jmc19idWcocmV0KTsKIAogCi0JaWYgKCF0cmFjZS0+ZW50cmllcyAmJiAhc2F2ZSh0cmFj ZSkpCisJaWYgKCF0cmFjZS0+ZW50cmllcyAmJiAhc2F2ZV90cmFjZSh0cmFjZSkpCiAJCXJldHVy biAwOwogCiAJLyoKQEAgLTIzMTgsNyArMjMxNyw4IEBAIGNoZWNrX3ByZXZzX2FkZChzdHJ1Y3Qg dGFza19zdHJ1Y3QgKmN1cnIKIAkJICogYWRkZWQ6CiAJCSAqLwogCQlpZiAoaGxvY2stPnJlYWQg IT0gMiAmJiBobG9jay0+Y2hlY2spIHsKLQkJCWludCByZXQgPSBjaGVja19wcmV2X2FkZChjdXJy LCBobG9jaywgbmV4dCwgZGlzdGFuY2UsICZ0cmFjZSwgc2F2ZV90cmFjZSk7CisJCQlpbnQgcmV0 ID0gY2hlY2tfcHJldl9hZGQoY3VyciwgaGxvY2ssIG5leHQsIGRpc3RhbmNlLAorCQkJCQkJICZ0 cmFjZSk7CiAJCQlpZiAoIXJldCkKIAkJCQlyZXR1cm4gMDsKIAoKCl9fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50 ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9y Zy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeA== 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=-4.0 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_PASS,URIBL_BLOCKED autolearn=ham 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 EEC09C10F03 for ; Thu, 25 Apr 2019 10:35:56 +0000 (UTC) Received: from mail.linuxfoundation.org (mail.linuxfoundation.org [140.211.169.12]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id C5A242084B for ; Thu, 25 Apr 2019 10:35:56 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org C5A242084B Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=linutronix.de Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=iommu-bounces@lists.linux-foundation.org Received: from mail.linux-foundation.org (localhost [127.0.0.1]) by mail.linuxfoundation.org (Postfix) with ESMTP id EA0451D30; Thu, 25 Apr 2019 10:35:09 +0000 (UTC) Received: from smtp2.linuxfoundation.org (smtp2.linux-foundation.org [172.17.192.36]) by mail.linuxfoundation.org (Postfix) with ESMTPS id BC97D1D3B for ; Thu, 25 Apr 2019 10:34:27 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from Galois.linutronix.de (Galois.linutronix.de [146.0.238.70]) by smtp2.linuxfoundation.org (Postfix) with ESMTPS id 47B6C1DD44 for ; Thu, 25 Apr 2019 10:34:27 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=nanos.tec.linutronix.de) by Galois.linutronix.de with esmtp (Exim 4.80) (envelope-from ) id 1hJbA8-0001us-4y; Thu, 25 Apr 2019 11:59:28 +0200 Message-Id: <20190425094802.803362058@linutronix.de> User-Agent: quilt/0.65 Date: Thu, 25 Apr 2019 11:45:11 +0200 From: Thomas Gleixner To: LKML Subject: [patch V3 18/29] lockdep: Remove save argument from check_prev_add() References: <20190425094453.875139013@linutronix.de> MIME-Version: 1.0 Cc: Mike Snitzer , David Airlie , Catalin Marinas , Joonas Lahtinen , dri-devel@lists.freedesktop.org, linux-mm@kvack.org, dm-devel@redhat.com, Alexander Potapenko , Christoph Lameter , Miroslav Benes , Christoph Hellwig , Alasdair Kergon , linux-arch@vger.kernel.org, x86@kernel.org, kasan-dev@googlegroups.com, Johannes Thumshirn , Andrey Ryabinin , Alexey Dobriyan , intel-gfx@lists.freedesktop.org, David Rientjes , Maarten Lankhorst , Akinobu Mita , Steven Rostedt , Josef Bacik , Rodrigo Vivi , Mike Rapoport , Jani Nikula , Andy Lutomirski , Josh Poimboeuf , David Sterba , Dmitry Vyukov , Tom Zanussi , Chris Mason , Pekka Enberg , iommu@lists.linux-foundation.org, Daniel Vetter , Andrew Morton , Robin Murphy , linux-btrfs@vger.kernel.org X-BeenThere: iommu@lists.linux-foundation.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Development issues for Linux IOMMU support List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 7bit Sender: iommu-bounces@lists.linux-foundation.org Errors-To: iommu-bounces@lists.linux-foundation.org Message-ID: <20190425094511.l5UiiQgcFbvMqb6PmHXpKG5uMQz7qOxGjD9piQgX-XE@z> There is only one caller which hands in save_trace as function pointer. Signed-off-by: Thomas Gleixner --- kernel/locking/lockdep.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) --- a/kernel/locking/lockdep.c +++ b/kernel/locking/lockdep.c @@ -2158,8 +2158,7 @@ check_deadlock(struct task_struct *curr, */ static int check_prev_add(struct task_struct *curr, struct held_lock *prev, - struct held_lock *next, int distance, struct stack_trace *trace, - int (*save)(struct stack_trace *trace)) + struct held_lock *next, int distance, struct stack_trace *trace) { struct lock_list *uninitialized_var(target_entry); struct lock_list *entry; @@ -2199,11 +2198,11 @@ check_prev_add(struct task_struct *curr, if (unlikely(!ret)) { if (!trace->entries) { /* - * If @save fails here, the printing might trigger - * a WARN but because of the !nr_entries it should - * not do bad things. + * If save_trace fails here, the printing might + * trigger a WARN but because of the !nr_entries it + * should not do bad things. */ - save(trace); + save_trace(trace); } return print_circular_bug(&this, target_entry, next, prev); } @@ -2253,7 +2252,7 @@ check_prev_add(struct task_struct *curr, return print_bfs_bug(ret); - if (!trace->entries && !save(trace)) + if (!trace->entries && !save_trace(trace)) return 0; /* @@ -2318,7 +2317,8 @@ check_prevs_add(struct task_struct *curr * added: */ if (hlock->read != 2 && hlock->check) { - int ret = check_prev_add(curr, hlock, next, distance, &trace, save_trace); + int ret = check_prev_add(curr, hlock, next, distance, + &trace); if (!ret) return 0; _______________________________________________ iommu mailing list iommu@lists.linux-foundation.org https://lists.linuxfoundation.org/mailman/listinfo/iommu