From nobody Sat Dec 24 15:32:27 2022 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4NfSj81qDyz1HDnl; Sat, 24 Dec 2022 15:32:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4NfSj811P8z3DB4; Sat, 24 Dec 2022 15:32:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1671895948; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BxyGakUBmsKn38iScnPkHC+iH7Mitm34Z+0Mz8zhzhY=; b=HbpIPe9x0/gLqpHd6ENWxBCZCp+LNGxNxeqHoZ5RsphIk5huuSttf41goJkzqguWQt6N9y USIvlYM8XshGIeY+zqXWr0lNnqbQEv73dd9Q5BMsFFxYgIRw2ftSE5EEtpgynhkb4iDpeW tpgD4KYsQoxyAYq35ljQZQDHkCIR/RkkCW1n/Z1zXgjtq/iAL/MHSWsiWPtclpD6BAODfM qkoXi49HI/XplEXGvq//gmlC4TeqjkBV+/iV8/W5SUQAgZG2BzZUdmg5G6ZHy8VtrkrvvT 0Ihf0Miuz66BwUz83HOVOjNezuLJXV8Y9LfSzjmokAuramubPaq07WMDq1gtMQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1671895948; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BxyGakUBmsKn38iScnPkHC+iH7Mitm34Z+0Mz8zhzhY=; b=xCXidj6MCcI5ZCzCJYB/16EwWN+dK4k0OTprLX02zhu+gdpaeDHDgtOK53KYo6mPrIkEVy KV3fjGoHbMMJgsYoRZ174OGul1NgwfF9wjIfYEj2qRF8qMVAY5ShcfK3+BavCJuyEdJ2D+ WZ+lrNWCOGHj7QXD8qv0P7RiNMJHfLrV5BYIlJ7v3QIk1dCb7MEMqc/7C2o63S/Chw4biS HwXndRdkY6lF52XUGUzTVftfc2U9Zsk2jB5e5bGJ2RHdsqVAWhW4QhAe6rE44I3lU4dVnL zhqJx9KPnn5AioUUANmY4LdAOVnSMvEL5XxwbRtWoFUSZM2pk5b9k7NWbN2GzQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1671895948; a=rsa-sha256; cv=none; b=CNXiqraDx8DQGCYtZJ3uVfhmeVpKtrGEIxsrKIRbJ3p2xWHPIyhQS5svRP6DBBdIuixyrW WyWYI/yxH1d5ZANF+8yDdZ6f4ZabUKxomrB/tTW8ioWxognZwZRRj0T7nGEp71OVZFYTVC VEPglWu7/WDhHw2BjGztiNDjjLPZ3OMXIFU+NIGCWnRw2GAjK0tpeN2xyHoBoOFpbg6fIm 5RfrvYORlkzj1Hx2HBRVQc+AQF5AiSTtlBPcYSs0NQYqFAhWIu/bVmziw7H6llkVDUnEc7 pb/wK4rHOVy0WFIcYZr/1b8vX+0CpSnhu20YpkPHvtWUP+lW12gAAnpeLOO7sg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4NfSj804vtzJ6h; Sat, 24 Dec 2022 15:32:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 2BOFWRsq088076; Sat, 24 Dec 2022 15:32:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2BOFWRT2088075; Sat, 24 Dec 2022 15:32:27 GMT (envelope-from git) Date: Sat, 24 Dec 2022 15:32:27 GMT Message-Id: <202212241532.2BOFWRT2088075@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Vincenzo Maffione Subject: git: 92e8b4a6301c - main - debug_put_get: don't crash on null pointers List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: vmaffione X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 92e8b4a6301cc4ff4481e981c95c5b30b2a44506 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by vmaffione: URL: https://cgit.FreeBSD.org/src/commit/?id=92e8b4a6301cc4ff4481e981c95c5b30b2a44506 commit 92e8b4a6301cc4ff4481e981c95c5b30b2a44506 Author: Vincenzo Maffione AuthorDate: 2022-12-24 15:31:36 +0000 Commit: Vincenzo Maffione CommitDate: 2022-12-24 15:32:12 +0000 debug_put_get: don't crash on null pointers MFC after: 7 days --- sys/dev/netmap/netmap_kern.h | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/sys/dev/netmap/netmap_kern.h b/sys/dev/netmap/netmap_kern.h index 0c658c1e046d..6e6561ef7be4 100644 --- a/sys/dev/netmap/netmap_kern.h +++ b/sys/dev/netmap/netmap_kern.h @@ -1628,8 +1628,8 @@ void __netmap_adapter_get(struct netmap_adapter *na); #define netmap_adapter_get(na) \ do { \ struct netmap_adapter *__na = na; \ - nm_prinf("getting %p:%s (%d)", __na, (__na)->name, (__na)->na_refcount); \ __netmap_adapter_get(__na); \ + nm_prinf("getting %p:%s -> %d", __na, (__na)->name, (__na)->na_refcount); \ } while (0) int __netmap_adapter_put(struct netmap_adapter *na); @@ -1637,8 +1637,11 @@ int __netmap_adapter_put(struct netmap_adapter *na); #define netmap_adapter_put(na) \ ({ \ struct netmap_adapter *__na = na; \ - nm_prinf("putting %p:%s (%d)", __na, (__na)->name, (__na)->na_refcount); \ - __netmap_adapter_put(__na); \ + if (__na == NULL) \ + nm_prinf("putting NULL"); \ + else \ + nm_prinf("putting %p:%s -> %d", __na, (__na)->name, (__na)->na_refcount - 1); \ + __netmap_adapter_put(__na); \ }) #else /* !NM_DEBUG_PUTGET */