From nobody Thu Aug 24 20:51:59 2023 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 4RWwHg7062z4rYvF; Thu, 24 Aug 2023 20:51:59 +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 4RWwHg6Ty1z3QGv; Thu, 24 Aug 2023 20:51:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692910319; 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=CCu2qwUifx0kAtM1j5qS7Mvxr20ZLUi05zoVH24ZQPM=; b=CHA7B9JpNV17eQJf3RCe1VKHX4E27VLhumjTccRr03g7RS6uXYjWuPl8WQ5whdX1+qqEPx tF+DksHF3m7xW0D2SytZ1lL82CFbn0USaauiG35/DKpdmrcGdTbiI6xSGmAgNmU9CMck95 JMYW5dtGqVpGL+HE1ZQvFFmAD2+pgM2yZ1USMrosDo9oPJoTqrdUupI4OuMet0AVD9E5f3 5lcC4w8mKbO6Wwe2c26X9luiv7//rbPx/Eu84ap8t+zwfvaOgaZfFlABBE9YKim5djzv+n INFs8TvHMPXGO3oBQwr9zhIR0TnvbSmQY/ZhQPcT1hWNxjwQUZf1djuo3FbiuA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692910319; 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=CCu2qwUifx0kAtM1j5qS7Mvxr20ZLUi05zoVH24ZQPM=; b=uzr1flht37TxSo3TbcE/48sYra2TbcIE3L9tjYItHHYR8QzTS7b5jvapzU+Eysz1Gcx09t xOm1TDu2S8bgw61u4/HiL25UwPnAMwu0CwOYWoKwxlLA17ej74qUty/L0dyGr7nqUgOSsf augLcRRFo1DU3mLNlTJ9X9U+LsWpDrnpqrqjY0fyux1L8X7WYDLK0r/vYySLC5Q8Szgp9D 5/OX5RfXWkiI6nFp1ZWXIp+oQ4IGsgJ+7Jl1A4hMe6ohCfrMSUObvqh+n3NAeqKInytmXB 1v5rjKAnaxG3LcYswJCWHwUgc6x6NvsZc7cyXG6hWNef/45/696rvEIBTP88zg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692910319; a=rsa-sha256; cv=none; b=hP9sJ9DbswTf4vQ0MbMrlJ7NVA2unqFTqp+LwSjdhUJb45QrdyBg4gof6zLnU9AJWrmbxU yRK+oqbW3nt0ZYcVIf2jtbjagZpGid2JR+5CPdAtG66a8byx6CwubPX9CAXV293vAcu+1I H8rSVXJGY+dEzCk+5BCt6sApl9obS6Cb8d/V5qmi+mojr5xZgH+pTI/Ml7GiXUB5E+OaHk YxD05g+enYndQjfz1ghJAI5h/EQFhqGYQBQi6M+z5HKpUzLnoNUobonn/djtgga5ADF62E gJhutq6E7HIbXJSEUe5DTJb2LXU1NqazJ1wlbXZqwMMhqV4z0Git9rr6bJUeMw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4RWwHg5V0Zzhx1; Thu, 24 Aug 2023 20:51:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37OKpxL7039511; Thu, 24 Aug 2023 20:51:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37OKpxYX039508; Thu, 24 Aug 2023 20:51:59 GMT (envelope-from git) Date: Thu, 24 Aug 2023 20:51:59 GMT Message-Id: <202308242051.37OKpxYX039508@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kevin Bowling Subject: git: fe6c4e214d76 - main - enic: Don't restart on VLAN changes 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: kbowling X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: fe6c4e214d76b0e856e5a050abb5420de4f5020b Auto-Submitted: auto-generated The branch main has been updated by kbowling: URL: https://cgit.FreeBSD.org/src/commit/?id=fe6c4e214d76b0e856e5a050abb5420de4f5020b commit fe6c4e214d76b0e856e5a050abb5420de4f5020b Author: Kevin Bowling AuthorDate: 2023-08-24 20:29:10 +0000 Commit: Kevin Bowling CommitDate: 2023-08-24 20:46:56 +0000 enic: Don't restart on VLAN changes In rS360398, a new iflib device method was added with default of opt out for VLAN events needing an interface reset. This re-init is unintentional for vmxnet3(4). MFC after: 2 weeks Sponsored by: BBOX.io Differential Revision: https://reviews.freebsd.org/D41558 --- sys/dev/enic/if_enic.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/sys/dev/enic/if_enic.c b/sys/dev/enic/if_enic.c index b2fc3af56006..154eedfd0a19 100644 --- a/sys/dev/enic/if_enic.c +++ b/sys/dev/enic/if_enic.c @@ -117,6 +117,7 @@ static int enic_dev_wait(struct vnic_dev *, int (*) (struct vnic_dev *, int), int (*) (struct vnic_dev *, int *), int arg); static int enic_map_bar(struct enic_softc *, struct enic_bar_info *, int, bool); static void enic_update_packet_filter(struct enic *enic); +static bool enic_if_needs_restart(if_ctx_t, enum iflib_restart_event); typedef enum { ENIC_BARRIER_RD, @@ -174,6 +175,8 @@ static device_method_t enic_iflib_methods[] = { DEVMETHOD(ifdi_intr_disable, enic_intr_disable_all), DEVMETHOD(ifdi_msix_intr_assign, enic_msix_intr_assign), + DEVMETHOD(ifdi_needs_restart, enic_if_needs_restart), + DEVMETHOD_END }; @@ -1564,6 +1567,16 @@ enic_update_packet_filter(struct enic *enic) ENIC_UNLOCK(softc); } +static bool +enic_if_needs_restart(if_ctx_t ctx __unused, enum iflib_restart_event event) +{ + switch (event) { + case IFLIB_RESTART_VLAN_CONFIG: + default: + return (false); + } +} + int enic_setup_finish(struct enic *enic) {