Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Message-ID: <7c3f3057-033a-f871-bd5d-0ac0da2b18a0@meta.com>
Date:   Mon, 7 Nov 2022 08:40:14 -0800
User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:102.0)
 Gecko/20100101 Thunderbird/102.4.1
Subject: Re: [PATCH bpf-next] bpf: Initialize same number of free nodes for
 each pcpu_freelist
Content-Language: en-US
To:     Xu Kuohai <xukuohai@huaweicloud.com>, bpf@vger.kernel.org,
        linux-kernel@vger.kernel.org
Cc:     Alexei Starovoitov <ast@kernel.org>,
        Daniel Borkmann <daniel@iogearbox.net>,
        Andrii Nakryiko <andrii@kernel.org>,
        Martin KaFai Lau <martin.lau@linux.dev>,
        Song Liu <song@kernel.org>, Yonghong Song <yhs@fb.com>,
        John Fastabend <john.fastabend@gmail.com>,
        KP Singh <kpsingh@kernel.org>,
        Stanislav Fomichev <sdf@google.com>,
        Hao Luo <haoluo@google.com>, Jiri Olsa <jolsa@kernel.org>
References: <20221107085030.3901608-1-xukuohai@huaweicloud.com>
From:   Yonghong Song <yhs@meta.com>
In-Reply-To: <20221107085030.3901608-1-xukuohai@huaweicloud.com>
Content-Type: text/plain; charset=UTF-8; format=flowed
Content-Transfer-Encoding: 7bit
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?TUsvV25lOXdzckp5dGhFcXhBUUhXV21aZGZkazJtQ1A4a0VQSEVuT0xaU2VB?=
 =?utf-8?B?QThBeUZFbzhjbGhZMTB2QUxOa2JXMFpTUE5OOTVHZ281bWE1Z0VIMmp5d2lo?=
 =?utf-8?B?cmhzTEdBY1FaNVhVN3VrU0xTd3k2ZFl2VlVhZU0vZGl5UEsrZU5kM3FLTkUw?=
 =?utf-8?B?WVpqd2lKeXN2Y0hLSVhBYi9JdjdTRnRBNU15K3VMN2JkVkJ6TXloRU1EQ1VI?=
 =?utf-8?B?SDNiVzVvcXNpdjk5TFE2VmtTNlJNM29EdXV3Y01RZmw4aWVxMEFPZnJvalZK?=
 =?utf-8?B?NGpScDIrZEdxQjRTdmZMdTFhaDN6amMzN1JOV045ZTFxc2t4dGE0djdCdDRT?=
 =?utf-8?B?cE5sN1VVZzlNRVlZYzNJVTk3UDNaQjhnQU44TXhQd1d3eWtDa3ovai8xMTVG?=
 =?utf-8?B?QzRXTkEyYzR4Z09lUmxveHNPb2ZKT2psT3JtZjZsa2NLR0VCcEhwUVp6dW9D?=
 =?utf-8?B?Y3pjVUZCS2lNSzNuVmpwaVhpWllnV2FXU0g1REJReHBERHV0TmwyWE1DZnFD?=
 =?utf-8?B?dnVZRmM2TnJ3NG82TVBoaVZKc0J3Snh6Sk1EdVlvUTMwb3FRUkFjOHdyQ1M5?=
 =?utf-8?B?cVBzVEtFTHhVNmx4QzY1NHdFZG5GV25Wd3AvZWhnZ3lzUnJQL0NwcFJoSjdv?=
 =?utf-8?B?V3lpQXY2dUQxaFBMcDhHNmhBWjhNcUtCVDIrMXlNbW5kcVJ3b0FZWWUwWGVT?=
 =?utf-8?B?cDVSbDREK0hudkFRUnUzNFBjWWhuUXZkSG9zL2dnTVMzL3FKQnMvdldpbktK?=
 =?utf-8?B?Wm1qNitsbjhjS3pHTTh6Q0lJVnFrMDZGY2VDcklhV1A0SG9ZWEh6M1IvWGEw?=
 =?utf-8?B?bHJ0YVltSDM2TTFFckdZT2xhZ2ZmWTNIOUQzdlphY2RwQXZBelVQdWRxR1dH?=
 =?utf-8?B?VU91WUVHMDdWNE56Q3dDWWl1OGZldmxnb25KYnBNN2l3UU52dTlST1V4Y3du?=
 =?utf-8?B?RFlDVnNVcXNVYnhxeDY1SFpxZHM1b3dZOENGOFVkZ1hvSWZEblFkd3BIdW5D?=
 =?utf-8?B?K1YzWE03MVFTMVFORlVZUFdEeEN4ZDhoVnBFeU1mYlowQ2ZHbExLZk9abGhI?=
 =?utf-8?B?Qzlxem5adWorN0VPTVNYU1ltdUVyd0FaYlpYZVB2ZXRUNlJxeDZRS1Z6Z3dD?=
 =?utf-8?B?SDVvMlZySTVpQ0ZrNjdRTzVmMkxJeVdCcmN6ck5reVdiMXFoODhHSCtQKzZZ?=
 =?utf-8?B?Q1R1VXB0TnRoLzZIaU1vTStxU1hyMmhPUDFNcVNibzhaaUFEUWZ5Z1dMUFN5?=
 =?utf-8?B?UWtZVGRUQ3BIWTQ0SHcxZllWVVhUT2RHRDNPWitJTmk2d0NldWxYdXVPelgv?=
 =?utf-8?B?alorYWdiWXZZdzI4MmZPWVkydGpsaEVvSlZJWGFiT050ZlpxenNyQUZ4cFll?=
 =?utf-8?B?ZmVWWXY4dUU0RDY4NUlyVzRhelpwQVpGV2o3NXY5TEhtM3RWNjIxSG1VL1VE?=
 =?utf-8?B?Wk1CT3VFaHVRM096TUtPWmZoblZDQkxvd3dzTVVUZ0lNdUkwNGM1QklpaXpS?=
 =?utf-8?B?OXlGTXlUbnRqNnpIZnNyTFE2NVdSL25WdjF4alZCUkxITXRwSjJCell6OHdS?=
 =?utf-8?B?a0NDK2FsWmJqQWdQc0hxMjRRcnY1UllJM0tCenprdi9IeHlIbElhb2xLYnlu?=
 =?utf-8?B?WkFNd2NJcmhIMFpML1lPMFBoZzNUMUgwRThiLzJNYWF0NDcxbXYwTTRHc0hq?=
 =?utf-8?B?ZVJxMFFQbHFDZkhLcDdqTm5VaHcxRG9OZGhiZFUxWUJMaEM5WmlZVnJDWkVm?=
 =?utf-8?B?ZjJYYWRaelR0M1JCSVRtNDJNY0grVFFRTTM4cEtONHV0cklYQmIrQ01YME5T?=
 =?utf-8?B?RjVqZWRaQ015dDllZDBlTGxHY0FVbk9yQ2hxak8wa1djWmdXTDdMMHZjWXEv?=
 =?utf-8?B?VXZZRXFrMmRvNnpUNkxrOGNnbVZHaU04MVFJMTZsdFFoWlFoa0xYZk1TNHdi?=
 =?utf-8?B?WTBKd01ISVVjYTJJTVF3T1ZiQk9EQ0NzNkZmSGQwSkJZcTRtVU1LWVAyRm5n?=
 =?utf-8?B?YURDTnUrVmpxb1hHOStDQW90Ry83a0NXRng1QStSck5RdTVXekVvNkFZMlJN?=
 =?utf-8?B?T1NqRjBlM2N0UjhINUF6akV1ZDk5YmwvRi9JM0RQODduaDV2ZnZvd1NXcUEv?=
 =?utf-8?B?enFZRytZeUlGOUNWMis5VlhmbVFhTWJKa0oyY3V3MTZQY3FBZVZUeUk0ODhs?=
 =?utf-8?B?WVE9PQ==?=
