From owner-svn-src-all@freebsd.org Wed Jan 1 02:37:51 2020 Return-Path: Delivered-To: svn-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 34ACD1E37DB; Wed, 1 Jan 2020 02:37:51 +0000 (UTC) (envelope-from koobs.freebsd@gmail.com) Received: from mail-pl1-x641.google.com (mail-pl1-x641.google.com [IPv6:2607:f8b0:4864:20::641]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 47nb1V1yD5z3xvm; Wed, 1 Jan 2020 02:37:49 +0000 (UTC) (envelope-from koobs.freebsd@gmail.com) Received: by mail-pl1-x641.google.com with SMTP id y8so16403661pll.13; Tue, 31 Dec 2019 18:37:49 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:reply-to:subject:to:references:from:message-id:date :user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=Po6xuQDXVEI5GLsilURv7eOaitTOc/AgjQBnYOxOpw0=; b=UxcBbktDNOzDc+R2YgDFx9t3gJ5Qht7Ga/+Y/Lvp7lgo6ahH8Yf9ancHcnd+C/7mas FxIy/GhWwxZKKZeSam+q9ZippnL6E2JLBi+7l52FImHyjkud+U8jro9NoY9oG/6B8Kg2 n1E8vTj9jYDlwPMZIM7FLZXNUt6pCa18lRHxLcGwWrB9MAxpT8LyaEztqpiAO6Jsb1Pn O3+kdzO5n0cBgKBDz9pBqUtIFBOuQzO6wefwJtTIgWQU0neFY6f5+qZ5ZBt0Lt8irErL SAVJSKhxZlgYueeGOMTUZDrfoFOrefkUOaVWsIbDLbUd/jbZOm5z3siwwl5BDF+RBLew JuaA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:reply-to:subject:to:references:from :message-id:date:user-agent:mime-version:in-reply-to :content-language:content-transfer-encoding; bh=Po6xuQDXVEI5GLsilURv7eOaitTOc/AgjQBnYOxOpw0=; b=qUPpzMCDS2pUT1QlLFzUFgwIvNte5YQawpq0qhTHn37y99QzPbjHsAYNV6H5bLaxTQ P8EZP4geozJRtB+n4px2mRs9WK8FdqS16N7Z1YRbM5VOoNcxz4YhFDIeZkvIhx3eHaKk e9f4y6i7o3Y90hJXovsGnqpde5qhHsJHPtVQeC86rsW+IcUSXPy40V9LvIJcQLdNlJlO pUf5d/HVvpqEFNPfYqlhuWIqWnZhkKAkWb3HSWzqRuj2/ePO4nOlw+VeEVpWKHayJf3N Ns2i7GWZtr3TCkStXfsxal+GX6RAUYB0g/OYfgujRb0mZr/8PYAteOH3/oSAvJ13sLd8 4bqg== X-Gm-Message-State: APjAAAUSDJqlPBIBzhiZxWw4Ymjb93dDY+wbDjePR3nRsEkYyDakrm1N vi8a83hRXxZSh3JwhpEQq4PUUpBi X-Google-Smtp-Source: APXvYqx0sa9WY1r5g51j3msFMsb/10suu/HI/LjRheYFnYfX0ynEN9ErcZ4G3Y0gsXJf8Jwj0NCHRg== X-Received: by 2002:a17:902:724a:: with SMTP id c10mr79376574pll.39.1577846268347; Tue, 31 Dec 2019 18:37:48 -0800 (PST) Received: from [192.168.1.110] (180-150-68-130.b49644.syd.nbn.aussiebb.net. [180.150.68.130]) by smtp.gmail.com with ESMTPSA id h126sm33384116pfe.19.2019.12.31.18.37.46 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 31 Dec 2019 18:37:48 -0800 (PST) Sender: Kubilay Kocak Reply-To: koobs@FreeBSD.org Subject: Re: svn commit: r356240 - head/sys/netinet To: Alexander Motin , src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org References: <201912311858.xBVIwUSh048909@repo.freebsd.org> From: Kubilay Kocak Message-ID: Date: Wed, 1 Jan 2020 13:37:44 +1100 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:72.0) Gecko/20100101 Thunderbird/72.0 MIME-Version: 1.0 In-Reply-To: <201912311858.xBVIwUSh048909@repo.freebsd.org> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit X-Rspamd-Queue-Id: 47nb1V1yD5z3xvm X-Spamd-Bar: --- Authentication-Results: mx1.freebsd.org; dkim=pass header.d=gmail.com header.s=20161025 header.b=UxcBbktD; dmarc=none; spf=pass (mx1.freebsd.org: domain of koobsfreebsd@gmail.com designates 2607:f8b0:4864:20::641 as permitted sender) smtp.mailfrom=koobsfreebsd@gmail.com X-Spamd-Result: default: False [-3.15 / 15.00]; RCVD_VIA_SMTP_AUTH(0.00)[]; HAS_REPLYTO(0.00)[koobs@FreeBSD.org]; TO_DN_SOME(0.00)[]; R_SPF_ALLOW(-0.20)[+ip6:2607:f8b0:4000::/36]; REPLYTO_ADDR_EQ_FROM(0.00)[]; RCVD_COUNT_THREE(0.00)[3]; DKIM_TRACE(0.00)[gmail.com:+]; FORGED_SENDER(0.30)[koobs@FreeBSD.org,koobsfreebsd@gmail.com]; IP_SCORE(-0.95)[ip: (-0.68), ipnet: 2607:f8b0::/32(-2.15), asn: 15169(-1.87), country: US(-0.05)]; MIME_TRACE(0.00)[0:+]; FREEMAIL_ENVFROM(0.00)[gmail.com]; MID_RHS_MATCH_FROM(0.00)[]; TAGGED_FROM(0.00)[]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; R_DKIM_ALLOW(-0.20)[gmail.com:s=20161025]; FROM_NEQ_ENVFROM(0.00)[koobs@FreeBSD.org,koobsfreebsd@gmail.com]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[4]; TO_MATCH_ENVRCPT_ALL(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; MIME_GOOD(-0.10)[text/plain]; DMARC_NA(0.00)[FreeBSD.org]; RCVD_IN_DNSWL_NONE(0.00)[1.4.6.0.0.0.0.0.0.0.0.0.0.0.0.0.0.2.0.0.4.6.8.4.0.b.8.f.7.0.6.2.list.dnswl.org : 127.0.5.0]; RCVD_TLS_ALL(0.00)[] 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" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 01 Jan 2020 02:37:51 -0000 On 1/01/2020 5:58 am, Alexander Motin wrote: > Author: mav > Date: Tue Dec 31 18:58:29 2019 > New Revision: 356240 > URL: https://svnweb.freebsd.org/changeset/base/356240 > > Log: > Relax locking of carp_forus(). > > This fixes deadlock between CARP and bridge. Bridge calls this function > taking CARP lock while holding bridge lock. Same time CARP tries to send > its announcements via the bridge while holding CARP lock. > > Use of CARP_LOCK() here does not solve anything, since sc_addr is constant > while race on sc_state is harmless and use of the lock does not close it. > > Reviewed by: glebius > MFC after: 2 weeks > Sponsored by: iXsystems, Inc. > > Modified: > head/sys/netinet/ip_carp.c > > Modified: head/sys/netinet/ip_carp.c > ============================================================================== > --- head/sys/netinet/ip_carp.c Tue Dec 31 18:28:25 2019 (r356239) > +++ head/sys/netinet/ip_carp.c Tue Dec 31 18:58:29 2019 (r356240) > @@ -1230,14 +1230,15 @@ carp_forus(struct ifnet *ifp, u_char *dhost) > > CIF_LOCK(ifp->if_carp); > IFNET_FOREACH_CARP(ifp, sc) { > - CARP_LOCK(sc); > + /* > + * CARP_LOCK() is not here, since would protect nothing, but > + * cause deadlock with if_bridge, calling this under its lock. > + */ > if (sc->sc_state == MASTER && !bcmp(dhost, LLADDR(&sc->sc_addr), > ETHER_ADDR_LEN)) { > - CARP_UNLOCK(sc); > CIF_UNLOCK(ifp->if_carp); > return (1); > } > - CARP_UNLOCK(sc); > } > CIF_UNLOCK(ifp->if_carp); > > _______________________________________________ > svn-src-head@freebsd.org mailing list > https://lists.freebsd.org/mailman/listinfo/svn-src-head > To unsubscribe, send any mail to "svn-src-head-unsubscribe@freebsd.org" > Hi Alexander, Is this a only-head-impacted fix, or does the issue impact stable/12,11 too, warranting MFC ?