From owner-svn-src-all@freebsd.org Mon Jan 28 09:27:30 2019
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id 22FB814AD0D8;
Mon, 28 Jan 2019 09:27:30 +0000 (UTC)
(envelope-from vmaffione@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)
server-signature RSA-PSS (4096 bits)
client-signature RSA-PSS (4096 bits) client-digest SHA256)
(Client CN "mxrelay.nyi.freebsd.org",
Issuer "Let's Encrypt Authority X3" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id B1238824D4;
Mon, 28 Jan 2019 09:27:29 +0000 (UTC)
(envelope-from vmaffione@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
[IPv6:2610:1c1:1:6068::e6a:0])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client did not present a certificate)
by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id ED98B1D98F;
Mon, 28 Jan 2019 09:27:28 +0000 (UTC)
(envelope-from vmaffione@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x0S9RSlE043059;
Mon, 28 Jan 2019 09:27:28 GMT (envelope-from vmaffione@FreeBSD.org)
Received: (from vmaffione@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id x0S9RS3T043058;
Mon, 28 Jan 2019 09:27:28 GMT (envelope-from vmaffione@FreeBSD.org)
Message-Id: <201901280927.x0S9RS3T043058@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: vmaffione set sender to
vmaffione@FreeBSD.org using -f
From: Vincenzo Maffione <vmaffione@FreeBSD.org>
Date: Mon, 28 Jan 2019 09:27:28 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org
Subject: svn commit: r343522 - stable/11/sys/dev/netmap
X-SVN-Group: stable-11
X-SVN-Commit-Author: vmaffione
X-SVN-Commit-Paths: stable/11/sys/dev/netmap
X-SVN-Commit-Revision: 343522
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-Rspamd-Queue-Id: B1238824D4
X-Spamd-Bar: --
Authentication-Results: mx1.freebsd.org
X-Spamd-Result: default: False [-2.97 / 15.00];
local_wl_from(0.00)[FreeBSD.org];
NEURAL_HAM_MEDIUM(-1.00)[-0.998,0];
NEURAL_HAM_SHORT(-0.97)[-0.969,0];
ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US];
NEURAL_HAM_LONG(-1.00)[-0.999,0]
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
user" and " projects" \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 28 Jan 2019 09:27:30 -0000
Author: vmaffione
Date: Mon Jan 28 09:27:28 2019
New Revision: 343522
URL: https://svnweb.freebsd.org/changeset/base/343522
Log:
MFC r343413
netmap: fix crash with monitors and VALE ports
Crash report described here:
https://github.com/luigirizzo/netmap/issues/583
Fixed by providing dummy sync callback in case it is missing.
Modified:
stable/11/sys/dev/netmap/netmap_monitor.c
Directory Properties:
stable/11/ (props changed)
Modified: stable/11/sys/dev/netmap/netmap_monitor.c
==============================================================================
--- stable/11/sys/dev/netmap/netmap_monitor.c Mon Jan 28 09:18:28 2019 (r343521)
+++ stable/11/sys/dev/netmap/netmap_monitor.c Mon Jan 28 09:27:28 2019 (r343522)
@@ -259,11 +259,20 @@ static int netmap_monitor_parent_txsync(struct netmap_
static int netmap_monitor_parent_rxsync(struct netmap_kring *, int);
static int netmap_monitor_parent_notify(struct netmap_kring *, int);
+static int
+nm_monitor_dummycb(struct netmap_kring *kring, int flags)
+{
+ (void)kring;
+ (void)flags;
+ return 0;
+}
+
static void
nm_monitor_intercept_callbacks(struct netmap_kring *kring)
{
ND("intercept callbacks on %s", kring->name);
- kring->mon_sync = kring->nm_sync;
+ kring->mon_sync = kring->nm_sync != NULL ?
+ kring->nm_sync : nm_monitor_dummycb;
kring->mon_notify = kring->nm_notify;
if (kring->tx == NR_TX) {
kring->nm_sync = netmap_monitor_parent_txsync;