From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 66423A0A03; Mon, 18 Jan 2021 21:35:53 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 96295140E3F; Mon, 18 Jan 2021 21:35:41 +0100 (CET) Received: from mail-pl1-f178.google.com (mail-pl1-f178.google.com [209.85.214.178]) by mails.dpdk.org (Postfix) with ESMTP id 435B2140E31 for ; Mon, 18 Jan 2021 21:35:39 +0100 (CET) Received: by mail-pl1-f178.google.com with SMTP id b8so9263859plx.0 for ; Mon, 18 Jan 2021 12:35:39 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=pensando.io; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=bSmpDwBakpZ9ausv5Xzn0hCAL8t7stgUDjVVwuwbC1k=; b=EjV/DAiaBZJFswz1VxKzT0Lvcv+HBw+lUnzCsSwoMd6b8uftnwD2qb5nfh3j57GuAU 6EiYTb0KeV/D9zH66NWCJQgXr394GbC0MlWD0GQLs+3vFToXMDl9uytRArSuC9vFnSFh qS0zJAXBRMiWooNlktfbkQs0q2QzXci8Sa2Nhdp4ckKbm5f5IIQG5BQ/BrrUz/+2Auc+ bxpTDnHnFkrFIFa1DbT6xonz2X3eF6bU12f/yoFnN3pAxVJqB4c72WlCo805zyeHGtHz +ZhVjf+7wOdhAgjHuVT8h1AgZCuw1uRGV7dqc2X/Wuc2SRcpVY4qUCj/Z0n0Mlr+uYZZ THQg== 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; bh=bSmpDwBakpZ9ausv5Xzn0hCAL8t7stgUDjVVwuwbC1k=; b=h+MIajroNhBTrF0XCSx1+W/hq3yY+OaWCfn3OfukA9I+DtHg4ZhehnayDXQ2/N9DAR N0RrUn91lDMqftgx99Nxis4LLiD+u7rQc4CbP/6a80sgdYYZ8m/UQ+TXhmlSBt3OeRW/ T6wWKbDBoasbEgrHrs27sxOugs0MPlNcCYau1HXlX1/iv1mMHNMVWWS51lsi7SQhXKxp yaY75jDgw7dFquyJ50N5qgGIr4TCd1QfkBIiPVACv+b4UshkGfb7ovLllIWoRgjL51x4 lKfMjfmkySsXLvPr9I4cWpE8Y8gXzIJGjV9OWd5xHv5oTM5chkOT77u57QP3Al28lLLL 9+7w== X-Gm-Message-State: AOAM531rkJHAtcuPTi8ySoWVwhDMGk36434+70LcVE97YOdKbPvL8iBH 0+niZsnNOepGUdiESlyORc73XVi5pwSbaQ== X-Google-Smtp-Source: ABdhPJzkAW7nUXzJtgDmbpGgXbdv9O5TSfI16H/WPyEE4n4AR8lzP1XSiCA8xWst3GV98UDhSqyLbQ== X-Received: by 2002:a17:90a:bb0d:: with SMTP id u13mr1171994pjr.106.1611002138376; Mon, 18 Jan 2021 12:35:38 -0800 (PST) Received: from driver-dev1.pensando.io ([12.226.153.42]) by smtp.gmail.com with ESMTPSA id g201sm795160pfb.81.2021.01.18.12.35.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 18 Jan 2021 12:35:37 -0800 (PST) From: Andrew Boyer To: dev@dpdk.org Cc: Alfredo Cardigliano , Andrew Boyer Date: Mon, 18 Jan 2021 12:34:58 -0800 Message-Id: <20210118203508.1332-4-aboyer@pensando.io> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210118203508.1332-1-aboyer@pensando.io> References: <20210118203508.1332-1-aboyer@pensando.io> Subject: [dpdk-dev] [PATCH 03/13] net/ionic: observe endianness in Rx filter code X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" The IONIC firmware is little-endian. Add a new field to struct ionic_rx_filter to store the CPU-endian match type. Use a local variable for the VLAN when searching the hash table. Signed-off-by: Andrew Boyer --- drivers/net/ionic/ionic_rx_filter.c | 22 +++++++++++----------- drivers/net/ionic/ionic_rx_filter.h | 1 + 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/drivers/net/ionic/ionic_rx_filter.c b/drivers/net/ionic/ionic_rx_filter.c index fe624538df..320b9019b3 100644 --- a/drivers/net/ionic/ionic_rx_filter.c +++ b/drivers/net/ionic/ionic_rx_filter.c @@ -25,7 +25,7 @@ ionic_rx_filter_del(struct ionic_lif *lif, struct ionic_rx_filter *f) .pending_work = true, .cmd.rx_filter_del = { .opcode = IONIC_CMD_RX_FILTER_DEL, - .filter_id = f->filter_id, + .filter_id = rte_cpu_to_le_32(f->filter_id), }, }; @@ -74,25 +74,24 @@ ionic_rx_filter_save(struct ionic_lif *lif, uint32_t flow_id, return -ENOMEM; f->flow_id = flow_id; - f->filter_id = ctx->comp.rx_filter_add.filter_id; + f->filter_id = rte_le_to_cpu_32(ctx->comp.rx_filter_add.filter_id); f->rxq_index = rxq_index; + f->match = rte_le_to_cpu_16(f->cmd.match); memcpy(&f->cmd, &ctx->cmd, sizeof(f->cmd)); - switch (f->cmd.match) { + switch (f->match) { case IONIC_RX_FILTER_MATCH_VLAN: - key = f->cmd.vlan.vlan & IONIC_RX_FILTER_HLISTS_MASK; + key = rte_le_to_cpu_16(f->cmd.vlan.vlan); break; case IONIC_RX_FILTER_MATCH_MAC: memcpy(&key, f->cmd.mac.addr, sizeof(key)); - key &= IONIC_RX_FILTER_HLISTS_MASK; - break; - case IONIC_RX_FILTER_MATCH_MAC_VLAN: - key = f->cmd.mac_vlan.vlan & IONIC_RX_FILTER_HLISTS_MASK; break; default: return -EINVAL; } + key &= IONIC_RX_FILTER_HLISTS_MASK; + rte_spinlock_lock(&lif->rx_filters.lock); LIST_INSERT_HEAD(&lif->rx_filters.by_hash[key], f, by_hash); @@ -111,11 +110,12 @@ ionic_rx_filter_by_vlan(struct ionic_lif *lif, uint16_t vid) { uint32_t key = vid & IONIC_RX_FILTER_HLISTS_MASK; struct ionic_rx_filter *f; + __le16 vid_le = rte_cpu_to_le_16(vid); LIST_FOREACH(f, &lif->rx_filters.by_hash[key], by_hash) { - if (f->cmd.match != IONIC_RX_FILTER_MATCH_VLAN) + if (f->match != IONIC_RX_FILTER_MATCH_VLAN) continue; - if (f->cmd.vlan.vlan == vid) + if (f->cmd.vlan.vlan == vid_le) return f; } @@ -130,7 +130,7 @@ ionic_rx_filter_by_addr(struct ionic_lif *lif, const uint8_t *addr) struct ionic_rx_filter *f; LIST_FOREACH(f, &lif->rx_filters.by_hash[key], by_hash) { - if (f->cmd.match != IONIC_RX_FILTER_MATCH_MAC) + if (f->match != IONIC_RX_FILTER_MATCH_MAC) continue; if (memcmp(addr, f->cmd.mac.addr, RTE_ETHER_ADDR_LEN) == 0) return f; diff --git a/drivers/net/ionic/ionic_rx_filter.h b/drivers/net/ionic/ionic_rx_filter.h index 6204a7b535..e1dd5f910c 100644 --- a/drivers/net/ionic/ionic_rx_filter.h +++ b/drivers/net/ionic/ionic_rx_filter.h @@ -15,6 +15,7 @@ struct ionic_rx_filter { uint32_t flow_id; uint32_t filter_id; uint16_t rxq_index; + uint16_t match; struct ionic_rx_filter_add_cmd cmd; LIST_ENTRY(ionic_rx_filter) by_hash; LIST_ENTRY(ionic_rx_filter) by_id; -- 2.17.1