From patchwork Tue Jan 26 18:56:59 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Elder X-Patchwork-Id: 371493 Delivered-To: patch@linaro.org Received: by 2002:a02:a60d:0:0:0:0:0 with SMTP id c13csp107411jam; Wed, 27 Jan 2021 02:03:24 -0800 (PST) X-Google-Smtp-Source: ABdhPJz0aU7CqVMPaZAIyPBk649fNqSoEsyIvfQ92bNvL5qcycgymXkkpgUX2F/n3MMAr+GTtmbI X-Received: by 2002:aa7:d651:: with SMTP id v17mr8405224edr.91.1611741804267; Wed, 27 Jan 2021 02:03:24 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1611741804; cv=none; d=google.com; s=arc-20160816; b=SZWpc5l2h/9ifsdB5Lao1Bm5kqoutNxax81VMuTH6tBcKlhx5qyM85BT7noXJ1AZ4x 5Cepc/v1D/7udFLiNa7OR/j5AJZBxLtLkMtspM1E5lRfZetCJP0LWL6KuNUfEgmQDN0e vm+i/VFpFBuoAc7WyEtGzpq9RUvUuPIDeB8LzjEZLYIIHDjwSzC55zYAUtbX4CGIkR/O o0RqFzENRwP9AyUJhNeqoeMPBdKVc9DLjVr7FSv4HsDbrSvE/Wh9quo+IJK4Qpo1qyru 65IxWsSR1AOPMKv0pe/mbNdm+h1RG9jbFzr6gIPlBqe9unmjrg+gCOSutAQpXwZWyLvc MCxQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=JpZv+T7F3bf/GFAbswYSEjxp4C4JU0WA8H2GZ/JQhn0=; b=t0J7wochw3ulZp4Czk/zOyRRlHJqrSuGbe+2Kvv0ISez5rE/qFr+9wAzGuTc+qzlBr Xh3iuFzcbn8RzlbmGChs2BdhLw1kl/FQJsHU2nue9a1vlm/i36lIxIOyiawIiru6CxgL M2oXt4olp1FuJ7TtlZTCyC+b9ztlowUxMU/ByO0Cp+qaPnnSH2SYM84yEnUPSMUPQb6u rmpIkA5klVG6RIyFyVuXM4795bxPMIpWJ8aH/92rb7r6PPRBcCgFD/eVy2BU3CYom8ow UOrsnUh+ANLM9Re0TtKGg3EtA56cvsm6L33edSlQhNHpfZ4OJZtBq44jForA2wn/vtDs jyMg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=S8gh6Jjw; spf=pass (google.com: domain of netdev-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=netdev-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id p1si853376eds.205.2021.01.27.02.03.24; Wed, 27 Jan 2021 02:03:24 -0800 (PST) Received-SPF: pass (google.com: domain of netdev-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=S8gh6Jjw; spf=pass (google.com: domain of netdev-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=netdev-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S316810AbhAZXKk (ORCPT + 7 others); Tue, 26 Jan 2021 18:10:40 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47060 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731834AbhAZS5u (ORCPT ); Tue, 26 Jan 2021 13:57:50 -0500 Received: from mail-io1-xd2e.google.com (mail-io1-xd2e.google.com [IPv6:2607:f8b0:4864:20::d2e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 23732C061786 for ; Tue, 26 Jan 2021 10:57:10 -0800 (PST) Received: by mail-io1-xd2e.google.com with SMTP id d13so35784219ioy.4 for ; Tue, 26 Jan 2021 10:57:10 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=JpZv+T7F3bf/GFAbswYSEjxp4C4JU0WA8H2GZ/JQhn0=; b=S8gh6JjwnkIt4hEKTVwbdAvFLYkQsLiG2G7Hx9nAz8Cg+/0FottfVYSu6F2mju2eTK FNWeI/hjac9R+wFPa/K14hUxl2HJXtnRtUNsKUPFCiwoj8Z7sRDABYSxdvdxduacFbQ4 Ae54zsGSgORxvaNu/ijyC+qvVLSCEmzqEEjhIHuNByC0fThw5vJedyfXLG+Z5LhRK56K nM9JxhbmT4eAp4qWAjTj0GJ7McCTF23nPg3Vj9TksyUtPP4IUb5L3JZ5w765Ssx3prlY 1I/FnmkBfDySplKgZHkurGy0C+4JDPqWV8Kg5Yd7DExeTaJCbsNb0/hlYP82+i+FHJFj ST4w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=JpZv+T7F3bf/GFAbswYSEjxp4C4JU0WA8H2GZ/JQhn0=; b=MdaQ5178Mjz32OopDlSt8Su1neYIBCu7kAY9u82TfQekp1RtV7T25VvTLbBVsT2Hgr 6fsm/YHLt/VoTL2l7jhRHn128r7ST7xfUGV4oWZ5tizupwDnuGUkVrD0VKwJZTtvLnwb kwf4of1EZiIn6I4BpIXDeP265A65HUG8JA2dIFpbB3WxurpLnsNX2+OcfzBkkZoerL6/ T9XaP5xJV3qiJR3eSHNl3uDw8Yi647ip2vWUFvsdKm1VhCjW1GVYKN9hqjuxCCjp4EUd gWfsP4baE24U0okVEEItdtvkTsGTGvv4jg9B4sDGIpC/7ocTPWxCsj7MSNs/WGKb+xVD aZaw== X-Gm-Message-State: AOAM533x0Tu2kYnrIYk+wm1leER9Xw1lvftG6/87FJHA1HEWoDIte6HJ VmFFs51hBW+rA7I52yR2Lc88wQ== X-Received: by 2002:a05:6e02:1c2a:: with SMTP id m10mr5953238ilh.17.1611687429447; Tue, 26 Jan 2021 10:57:09 -0800 (PST) Received: from beast.localdomain (c-73-185-129-58.hsd1.mn.comcast.net. [73.185.129.58]) by smtp.gmail.com with ESMTPSA id l14sm13060681ilh.58.2021.01.26.10.57.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 Jan 2021 10:57:08 -0800 (PST) From: Alex Elder To: davem@davemloft.net, kuba@kernel.org Cc: elder@kernel.org, evgreen@chromium.org, bjorn.andersson@linaro.org, cpratapa@codeaurora.org, subashab@codeaurora.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH net-next v2 2/6] net: ipa: minor update to handling of packet with status Date: Tue, 26 Jan 2021 12:56:59 -0600 Message-Id: <20210126185703.29087-3-elder@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210126185703.29087-1-elder@linaro.org> References: <20210126185703.29087-1-elder@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Rearrange some comments and assignments made when handling a packet that is received with status, aiming to improve understandability. Use DIV_ROUND_CLOSEST() to get a better per-packet true size estimate. Signed-off-by: Alex Elder --- drivers/net/ipa/ipa_endpoint.c | 30 +++++++++++++++++------------- 1 file changed, 17 insertions(+), 13 deletions(-) -- 2.20.1 diff --git a/drivers/net/ipa/ipa_endpoint.c b/drivers/net/ipa/ipa_endpoint.c index 39ae0dd4e0471..c5524215054c8 100644 --- a/drivers/net/ipa/ipa_endpoint.c +++ b/drivers/net/ipa/ipa_endpoint.c @@ -1213,12 +1213,11 @@ static void ipa_endpoint_status_parse(struct ipa_endpoint *endpoint, continue; } - /* Compute the amount of buffer space consumed by the - * packet, including the status element. If the hardware - * is configured to pad packet data to an aligned boundary, - * account for that. And if checksum offload is is enabled - * a trailer containing computed checksum information will - * be appended. + /* Compute the amount of buffer space consumed by the packet, + * including the status element. If the hardware is configured + * to pad packet data to an aligned boundary, account for that. + * And if checksum offload is enabled a trailer containing + * computed checksum information will be appended. */ align = endpoint->data->rx.pad_align ? : 1; len = le16_to_cpu(status->pkt_len); @@ -1226,16 +1225,21 @@ static void ipa_endpoint_status_parse(struct ipa_endpoint *endpoint, if (endpoint->data->checksum) len += sizeof(struct rmnet_map_dl_csum_trailer); - /* Charge the new packet with a proportional fraction of - * the unused space in the original receive buffer. - * XXX Charge a proportion of the *whole* receive buffer? - */ if (!ipa_status_drop_packet(status)) { - u32 extra = unused * len / total_len; - void *data2 = data + sizeof(*status); - u32 len2 = le16_to_cpu(status->pkt_len); + void *data2; + u32 extra; + u32 len2; /* Client receives only packet data (no status) */ + data2 = data + sizeof(*status); + len2 = le16_to_cpu(status->pkt_len); + + /* Have the true size reflect the extra unused space in + * the original receive buffer. Distribute the "cost" + * proportionately across all aggregated packets in the + * buffer. + */ + extra = DIV_ROUND_CLOSEST(unused * len, total_len); ipa_endpoint_skb_copy(endpoint, data2, len2, extra); }