From owner-dev-commits-src-all@freebsd.org Fri Apr 2 10:45:53 2021 Return-Path: Delivered-To: dev-commits-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id B99C55CB713; Fri, 2 Apr 2021 10:45:53 +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 4FBcCj4rRsz4jBd; Fri, 2 Apr 2021 10:45:53 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 9914E1EA20; Fri, 2 Apr 2021 10:45:53 +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 132Ajrt4091519; Fri, 2 Apr 2021 10:45:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 132AjrcK091518; Fri, 2 Apr 2021 10:45:53 GMT (envelope-from git) Date: Fri, 2 Apr 2021 10:45:53 GMT Message-Id: <202104021045.132AjrcK091518@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: 9bad2638cc18 - main - netmap: restore commit a56e6334d1b7ed6e6faaa8b4612d948005ba74f5 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: 9bad2638cc1882b44adb29a1cb1234f79e5c29f1 Auto-Submitted: auto-generated X-BeenThere: dev-commits-src-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 02 Apr 2021 10:45:53 -0000 The branch main has been updated by vmaffione: URL: https://cgit.FreeBSD.org/src/commit/?id=9bad2638cc1882b44adb29a1cb1234f79e5c29f1 commit 9bad2638cc1882b44adb29a1cb1234f79e5c29f1 Author: Vincenzo Maffione AuthorDate: 2021-04-02 10:43:19 +0000 Commit: Vincenzo Maffione CommitDate: 2021-04-02 10:45:47 +0000 netmap: restore commit a56e6334d1b7ed6e6faaa8b4612d948005ba74f5 The fix in a56e6334d1b7ed6e6faaa8b4612d948005ba74f5 was accidentally reverted by commit 45c67e8f6b56b9744f01142747fadf291fe3fad2. --- sys/net/netmap_user.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sys/net/netmap_user.h b/sys/net/netmap_user.h index 27f8592eed85..06b159d9bfe7 100644 --- a/sys/net/netmap_user.h +++ b/sys/net/netmap_user.h @@ -995,7 +995,8 @@ nm_close(struct nm_desc *d) static int nm_mmap(struct nm_desc *d, const struct nm_desc *parent) { - //XXX TODO: check if mmap is already done + if (d->done_mmap) + return 0; if (IS_NETMAP_DESC(parent) && parent->mem && parent->req.nr_arg2 == d->req.nr_arg2) {