From mboxrd@z Thu Jan 1 00:00:00 1970 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=-8.6 required=3.0 tests=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_MUTT 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 993B4C04AAC for ; Mon, 20 May 2019 15:40:46 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 64E9121726 for ; Mon, 20 May 2019 15:40:46 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="szsaZEAW" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2392263AbfETPkn (ORCPT ); Mon, 20 May 2019 11:40:43 -0400 Received: from mail-pg1-f193.google.com ([209.85.215.193]:38481 "EHLO mail-pg1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2392252AbfETPkm (ORCPT ); Mon, 20 May 2019 11:40:42 -0400 Received: by mail-pg1-f193.google.com with SMTP id j26so6980593pgl.5 for ; Mon, 20 May 2019 08:40:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to:user-agent; bh=k/heyaUqeKgmsqNyqFuRQhrCnWAaJChzuChioekfYFU=; b=szsaZEAWQZBAPa/oSIDZup6Sf3jSi3AJ76WcSsZC1BgEtPm2HRp1c+w0lJQChX3EX6 hX/GoTqMK+0+zx/9R5rDkf5m5aZmhpybbpZJQBdSeK5uTi3+UvGjBlOQcsZMpnKl4AzR qlGDJn7Oq7xYDgi8LQsdENsNMpNdnWWnty6fDhrh/VjIO0o5tu81pgh8/DOF5kR34az6 KABjDG9DI7NtDSB5JsYly4sD4iTg3dk/qU8HG67UhbEngTVIYwRYPstU4hFei2dlyvNx n7fhc7CgCLg7Z/rik+tGZirioJ5jwOUhd9dYcpPxgvLI1JGroSd3ozTGxA9XV5aVgnZs VIJQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to:user-agent; bh=k/heyaUqeKgmsqNyqFuRQhrCnWAaJChzuChioekfYFU=; b=BDXzKD6EJdUvsRcM+RTnTbriTVa2oi4cD9s1gmSd+5UKETVHHUXc4R5KNapjTWk3gg IozIDH8noOsUn5HAIMKtXGteXtUXe8FGXhnlFuAiU19zDG9nDqumKitbDpo8O7PIMPox aIZJn8NAMkeUkaGXzXSULsAWeDRNMh+KHfrK8apxkZB8nNewHZCnCEWZnfD/dOjZ8isR HmAlYaqF1aJobRHvPGN8Zy03LEtfGWVqk3ZeAGgBJv416cVlPyjayZv7vuVpk86BvW0n LlLpIUylpOXgA7BfAEL2rNSHGVS0HUCWtMlVcKXhpdIgMX6n6ivWa8v2H2XpDkNZXquF tmFA== X-Gm-Message-State: APjAAAX3D5rNDJMy/+UtjBVKpUsUkCARu7THv2zuI4h34MZ+5F6Pa62q NquQIbc9usaj2FAWI6stB++iUg== X-Google-Smtp-Source: APXvYqzB4o9I2xZFF8x25ug5HF4C3D7MauyyGIjq+J9XrCQDbuj+gG89I5cVtID1X4Jo1vMXmLyuqA== X-Received: by 2002:aa7:9a8c:: with SMTP id w12mr80346129pfi.187.1558366841456; Mon, 20 May 2019 08:40:41 -0700 (PDT) Received: from tuxbook-pro (104-188-17-28.lightspeed.sndgca.sbcglobal.net. [104.188.17.28]) by smtp.gmail.com with ESMTPSA id a69sm47830937pfa.81.2019.05.20.08.40.39 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 20 May 2019 08:40:40 -0700 (PDT) Date: Mon, 20 May 2019 08:41:08 -0700 From: Bjorn Andersson To: Alex Elder Cc: arnd@arndb.de, subashab@codeaurora.org, david.brown@linaro.org, agross@kernel.org, davem@davemloft.net, ilias.apalodimas@linaro.org, cpratapa@codeaurora.org, syadagir@codeaurora.org, evgreen@chromium.org, benchan@google.com, ejcaruso@google.com, netdev@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH 2/8] net: qualcomm: rmnet: kill RMNET_MAP_GET_*() accessor macros Message-ID: <20190520154108.GQ2085@tuxbook-pro> References: <20190520135354.18628-1-elder@linaro.org> <20190520135354.18628-3-elder@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20190520135354.18628-3-elder@linaro.org> User-Agent: Mutt/1.11.4 (2019-03-13) Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org On Mon 20 May 06:53 PDT 2019, Alex Elder wrote: > The following macros, defined in "rmnet_map.h", assume a socket > buffer is provided as an argument without any real indication this > is the case. > RMNET_MAP_GET_MUX_ID() > RMNET_MAP_GET_CD_BIT() > RMNET_MAP_GET_PAD() > RMNET_MAP_GET_CMD_START() > RMNET_MAP_GET_LENGTH() > What they hide is pretty trivial accessing of fields in a structure, > and it's much clearer to see this if we do these accesses directly. > > So rather than using these accessor macros, assign a local > variable of the map header pointer type to the socket buffer data > pointer, and derereference that pointer variable. > > Use the network byte order macros (e.g., ntohs()), not the Linux > byte order functions (e.g. be_to_cpu16()) to convert the big-endian > packet length field, to match the convention used elswhere in the > driver. > > There's no need to byte swap 0; it's all zeros irrespective of > endianness. > Reviewed-by: Bjorn Andersson > Signed-off-by: Alex Elder > --- > drivers/net/ethernet/qualcomm/rmnet/rmnet_handlers.c | 9 +++++---- > drivers/net/ethernet/qualcomm/rmnet/rmnet_map.h | 12 ------------ > .../net/ethernet/qualcomm/rmnet/rmnet_map_command.c | 11 ++++++++--- > drivers/net/ethernet/qualcomm/rmnet/rmnet_map_data.c | 4 ++-- > 4 files changed, 15 insertions(+), 21 deletions(-) > > diff --git a/drivers/net/ethernet/qualcomm/rmnet/rmnet_handlers.c b/drivers/net/ethernet/qualcomm/rmnet/rmnet_handlers.c > index 11167abe5934..4c1b62b72504 100644 > --- a/drivers/net/ethernet/qualcomm/rmnet/rmnet_handlers.c > +++ b/drivers/net/ethernet/qualcomm/rmnet/rmnet_handlers.c > @@ -65,20 +65,21 @@ static void > __rmnet_map_ingress_handler(struct sk_buff *skb, > struct rmnet_port *port) > { > + struct rmnet_map_header *map_header = (void *)skb->data; > struct rmnet_endpoint *ep; > u16 len, pad; > u8 mux_id; > > - if (RMNET_MAP_GET_CD_BIT(skb)) { > + if (map_header->cd_bit) { > if (port->data_format & RMNET_FLAGS_INGRESS_MAP_COMMANDS) > return rmnet_map_command(skb, port); > > goto free_skb; > } > > - mux_id = RMNET_MAP_GET_MUX_ID(skb); > - pad = RMNET_MAP_GET_PAD(skb); > - len = RMNET_MAP_GET_LENGTH(skb) - pad; > + mux_id = map_header->mux_id; > + pad = map_header->pad_len; > + len = ntohs(map_header->pkt_len) - pad; > > if (mux_id >= RMNET_MAX_LOGICAL_EP) > goto free_skb; > diff --git a/drivers/net/ethernet/qualcomm/rmnet/rmnet_map.h b/drivers/net/ethernet/qualcomm/rmnet/rmnet_map.h > index b1ae9499c0b2..a30a7b405a11 100644 > --- a/drivers/net/ethernet/qualcomm/rmnet/rmnet_map.h > +++ b/drivers/net/ethernet/qualcomm/rmnet/rmnet_map.h > @@ -63,18 +63,6 @@ struct rmnet_map_ul_csum_header { > u16 csum_enabled:1; > } __aligned(1); > > -#define RMNET_MAP_GET_MUX_ID(Y) (((struct rmnet_map_header *) \ > - (Y)->data)->mux_id) > -#define RMNET_MAP_GET_CD_BIT(Y) (((struct rmnet_map_header *) \ > - (Y)->data)->cd_bit) > -#define RMNET_MAP_GET_PAD(Y) (((struct rmnet_map_header *) \ > - (Y)->data)->pad_len) > -#define RMNET_MAP_GET_CMD_START(Y) ((struct rmnet_map_control_command *) \ > - ((Y)->data + \ > - sizeof(struct rmnet_map_header))) > -#define RMNET_MAP_GET_LENGTH(Y) (ntohs(((struct rmnet_map_header *) \ > - (Y)->data)->pkt_len)) > - > #define RMNET_MAP_COMMAND_REQUEST 0 > #define RMNET_MAP_COMMAND_ACK 1 > #define RMNET_MAP_COMMAND_UNSUPPORTED 2 > diff --git a/drivers/net/ethernet/qualcomm/rmnet/rmnet_map_command.c b/drivers/net/ethernet/qualcomm/rmnet/rmnet_map_command.c > index f6cf59aee212..f675f47c3495 100644 > --- a/drivers/net/ethernet/qualcomm/rmnet/rmnet_map_command.c > +++ b/drivers/net/ethernet/qualcomm/rmnet/rmnet_map_command.c > @@ -20,12 +20,13 @@ static u8 rmnet_map_do_flow_control(struct sk_buff *skb, > struct rmnet_port *port, > int enable) > { > + struct rmnet_map_header *map_header = (void *)skb->data; > struct rmnet_endpoint *ep; > struct net_device *vnd; > u8 mux_id; > int r; > > - mux_id = RMNET_MAP_GET_MUX_ID(skb); > + mux_id = map_header->mux_id; > > if (mux_id >= RMNET_MAX_LOGICAL_EP) { > kfree_skb(skb); > @@ -57,6 +58,7 @@ static void rmnet_map_send_ack(struct sk_buff *skb, > unsigned char type, > struct rmnet_port *port) > { > + struct rmnet_map_header *map_header = (void *)skb->data; > struct rmnet_map_control_command *cmd; > struct net_device *dev = skb->dev; > > @@ -66,7 +68,8 @@ static void rmnet_map_send_ack(struct sk_buff *skb, > > skb->protocol = htons(ETH_P_MAP); > > - cmd = RMNET_MAP_GET_CMD_START(skb); > + /* Command data immediately follows the header */ > + cmd = (struct rmnet_map_control_command *)(map_header + 1); > cmd->cmd_type = type & 0x03; > > netif_tx_lock(dev); > @@ -79,11 +82,13 @@ static void rmnet_map_send_ack(struct sk_buff *skb, > */ > void rmnet_map_command(struct sk_buff *skb, struct rmnet_port *port) > { > + struct rmnet_map_header *map_header = (void *)skb->data; > struct rmnet_map_control_command *cmd; > unsigned char command_name; > unsigned char rc = 0; > > - cmd = RMNET_MAP_GET_CMD_START(skb); > + /* Command data immediately follows the header */ > + cmd = (struct rmnet_map_control_command *)(map_header + 1); > command_name = cmd->command_name; > > switch (command_name) { > diff --git a/drivers/net/ethernet/qualcomm/rmnet/rmnet_map_data.c b/drivers/net/ethernet/qualcomm/rmnet/rmnet_map_data.c > index 57a9c314a665..498f20ba1826 100644 > --- a/drivers/net/ethernet/qualcomm/rmnet/rmnet_map_data.c > +++ b/drivers/net/ethernet/qualcomm/rmnet/rmnet_map_data.c > @@ -323,7 +323,7 @@ struct sk_buff *rmnet_map_deaggregate(struct sk_buff *skb, > return NULL; > > maph = (struct rmnet_map_header *)skb->data; > - packet_len = ntohs(maph->pkt_len) + sizeof(struct rmnet_map_header); > + packet_len = ntohs(maph->pkt_len) + sizeof(*maph); > > if (port->data_format & RMNET_FLAGS_INGRESS_MAP_CKSUMV4) > packet_len += sizeof(struct rmnet_map_dl_csum_trailer); > @@ -332,7 +332,7 @@ struct sk_buff *rmnet_map_deaggregate(struct sk_buff *skb, > return NULL; > > /* Some hardware can send us empty frames. Catch them */ > - if (ntohs(maph->pkt_len) == 0) > + if (!maph->pkt_len) > return NULL; > > skbn = alloc_skb(packet_len + RMNET_MAP_DEAGGR_SPACING, GFP_ATOMIC); > -- > 2.20.1 >