From: maowenan <maowenan@huawei.com>
To: Willem de Bruijn <willemdebruijn.kernel@gmail.com>
Cc: David Miller <davem@davemloft.net>,
Network Development <netdev@vger.kernel.org>,
LKML <linux-kernel@vger.kernel.org>,
<kernel-janitors@vger.kernel.org>
Subject: Re: [PATCH -next] packet: remove unused variable 'status' in __packet_lookup_frame_in_block
Date: Mon, 10 Jun 2019 22:02:32 +0800 [thread overview]
Message-ID: <caf8d25f-60e2-a0c0-dc21-956ea32ee59a@huawei.com> (raw)
In-Reply-To: <CAF=yD-JOCZHt6q3ArCqY5PMW1vP5ZmNkYMKUB14TrgU-X30cSQ@mail.gmail.com>
On 2019/6/10 21:05, Willem de Bruijn wrote:
> On Mon, Jun 10, 2019 at 8:17 AM Mao Wenan <maowenan@huawei.com> wrote:
>>
>> The variable 'status' in __packet_lookup_frame_in_block() is never used since
>> introduction in commit f6fb8f100b80 ("af-packet: TPACKET_V3 flexible buffer
>> implementation."), we can remove it.
>> And when __packet_lookup_frame_in_block() calls prb_retire_current_block(),
>> it can pass macro TP_STATUS_KERNEL instead of 0.
>>
>> Signed-off-by: Mao Wenan <maowenan@huawei.com>
>> ---
>> net/packet/af_packet.c | 5 ++---
>> 1 file changed, 2 insertions(+), 3 deletions(-)
>>
>> diff --git a/net/packet/af_packet.c b/net/packet/af_packet.c
>> index a29d66d..fb1a79c 100644
>> --- a/net/packet/af_packet.c
>> +++ b/net/packet/af_packet.c
>> @@ -1003,7 +1003,6 @@ static void prb_fill_curr_block(char *curr,
>> /* Assumes caller has the sk->rx_queue.lock */
>> static void *__packet_lookup_frame_in_block(struct packet_sock *po,
>> struct sk_buff *skb,
>> - int status,
>> unsigned int len
>> )
>> {
>> @@ -1046,7 +1045,7 @@ static void *__packet_lookup_frame_in_block(struct packet_sock *po,
>> }
>>
>> /* Ok, close the current block */
>> - prb_retire_current_block(pkc, po, 0);
>> + prb_retire_current_block(pkc, po, TP_STATUS_KERNEL);
>
> I don't think that 0 is intended to mean TP_STATUS_KERNEL here.
>
> prb_retire_current_block calls prb_close_block which sets status to
>
> TP_STATUS_USER | stat
>
> where stat is 0 or TP_STATUS_BLK_TMO.
#define TP_STATUS_KERNEL 0
#define TP_STATUS_BLK_TMO (1 << 5)
Actually, packet_current_rx_frame calls __packet_lookup_frame_in_block with status=TP_STATUS_KERNEL
in original code.
__packet_lookup_frame_in_block in this function, first is to check whether the currently active block
has enough space for the packet, which means status of block should be TP_STATUS_KERNEL, then it calls
prb_retire_current_block to retire this block.
Since there needs some discussion about means of status, I can send v2 only removing the parameter status of
__packet_lookup_frame_in_block?
>
>
next prev parent reply other threads:[~2019-06-10 14:02 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-06-10 11:58 [PATCH -next] packet: remove unused variable 'status' in __packet_lookup_frame_in_block Mao Wenan
2019-06-10 13:05 ` Willem de Bruijn
2019-06-10 14:02 ` maowenan [this message]
2019-06-10 14:34 ` Willem de Bruijn
2019-06-11 1:32 ` [PATCH -next v2] " Mao Wenan
2019-06-11 19:13 ` David Miller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=caf8d25f-60e2-a0c0-dc21-956ea32ee59a@huawei.com \
--to=maowenan@huawei.com \
--cc=davem@davemloft.net \
--cc=kernel-janitors@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=willemdebruijn.kernel@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).