X-OriginatorOrg: meta.com
X-MS-Exchange-CrossTenant-Network-Message-Id: eedb12d5-1d18-45be-ea38-08dac0dec087
X-MS-Exchange-CrossTenant-AuthSource: SN6PR1501MB2064.namprd15.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Nov 2022 16:40:17.4876
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 8ae927fe-1255-47a7-a2af-5f3a069daaa2
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: sNO/XLlOJ7twy7kCn+LLwwY1VRhE6oiKdCBOMNsE46RC9yCJ6s9vfmtzpM4mrZTT
X-MS-Exchange-Transport-CrossTenantHeadersStamped: CO6PR15MB4196
X-Proofpoint-ORIG-GUID: lSf5-mRIlaP2fXDqSJRjSFBDuqtx3X2j
X-Proofpoint-GUID: lSf5-mRIlaP2fXDqSJRjSFBDuqtx3X2j
X-Proofpoint-Virus-Version: vendor=baseguard
 engine=ICAP:2.0.219,Aquarius:18.0.895,Hydra:6.0.545,FMLib:17.11.122.1
 definitions=2022-11-07_08,2022-11-07_02,2022-06-22_01
X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,NICE_REPLY_A,RCVD_IN_DNSWL_LOW,
        RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,SPF_NONE
        autolearn=ham autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org


