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=-16.3 required=3.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT, USER_IN_DEF_DKIM_WL autolearn=ham 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 A51F8C31E46 for ; Wed, 12 Jun 2019 16:52:49 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 7BA7020645 for ; Wed, 12 Jun 2019 16:52:49 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="pvMrjaKq" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2502234AbfFLQws (ORCPT ); Wed, 12 Jun 2019 12:52:48 -0400 Received: from mail-qk1-f201.google.com ([209.85.222.201]:46267 "EHLO mail-qk1-f201.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2502240AbfFLQws (ORCPT ); Wed, 12 Jun 2019 12:52:48 -0400 Received: by mail-qk1-f201.google.com with SMTP id 18so14236191qkl.13 for ; Wed, 12 Jun 2019 09:52:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:in-reply-to:message-id:mime-version:references:subject:from:to :cc; bh=LAvvCh63rEf3Hma1oemsjvrm9WgK81lyDjCPwVpW+Lw=; b=pvMrjaKq0GjAXnx5zpHuSG3UFpQ4pQXtO1OAftetGn889FkgGt7vQypiQlz0r+5k+L 8fsQPbtXW4Cdf5toduccYJgdQLpcAD348f2sP5nWTiglWFriYV0+pY2C59t5OLIJmap7 ZWSa85QyfUa+ADBPuGJycMoBCT3Z8Du0+hG4Tp3C2Zm3axK2y1IpW0P0EtLEJ5H/9JNk 7EDgcVluhm+5GzUpXdOEwU37Ql7BpZHKGKN4WlR1YE4Unspncv55eqBs7nBVO7I4Wkp5 EdhBHCDyPgPI/TB4IaKX3hZuxW5Oi7WzOqwA/XyAWRuyRKTlOPVy2wAqYw2JbKUPsO9f VgqQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=LAvvCh63rEf3Hma1oemsjvrm9WgK81lyDjCPwVpW+Lw=; b=W/XYEWnboiL5tyWqdEUHj5SeyjL4H1jF/v0ABeWeLM28aFvXvIfWBwphe7dMqNTgmD aOaWKNjzqt/+lAj1+abM6ljPNU0FvLOzEX6Q3f24Kd0GWTnEE/7tRRO91U/CFCfMaNme vO3RizHcrV9mGTsXj72BxrS821gC7lK1pLnBEOIbxGcsz32Z1WyMyq5EBiDkX8XWZ6lm jB3/6uOGCXOZ/ZJcdYg3YTp0TGkBtVktpcQIJWADz1MxNDiArmkD15W42gHKS0K9fucN 2wLwJqDBKlUhE86Zqtg6isOVUpZKvLb8wwibhGNnMGZHEGYJ5T16RHk9Jw6knn2ZuuNP hyxw== X-Gm-Message-State: APjAAAU99sbmRGd5S1pv7+l9OCSc0g4jr7BlO7Rn0ScxRWf+Jdz5FDbF BJ2T1IbugC3Ed0SWWpqzi+tqFLOG45iIxQ== X-Google-Smtp-Source: APXvYqyD+vH4HQKIAnEvkV9UgCMd8NwFmZiMP8DzDQyYWn9dsQhZJJbMnAMpSsexeXLjEBidMiHUbM32/KB24g== X-Received: by 2002:ac8:2e5d:: with SMTP id s29mr63172216qta.70.1560358367249; Wed, 12 Jun 2019 09:52:47 -0700 (PDT) Date: Wed, 12 Jun 2019 09:52:28 -0700 In-Reply-To: <20190612165233.109749-1-edumazet@google.com> Message-Id: <20190612165233.109749-4-edumazet@google.com> Mime-Version: 1.0 References: <20190612165233.109749-1-edumazet@google.com> X-Mailer: git-send-email 2.22.0.rc2.383.gf4fbbf30c2-goog Subject: [PATCH net-next 3/8] net/packet: constify prb_lookup_block() and __tpacket_v3_has_room() From: Eric Dumazet To: "David S . Miller" , Willem de Bruijn , Mahesh Bandewar Cc: netdev , Eric Dumazet , Eric Dumazet Content-Type: text/plain; charset="UTF-8" Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Goal is to be able to use __tpacket_v3_has_room() without holding a lock. Signed-off-by: Eric Dumazet --- net/packet/af_packet.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/net/packet/af_packet.c b/net/packet/af_packet.c index 273bffd2130d36cceb9947540a8511a51895874a..5ef63d0c3ad0a184a03429fdd52cad26349647d1 100644 --- a/net/packet/af_packet.c +++ b/net/packet/af_packet.c @@ -1082,10 +1082,10 @@ static void *packet_current_rx_frame(struct packet_sock *po, } } -static void *prb_lookup_block(struct packet_sock *po, - struct packet_ring_buffer *rb, - unsigned int idx, - int status) +static void *prb_lookup_block(const struct packet_sock *po, + const struct packet_ring_buffer *rb, + unsigned int idx, + int status) { struct tpacket_kbdq_core *pkc = GET_PBDQC_FROM_RB(rb); struct tpacket_block_desc *pbd = GET_PBLOCK_DESC(pkc, idx); @@ -1211,12 +1211,12 @@ static bool __tpacket_has_room(const struct packet_sock *po, int pow_off) return packet_lookup_frame(po, &po->rx_ring, idx, TP_STATUS_KERNEL); } -static bool __tpacket_v3_has_room(struct packet_sock *po, int pow_off) +static bool __tpacket_v3_has_room(const struct packet_sock *po, int pow_off) { int idx, len; - len = po->rx_ring.prb_bdqc.knum_blocks; - idx = po->rx_ring.prb_bdqc.kactive_blk_num; + len = READ_ONCE(po->rx_ring.prb_bdqc.knum_blocks); + idx = READ_ONCE(po->rx_ring.prb_bdqc.kactive_blk_num); if (pow_off) idx += len >> pow_off; if (idx >= len) -- 2.22.0.rc2.383.gf4fbbf30c2-goog