From patchwork Wed Jun 24 15:33:50 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lorenzo Bianconi X-Patchwork-Id: 217183 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.1 required=3.0 tests=DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 66DD1C433DF for ; Wed, 24 Jun 2020 15:34:29 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 3D05A20706 for ; Wed, 24 Jun 2020 15:34:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1593012869; bh=1pJytwJejZQnTfJpmOAYaRgg4T3M4iz5/khnbm9cSqk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=RjKUJuAp4tm81ZFRo5KUj+y/2g5vjPTqDVwO9nNXvHWbpntTZ42GACri0rNm3RM4n fc/RRWl0NsNT2FJbHxN4gscwDbch4zmOsqTsAKWZThXcFr1bKwKAMhQcNc02rttMUQ K2G+moqjJPdJUqDJb8JZwQDxq1Eza4nPnYl+WXEA= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2404509AbgFXPe2 (ORCPT ); Wed, 24 Jun 2020 11:34:28 -0400 Received: from mail.kernel.org ([198.145.29.99]:60462 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2404323AbgFXPe2 (ORCPT ); Wed, 24 Jun 2020 11:34:28 -0400 Received: from lore-desk-wlan.redhat.com (unknown [151.48.138.186]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id EB68E206FA; Wed, 24 Jun 2020 15:34:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1593012868; bh=1pJytwJejZQnTfJpmOAYaRgg4T3M4iz5/khnbm9cSqk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=YCMy2tLT0yO/uBTDu5EF0+Oz5xWZ4+K0BndtlYUCdrOpTE4+4YKFJGdFJLbfqX2xP sqGCxQAZXo6/jwhY6yn40nhVweJwUWiB7uez08nTBH7xb2sB3PEiu2/SV/bnYuSjEu wVc4AtT/i99+I79qyFoeT+W4ZCjYqNBBfvJzz8Ao= From: Lorenzo Bianconi To: netdev@vger.kernel.org, bpf@vger.kernel.org Cc: davem@davemloft.net, ast@kernel.org, brouer@redhat.com, daniel@iogearbox.net, toke@redhat.com, lorenzo.bianconi@redhat.com, dsahern@kernel.org, andrii.nakryiko@gmail.com Subject: [PATCH v4 bpf-next 1/9] cpumap: use non-locked version __ptr_ring_consume_batched Date: Wed, 24 Jun 2020 17:33:50 +0200 Message-Id: <91807e9d58de5d48521631548ec4586f0090399b.1593012598.git.lorenzo@kernel.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: References: MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Jesper Dangaard Brouer Commit 77361825bb01 ("bpf: cpumap use ptr_ring_consume_batched") changed away from using single frame ptr_ring dequeue (__ptr_ring_consume) to consume a batched, but it uses a locked version, which as the comment explain isn't needed. Change to use the non-locked version __ptr_ring_consume_batched. Fixes: 77361825bb01 ("bpf: cpumap use ptr_ring_consume_batched") Signed-off-by: Jesper Dangaard Brouer Signed-off-by: Lorenzo Bianconi --- kernel/bpf/cpumap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kernel/bpf/cpumap.c b/kernel/bpf/cpumap.c index bd8658055c16..323c91c4fab0 100644 --- a/kernel/bpf/cpumap.c +++ b/kernel/bpf/cpumap.c @@ -259,7 +259,7 @@ static int cpu_map_kthread_run(void *data) * kthread CPU pinned. Lockless access to ptr_ring * consume side valid as no-resize allowed of queue. */ - n = ptr_ring_consume_batched(rcpu->queue, frames, CPUMAP_BATCH); + n = __ptr_ring_consume_batched(rcpu->queue, frames, CPUMAP_BATCH); for (i = 0; i < n; i++) { void *f = frames[i];