From nobody Thu Aug 24 20:51:58 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 4RWwHf6xBLz4rYw5; Thu, 24 Aug 2023 20:51:58 +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 4RWwHf6D44z3Pk4; Thu, 24 Aug 2023 20:51:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692910318; 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=b3zFnHlwYRW78GwGDiCtp1tkbNEZZqXl3uJ/igidhOQ=; b=pq88FsWlaURYeH1lhroK9ipTuG3aaht6Ro/ogyKKAjzhqJpVmz/QANz/mlEvx0lIjkF71K Pq95TKjE0jeu6Lt5cR6CXprTifTXWePe24oID2kOGX1AUWannEvkiO1SWkxbMnLKsfA3w+ acMABp6A25/HUFQPY7dLz/GOIOH1qPuV2DpsnDJnCfmJ39ph99HC4UiLsHurxy/U2/9K42 YnUPY79FZQ5md3UNZn6uZMd1RmuOPWi7o6EVquRUhPyOz6pOVHl9zEFpGTmeiJ5BLfKMZP gBzeiKonkOI35QaxLlmpft7LkMI6Y9l2si3tAii/eGnJ8UhgA6tEWCLK61ie2w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692910318; 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=b3zFnHlwYRW78GwGDiCtp1tkbNEZZqXl3uJ/igidhOQ=; b=PSX90yzNQ3LsVG/sjhV4K44mzH3jBbOD6hALhH8fiza1vxlP5fFcJK6uIEpou3FyZR1vm/ jswyCs++zyHwRRF66Bm6LVrM0AzTuewaYzhxuvfQGXkhYxZwSqZ0FprW/3xdk5sOs6/vPD OYR69063i4jadfoR78Fmv62c2L1FVhMARpFFoH5Q8GtAtGCJvlqs+KXgQY/SBV7SC1ojK1 GfXREfEk++Y+ibHSC60uVdBKmEMuilDwYRd15lt1FSUYsgS+htzTUBQoGYfe/LQXbMEO4s FGBjSU2hiICFVuCIC1drO2GNoX7h/wuDaSzIAdhR/Y0bCB1/m/ANJ8hvAU5EZg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692910318; a=rsa-sha256; cv=none; b=SB21fIEoXwhbAMXbjorA1m+DGwnMCBq8WaOhubmbAQdhr9Y38kbMPRA1Lom6+x1VxXMIN6 K+vv5aXguHVrgSu/JONZbaax4zRiG/k3/4yAY7eYT9ywbfy8jxV16ux2wheiOI98geDYWC gER6gNtxoxkabM0qR8/iFM1vUfiZDwNyTFyAzp3MdkepOI0Nio6L90VvCVMa9meWkvQ5g6 y2LMBAjWGih0nH2wIbZiYdi8hEI5kYoTDo4I11Gs2pAgM3ihajrEhqG6NdTqIZYAhzuKfw QCQ0Y5XU50a+dQWJaxKZ3NRcIzURYYMsVKKQq3Qjx5dGFk0FzqaJ8rRS+wjvLw== 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 4RWwHf4pvwzhwy; Thu, 24 Aug 2023 20:51:58 +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 37OKpwd1039465; Thu, 24 Aug 2023 20:51:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37OKpwUA039462; Thu, 24 Aug 2023 20:51:58 GMT (envelope-from git) Date: Thu, 24 Aug 2023 20:51:58 GMT Message-Id: <202308242051.37OKpwUA039462@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: b6b75424c57d - main - vmxnet3: 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: b6b75424c57d6da49967fef39f69080ce6939207 Auto-Submitted: auto-generated The branch main has been updated by kbowling: URL: https://cgit.FreeBSD.org/src/commit/?id=b6b75424c57d6da49967fef39f69080ce6939207 commit b6b75424c57d6da49967fef39f69080ce6939207 Author: Kevin Bowling AuthorDate: 2023-08-24 20:25:21 +0000 Commit: Kevin Bowling CommitDate: 2023-08-24 20:46:56 +0000 vmxnet3: 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/vmware/vmxnet3/if_vmx.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/sys/dev/vmware/vmxnet3/if_vmx.c b/sys/dev/vmware/vmxnet3/if_vmx.c index 99e84e744d57..2c3530a217f3 100644 --- a/sys/dev/vmware/vmxnet3/if_vmx.c +++ b/sys/dev/vmware/vmxnet3/if_vmx.c @@ -180,6 +180,7 @@ static void vmxnet3_enable_intr(struct vmxnet3_softc *, int); static void vmxnet3_disable_intr(struct vmxnet3_softc *, int); static void vmxnet3_intr_enable_all(if_ctx_t); static void vmxnet3_intr_disable_all(if_ctx_t); +static bool vmxnet3_if_needs_restart(if_ctx_t, enum iflib_restart_event); typedef enum { VMXNET3_BARRIER_RD, @@ -247,6 +248,8 @@ static device_method_t vmxnet3_iflib_methods[] = { DEVMETHOD(ifdi_suspend, vmxnet3_suspend), DEVMETHOD(ifdi_resume, vmxnet3_resume), + DEVMETHOD(ifdi_needs_restart, vmxnet3_if_needs_restart), + DEVMETHOD_END }; @@ -2505,6 +2508,16 @@ vmxnet3_intr_disable_all(if_ctx_t ctx) vmxnet3_disable_intr(sc, i); } +static bool +vmxnet3_if_needs_restart(if_ctx_t ctx __unused, enum iflib_restart_event event) +{ + switch (event) { + case IFLIB_RESTART_VLAN_CONFIG: + default: + return (false); + } +} + /* * Since this is a purely paravirtualized device, we do not have * to worry about DMA coherency. But at times, we must make sure