From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-ej1-f53.google.com (mail-ej1-f53.google.com [209.85.218.53]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id AA2E3149C63 for ; Fri, 23 Aug 2024 09:10:46 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.53 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724404249; cv=none; b=Ki5dsyRlfD4ayM16skeG3onzPHjRYc07SRdw/BCpXQ8CjeVMSM32E+uXcEZdeL4IX5CitwcVlpowzFYxWd39L/0IcDdfXTDiF4+cGD2KNfuXD4n27gFbUsFZ9fnWydOBupjpuyG1Owogrtg2QMxKlQ3oPx2avGtrQzgCluuNXto= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724404249; c=relaxed/simple; bh=Jg5ia3aHONUUadtyXlIgwVR+JddSADOSM/MNOrpTPos=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=gi3/5AIfWTUwa8Krr5OeQA4CaJRWocll29gCNeNXprAqGc/M0E+y3pDne7rsdE57n2XX7DypTEm4Q8AzlvFsLbFOmyOprrU0M7bbbB4++/L48dhmxbcnl4m8jlO2YUdH9sVwnqEtmg0pHfXfvzLvHcz4y0x9Xd4TL/+ozy5+5wQ= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=nXTDR0Q/; arc=none smtp.client-ip=209.85.218.53 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="nXTDR0Q/" Received: by mail-ej1-f53.google.com with SMTP id a640c23a62f3a-a8679f534c3so213599366b.0 for ; Fri, 23 Aug 2024 02:10:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1724404245; x=1725009045; darn=vger.kernel.org; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:from:to:cc:subject:date:message-id:reply-to; bh=6AhXsDMlvtQOFjb81q++WnGuzMYwKiixG4cCIOvamkc=; b=nXTDR0Q/zKG7a371r/C+Qox3UpjNVYReGEAUlEQ+v32xynpD+ysfyJG7JkwkdamYl/ WmhE7SJppdQmw+AB4HDaObMKIYibeyKqS9Ga1VDXaD2Z0e5C2iGg1mg+ff6NEge1Rf9V rC6XBVYqqvKiwQ9TiHub19DcpVpB0gXRCycVj2Hg3soA0gyYT7Ltqt8jib65SwGGnUne KFvFR9S6gKUm2nCTmk173+3OFsnNFtbZ0RN4khUSqahmgjpmGZvgsVsdfEJcvLvrmnN5 VdBs36Cqj57IRBqEldujJabIbRqBDzJyU11nyJD3dOvGA0bLeKurv6DxB8qcm/9FbRXm julA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1724404245; x=1725009045; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=6AhXsDMlvtQOFjb81q++WnGuzMYwKiixG4cCIOvamkc=; b=jOXUJNnkeQqUsoAKGOExWoePHtYBExq3ZG39/ZRAkyvjzrpOR6QHicOoLzFndwDiTX 3ydfnicdLe3UGiIKQqS9CK84yGRKUpTPC4Zk1NfsFw0ZUynUyYFsDaCcfYkk4R7p2CNH Jqk55nht3VflnsASv231zucROIm5EGJY1MT5grJY+fauBclrDjZOlqO6OliDRVzGb4Zv 378N7t/7vyUPwY65hGYfdaP2GLH/oOnVVYXQHAakoO7OwK7Zh8uBdGWiCOEMoeY0raMP z3+RM2G9JGuiKjaCfBlrzTuTYrFsIWC1RUISePMNgvJodo5vbYJTLXqYyaSkQpP1LuIm gbrA== X-Forwarded-Encrypted: i=1; AJvYcCV1m843LUk0nN5q5tz+fYkatAi261F2LjHcBYqNgc0sgkQW+jShrnR1TBGgcYI/44ZoO7OWRc0K2ui9qSY=@vger.kernel.org X-Gm-Message-State: AOJu0YyQiDZzVdiRmOOhljd/OiFtHj7ELFVTCtfsn4NBGMdWbKMq+wLl QE+hI2QQlmxr+68ryvKN0fM4NPsYKIx67RiWdLj+miCBxOVIBEs1u6oIM3UKxQg= X-Google-Smtp-Source: AGHT+IG6BzmUUMzpD/+Pr+Wo1DEsgeyuZhet4hGF2/3wMnlt4qwkqUwDqWOnA0zjSrMvDtOD42xikQ== X-Received: by 2002:a17:906:6a14:b0:a86:6a26:fec7 with SMTP id a640c23a62f3a-a86a52c70ecmr110389066b.30.1724404244722; Fri, 23 Aug 2024 02:10:44 -0700 (PDT) Received: from localhost ([196.207.164.177]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a868f2202fdsm232702266b.13.2024.08.23.02.10.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 23 Aug 2024 02:10:44 -0700 (PDT) Date: Fri, 23 Aug 2024 12:10:40 +0300 From: Dan Carpenter To: Christophe JAILLET Cc: Tony Nguyen , Przemek Kitszel , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , linux-kernel@vger.kernel.org, kernel-janitors@vger.kernel.org, intel-wired-lan@lists.osuosl.org, netdev@vger.kernel.org Subject: Re: [PATCH net-next] idpf: Slightly simplify memory management in idpf_add_del_mac_filters() Message-ID: References: Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: On Fri, Aug 23, 2024 at 08:23:29AM +0200, Christophe JAILLET wrote: > In idpf_add_del_mac_filters(), filters are chunked up into multiple > messages to avoid sending a control queue message buffer that is too large. > > Each chunk has up to IDPF_NUM_FILTERS_PER_MSG entries. So except for the > last iteration which can be smaller, space for exactly > IDPF_NUM_FILTERS_PER_MSG entries is allocated. > > There is no need to free and reallocate a smaller array just for the last > iteration. > > This slightly simplifies the code and avoid an (unlikely) memory allocation > failure. > > Signed-off-by: Christophe JAILLET > --- > drivers/net/ethernet/intel/idpf/idpf_virtchnl.c | 7 +++++-- > 1 file changed, 5 insertions(+), 2 deletions(-) > > diff --git a/drivers/net/ethernet/intel/idpf/idpf_virtchnl.c b/drivers/net/ethernet/intel/idpf/idpf_virtchnl.c > index 70986e12da28..b6f4b58e1094 100644 > --- a/drivers/net/ethernet/intel/idpf/idpf_virtchnl.c > +++ b/drivers/net/ethernet/intel/idpf/idpf_virtchnl.c > @@ -3669,12 +3669,15 @@ int idpf_add_del_mac_filters(struct idpf_vport *vport, > entries_size = sizeof(struct virtchnl2_mac_addr) * num_entries; > buf_size = struct_size(ma_list, mac_addr_list, num_entries); > > - if (!ma_list || num_entries != IDPF_NUM_FILTERS_PER_MSG) { > - kfree(ma_list); > + if (!ma_list) { > ma_list = kzalloc(buf_size, GFP_ATOMIC); > if (!ma_list) > return -ENOMEM; > } else { > + /* ma_list was allocated in the first iteration > + * so IDPF_NUM_FILTERS_PER_MSG entries are > + * available > + */ > memset(ma_list, 0, buf_size); > } It would be even nicer to move the ma_list allocation outside the loop: buf_size = struct_size(ma_list, mac_addr_list, IDPF_NUM_FILTERS_PER_MSG); ma_list = kmalloc(buf_size, GFP_ATOMIC); regards, dan carpenter