From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wm1-f47.google.com (mail-wm1-f47.google.com [209.85.128.47]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id CEC7D397937 for ; Thu, 3 Sep 2026 09:31:54 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.47 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788427916; cv=none; b=sv8g9Z2HJG7pmH7Ge1bcletiUs3XRkjLjcierQtxFf+l1PBPks7AFxE9OZx7xCdYgvg6bcehp32+RHUEg/9eWsErwEx21vv6OHN5HpnjxjsIyE0J+d7Pm+PpEV3DaEIZx4L8uDaYrSJTtpIqbraBvYefoD02/OOaWs0PokR4hZA= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788427916; c=relaxed/simple; bh=lI2mxNE9KnVCsl0teA51X5qx5kUoJhxl9QfZ4/JhFr0=; h=Message-ID:Date:MIME-Version:Subject:To:Cc:References:From: In-Reply-To:Content-Type; b=nHrYn7rKrBD6/zK39Poyjol/OuJDZM56ATUjGiocZl0J0FQe1SUmRXQxgVxA5DggbFp+3SzyviPwcyEWpsghh9KuOm6VFMmMIWqc0WPb/SY/lawC0qV2ldUSx/DvRqDVVDpPghiNSUUKr9OznR2BRMi+zgLQfSvKEhwbBL08ESQ= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=blackwall.org; spf=none smtp.mailfrom=blackwall.org; dkim=pass (2048-bit key) header.d=blackwall.org header.i=@blackwall.org header.b=DCvhpAVG; arc=none smtp.client-ip=209.85.128.47 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=blackwall.org Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=blackwall.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=blackwall.org header.i=@blackwall.org header.b="DCvhpAVG" Received: by mail-wm1-f47.google.com with SMTP id 5b1f17b1804b1-49b8687630fso17753695e9.3 for ; Thu, 03 Sep 2026 02:31:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=blackwall.org; s=google; t=1788427913; x=1789032713; darn=vger.kernel.org; h=content-transfer-encoding:content-type:in-reply-to:from:references :cc:to:content-language:subject:user-agent:mime-version:date :message-id:from:to:cc:subject:date:message-id:reply-to:content-type; bh=+YoJRVDKsxA+JZQB/DUL9Ib2BpXMsLJBJ11fKOwMq4g=; b=DCvhpAVGDLRLPpY8mcQsF9vKis843htQECInKdLB+q92oUwr8+UwC4X0kzBmf2Zjmn HsxpK7OvxR+ZCviQJJHw0XhrCKcBgGtpz+1fdOttH2a3C2FGxKLwjTyGXzXlzcqQnphY WRdqO4bSabUXnWwi34d3E6Evm7Qd7lecHKpN84zmjI4w5RBUnWxAfNacrV8MUiIicks3 kIAhQQX5iDueTW/C/VfoDGKlgbyWpLto91kpHJuK52Sg+qR+CJyhv7vR67kt4PiNWPU7 4jFntZf36Qfs3CsC/JZYzXPEIb7bF4N+bJ8xaskCY+ITp+CainrBV04etEaHfjMzGS4Z 2VgQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1788427913; x=1789032713; h=content-transfer-encoding:content-type:in-reply-to:from:references :cc:to:content-language:subject:user-agent:mime-version:date :message-id:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to:content-type; bh=+YoJRVDKsxA+JZQB/DUL9Ib2BpXMsLJBJ11fKOwMq4g=; b=U0OP8cmNcG5Lg9gMj1MZiCS4lq2aclikas4Ks+nPQtHoekOUGmCsv6Cb6qM4B4N4Yu R5ZaNG/3OKgJN95FRrQdXn82JtNMghcio5/xHNFgVJHehP7PuwSuHA61IfY2R4dgmLjs WDwr5avh6LcpVFWLVkHGCA1A3iOXdYmqsOZNyTtBIfLH0gwDiEqN+xViBJqm5luKfXLQ L45MiwWWL50pNZKagYQAW68kkmsZkSrUKn35krm1AVhyIMW5jwAP+krvL8j08b0H6AHK GnAPdUegyQLbAxGamUBreiKi4XVqFqpZthCVV6Uo3ba6m6xDuQ8hzC4BdxoPdLj/B/1Z jGqA== X-Forwarded-Encrypted: i=1; AKwUvByY3ov+dk9SogCzxPD9qe2A4NvJjh23WGB/nvSOUdXSZqmM8FAt+7f7yOPl0nSZCdiDyVbjiBrWhyixg60=@vger.kernel.org X-Gm-Message-State: AFuF++lVRDw+coN+t31idQQgICmUZcxiEGc9TSuzB+zqUmFcdIdNmijB 4cvVRhJ78I5K6f9CZjv2wAIcl7G0hJryKrOnb6ZjJSRUXEJX01qCXfzWKHSm7sOD3DQ= X-Gm-Gg: AYBFou1ZWHH5KHODGGX5H//jyitR/+FyTTIH6Ojcm2LhzAFpfNKW+Wqr9XLdNzIVicE KNoKk8aBFr4u1f1Kue9toGkqCnjYleGceQDKp//M1HxpyZJGLIdiLMcpNqG66pG2dMp1MX/BFJd +p/DViE1Aa1u2A8otQ7bcpU+lwvh9l74lQsFujIp6cl9/VE6ix1/n1muKraPF6YvQlheecm+2R1 /WHMBvgrvQIYrMXrDeRMukOr5zNeTCucmyn5t4lEIVwi4r/d1/CRKe4OkjjKKiKncykmpB7A1N+ aGfaX3uCOQnct7rYt+pIUs+ljEIdLIfVQ7+PnTtS3yBZ04gJdq8gMNEhJhIr35frnmUzOLpmRfG Nl3CmpTmhG9KOwGR/wnCeL8z0+ResWG8ZmO8mafRh/BOSygQorhidHffMvHaMJKxIolsSxchdyw d//plN/1QpTbPu2khMdzq7rDjKzYSeexaHGgXhovWtKouPDbU/RwhRz3dzWN59ec6JLPhzxWDng KViTu7exMnNF+3dV0M= X-Received: by 2002:a05:600c:4e8f:b0:499:bf0e:95c8 with SMTP id 5b1f17b1804b1-49ce57f5647mr162091905e9.1.1788427912710; Thu, 03 Sep 2026 02:31:52 -0700 (PDT) Received: from [192.168.0.161] (78-154-15-182.ip.btc-net.bg. [78.154.15.182]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-48448e80020sm12835333f8f.10.2026.09.03.02.31.51 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 03 Sep 2026 02:31:52 -0700 (PDT) Message-ID: <80d9e50b-fdc6-4337-9adb-8db1bd194ce4@blackwall.org> Date: Thu, 3 Sep 2026 12:31:51 +0300 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH net v2] bonding: fix slave_cnt leak on XDP error paths Content-Language: en-US, bg To: Hangbin Liu Cc: Jay Vosburgh , Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Daniel Borkmann , Jussi Maki , netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Hangbin Liu References: <20260903-bond_slave_cnt-v2-1-02e27304ca36@kylinos.cn> <30c405c0-d17b-4107-a4f4-d2595c661892@blackwall.org> From: Nikolay Aleksandrov In-Reply-To: Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit On 03/09/2026 12:27, Hangbin Liu wrote: > On Thu, Sep 03, 2026 at 11:18:32AM +0300, Nikolay Aleksandrov wrote: >>> diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c >>> index 947d92a669b6..f3290aee50d1 100644 >>> --- a/drivers/net/bonding/bond_main.c >>> +++ b/drivers/net/bonding/bond_main.c >>> @@ -2284,7 +2284,6 @@ int bond_enslave(struct net_device *bond_dev, struct net_device *slave_dev, >>> } >>> } >>> - WRITE_ONCE(bond->slave_cnt, bond->slave_cnt + 1); >>> netdev_compute_master_upper_features(bond->dev, true); >>> bond_set_carrier(bond); >>> @@ -2339,6 +2338,8 @@ int bond_enslave(struct net_device *bond_dev, struct net_device *slave_dev, >>> bond_xdp_set_features(bond_dev); >>> + WRITE_ONCE(bond->slave_cnt, bond->slave_cnt + 1); >>> + >>> slave_info(bond_dev, slave_dev, "Enslaving as %s interface with %s link\n", >>> bond_is_active_slave(new_slave) ? "an active" : "a backup", >>> new_slave->link != BOND_LINK_DOWN ? "an up" : "a down"); >>> >>> --- >>> base-commit: 70f3995830d3f1e79faa14eb0605914f778feca9 >>> change-id: 20260807-bond_slave_cnt-88e78c5f0ab9 >>> >>> Best regards, >> >> Thanks, looks good to me. One minor nit if there's another version - mention >> also the WRITE_ONCE() in the commit message or better yet do it in a separate >> commit that properly annotates slave_cnt everywhere. > > The WRITE_ONCE() change is made by Eric's recent fix > bc93419130bb ("net: bonding: annotate lockless writes with WRITE_ONCE()"). > > Do you mean add a comment for all the slave_cnt usage? > > Thanks > Hangbin Oops, my tree was older, forgot to sync it, my bad. All looks good.