Skip to content

Commit

Permalink
ionic: Use an u16 for rx_copybreak
Browse files Browse the repository at this point in the history
We only support (u16)-1 size for rx_copybreak, so we can reduce the
field size and move a couple other fields around to save a little
space in the ionic_lif struct.

Before:
	/* size: 17440, cachelines: 273, members: 56 */
	/* sum members: 17403, holes: 9, sum holes: 37 */
	/* last cacheline: 32 bytes */

After:
	/* size: 17424, cachelines: 273, members: 56 */
	/* sum members: 17401, holes: 7, sum holes: 23 */
	/* last cacheline: 16 bytes */

Signed-off-by: Brett Creeley <brett.creeley@amd.com>
Signed-off-by: Shannon Nelson <shannon.nelson@amd.com>
Link: https://lore.kernel.org/r/20240619003257.6138-8-shannon.nelson@amd.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
  • Loading branch information
Brett Creeley authored and Jakub Kicinski committed Jun 20, 2024
1 parent 55a3982 commit f703d56
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 4 deletions.
11 changes: 10 additions & 1 deletion drivers/net/ethernet/pensando/ionic/ionic_ethtool.c
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@
#include "ionic_ethtool.h"
#include "ionic_stats.h"

#define IONIC_MAX_RX_COPYBREAK min(U16_MAX, IONIC_MAX_BUF_LEN)

static void ionic_get_stats_strings(struct ionic_lif *lif, u8 *buf)
{
u32 i;
Expand Down Expand Up @@ -872,10 +874,17 @@ static int ionic_set_tunable(struct net_device *dev,
const void *data)
{
struct ionic_lif *lif = netdev_priv(dev);
u32 rx_copybreak;

switch (tuna->id) {
case ETHTOOL_RX_COPYBREAK:
lif->rx_copybreak = *(u32 *)data;
rx_copybreak = *(u32 *)data;
if (rx_copybreak > IONIC_MAX_RX_COPYBREAK) {
netdev_err(dev, "Max supported rx_copybreak size: %u\n",
IONIC_MAX_RX_COPYBREAK);
return -EINVAL;
}
lif->rx_copybreak = (u16)rx_copybreak;
break;
default:
return -EOPNOTSUPP;
Expand Down
6 changes: 3 additions & 3 deletions drivers/net/ethernet/pensando/ionic/ionic_lif.h
Original file line number Diff line number Diff line change
Expand Up @@ -206,10 +206,10 @@ struct ionic_lif {
unsigned int nxqs;
unsigned int ntxq_descs;
unsigned int nrxq_descs;
u32 rx_copybreak;
u64 rxq_features;
u16 rx_mode;
u64 hw_features;
u16 rx_copybreak;
u16 rx_mode;
bool registered;
u16 lif_type;
unsigned int link_down_count;
Expand All @@ -225,11 +225,11 @@ struct ionic_lif {
u32 info_sz;
struct ionic_qtype_info qtype_info[IONIC_QTYPE_MAX];

u16 rss_types;
u8 rss_hash_key[IONIC_RSS_HASH_KEY_SIZE];
u8 *rss_ind_tbl;
dma_addr_t rss_ind_tbl_pa;
u32 rss_ind_tbl_sz;
u16 rss_types;

struct ionic_rx_filters rx_filters;
u32 rx_coalesce_usecs; /* what the user asked for */
Expand Down

0 comments on commit f703d56

Please sign in to comment.