On 11/7/22 12:50 AM, Xu Kuohai wrote:
> From: Xu Kuohai <xukuohai@huawei.com>
> 
> pcpu_freelist_populate() initializes nr_elems / num_possible_cpus() + 1
> free nodes for each CPU except the last initialized CPU, always making
> the last CPU get fewer free nodes. For example, when nr_elems == 256

... free nodes for some cpus, and then possibly one cpu with fewer 
nodes, followed by remaining cpus with 0 nodes.

> and num_possible_cpus() == 32, if CPU 0 is the current cpu, CPU 0~27
> each gets 9 free nodes, CPU 28 gets 4 free nodes, CPU 29~31 get 0 free
> nodes, while in fact each CPU should get 8 nodes equally.
> 
> This patch initializes nr_elems / num_possible_cpus() free nodes for each
> CPU firstly, and then allocates the remaining free nodes by one for each
> CPU until no free nodes left.
> 
> Signed-off-by: Xu Kuohai <xukuohai@huawei.com>

LGTM. Did you observe any performance issues?

Acked-by: Yonghong Song <yhs@fb.com>

> ---
>   kernel/bpf/percpu_freelist.c | 9 ++++++---
>   1 file changed, 6 insertions(+), 3 deletions(-)
> 
> diff --git a/kernel/bpf/percpu_freelist.c b/kernel/bpf/percpu_freelist.c
> index b6e7f5c5b9ab..89e84f7381cc 100644
> --- a/kernel/bpf/percpu_freelist.c
> +++ b/kernel/bpf/percpu_freelist.c
> @@ -100,12 +100,15 @@ void pcpu_freelist_populate(struct pcpu_freelist *s, void *buf, u32 elem_size,
>   			    u32 nr_elems)
>   {
>   	struct pcpu_freelist_head *head;
> -	int i, cpu, pcpu_entries;
> +	int i, cpu, pcpu_entries, remain_entries;
> +
> +	pcpu_entries = nr_elems / num_possible_cpus();
> +	remain_entries = nr_elems % num_possible_cpus();
>   
> -	pcpu_entries = nr_elems / num_possible_cpus() + 1;
>   	i = 0;
>   
>   	for_each_possible_cpu(cpu) {
> +		int j = i + pcpu_entries + (remain_entries-- > 0 ? 1 : 0);
>   again:
>   		head = per_cpu_ptr(s->freelist, cpu);
>   		/* No locking required as this is not visible yet. */
> @@ -114,7 +117,7 @@ void pcpu_freelist_populate(struct pcpu_freelist *s, void *buf, u32 elem_size,
>   		buf += elem_size;
>   		if (i == nr_elems)
>   			break;
> -		if (i % pcpu_entries)
> +		if (i < j)
>   			goto again;
>   	}
>   }