From nobody Sat Dec 31 12:29:18 2022 X-Original-To: dev-commits-src-branches@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 4NkhJZ4Z4Pz2nMR8; Sat, 31 Dec 2022 12:29:18 +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 4NkhJZ40Xgz4KnW; Sat, 31 Dec 2022 12:29:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1672489758; 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=gYgMSjWuwBEt73ga+qL8mDCmpGCk38yRiV1GMsBPt68=; b=Mp2cFBKlXx0+592PiOvCBjHih09/Pkj48y56LUkSzvLvA9EZWgAQVhTjw0Zo8adeMrNwg+ UmH5MhWKA9qI4RAz/nEcvStukQ6fEEZwStCnwEAZc0IpafvjvOfOzKVKr7nOIXjlEskQsL GgmDSjTWlnpORJ//1vpUsNm+bb1yXkBWXhwnAkUs15APYJ8yCRH3eXFvsYceEIMa3bhCwT s9+4XDVyER5QwWoei4CpultbZwx5nDrugSwLklndU2NqnEbU24j+d+mlZ1DWAnI4o7If2b uWqAjt3vVjcTRnOYrUrDSCai/zfbwlIbODlf4G75bG1MW9MERszGgQTF8sFAiQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1672489758; 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=gYgMSjWuwBEt73ga+qL8mDCmpGCk38yRiV1GMsBPt68=; b=ZIZz7WQ3qFp9Oru1iRo96gfEfejfVH96SJpV0a6J4eZprrL/3zmHwyb3lrxVEmCw99X5Q2 jg8e5EN5u7PiELPX7n4WAdAAtQUn+nwdH8zH9mvrSsMsmPiRHReT1brtQHtwhJMr2aBuKD wjDSZAI4cy6AbHzb1pd3Fo8wVtCID/ahPb+5MqkSWpt+eH6Hg5IxqWWB1vls0YIIsd7kcZ BxpXXURhs594tzRQL4MPI8Vw0fClG+MFTTrApXwNL7AY+6HtgQlFmiIVL+QZhNJd2R/je4 x46jtY7hJtUhMEAzhXc5DgXODUm4NlN7QYg3mhB0KiU5jCjqESBXs/e00JL1nA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1672489758; a=rsa-sha256; cv=none; b=psPbQFvQYnxDZdp7kqCovI1iWtTPW8pYBXhoCMGSeb8FeWoQeMBl4w7WTwN8uWEM862bLN IIihIOVPIOWz8Y32kRGvz6+qilsYMh0lN/u2+TgXzvkdjOcY4rtMpoN/kBGWR8m8+zeL8x 96uo7Y0Brap3V07ry6tv0Z2IkawY75NL281rA2T72yHB9DtR6LlDJen7auPGb3lXqS8Eli 6V4S0QqbXWww/9NxqGIRChgomJL+FEieVzhWvu3OR8i15KBJCz5ornrksLvFCbNSKU/aDP zuGdy1XFNfv9Io0n7wRhAt64qzZSn4Rb5eh09Qs7HEDM3+MdClD39oTk2w4F5Q== 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 4NkhJZ36HWzndw; Sat, 31 Dec 2022 12:29:18 +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 2BVCTIO7070054; Sat, 31 Dec 2022 12:29:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2BVCTIqv070053; Sat, 31 Dec 2022 12:29:18 GMT (envelope-from git) Date: Sat, 31 Dec 2022 12:29:18 GMT Message-Id: <202212311229.2BVCTIqv070053@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Vincenzo Maffione Subject: git: 6e23ef9c5784 - stable/12 - debug_put_get: don't crash on null pointers List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/stable/12 X-Git-Reftype: branch X-Git-Commit: 6e23ef9c5784af2d924b035b40805685db47163b Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by vmaffione: URL: https://cgit.FreeBSD.org/src/commit/?id=6e23ef9c5784af2d924b035b40805685db47163b commit 6e23ef9c5784af2d924b035b40805685db47163b Author: Vincenzo Maffione AuthorDate: 2022-12-24 15:31:36 +0000 Commit: Vincenzo Maffione CommitDate: 2022-12-31 12:14:25 +0000 debug_put_get: don't crash on null pointers MFC after: 7 days (cherry picked from commit 92e8b4a6301cc4ff4481e981c95c5b30b2a44506) --- 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 b6f0f70c8ac8..ea124a332af8 100644 --- a/sys/dev/netmap/netmap_kern.h +++ b/sys/dev/netmap/netmap_kern.h @@ -1573,8 +1573,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); @@ -1582,8 +1582,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 */