From nobody Thu Dec 02 11:15:36 2021 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 2593A18B8453; Thu, 2 Dec 2021 11:15:37 +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 4J4YKN67xDz3KgS; Thu, 2 Dec 2021 11:15:36 +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 B29561C5F6; Thu, 2 Dec 2021 11:15:36 +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 1B2BFaKo068631; Thu, 2 Dec 2021 11:15:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1B2BFa1v068630; Thu, 2 Dec 2021 11:15:36 GMT (envelope-from git) Date: Thu, 2 Dec 2021 11:15:36 GMT Message-Id: <202112021115.1B2BFa1v068630@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Randall Stewart Subject: git: dcf2dfed26ed - main - tcp: unloading a module that is set to default should error. 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: rrs X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: dcf2dfed26ed34602e17bee9318f0fde9429577e Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1638443736; 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=IwM5LM1vxuEyfy5rgRTO7uk99HGSJUB61XvwbwlPej8=; b=JfSiNlZ6hzqQZkqTEB9/LVyOQTCG3GVCcSgVFlf6Iwiym4osUlKa9UGN3j9mf9Z1zB3WY0 P7D/PS+GbOPbEeR6EgkfSMCdC7NFQWrul658OsQED+UL6PLoDllPoOnhtJjfQSM+K+5oF+ 4C1XGtQWyCloTo+aeVmxdxgV/q7/4VSQYdY/5xe2SNuu/nEjS/R9xcTF16M+ZF0F6HLA8Q NxeHgzBHmH484aPKPpiygJ+ir8XZ2NS6cUHz1rKQEurU0VqEIPlsbvtGlv/+XKsS3SQuut 549k+ny6lx2QqOokeP1A2K2fk0ryLHBYHoT0oPTiOeBO8Zp/27/FDXm2/bfVOw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1638443736; a=rsa-sha256; cv=none; b=c+gAmlnbmnFced54PFa7trfvyy98BGLUfET5Lj5eIW6cmO/oGI1GW32bkn+NZC7L4Dyb/7 BsgA1uphNNvq9nanXpTTdzB2gxNtK9bA0CFrgMOKzUkrpxx2vaQM09+kdJTRg0FBTgFcWM 2SKtBlyKEGvHMa6W54HqvbHF8mVok7NIAoFqwuREMWCkmtCSIBzKDt0RCJYL3cGxxICYX4 6x4Zhq/00flS9sjE9ObBWfnqJL2fdIPVcQLMkoJDB52hAdum/7m174aZUyxfy7ax5Q80UF K1K9nOFGyE+LeP225sv8x1vLcaj6/ukuhIw3H9B+BmVWp2PDjnGBjYQW1bgVFw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by rrs: URL: https://cgit.FreeBSD.org/src/commit/?id=dcf2dfed26ed34602e17bee9318f0fde9429577e commit dcf2dfed26ed34602e17bee9318f0fde9429577e Author: Randall Stewart AuthorDate: 2021-12-02 11:12:16 +0000 Commit: Randall Stewart CommitDate: 2021-12-02 11:12:16 +0000 tcp: unloading a module that is set to default should error. I just discovered that the return of the EBUSY error was incorrectly rigged so that you could unload a CC module that was set to default. Its supposed to be an EBUSY error. Make it so. Reviewed by: Michael Tuexen Sponsored by: Netflix Inc. Differential Revision: https://reviews.freebsd.org/D33229 --- sys/netinet/cc/cc.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/sys/netinet/cc/cc.c b/sys/netinet/cc/cc.c index b49e5940bc7e..bcda9276d4d9 100644 --- a/sys/netinet/cc/cc.c +++ b/sys/netinet/cc/cc.c @@ -246,14 +246,13 @@ cc_deregister_algo(struct cc_algo *remove_cc) STAILQ_FOREACH_SAFE(funcs, &cc_list, entries, tmpfuncs) { if (funcs == remove_cc) { if (cc_check_default(remove_cc)) { - err = EBUSY; - break; + CC_LIST_WUNLOCK(); + return(EBUSY); } - /* Add a temp flag to stop new adds to it */ - funcs->flags |= CC_MODULE_BEING_REMOVED; break; } } + remove_cc->flags |= CC_MODULE_BEING_REMOVED; CC_LIST_WUNLOCK(); err = tcp_ccalgounload(remove_cc); /*