* RE: [PATCH net-next 2/4] net: stmmac: introduce PHY-less setup support
From: Ong, Boon Leong @ 2022-04-23 1:13 UTC (permalink / raw)
To: Andrew Lunn
Cc: Alexandre Torgue, Jose Abreu, Heiner Kallweit, Russell King,
Paolo Abeni, David S . Miller, Jakub Kicinski, Maxime Coquelin,
Alexandre Torgue, Giuseppe Cavallaro, netdev@vger.kernel.org,
linux-stm32@st-md-mailman.stormreply.com,
linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org
In-Reply-To: <YmKmifSfqRdjOXSd@lunn.ch>
>What you need to do is extend your DSD to list the fixed-link. See
>
>https://www.kernel.org/doc/html/latest/firmware-
>guide/acpi/dsd/phy.html#mac-node-example-with-a-fixed-link-subnode
>
Thanks for the feedback. I will explore with the BIOS supplier to the project
on this.
^ permalink raw reply
* Re: [PATCH net-next 1/4] net: pcs: xpcs: add CL37 1000BASE-X AN support
From: kernel test robot @ 2022-04-23 3:00 UTC (permalink / raw)
To: Ong Boon Leong, Alexandre Torgue, Jose Abreu, Andrew Lunn,
Heiner Kallweit, Russell King, Paolo Abeni, David S . Miller,
Jakub Kicinski, Maxime Coquelin, Giuseppe Cavallaro
Cc: kbuild-all, netdev, linux-stm32, linux-arm-kernel, linux-kernel,
Ong Boon Leong
In-Reply-To: <20220422073505.810084-2-boon.leong.ong@intel.com>
Hi Ong,
Thank you for the patch! Yet something to improve:
[auto build test ERROR on net-next/master]
url: https://github.com/intel-lab-lkp/linux/commits/Ong-Boon-Leong/pcs-xpcs-stmmac-add-1000BASE-X-AN-for-network-switch/20220422-154446
base: https://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next.git 9c8774e629a1950c24b44e3c8fb93d76fb644b49
config: arc-allyesconfig (https://download.01.org/0day-ci/archive/20220423/202204231033.DjMxbbXU-lkp@intel.com/config)
compiler: arceb-elf-gcc (GCC) 11.2.0
reproduce (this is a W=1 build):
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross
chmod +x ~/bin/make.cross
# https://github.com/intel-lab-lkp/linux/commit/dc88c5b7c183eeaff9db0e88d7b0d1d7f73e830b
git remote add linux-review https://github.com/intel-lab-lkp/linux
git fetch --no-tags linux-review Ong-Boon-Leong/pcs-xpcs-stmmac-add-1000BASE-X-AN-for-network-switch/20220422-154446
git checkout dc88c5b7c183eeaff9db0e88d7b0d1d7f73e830b
# save the config file
mkdir build_dir && cp config build_dir/.config
COMPILER_INSTALL_PATH=$HOME/0day COMPILER=gcc-11.2.0 make.cross W=1 O=build_dir ARCH=arc SHELL=/bin/bash
If you fix the issue, kindly add following tag as appropriate
Reported-by: kernel test robot <lkp@intel.com>
All errors (new ones prefixed by >>):
drivers/net/dsa/sja1105/sja1105_main.c: In function 'sja1105_static_config_reload':
>> drivers/net/dsa/sja1105/sja1105_main.c:2334:22: error: too few arguments to function 'xpcs_do_config'
2334 | rc = xpcs_do_config(xpcs, priv->phy_mode[i], mode);
| ^~~~~~~~~~~~~~
In file included from drivers/net/dsa/sja1105/sja1105_main.c:19:
include/linux/pcs/pcs-xpcs.h:33:5: note: declared here
33 | int xpcs_do_config(struct dw_xpcs *xpcs, phy_interface_t interface,
| ^~~~~~~~~~~~~~
vim +/xpcs_do_config +2334 drivers/net/dsa/sja1105/sja1105_main.c
2eea1fa82f681b Vladimir Oltean 2019-11-12 2224
6666cebc5e306f Vladimir Oltean 2019-05-02 2225 /* For situations where we need to change a setting at runtime that is only
6666cebc5e306f Vladimir Oltean 2019-05-02 2226 * available through the static configuration, resetting the switch in order
6666cebc5e306f Vladimir Oltean 2019-05-02 2227 * to upload the new static config is unavoidable. Back up the settings we
6666cebc5e306f Vladimir Oltean 2019-05-02 2228 * modify at runtime (currently only MAC) and restore them after uploading,
6666cebc5e306f Vladimir Oltean 2019-05-02 2229 * such that this operation is relatively seamless.
6666cebc5e306f Vladimir Oltean 2019-05-02 2230 */
2eea1fa82f681b Vladimir Oltean 2019-11-12 2231 int sja1105_static_config_reload(struct sja1105_private *priv,
2eea1fa82f681b Vladimir Oltean 2019-11-12 2232 enum sja1105_reset_reason reason)
6666cebc5e306f Vladimir Oltean 2019-05-02 2233 {
6cf99c13ea07b5 Vladimir Oltean 2019-11-09 2234 struct ptp_system_timestamp ptp_sts_before;
6cf99c13ea07b5 Vladimir Oltean 2019-11-09 2235 struct ptp_system_timestamp ptp_sts_after;
82760d7f2ea638 Vladimir Oltean 2021-05-24 2236 int speed_mbps[SJA1105_MAX_NUM_PORTS];
84db00f2c04338 Vladimir Oltean 2021-05-31 2237 u16 bmcr[SJA1105_MAX_NUM_PORTS] = {0};
6666cebc5e306f Vladimir Oltean 2019-05-02 2238 struct sja1105_mac_config_entry *mac;
6cf99c13ea07b5 Vladimir Oltean 2019-11-09 2239 struct dsa_switch *ds = priv->ds;
6cf99c13ea07b5 Vladimir Oltean 2019-11-09 2240 s64 t1, t2, t3, t4;
6cf99c13ea07b5 Vladimir Oltean 2019-11-09 2241 s64 t12, t34;
6666cebc5e306f Vladimir Oltean 2019-05-02 2242 int rc, i;
6cf99c13ea07b5 Vladimir Oltean 2019-11-09 2243 s64 now;
6666cebc5e306f Vladimir Oltean 2019-05-02 2244
af580ae2dcb250 Vladimir Oltean 2019-11-09 2245 mutex_lock(&priv->mgmt_lock);
af580ae2dcb250 Vladimir Oltean 2019-11-09 2246
6666cebc5e306f Vladimir Oltean 2019-05-02 2247 mac = priv->static_config.tables[BLK_IDX_MAC_CONFIG].entries;
6666cebc5e306f Vladimir Oltean 2019-05-02 2248
8400cff60b472c Vladimir Oltean 2019-06-08 2249 /* Back up the dynamic link speed changed by sja1105_adjust_port_config
8400cff60b472c Vladimir Oltean 2019-06-08 2250 * in order to temporarily restore it to SJA1105_SPEED_AUTO - which the
8400cff60b472c Vladimir Oltean 2019-06-08 2251 * switch wants to see in the static config in order to allow us to
8400cff60b472c Vladimir Oltean 2019-06-08 2252 * change it through the dynamic interface later.
6666cebc5e306f Vladimir Oltean 2019-05-02 2253 */
542043e91df452 Vladimir Oltean 2021-05-24 2254 for (i = 0; i < ds->num_ports; i++) {
3ad1d171548e85 Vladimir Oltean 2021-06-11 2255 u32 reg_addr = mdiobus_c45_addr(MDIO_MMD_VEND2, MDIO_CTRL1);
3ad1d171548e85 Vladimir Oltean 2021-06-11 2256
41fed17fdbe531 Vladimir Oltean 2021-05-31 2257 speed_mbps[i] = sja1105_port_speed_to_ethtool(priv,
41fed17fdbe531 Vladimir Oltean 2021-05-31 2258 mac[i].speed);
41fed17fdbe531 Vladimir Oltean 2021-05-31 2259 mac[i].speed = priv->info->port_speed[SJA1105_SPEED_AUTO];
6666cebc5e306f Vladimir Oltean 2019-05-02 2260
3ad1d171548e85 Vladimir Oltean 2021-06-11 2261 if (priv->xpcs[i])
3ad1d171548e85 Vladimir Oltean 2021-06-11 2262 bmcr[i] = mdiobus_read(priv->mdio_pcs, i, reg_addr);
84db00f2c04338 Vladimir Oltean 2021-05-31 2263 }
ffe10e679cec9a Vladimir Oltean 2020-03-20 2264
6cf99c13ea07b5 Vladimir Oltean 2019-11-09 2265 /* No PTP operations can run right now */
6cf99c13ea07b5 Vladimir Oltean 2019-11-09 2266 mutex_lock(&priv->ptp_data.lock);
6cf99c13ea07b5 Vladimir Oltean 2019-11-09 2267
6cf99c13ea07b5 Vladimir Oltean 2019-11-09 2268 rc = __sja1105_ptp_gettimex(ds, &now, &ptp_sts_before);
61c77533b82ba8 Vladimir Oltean 2021-06-18 2269 if (rc < 0) {
61c77533b82ba8 Vladimir Oltean 2021-06-18 2270 mutex_unlock(&priv->ptp_data.lock);
61c77533b82ba8 Vladimir Oltean 2021-06-18 2271 goto out;
61c77533b82ba8 Vladimir Oltean 2021-06-18 2272 }
6cf99c13ea07b5 Vladimir Oltean 2019-11-09 2273
6666cebc5e306f Vladimir Oltean 2019-05-02 2274 /* Reset switch and send updated static configuration */
6666cebc5e306f Vladimir Oltean 2019-05-02 2275 rc = sja1105_static_config_upload(priv);
61c77533b82ba8 Vladimir Oltean 2021-06-18 2276 if (rc < 0) {
61c77533b82ba8 Vladimir Oltean 2021-06-18 2277 mutex_unlock(&priv->ptp_data.lock);
61c77533b82ba8 Vladimir Oltean 2021-06-18 2278 goto out;
61c77533b82ba8 Vladimir Oltean 2021-06-18 2279 }
6cf99c13ea07b5 Vladimir Oltean 2019-11-09 2280
6cf99c13ea07b5 Vladimir Oltean 2019-11-09 2281 rc = __sja1105_ptp_settime(ds, 0, &ptp_sts_after);
61c77533b82ba8 Vladimir Oltean 2021-06-18 2282 if (rc < 0) {
61c77533b82ba8 Vladimir Oltean 2021-06-18 2283 mutex_unlock(&priv->ptp_data.lock);
61c77533b82ba8 Vladimir Oltean 2021-06-18 2284 goto out;
61c77533b82ba8 Vladimir Oltean 2021-06-18 2285 }
6cf99c13ea07b5 Vladimir Oltean 2019-11-09 2286
6cf99c13ea07b5 Vladimir Oltean 2019-11-09 2287 t1 = timespec64_to_ns(&ptp_sts_before.pre_ts);
6cf99c13ea07b5 Vladimir Oltean 2019-11-09 2288 t2 = timespec64_to_ns(&ptp_sts_before.post_ts);
6cf99c13ea07b5 Vladimir Oltean 2019-11-09 2289 t3 = timespec64_to_ns(&ptp_sts_after.pre_ts);
6cf99c13ea07b5 Vladimir Oltean 2019-11-09 2290 t4 = timespec64_to_ns(&ptp_sts_after.post_ts);
6cf99c13ea07b5 Vladimir Oltean 2019-11-09 2291 /* Mid point, corresponds to pre-reset PTPCLKVAL */
6cf99c13ea07b5 Vladimir Oltean 2019-11-09 2292 t12 = t1 + (t2 - t1) / 2;
6cf99c13ea07b5 Vladimir Oltean 2019-11-09 2293 /* Mid point, corresponds to post-reset PTPCLKVAL, aka 0 */
6cf99c13ea07b5 Vladimir Oltean 2019-11-09 2294 t34 = t3 + (t4 - t3) / 2;
6cf99c13ea07b5 Vladimir Oltean 2019-11-09 2295 /* Advance PTPCLKVAL by the time it took since its readout */
6cf99c13ea07b5 Vladimir Oltean 2019-11-09 2296 now += (t34 - t12);
6cf99c13ea07b5 Vladimir Oltean 2019-11-09 2297
6cf99c13ea07b5 Vladimir Oltean 2019-11-09 2298 __sja1105_ptp_adjtime(ds, now);
6cf99c13ea07b5 Vladimir Oltean 2019-11-09 2299
6cf99c13ea07b5 Vladimir Oltean 2019-11-09 2300 mutex_unlock(&priv->ptp_data.lock);
6666cebc5e306f Vladimir Oltean 2019-05-02 2301
2eea1fa82f681b Vladimir Oltean 2019-11-12 2302 dev_info(priv->ds->dev,
2eea1fa82f681b Vladimir Oltean 2019-11-12 2303 "Reset switch and programmed static config. Reason: %s\n",
2eea1fa82f681b Vladimir Oltean 2019-11-12 2304 sja1105_reset_reasons[reason]);
2eea1fa82f681b Vladimir Oltean 2019-11-12 2305
6666cebc5e306f Vladimir Oltean 2019-05-02 2306 /* Configure the CGU (PLLs) for MII and RMII PHYs.
6666cebc5e306f Vladimir Oltean 2019-05-02 2307 * For these interfaces there is no dynamic configuration
6666cebc5e306f Vladimir Oltean 2019-05-02 2308 * needed, since PLLs have same settings at all speeds.
6666cebc5e306f Vladimir Oltean 2019-05-02 2309 */
cb5a82d2b9aaca Vladimir Oltean 2021-06-18 2310 if (priv->info->clocking_setup) {
c50376783f23ff Vladimir Oltean 2021-05-24 2311 rc = priv->info->clocking_setup(priv);
6666cebc5e306f Vladimir Oltean 2019-05-02 2312 if (rc < 0)
6666cebc5e306f Vladimir Oltean 2019-05-02 2313 goto out;
cb5a82d2b9aaca Vladimir Oltean 2021-06-18 2314 }
6666cebc5e306f Vladimir Oltean 2019-05-02 2315
542043e91df452 Vladimir Oltean 2021-05-24 2316 for (i = 0; i < ds->num_ports; i++) {
3ad1d171548e85 Vladimir Oltean 2021-06-11 2317 struct dw_xpcs *xpcs = priv->xpcs[i];
3ad1d171548e85 Vladimir Oltean 2021-06-11 2318 unsigned int mode;
84db00f2c04338 Vladimir Oltean 2021-05-31 2319
8400cff60b472c Vladimir Oltean 2019-06-08 2320 rc = sja1105_adjust_port_config(priv, i, speed_mbps[i]);
6666cebc5e306f Vladimir Oltean 2019-05-02 2321 if (rc < 0)
6666cebc5e306f Vladimir Oltean 2019-05-02 2322 goto out;
ffe10e679cec9a Vladimir Oltean 2020-03-20 2323
3ad1d171548e85 Vladimir Oltean 2021-06-11 2324 if (!xpcs)
84db00f2c04338 Vladimir Oltean 2021-05-31 2325 continue;
84db00f2c04338 Vladimir Oltean 2021-05-31 2326
3ad1d171548e85 Vladimir Oltean 2021-06-11 2327 if (bmcr[i] & BMCR_ANENABLE)
3ad1d171548e85 Vladimir Oltean 2021-06-11 2328 mode = MLO_AN_INBAND;
3ad1d171548e85 Vladimir Oltean 2021-06-11 2329 else if (priv->fixed_link[i])
3ad1d171548e85 Vladimir Oltean 2021-06-11 2330 mode = MLO_AN_FIXED;
3ad1d171548e85 Vladimir Oltean 2021-06-11 2331 else
3ad1d171548e85 Vladimir Oltean 2021-06-11 2332 mode = MLO_AN_PHY;
ffe10e679cec9a Vladimir Oltean 2020-03-20 2333
3ad1d171548e85 Vladimir Oltean 2021-06-11 @2334 rc = xpcs_do_config(xpcs, priv->phy_mode[i], mode);
3ad1d171548e85 Vladimir Oltean 2021-06-11 2335 if (rc < 0)
3ad1d171548e85 Vladimir Oltean 2021-06-11 2336 goto out;
ffe10e679cec9a Vladimir Oltean 2020-03-20 2337
3ad1d171548e85 Vladimir Oltean 2021-06-11 2338 if (!phylink_autoneg_inband(mode)) {
ffe10e679cec9a Vladimir Oltean 2020-03-20 2339 int speed = SPEED_UNKNOWN;
ffe10e679cec9a Vladimir Oltean 2020-03-20 2340
56b63466333b25 Vladimir Oltean 2021-06-11 2341 if (priv->phy_mode[i] == PHY_INTERFACE_MODE_2500BASEX)
56b63466333b25 Vladimir Oltean 2021-06-11 2342 speed = SPEED_2500;
56b63466333b25 Vladimir Oltean 2021-06-11 2343 else if (bmcr[i] & BMCR_SPEED1000)
ffe10e679cec9a Vladimir Oltean 2020-03-20 2344 speed = SPEED_1000;
84db00f2c04338 Vladimir Oltean 2021-05-31 2345 else if (bmcr[i] & BMCR_SPEED100)
ffe10e679cec9a Vladimir Oltean 2020-03-20 2346 speed = SPEED_100;
053d8ad10d585a Vladimir Oltean 2021-03-04 2347 else
ffe10e679cec9a Vladimir Oltean 2020-03-20 2348 speed = SPEED_10;
ffe10e679cec9a Vladimir Oltean 2020-03-20 2349
3ad1d171548e85 Vladimir Oltean 2021-06-11 2350 xpcs_link_up(&xpcs->pcs, mode, priv->phy_mode[i],
3ad1d171548e85 Vladimir Oltean 2021-06-11 2351 speed, DUPLEX_FULL);
ffe10e679cec9a Vladimir Oltean 2020-03-20 2352 }
ffe10e679cec9a Vladimir Oltean 2020-03-20 2353 }
4d7525085a9ba8 Vladimir Oltean 2020-05-28 2354
4d7525085a9ba8 Vladimir Oltean 2020-05-28 2355 rc = sja1105_reload_cbs(priv);
4d7525085a9ba8 Vladimir Oltean 2020-05-28 2356 if (rc < 0)
4d7525085a9ba8 Vladimir Oltean 2020-05-28 2357 goto out;
6666cebc5e306f Vladimir Oltean 2019-05-02 2358 out:
af580ae2dcb250 Vladimir Oltean 2019-11-09 2359 mutex_unlock(&priv->mgmt_lock);
af580ae2dcb250 Vladimir Oltean 2019-11-09 2360
6666cebc5e306f Vladimir Oltean 2019-05-02 2361 return rc;
6666cebc5e306f Vladimir Oltean 2019-05-02 2362 }
6666cebc5e306f Vladimir Oltean 2019-05-02 2363
--
0-DAY CI Kernel Test Service
https://01.org/lkp
^ permalink raw reply
* Re: iwlwifi: iwl-dbg: Use del_timer_sync() before freeing
From: Kalle Valo @ 2022-04-23 6:33 UTC (permalink / raw)
To: Guenter Roeck
Cc: linux-wireless, Luca Coelho, linux-kernel, netdev, Steven Rostedt,
Johannes Berg, Guenter Roeck, Gregory Greenman
In-Reply-To: <20220411154210.1870008-1-linux@roeck-us.net>
Guenter Roeck <linux@roeck-us.net> wrote:
> In Chrome OS, a large number of crashes is observed due to corrupted timer
> lists. Steven Rostedt pointed out that this usually happens when a timer
> is freed while still active, and that the problem is often triggered
> by code calling del_timer() instead of del_timer_sync() just before
> freeing.
>
> Steven also identified the iwlwifi driver as one of the possible culprits
> since it does exactly that.
>
> Reported-by: Steven Rostedt <rostedt@goodmis.org>
> Cc: Steven Rostedt <rostedt@goodmis.org>
> Cc: Johannes Berg <johannes.berg@intel.com>
> Cc: Gregory Greenman <gregory.greenman@intel.com>
> Fixes: 60e8abd9d3e91 ("iwlwifi: dbg_ini: add periodic trigger new API support")
> Signed-off-by: Guenter Roeck <linux@roeck-us.net>
> Acked-by: Gregory Greenman <gregory.greenman@intel.com>
> Tested-by: Sedat Dilek <sedat.dilek@gmail.com> # Linux v5.17.3-rc1 and Debian LLVM-14
Patch applied to wireless.git, thanks.
7635a1ad8d92 iwlwifi: iwl-dbg: Use del_timer_sync() before freeing
--
https://patchwork.kernel.org/project/linux-wireless/patch/20220411154210.1870008-1-linux@roeck-us.net/
https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches
^ permalink raw reply
* Re: [PATCH] iwlwifi: iwl-dbg: Use del_timer_sync() before freeing
From: Kalle Valo @ 2022-04-23 6:35 UTC (permalink / raw)
To: Sedat Dilek
Cc: Greenman, Gregory, linux@roeck-us.net,
linux-wireless@vger.kernel.org, rostedt@goodmis.org,
Berg, Johannes, linux-kernel@vger.kernel.org,
netdev@vger.kernel.org, Coelho, Luciano
In-Reply-To: <CA+icZUVEfKcGi7ME3hoyinz2VQxLKhCXgwDA2K3AB7MEK-bveQ@mail.gmail.com>
Sedat Dilek <sedat.dilek@gmail.com> writes:
> On Wed, Apr 13, 2022 at 11:56 AM Greenman, Gregory
> <gregory.greenman@intel.com> wrote:
>>
>>
>> On Mon, 2022-04-11 at 08:42 -0700, Guenter Roeck wrote:
>> > In Chrome OS, a large number of crashes is observed due to corrupted
>> > timer
>> > lists. Steven Rostedt pointed out that this usually happens when a
>> > timer
>> > is freed while still active, and that the problem is often triggered
>> > by code calling del_timer() instead of del_timer_sync() just before
>> > freeing.
>> >
>> > Steven also identified the iwlwifi driver as one of the possible
>> > culprits
>> > since it does exactly that.
>> >
>> > Reported-by: Steven Rostedt <rostedt@goodmis.org>
>> > Cc: Steven Rostedt <rostedt@goodmis.org>
>> > Cc: Johannes Berg <johannes.berg@intel.com>
>> > Cc: Gregory Greenman <gregory.greenman@intel.com>
>> > Fixes: 60e8abd9d3e91 ("iwlwifi: dbg_ini: add periodic trigger new API
>> > support")
>> > Signed-off-by: Guenter Roeck <linux@roeck-us.net>
>> > ---
>> > v1 (from RFC):
>> > Removed Shahar S Matityahu from Cc: and added Gregory Greenman.
>> > No functional change.
>> >
>> > I thought about the need to add a mutex to protect the timer list,
>> > but
>> > I convinced myself that it is not necessary because the code adding
>> > the timer list and the code removing it should never be never
>> > executed
>> > in parallel.
>> >
>> > drivers/net/wireless/intel/iwlwifi/iwl-dbg-tlv.c | 2 +-
>> > 1 file changed, 1 insertion(+), 1 deletion(-)
>> >
>> > diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-dbg-tlv.c
>> > b/drivers/net/wireless/intel/iwlwifi/iwl-dbg-tlv.c
>> > index 866a33f49915..3237d4b528b5 100644
>> > --- a/drivers/net/wireless/intel/iwlwifi/iwl-dbg-tlv.c
>> > +++ b/drivers/net/wireless/intel/iwlwifi/iwl-dbg-tlv.c
>> > @@ -371,7 +371,7 @@ void iwl_dbg_tlv_del_timers(struct iwl_trans
>> > *trans)
>> > struct iwl_dbg_tlv_timer_node *node, *tmp;
>> >
>> > list_for_each_entry_safe(node, tmp, timer_list, list) {
>> > - del_timer(&node->timer);
>> > + del_timer_sync(&node->timer);
>> > list_del(&node->list);
>> > kfree(node);
>> > }
>>
>> Hi Kalle,
>>
>> Can you please pick it up to wireless-drivers for the next rc?
>> It is an important fix.
>> Luca has already assigned it to you in patchwork.
>>
>> Thanks!
>>
>> Acked-by: Gregory Greenman <gregory.greenman@intel.com>
>
> I have tested this on top of Linux v5.17.3-rc1.
>
> Feel free to add my...
>
> Tested-by: Sedat Dilek <sedat.dilek@gmail.com> # Linux v5.17.3-rc1 and
> Debian LLVM-14
Please keep the Tested-by in one line, otherwise patchwork cannot parse
it correctly. I fixed this manually during commit.
--
https://patchwork.kernel.org/project/linux-wireless/list/
https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches
^ permalink raw reply
* Re: wlcore: main: use pm_runtime_resume_and_get() instead of pm_runtime_get_sync()
From: Kalle Valo @ 2022-04-23 7:08 UTC (permalink / raw)
To: cgel.zte
Cc: davem, kuba, pabeni, gregkh, linux-wireless, netdev, linux-kernel,
Minghao Chi, Zeal Robot
In-Reply-To: <20220412091742.2533527-1-chi.minghao@zte.com.cn>
cgel.zte@gmail.com wrote:
> From: Minghao Chi <chi.minghao@zte.com.cn>
>
> Using pm_runtime_resume_and_get is more appropriate
> for simplifing code
>
> Reported-by: Zeal Robot <zealci@zte.com.cn>
> Signed-off-by: Minghao Chi <chi.minghao@zte.com.cn>
Patch applied to wireless-next.git, thanks.
ab589ac24ee1 wlcore: main: use pm_runtime_resume_and_get() instead of pm_runtime_get_sync()
--
https://patchwork.kernel.org/project/linux-wireless/patch/20220412091742.2533527-1-chi.minghao@zte.com.cn/
https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches
^ permalink raw reply
* Re: wlcore: sysfs: use pm_runtime_resume_and_get() instead of pm_runtime_get_sync()
From: Kalle Valo @ 2022-04-23 7:11 UTC (permalink / raw)
To: cgel.zte
Cc: davem, kuba, linux-wireless, netdev, linux-kernel, Minghao Chi,
Zeal Robot
In-Reply-To: <20220413093431.2538254-1-chi.minghao@zte.com.cn>
cgel.zte@gmail.com wrote:
> From: Minghao Chi <chi.minghao@zte.com.cn>
>
> Using pm_runtime_resume_and_get is more appropriate
> for simplifing code
>
> Reported-by: Zeal Robot <zealci@zte.com.cn>
> Signed-off-by: Minghao Chi <chi.minghao@zte.com.cn>
Patch applied to wireless-next.git, thanks.
da8e909c99e4 wlcore: sysfs: use pm_runtime_resume_and_get() instead of pm_runtime_get_sync()
--
https://patchwork.kernel.org/project/linux-wireless/patch/20220413093431.2538254-1-chi.minghao@zte.com.cn/
https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches
^ permalink raw reply
* Re: [PATCH] wlcore: testmode: use pm_runtime_resume_and_get() instead of pm_runtime_get_sync()
From: Kalle Valo @ 2022-04-23 7:11 UTC (permalink / raw)
To: cgel.zte
Cc: davem, kuba, linux-wireless, netdev, linux-stm32,
linux-arm-kernel, linux-kernel, Minghao Chi, Zeal Robot
In-Reply-To: <20220413093502.2538316-1-chi.minghao@zte.com.cn>
cgel.zte@gmail.com wrote:
> From: Minghao Chi <chi.minghao@zte.com.cn>
>
> Using pm_runtime_resume_and_get is more appropriate
> for simplifing code
>
> Reported-by: Zeal Robot <zealci@zte.com.cn>
> Signed-off-by: Minghao Chi <chi.minghao@zte.com.cn>
Patch applied to wireless-next.git, thanks.
3447eebe6084 wlcore: testmode: use pm_runtime_resume_and_get() instead of pm_runtime_get_sync()
--
https://patchwork.kernel.org/project/linux-wireless/patch/20220413093502.2538316-1-chi.minghao@zte.com.cn/
https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches
^ permalink raw reply
* Re: wlcore: vendor_cmd: use pm_runtime_resume_and_get() instead of pm_runtime_get_sync()
From: Kalle Valo @ 2022-04-23 7:12 UTC (permalink / raw)
To: cgel.zte
Cc: davem, kuba, linux-wireless, netdev, linux-kernel, Minghao Chi,
Zeal Robot
In-Reply-To: <20220413093939.2538825-1-chi.minghao@zte.com.cn>
cgel.zte@gmail.com wrote:
> From: Minghao Chi <chi.minghao@zte.com.cn>
>
> Using pm_runtime_resume_and_get is more appropriate
> for simplifing code
>
> Reported-by: Zeal Robot <zealci@zte.com.cn>
> Signed-off-by: Minghao Chi <chi.minghao@zte.com.cn>
Patch applied to wireless-next.git, thanks.
d8e11976d8e8 wlcore: vendor_cmd: use pm_runtime_resume_and_get() instead of pm_runtime_get_sync()
--
https://patchwork.kernel.org/project/linux-wireless/patch/20220413093939.2538825-1-chi.minghao@zte.com.cn/
https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches
^ permalink raw reply
* Re: wlcore: sdio: using pm_runtime_resume_and_get() instead of pm_runtime_get_sync()
From: Kalle Valo @ 2022-04-23 7:12 UTC (permalink / raw)
To: cgel.zte
Cc: davem, kuba, linux-wireless, netdev, linux-kernel, Minghao Chi,
Zeal Robot
In-Reply-To: <20220419110445.2574424-1-chi.minghao@zte.com.cn>
cgel.zte@gmail.com wrote:
> From: Minghao Chi <chi.minghao@zte.com.cn>
>
> Using pm_runtime_resume_and_get() to replace pm_runtime_get_sync and
> pm_runtime_put_noidle. This change is just to simplify the code, no
> actual functional changes.
>
> Reported-by: Zeal Robot <zealci@zte.com.cn>
> Signed-off-by: Minghao Chi <chi.minghao@zte.com.cn>
Patch applied to wireless-next.git, thanks.
00bfc8964f43 wlcore: sdio: using pm_runtime_resume_and_get() instead of pm_runtime_get_sync()
--
https://patchwork.kernel.org/project/linux-wireless/patch/20220419110445.2574424-1-chi.minghao@zte.com.cn/
https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches
^ permalink raw reply
* Re: wlcore: cmd: using pm_runtime_resume_and_get() instead of pm_runtime_get_sync()
From: Kalle Valo @ 2022-04-23 7:12 UTC (permalink / raw)
To: cgel.zte
Cc: davem, kuba, linux-wireless, netdev, linux-kernel, Minghao Chi,
Zeal Robot
In-Reply-To: <20220420090141.2588553-1-chi.minghao@zte.com.cn>
cgel.zte@gmail.com wrote:
> From: Minghao Chi <chi.minghao@zte.com.cn>
>
> Using pm_runtime_resume_and_get() to replace pm_runtime_get_sync and
> pm_runtime_put_noidle. This change is just to simplify the code, no
> actual functional changes.
>
> Reported-by: Zeal Robot <zealci@zte.com.cn>
> Signed-off-by: Minghao Chi <chi.minghao@zte.com.cn>
Patch applied to wireless-next.git, thanks.
e05c7ddfeb23 wlcore: cmd: using pm_runtime_resume_and_get() instead of pm_runtime_get_sync()
--
https://patchwork.kernel.org/project/linux-wireless/patch/20220420090141.2588553-1-chi.minghao@zte.com.cn/
https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches
^ permalink raw reply
* [PATCH] net: set proper memcg for net_init hooks allocations
From: Vasily Averin @ 2022-04-23 7:56 UTC (permalink / raw)
To: Vlastimil Babka, Shakeel Butt
Cc: kernel, Florian Westphal, linux-kernel, Roman Gushchin,
Michal Hocko, cgroups, netdev, David S. Miller, Jakub Kicinski,
Paolo Abeni
In-Reply-To: <CALvZod7ys1SNrQhbweCoCKVyfN1itE16jhC97TqjWtHDFh1RpQ@mail.gmail.com>
__register_pernet_operations() executes init hook of registered
pernet_operation structure in all existing net namespaces.
Typically, these hooks are called by a process associated with
the specified net namespace, and all __GFP_ACCOUNTING marked
allocation are accounted for corresponding container/memcg.
However __register_pernet_operations() calls the hooks in the same
context, and as a result all marked allocations are accounted
to one memcg for all processed net namespaces.
This patch adjusts active memcg for each net namespace and helps
to account memory allocated inside ops_init() into the proper memcg.
Signed-off-by: Vasily Averin <vvs@openvz.org>
---
v1: introduced get_mem_cgroup_from_kmem(), which takes the refcount
for the found memcg, suggested by Shakeel
---
include/linux/memcontrol.h | 11 +++++++++++
net/core/net_namespace.c | 9 +++++++++
2 files changed, 20 insertions(+)
diff --git a/include/linux/memcontrol.h b/include/linux/memcontrol.h
index 0abbd685703b..16b157852a8c 100644
--- a/include/linux/memcontrol.h
+++ b/include/linux/memcontrol.h
@@ -1768,4 +1768,15 @@ static inline struct mem_cgroup *mem_cgroup_from_obj(void *p)
#endif /* CONFIG_MEMCG_KMEM */
+static inline struct mem_cgroup *get_mem_cgroup_from_kmem(void *p)
+{
+ struct mem_cgroup *memcg;
+
+ rcu_read_lock();
+ do {
+ memcg = mem_cgroup_from_obj(p);
+ } while (memcg && !css_tryget(&memcg->css));
+ rcu_read_unlock();
+ return memcg;
+}
#endif /* _LINUX_MEMCONTROL_H */
diff --git a/net/core/net_namespace.c b/net/core/net_namespace.c
index a5b5bb99c644..56608f56bed6 100644
--- a/net/core/net_namespace.c
+++ b/net/core/net_namespace.c
@@ -26,6 +26,7 @@
#include <net/net_namespace.h>
#include <net/netns/generic.h>
+#include <linux/sched/mm.h>
/*
* Our network namespace constructor/destructor lists
*/
@@ -1147,7 +1148,15 @@ static int __register_pernet_operations(struct list_head *list,
* setup_net() and cleanup_net() are not possible.
*/
for_each_net(net) {
+ struct mem_cgroup *old, *memcg;
+
+ memcg = get_mem_cgroup_from_kmem(net);
+ if (!memcg)
+ memcg = root_mem_cgroup;
+ old = set_active_memcg(memcg);
error = ops_init(ops, net);
+ set_active_memcg(old);
+ css_put(&memcg->css);
if (error)
goto out_undo;
list_add_tail(&net->exit_list, &net_exit_list);
--
2.31.1
^ permalink raw reply related
* Re: [PATCH] net: unexport csum_and_copy_{from,to}_user
From: Geert Uytterhoeven @ 2022-04-23 8:05 UTC (permalink / raw)
To: Christoph Hellwig
Cc: Andrew Morton, the arch/x86 maintainers, alpha, linux-m68k,
linuxppc-dev, Linux Kernel Mailing List, netdev
In-Reply-To: <20220421070440.1282704-1-hch@lst.de>
On Fri, Apr 22, 2022 at 11:14 PM Christoph Hellwig <hch@lst.de> wrote:
> csum_and_copy_from_user and csum_and_copy_to_user are exported by
> a few architectures, but not actually used in modular code. Drop
> the exports.
>
> Signed-off-by: Christoph Hellwig <hch@lst.de>
> arch/m68k/lib/checksum.c | 2 --
Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org
In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
^ permalink raw reply
* Re: [PATCH bpf-next v6 3/6] bpf: Allow helpers to accept pointers with a fixed size
From: kernel test robot @ 2022-04-23 8:38 UTC (permalink / raw)
To: Maxim Mikityanskiy, bpf, Alexei Starovoitov, Daniel Borkmann,
Andrii Nakryiko, netdev
Cc: kbuild-all, Tariq Toukan, Martin KaFai Lau, Song Liu,
Yonghong Song, John Fastabend, KP Singh, Jakub Kicinski,
Petar Penkov, Lorenz Bauer, Eric Dumazet, Hideaki YOSHIFUJI,
David Ahern, Shuah Khan, Jesper Dangaard Brouer,
Nathan Chancellor, Nick Desaulniers, Joe Stringer, Florent Revest,
linux-kselftest, Toke Høiland-Jørgensen,
Kumar Kartikeya Dwivedi, Florian Westphal, pabeni,
Maxim Mikityanskiy
In-Reply-To: <20220422172422.4037988-4-maximmi@nvidia.com>
Hi Maxim,
Thank you for the patch! Perhaps something to improve:
[auto build test WARNING on bpf-next/master]
url: https://github.com/intel-lab-lkp/linux/commits/Maxim-Mikityanskiy/bpf-Use-ipv6_only_sock-in-bpf_tcp_gen_syncookie/20220423-022511
base: https://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next.git master
config: arc-randconfig-r036-20220422 (https://download.01.org/0day-ci/archive/20220423/202204231646.yQjLArUK-lkp@intel.com/config)
compiler: arc-elf-gcc (GCC) 11.2.0
reproduce (this is a W=1 build):
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross
chmod +x ~/bin/make.cross
# https://github.com/intel-lab-lkp/linux/commit/e374c2f19a674b586212d155ecb708aaa86dcd2c
git remote add linux-review https://github.com/intel-lab-lkp/linux
git fetch --no-tags linux-review Maxim-Mikityanskiy/bpf-Use-ipv6_only_sock-in-bpf_tcp_gen_syncookie/20220423-022511
git checkout e374c2f19a674b586212d155ecb708aaa86dcd2c
# save the config file
mkdir build_dir && cp config build_dir/.config
COMPILER_INSTALL_PATH=$HOME/0day COMPILER=gcc-11.2.0 make.cross W=1 O=build_dir ARCH=arc SHELL=/bin/bash kernel/bpf/
If you fix the issue, kindly add following tag as appropriate
Reported-by: kernel test robot <lkp@intel.com>
All warnings (new ones prefixed by >>):
kernel/bpf/verifier.c: In function 'check_helper_call':
>> kernel/bpf/verifier.c:5954:49: warning: array subscript 5 is above array bounds of 'const enum bpf_arg_type[5]' [-Warray-bounds]
5954 | return arg_type_is_mem_size(fn->arg_type[arg + 1]) || fn->arg_size[arg];
| ~~~~~~~~~~~~^~~~~~~~~
In file included from include/linux/bpf-cgroup.h:5,
from kernel/bpf/verifier.c:7:
include/linux/bpf.h:456:35: note: while referencing 'arg_type'
456 | enum bpf_arg_type arg_type[5];
| ^~~~~~~~
kernel/bpf/verifier.c:5952:57: warning: array subscript 5 is above array bounds of 'const enum bpf_arg_type[5]' [-Warray-bounds]
5952 | return arg_type_is_mem_size(fn->arg_type[arg + 1]) ==
| ~~~~~~~~~~~~^~~~~~~~~
In file included from include/linux/bpf-cgroup.h:5,
from kernel/bpf/verifier.c:7:
include/linux/bpf.h:456:35: note: while referencing 'arg_type'
456 | enum bpf_arg_type arg_type[5];
| ^~~~~~~~
vim +5954 kernel/bpf/verifier.c
5948
5949 static bool check_args_pair_invalid(const struct bpf_func_proto *fn, int arg)
5950 {
5951 if (arg_type_is_mem_ptr(fn->arg_type[arg]))
5952 return arg_type_is_mem_size(fn->arg_type[arg + 1]) ==
5953 !!fn->arg_size[arg];
> 5954 return arg_type_is_mem_size(fn->arg_type[arg + 1]) || fn->arg_size[arg];
5955 }
5956
--
0-DAY CI Kernel Test Service
https://01.org/lkp
^ permalink raw reply
* Re: [PATCH net] net: Use this_cpu_inc() to increment net->core_stats
From: Peter Zijlstra @ 2022-04-23 9:24 UTC (permalink / raw)
To: Sebastian Andrzej Siewior
Cc: Eric Dumazet, netdev, David S. Miller, Jakub Kicinski,
Paolo Abeni, Thomas Gleixner
In-Reply-To: <YmGLkz+dIBb5JjFF@linutronix.de>
On Thu, Apr 21, 2022 at 06:51:31PM +0200, Sebastian Andrzej Siewior wrote:
> On 2022-04-21 09:06:05 [-0700], Eric Dumazet wrote:
> > On Thu, Apr 21, 2022 at 7:00 AM Sebastian Andrzej Siewior
> > <bigeasy@linutronix.de> wrote:
> > >
> >
> > > for_each_possible_cpu(i) {
> > > core_stats = per_cpu_ptr(p, i);
> > > - storage->rx_dropped += local_read(&core_stats->rx_dropped);
> > > - storage->tx_dropped += local_read(&core_stats->tx_dropped);
> > > - storage->rx_nohandler += local_read(&core_stats->rx_nohandler);
> > > + storage->rx_dropped += core_stats->rx_dropped;
> > > + storage->tx_dropped += core_stats->tx_dropped;
> > > + storage->rx_nohandler += core_stats->rx_nohandler;
> >
> > I think that one of the reasons for me to use local_read() was that
> > it provided what was needed to avoid future syzbot reports.
>
> syzbot report due a plain read of a per-CPU variable which might be
> modified?
>
> > Perhaps use READ_ONCE() here ?
> >
> > Yes, we have many similar folding loops that are simply assuming
> > compiler won't do stupid things.
>
> I wasn't sure about that and added PeterZ to do some yelling here just
> in case. And yes, we have other sites doing exactly that. In
> Documentation/core-api/this_cpu_ops.rst
> there is nothing about remote-READ-access (only that there should be no
> writes (due to parallel this_cpu_inc() on the local CPU)). I know that a
> 32bit write can be optimized in two 16bit writes in certain cases but a
> read is a read.
> PeterZ? :)
Eric is right. READ_ONCE() is 'required' to ensure the compiler doesn't
split the load and KCSAN konws about these things.
^ permalink raw reply
* Re: [PATCH -next] ath11k: fix missing unlock on error in ath11k_wow_op_resume()
From: Kalle Valo @ 2022-04-23 9:28 UTC (permalink / raw)
To: Yang Yingliang
Cc: linux-kernel, netdev, linux-wireless, ath11k, quic_kvalo,
quic_cjhuang, davem, kuba
In-Reply-To: <20220408030912.3087293-1-yangyingliang@huawei.com>
Yang Yingliang <yangyingliang@huawei.com> wrote:
> Add the missing unlock before return from function ath11k_wow_op_resume()
> in the error handling case.
>
> Fixes: 90bf5c8d0f7e ("ath11k: purge rx pktlog when entering WoW")
> Reported-by: Hulk Robot <hulkci@huawei.com>
> Signed-off-by: Yang Yingliang <yangyingliang@huawei.com>
> Signed-off-by: Kalle Valo <quic_kvalo@quicinc.com>
Patch applied to ath-next branch of ath.git, thanks.
605194411d73 ath11k: fix missing unlock on error in ath11k_wow_op_resume()
--
https://patchwork.kernel.org/project/linux-wireless/patch/20220408030912.3087293-1-yangyingliang@huawei.com/
https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches
^ permalink raw reply
* Re: [PATCH] nfc: nfcmrvl: spi: Fix irq_of_parse_and_map() return value
From: Krzysztof Kozlowski @ 2022-04-23 9:28 UTC (permalink / raw)
To: Jakub Kicinski
Cc: Vincent Cuissard, Samuel Ortiz, linux-nfc, netdev, linux-kernel
In-Reply-To: <20220422161305.59e0be38@kernel.org>
On 23/04/2022 01:13, Jakub Kicinski wrote:
> On Fri, 22 Apr 2022 12:47:58 +0200 Krzysztof Kozlowski wrote:
>> The irq_of_parse_and_map() returns 0 on failure, not a negative ERRNO.
>>
>> Fixes: caf6e49bf6d0 ("NFC: nfcmrvl: add spi driver")
>> Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
>> ---
>> This is another issue to https://lore.kernel.org/all/20220422084605.2775542-1-lv.ruyi@zte.com.cn/
>
> Maybe send one patch that fixes both and also fixes the usage of ret?
Bah, I just blindly copied one part of his patch without deeper check.
Thanks for noticing it.
Best regards,
Krzysztof
^ permalink raw reply
* Re: [PATCH] ath11k: Fix build warning without CONFIG_IPV6
From: Kalle Valo @ 2022-04-23 9:29 UTC (permalink / raw)
To: YueHaibing
Cc: davem, kuba, pabeni, quic_cjhuang, quic_bqiang, ath11k,
linux-wireless, netdev, linux-kernel, YueHaibing
In-Reply-To: <20220411020843.10284-1-yuehaibing@huawei.com>
YueHaibing <yuehaibing@huawei.com> wrote:
> drivers/net/wireless/ath/ath11k/mac.c:8175:13: error: ‘ath11k_mac_op_ipv6_changed’ defined but not used [-Werror=unused-function]
> static void ath11k_mac_op_ipv6_changed(struct ieee80211_hw *hw,
> ^~~~~~~~~~~~~~~~~~~~~~~~~~
>
> Wrap it with #ifdef block to fix this.
>
> Fixes: c3c36bfe998b ("ath11k: support ARP and NS offload")
> Signed-off-by: YueHaibing <yuehaibing@huawei.com>
> Signed-off-by: Kalle Valo <quic_kvalo@quicinc.com>
Patch applied to ath-next branch of ath.git, thanks.
67888630adde ath11k: Fix build warning without CONFIG_IPV6
--
https://patchwork.kernel.org/project/linux-wireless/patch/20220411020843.10284-1-yuehaibing@huawei.com/
https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches
^ permalink raw reply
* Re: [PATCH] wil6210: using pm_runtime_resume_and_get instead of pm_runtime_get_sync
From: Kalle Valo @ 2022-04-23 9:31 UTC (permalink / raw)
To: cgel.zte
Cc: merez, davem, kuba, linux-wireless, wil6210, netdev, linux-kernel,
Minghao Chi, Zeal Robot
In-Reply-To: <20220411013602.2517086-1-chi.minghao@zte.com.cn>
cgel.zte@gmail.com wrote:
> Using pm_runtime_resume_and_get() is more appropriate
> for simplifing code.
>
> Reported-by: Zeal Robot <zealci@zte.com.cn>
> Signed-off-by: Minghao Chi <chi.minghao@zte.com.cn>
> Signed-off-by: Kalle Valo <quic_kvalo@quicinc.com>
Patch applied to ath-next branch of ath.git, thanks.
45286070e9e7 wil6210: use pm_runtime_resume_and_get() instead of pm_runtime_get_sync()
--
https://patchwork.kernel.org/project/linux-wireless/patch/20220411013602.2517086-1-chi.minghao@zte.com.cn/
https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches
^ permalink raw reply
* Re: [PATCH] net: set proper memcg for net_init hooks allocations
From: kernel test robot @ 2022-04-23 9:39 UTC (permalink / raw)
To: Vasily Averin, Vlastimil Babka, Shakeel Butt
Cc: kbuild-all, kernel, Florian Westphal, linux-kernel,
Roman Gushchin, Michal Hocko, cgroups, netdev, Jakub Kicinski,
Paolo Abeni
In-Reply-To: <6f38e02b-9af3-4dcf-9000-1118a04b13c7@openvz.org>
Hi Vasily,
Thank you for the patch! Yet something to improve:
[auto build test ERROR on linus/master]
[also build test ERROR on v5.18-rc3 next-20220422]
[If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch]
url: https://github.com/intel-lab-lkp/linux/commits/Vasily-Averin/net-set-proper-memcg-for-net_init-hooks-allocations/20220423-160759
base: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git c00c5e1d157bec0ef0b0b59aa5482eb8dc7e8e49
config: mips-buildonly-randconfig-r006-20220423 (https://download.01.org/0day-ci/archive/20220423/202204231724.0eEAtmxV-lkp@intel.com/config)
compiler: mips64-linux-gcc (GCC) 11.2.0
reproduce (this is a W=1 build):
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross
chmod +x ~/bin/make.cross
# https://github.com/intel-lab-lkp/linux/commit/3b379e5391e36e13b9f36305aa6d233fb03d4e58
git remote add linux-review https://github.com/intel-lab-lkp/linux
git fetch --no-tags linux-review Vasily-Averin/net-set-proper-memcg-for-net_init-hooks-allocations/20220423-160759
git checkout 3b379e5391e36e13b9f36305aa6d233fb03d4e58
# save the config file
mkdir build_dir && cp config build_dir/.config
COMPILER_INSTALL_PATH=$HOME/0day COMPILER=gcc-11.2.0 make.cross W=1 O=build_dir ARCH=mips prepare
If you fix the issue, kindly add following tag as appropriate
Reported-by: kernel test robot <lkp@intel.com>
All errors (new ones prefixed by >>):
In file included from include/linux/swap.h:9,
from include/linux/suspend.h:5,
from arch/mips/kernel/asm-offsets.c:17:
include/linux/memcontrol.h: In function 'get_mem_cgroup_from_kmem':
>> include/linux/memcontrol.h:1773:28: error: implicit declaration of function 'css_tryget'; did you mean 'wb_tryget'? [-Werror=implicit-function-declaration]
1773 | } while (memcg && !css_tryget(&memcg->css));
| ^~~~~~~~~~
| wb_tryget
>> include/linux/memcontrol.h:1773:45: error: invalid use of undefined type 'struct mem_cgroup'
1773 | } while (memcg && !css_tryget(&memcg->css));
| ^~
arch/mips/kernel/asm-offsets.c: At top level:
arch/mips/kernel/asm-offsets.c:26:6: warning: no previous prototype for 'output_ptreg_defines' [-Wmissing-prototypes]
26 | void output_ptreg_defines(void)
| ^~~~~~~~~~~~~~~~~~~~
arch/mips/kernel/asm-offsets.c:78:6: warning: no previous prototype for 'output_task_defines' [-Wmissing-prototypes]
78 | void output_task_defines(void)
| ^~~~~~~~~~~~~~~~~~~
arch/mips/kernel/asm-offsets.c:92:6: warning: no previous prototype for 'output_thread_info_defines' [-Wmissing-prototypes]
92 | void output_thread_info_defines(void)
| ^~~~~~~~~~~~~~~~~~~~~~~~~~
arch/mips/kernel/asm-offsets.c:108:6: warning: no previous prototype for 'output_thread_defines' [-Wmissing-prototypes]
108 | void output_thread_defines(void)
| ^~~~~~~~~~~~~~~~~~~~~
arch/mips/kernel/asm-offsets.c:179:6: warning: no previous prototype for 'output_mm_defines' [-Wmissing-prototypes]
179 | void output_mm_defines(void)
| ^~~~~~~~~~~~~~~~~
arch/mips/kernel/asm-offsets.c:240:6: warning: no previous prototype for 'output_sc_defines' [-Wmissing-prototypes]
240 | void output_sc_defines(void)
| ^~~~~~~~~~~~~~~~~
arch/mips/kernel/asm-offsets.c:253:6: warning: no previous prototype for 'output_signal_defined' [-Wmissing-prototypes]
253 | void output_signal_defined(void)
| ^~~~~~~~~~~~~~~~~~~~~
arch/mips/kernel/asm-offsets.c:332:6: warning: no previous prototype for 'output_pm_defines' [-Wmissing-prototypes]
332 | void output_pm_defines(void)
| ^~~~~~~~~~~~~~~~~
cc1: some warnings being treated as errors
make[2]: *** [scripts/Makefile.build:120: arch/mips/kernel/asm-offsets.s] Error 1
make[2]: Target '__build' not remade because of errors.
make[1]: *** [Makefile:1194: prepare0] Error 2
make[1]: Target 'prepare' not remade because of errors.
make: *** [Makefile:219: __sub-make] Error 2
make: Target 'prepare' not remade because of errors.
vim +1773 include/linux/memcontrol.h
1765
1766 static inline struct mem_cgroup *get_mem_cgroup_from_kmem(void *p)
1767 {
1768 struct mem_cgroup *memcg;
1769
1770 rcu_read_lock();
1771 do {
1772 memcg = mem_cgroup_from_obj(p);
> 1773 } while (memcg && !css_tryget(&memcg->css));
--
0-DAY CI Kernel Test Service
https://01.org/lkp
^ permalink raw reply
* Re: [PATCH] net: set proper memcg for net_init hooks allocations
From: kernel test robot @ 2022-04-23 9:39 UTC (permalink / raw)
To: Vasily Averin, Vlastimil Babka, Shakeel Butt
Cc: llvm, kbuild-all, kernel, Florian Westphal, linux-kernel,
Roman Gushchin, Michal Hocko, cgroups, netdev, Jakub Kicinski,
Paolo Abeni
In-Reply-To: <6f38e02b-9af3-4dcf-9000-1118a04b13c7@openvz.org>
Hi Vasily,
Thank you for the patch! Yet something to improve:
[auto build test ERROR on linus/master]
[also build test ERROR on v5.18-rc3 next-20220422]
[If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch]
url: https://github.com/intel-lab-lkp/linux/commits/Vasily-Averin/net-set-proper-memcg-for-net_init-hooks-allocations/20220423-160759
base: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git c00c5e1d157bec0ef0b0b59aa5482eb8dc7e8e49
config: powerpc-buildonly-randconfig-r004-20220422 (https://download.01.org/0day-ci/archive/20220423/202204231728.QUjBA8ZH-lkp@intel.com/config)
compiler: clang version 15.0.0 (https://github.com/llvm/llvm-project 5bd87350a5ae429baf8f373cb226a57b62f87280)
reproduce (this is a W=1 build):
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross
chmod +x ~/bin/make.cross
# install powerpc cross compiling tool for clang build
# apt-get install binutils-powerpc-linux-gnu
# https://github.com/intel-lab-lkp/linux/commit/3b379e5391e36e13b9f36305aa6d233fb03d4e58
git remote add linux-review https://github.com/intel-lab-lkp/linux
git fetch --no-tags linux-review Vasily-Averin/net-set-proper-memcg-for-net_init-hooks-allocations/20220423-160759
git checkout 3b379e5391e36e13b9f36305aa6d233fb03d4e58
# save the config file
mkdir build_dir && cp config build_dir/.config
COMPILER_INSTALL_PATH=$HOME/0day COMPILER=clang make.cross W=1 O=build_dir ARCH=powerpc prepare
If you fix the issue, kindly add following tag as appropriate
Reported-by: kernel test robot <lkp@intel.com>
All errors (new ones prefixed by >>):
In file included from arch/powerpc/kernel/asm-offsets.c:21:
In file included from include/linux/suspend.h:5:
In file included from include/linux/swap.h:9:
>> include/linux/memcontrol.h:1773:38: error: incomplete definition of type 'struct mem_cgroup'
} while (memcg && !css_tryget(&memcg->css));
~~~~~^
include/linux/mm_types.h:31:8: note: forward declaration of 'struct mem_cgroup'
struct mem_cgroup;
^
1 error generated.
make[2]: *** [scripts/Makefile.build:120: arch/powerpc/kernel/asm-offsets.s] Error 1
make[2]: Target '__build' not remade because of errors.
make[1]: *** [Makefile:1194: prepare0] Error 2
make[1]: Target 'prepare' not remade because of errors.
make: *** [Makefile:219: __sub-make] Error 2
make: Target 'prepare' not remade because of errors.
vim +1773 include/linux/memcontrol.h
1765
1766 static inline struct mem_cgroup *get_mem_cgroup_from_kmem(void *p)
1767 {
1768 struct mem_cgroup *memcg;
1769
1770 rcu_read_lock();
1771 do {
1772 memcg = mem_cgroup_from_obj(p);
> 1773 } while (memcg && !css_tryget(&memcg->css));
--
0-DAY CI Kernel Test Service
https://01.org/lkp
^ permalink raw reply
* Re: [PATCH] net: unexport csum_and_copy_{from,to}_user
From: Arnd Bergmann @ 2022-04-23 9:47 UTC (permalink / raw)
To: Christoph Hellwig
Cc: Andrew Morton, Networking, the arch/x86 maintainers,
Linux Kernel Mailing List, linux-m68k, alpha, linuxppc-dev
In-Reply-To: <20220421070440.1282704-1-hch@lst.de>
On Thu, Apr 21, 2022 at 9:04 AM Christoph Hellwig <hch@lst.de> wrote:
>
> csum_and_copy_from_user and csum_and_copy_to_user are exported by
> a few architectures, but not actually used in modular code. Drop
> the exports.
>
> Signed-off-by: Christoph Hellwig <hch@lst.de>
Acked-by: Arnd Bergmann <arnd@arndb.de>
^ permalink raw reply
* Re: [PATCH net v3] ice: Fix race during aux device (un)plugging
From: Ivan Vecera @ 2022-04-23 10:15 UTC (permalink / raw)
To: Ertman, David M
Cc: netdev@vger.kernel.org, poros, mschmidt, Leon Romanovsky,
Brandeburg, Jesse, Nguyen, Anthony L, David S. Miller,
Jakub Kicinski, Paolo Abeni, Saleem, Shiraz,
moderated list:INTEL ETHERNET DRIVERS, open list
In-Reply-To: <MW5PR11MB58110D02BF761C889B29CBC7DDF79@MW5PR11MB5811.namprd11.prod.outlook.com>
On Fri, 22 Apr 2022 20:55:10 +0000
"Ertman, David M" <david.m.ertman@intel.com> wrote:
> > -----Original Message-----
> > From: Ertman, David M
> > Sent: Friday, April 22, 2022 10:42 AM
> > To: Ivan Vecera <ivecera@redhat.com>; netdev@vger.kernel.org
> > Cc: poros <poros@redhat.com>; mschmidt <mschmidt@redhat.com>; Leon
> > Romanovsky <leon@kernel.org>; Brandeburg, Jesse
> > <jesse.brandeburg@intel.com>; Nguyen, Anthony L
> > <anthony.l.nguyen@intel.com>; David S. Miller <davem@davemloft.net>;
> > Jakub Kicinski <kuba@kernel.org>; Paolo Abeni <pabeni@redhat.com>;
> > Saleem, Shiraz <shiraz.saleem@intel.com>; moderated list:INTEL ETHERNET
> > DRIVERS <intel-wired-lan@lists.osuosl.org>; open list <linux-
> > kernel@vger.kernel.org>
> > Subject: RE: [PATCH net v3] ice: Fix race during aux device (un)plugging
> >
> > > -----Original Message-----
> > > From: Ivan Vecera <ivecera@redhat.com>
> > > Sent: Wednesday, April 20, 2022 11:09 PM
> > > To: netdev@vger.kernel.org
> > > Cc: poros <poros@redhat.com>; mschmidt <mschmidt@redhat.com>;
> > Leon
> > > Romanovsky <leon@kernel.org>; Brandeburg, Jesse
> > > <jesse.brandeburg@intel.com>; Nguyen, Anthony L
> > > <anthony.l.nguyen@intel.com>; David S. Miller <davem@davemloft.net>;
> > > Jakub Kicinski <kuba@kernel.org>; Paolo Abeni <pabeni@redhat.com>;
> > > Ertman, David M <david.m.ertman@intel.com>; Saleem, Shiraz
> > > <shiraz.saleem@intel.com>; moderated list:INTEL ETHERNET DRIVERS
> > <intel-
> > > wired-lan@lists.osuosl.org>; open list <linux-kernel@vger.kernel.org>
> > > Subject: [PATCH net v3] ice: Fix race during aux device (un)plugging
> > >
> > > Function ice_plug_aux_dev() assigns pf->adev field too early prior
> > > aux device initialization and on other side ice_unplug_aux_dev()
> > > starts aux device deinit and at the end assigns NULL to pf->adev.
> > > This is wrong because pf->adev should always be non-NULL only when
> > > aux device is fully initialized and ready. This wrong order causes
> > > a crash when ice_send_event_to_aux() call occurs because that function
> > > depends on non-NULL value of pf->adev and does not assume that
> > > aux device is half-initialized or half-destroyed.
> > > After order correction the race window is tiny but it is still there,
> > > as Leon mentioned and manipulation with pf->adev needs to be protected
> > > by mutex.
> > >
> > > Fix (un-)plugging functions so pf->adev field is set after aux device
> > > init and prior aux device destroy and protect pf->adev assignment by
> > > new mutex. This mutex is also held during ice_send_event_to_aux()
> > > call to ensure that aux device is valid during that call. Device
> > > lock used ice_send_event_to_aux() to avoid its concurrent run can
> > > be removed as this is secured by that mutex.
> > >
> > > Reproducer:
> > > cycle=1
> > > while :;do
> > > echo "#### Cycle: $cycle"
> > >
> > > ip link set ens7f0 mtu 9000
> > > ip link add bond0 type bond mode 1 miimon 100
> > > ip link set bond0 up
> > > ifenslave bond0 ens7f0
> > > ip link set bond0 mtu 9000
> > > ethtool -L ens7f0 combined 1
> > > ip link del bond0
> > > ip link set ens7f0 mtu 1500
> > > sleep 1
> > >
> > > let cycle++
> > > done
> > >
> > > In short when the device is added/removed to/from bond the aux device
> > > is unplugged/plugged. When MTU of the device is changed an event is
> > > sent to aux device asynchronously. This can race with (un)plugging
> > > operation and because pf->adev is set too early (plug) or too late
> > > (unplug) the function ice_send_event_to_aux() can touch uninitialized
> > > or destroyed fields. In the case of crash below pf->adev->dev.mutex.
> > >
> > > Crash:
> > > [ 53.372066] bond0: (slave ens7f0): making interface the new active one
> > > [ 53.378622] bond0: (slave ens7f0): Enslaving as an active interface with an
> > u
> > > p link
> > > [ 53.386294] IPv6: ADDRCONF(NETDEV_CHANGE): bond0: link becomes
> > > ready
> > > [ 53.549104] bond0: (slave ens7f1): Enslaving as a backup interface with an
> > > up
> > > link
> > > [ 54.118906] ice 0000:ca:00.0 ens7f0: Number of in use tx queues changed
> > > inval
> > > idating tc mappings. Priority traffic classification disabled!
> > > [ 54.233374] ice 0000:ca:00.1 ens7f1: Number of in use tx queues changed
> > > inval
> > > idating tc mappings. Priority traffic classification disabled!
> > > [ 54.248204] bond0: (slave ens7f0): Releasing backup interface
> > > [ 54.253955] bond0: (slave ens7f1): making interface the new active one
> > > [ 54.274875] bond0: (slave ens7f1): Releasing backup interface
> > > [ 54.289153] bond0 (unregistering): Released all slaves
> > > [ 55.383179] MII link monitoring set to 100 ms
> > > [ 55.398696] bond0: (slave ens7f0): making interface the new active one
> > > [ 55.405241] BUG: kernel NULL pointer dereference, address:
> > > 0000000000000080
> > > [ 55.405289] bond0: (slave ens7f0): Enslaving as an active interface with an
> > u
> > > p link
> > > [ 55.412198] #PF: supervisor write access in kernel mode
> > > [ 55.412200] #PF: error_code(0x0002) - not-present page
> > > [ 55.412201] PGD 25d2ad067 P4D 0
> > > [ 55.412204] Oops: 0002 [#1] PREEMPT SMP NOPTI
> > > [ 55.412207] CPU: 0 PID: 403 Comm: kworker/0:2 Kdump: loaded Tainted:
> > G
> > > S
> > > 5.17.0-13579-g57f2d6540f03 #1
> > > [ 55.429094] bond0: (slave ens7f1): Enslaving as a backup interface with an
> > > up
> > > link
> > > [ 55.430224] Hardware name: Dell Inc. PowerEdge R750/06V45N, BIOS
> > 1.4.4
> > > 10/07/
> > > 2021
> > > [ 55.430226] Workqueue: ice ice_service_task [ice]
> > > [ 55.468169] RIP: 0010:mutex_unlock+0x10/0x20
> > > [ 55.472439] Code: 0f b1 13 74 96 eb e0 4c 89 ee eb d8 e8 79 54 ff ff 66 0f 1f
> > 84
> > > 00 00 00 00 00 0f 1f 44 00 00 65 48 8b 04 25 40 ef 01 00 31 d2 <f0> 48 0f b1 17
> > 75
> > > 01 c3 e9 e3 fe ff ff 0f 1f 00 0f 1f 44 00 00 48
> > > [ 55.491186] RSP: 0018:ff4454230d7d7e28 EFLAGS: 00010246
> > > [ 55.496413] RAX: ff1a79b208b08000 RBX: ff1a79b2182e8880 RCX:
> > > 0000000000000001
> > > [ 55.503545] RDX: 0000000000000000 RSI: ff4454230d7d7db0 RDI:
> > > 0000000000000080
> > > [ 55.510678] RBP: ff1a79d1c7e48b68 R08: ff4454230d7d7db0 R09:
> > > 0000000000000041
> > > [ 55.517812] R10: 00000000000000a5 R11: 00000000000006e6 R12:
> > > ff1a79d1c7e48bc0
> > > [ 55.524945] R13: 0000000000000000 R14: ff1a79d0ffc305c0 R15:
> > > 0000000000000000
> > > [ 55.532076] FS: 0000000000000000(0000) GS:ff1a79d0ffc00000(0000)
> > > knlGS:0000000000000000
> > > [ 55.540163] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033
> > > [ 55.545908] CR2: 0000000000000080 CR3: 00000003487ae003 CR4:
> > > 0000000000771ef0
> > > [ 55.553041] DR0: 0000000000000000 DR1: 0000000000000000 DR2:
> > > 0000000000000000
> > > [ 55.560173] DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7:
> > > 0000000000000400
> > > [ 55.567305] PKRU: 55555554
> > > [ 55.570018] Call Trace:
> > > [ 55.572474] <TASK>
> > > [ 55.574579] ice_service_task+0xaab/0xef0 [ice]
> > > [ 55.579130] process_one_work+0x1c5/0x390
> > > [ 55.583141] ? process_one_work+0x390/0x390
> > > [ 55.587326] worker_thread+0x30/0x360
> > > [ 55.590994] ? process_one_work+0x390/0x390
> > > [ 55.595180] kthread+0xe6/0x110
> > > [ 55.598325] ? kthread_complete_and_exit+0x20/0x20
> > > [ 55.603116] ret_from_fork+0x1f/0x30
> > > [ 55.606698] </TASK>
> > >
> > > Fixes: f9f5301e7e2d ("ice: Register auxiliary device to provide RDMA")
> > > Cc: Leon Romanovsky <leon@kernel.org>
> > > Signed-off-by: Ivan Vecera <ivecera@redhat.com>
> >
> > Sorry for previous mis-reply - hit the wrong button.
> >
> > LGTM
> > Acked-by: Dave Ertman <david.m.ertman@intel.com>
>
> After thinking about this for a bit longer, I did think of one issue.
>
> With the removal of the device_lock in ice_send_event_to_aux(), there is no guarantee that the
> function pointer will not become NULL by the auxiliary_driver unloading. It is a very small window,
> but it could happen.
>
> I think the device_lock should probably stay also.
>
> DaveE
>
The function pointer can't become NULL but adev->dev.driver can. So yeah, you are right the device lock
needs to be held as well.
Will submit v4.
Thx,
Ivan
^ permalink raw reply
* [PATCH net v4] ice: Fix race during aux device (un)plugging
From: Ivan Vecera @ 2022-04-23 10:20 UTC (permalink / raw)
To: netdev
Cc: poros, mschmidt, Leon Romanovsky, Jesse Brandeburg, Tony Nguyen,
David S. Miller, Jakub Kicinski, Paolo Abeni, Shiraz Saleem,
Dave Ertman, moderated list:INTEL ETHERNET DRIVERS, open list
Function ice_plug_aux_dev() assigns pf->adev field too early prior
aux device initialization and on other side ice_unplug_aux_dev()
starts aux device deinit and at the end assigns NULL to pf->adev.
This is wrong because pf->adev should always be non-NULL only when
aux device is fully initialized and ready. This wrong order causes
a crash when ice_send_event_to_aux() call occurs because that function
depends on non-NULL value of pf->adev and does not assume that
aux device is half-initialized or half-destroyed.
After order correction the race window is tiny but it is still there,
as Leon mentioned and manipulation with pf->adev needs to be protected
by mutex.
Fix (un-)plugging functions so pf->adev field is set after aux device
init and prior aux device destroy and protect pf->adev assignment by
new mutex. This mutex is also held during ice_send_event_to_aux()
call to ensure that aux device is valid during that call.
Note that device lock used ice_send_event_to_aux() needs to be kept
to avoid race with aux drv unload.
Reproducer:
cycle=1
while :;do
echo "#### Cycle: $cycle"
ip link set ens7f0 mtu 9000
ip link add bond0 type bond mode 1 miimon 100
ip link set bond0 up
ifenslave bond0 ens7f0
ip link set bond0 mtu 9000
ethtool -L ens7f0 combined 1
ip link del bond0
ip link set ens7f0 mtu 1500
sleep 1
let cycle++
done
In short when the device is added/removed to/from bond the aux device
is unplugged/plugged. When MTU of the device is changed an event is
sent to aux device asynchronously. This can race with (un)plugging
operation and because pf->adev is set too early (plug) or too late
(unplug) the function ice_send_event_to_aux() can touch uninitialized
or destroyed fields. In the case of crash below pf->adev->dev.mutex.
Crash:
[ 53.372066] bond0: (slave ens7f0): making interface the new active one
[ 53.378622] bond0: (slave ens7f0): Enslaving as an active interface with an u
p link
[ 53.386294] IPv6: ADDRCONF(NETDEV_CHANGE): bond0: link becomes ready
[ 53.549104] bond0: (slave ens7f1): Enslaving as a backup interface with an up
link
[ 54.118906] ice 0000:ca:00.0 ens7f0: Number of in use tx queues changed inval
idating tc mappings. Priority traffic classification disabled!
[ 54.233374] ice 0000:ca:00.1 ens7f1: Number of in use tx queues changed inval
idating tc mappings. Priority traffic classification disabled!
[ 54.248204] bond0: (slave ens7f0): Releasing backup interface
[ 54.253955] bond0: (slave ens7f1): making interface the new active one
[ 54.274875] bond0: (slave ens7f1): Releasing backup interface
[ 54.289153] bond0 (unregistering): Released all slaves
[ 55.383179] MII link monitoring set to 100 ms
[ 55.398696] bond0: (slave ens7f0): making interface the new active one
[ 55.405241] BUG: kernel NULL pointer dereference, address: 0000000000000080
[ 55.405289] bond0: (slave ens7f0): Enslaving as an active interface with an u
p link
[ 55.412198] #PF: supervisor write access in kernel mode
[ 55.412200] #PF: error_code(0x0002) - not-present page
[ 55.412201] PGD 25d2ad067 P4D 0
[ 55.412204] Oops: 0002 [#1] PREEMPT SMP NOPTI
[ 55.412207] CPU: 0 PID: 403 Comm: kworker/0:2 Kdump: loaded Tainted: G S
5.17.0-13579-g57f2d6540f03 #1
[ 55.429094] bond0: (slave ens7f1): Enslaving as a backup interface with an up
link
[ 55.430224] Hardware name: Dell Inc. PowerEdge R750/06V45N, BIOS 1.4.4 10/07/
2021
[ 55.430226] Workqueue: ice ice_service_task [ice]
[ 55.468169] RIP: 0010:mutex_unlock+0x10/0x20
[ 55.472439] Code: 0f b1 13 74 96 eb e0 4c 89 ee eb d8 e8 79 54 ff ff 66 0f 1f 84 00 00 00 00 00 0f 1f 44 00 00 65 48 8b 04 25 40 ef 01 00 31 d2 <f0> 48 0f b1 17 75 01 c3 e9 e3 fe ff ff 0f 1f 00 0f 1f 44 00 00 48
[ 55.491186] RSP: 0018:ff4454230d7d7e28 EFLAGS: 00010246
[ 55.496413] RAX: ff1a79b208b08000 RBX: ff1a79b2182e8880 RCX: 0000000000000001
[ 55.503545] RDX: 0000000000000000 RSI: ff4454230d7d7db0 RDI: 0000000000000080
[ 55.510678] RBP: ff1a79d1c7e48b68 R08: ff4454230d7d7db0 R09: 0000000000000041
[ 55.517812] R10: 00000000000000a5 R11: 00000000000006e6 R12: ff1a79d1c7e48bc0
[ 55.524945] R13: 0000000000000000 R14: ff1a79d0ffc305c0 R15: 0000000000000000
[ 55.532076] FS: 0000000000000000(0000) GS:ff1a79d0ffc00000(0000) knlGS:0000000000000000
[ 55.540163] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033
[ 55.545908] CR2: 0000000000000080 CR3: 00000003487ae003 CR4: 0000000000771ef0
[ 55.553041] DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000
[ 55.560173] DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400
[ 55.567305] PKRU: 55555554
[ 55.570018] Call Trace:
[ 55.572474] <TASK>
[ 55.574579] ice_service_task+0xaab/0xef0 [ice]
[ 55.579130] process_one_work+0x1c5/0x390
[ 55.583141] ? process_one_work+0x390/0x390
[ 55.587326] worker_thread+0x30/0x360
[ 55.590994] ? process_one_work+0x390/0x390
[ 55.595180] kthread+0xe6/0x110
[ 55.598325] ? kthread_complete_and_exit+0x20/0x20
[ 55.603116] ret_from_fork+0x1f/0x30
[ 55.606698] </TASK>
Fixes: f9f5301e7e2d ("ice: Register auxiliary device to provide RDMA")
Reviewed-by: Leon Romanovsky <leonro@nvidia.com>
Signed-off-by: Ivan Vecera <ivecera@redhat.com>
---
drivers/net/ethernet/intel/ice/ice.h | 1 +
drivers/net/ethernet/intel/ice/ice_idc.c | 25 +++++++++++++++--------
drivers/net/ethernet/intel/ice/ice_main.c | 2 ++
3 files changed, 20 insertions(+), 8 deletions(-)
diff --git a/drivers/net/ethernet/intel/ice/ice.h b/drivers/net/ethernet/intel/ice/ice.h
index 8ed3c9ab7ff7..a895e3a8e988 100644
--- a/drivers/net/ethernet/intel/ice/ice.h
+++ b/drivers/net/ethernet/intel/ice/ice.h
@@ -540,6 +540,7 @@ struct ice_pf {
struct mutex avail_q_mutex; /* protects access to avail_[rx|tx]qs */
struct mutex sw_mutex; /* lock for protecting VSI alloc flow */
struct mutex tc_mutex; /* lock to protect TC changes */
+ struct mutex adev_mutex; /* lock to protect aux device access */
u32 msg_enable;
struct ice_ptp ptp;
struct tty_driver *ice_gnss_tty_driver;
diff --git a/drivers/net/ethernet/intel/ice/ice_idc.c b/drivers/net/ethernet/intel/ice/ice_idc.c
index 25a436d342c2..3e3b2ed4cd5d 100644
--- a/drivers/net/ethernet/intel/ice/ice_idc.c
+++ b/drivers/net/ethernet/intel/ice/ice_idc.c
@@ -37,14 +37,17 @@ void ice_send_event_to_aux(struct ice_pf *pf, struct iidc_event *event)
if (WARN_ON_ONCE(!in_task()))
return;
+ mutex_lock(&pf->adev_mutex);
if (!pf->adev)
- return;
+ goto finish;
device_lock(&pf->adev->dev);
iadrv = ice_get_auxiliary_drv(pf);
if (iadrv && iadrv->event_handler)
iadrv->event_handler(pf, event);
device_unlock(&pf->adev->dev);
+finish:
+ mutex_unlock(&pf->adev_mutex);
}
/**
@@ -290,7 +293,6 @@ int ice_plug_aux_dev(struct ice_pf *pf)
return -ENOMEM;
adev = &iadev->adev;
- pf->adev = adev;
iadev->pf = pf;
adev->id = pf->aux_idx;
@@ -300,18 +302,20 @@ int ice_plug_aux_dev(struct ice_pf *pf)
ret = auxiliary_device_init(adev);
if (ret) {
- pf->adev = NULL;
kfree(iadev);
return ret;
}
ret = auxiliary_device_add(adev);
if (ret) {
- pf->adev = NULL;
auxiliary_device_uninit(adev);
return ret;
}
+ mutex_lock(&pf->adev_mutex);
+ pf->adev = adev;
+ mutex_unlock(&pf->adev_mutex);
+
return 0;
}
@@ -320,12 +324,17 @@ int ice_plug_aux_dev(struct ice_pf *pf)
*/
void ice_unplug_aux_dev(struct ice_pf *pf)
{
- if (!pf->adev)
- return;
+ struct auxiliary_device *adev;
- auxiliary_device_delete(pf->adev);
- auxiliary_device_uninit(pf->adev);
+ mutex_lock(&pf->adev_mutex);
+ adev = pf->adev;
pf->adev = NULL;
+ mutex_unlock(&pf->adev_mutex);
+
+ if (adev) {
+ auxiliary_device_delete(adev);
+ auxiliary_device_uninit(adev);
+ }
}
/**
diff --git a/drivers/net/ethernet/intel/ice/ice_main.c b/drivers/net/ethernet/intel/ice/ice_main.c
index 5b1198859da7..2cbbf7abefc4 100644
--- a/drivers/net/ethernet/intel/ice/ice_main.c
+++ b/drivers/net/ethernet/intel/ice/ice_main.c
@@ -3769,6 +3769,7 @@ u16 ice_get_avail_rxq_count(struct ice_pf *pf)
static void ice_deinit_pf(struct ice_pf *pf)
{
ice_service_task_stop(pf);
+ mutex_destroy(&pf->adev_mutex);
mutex_destroy(&pf->sw_mutex);
mutex_destroy(&pf->tc_mutex);
mutex_destroy(&pf->avail_q_mutex);
@@ -3847,6 +3848,7 @@ static int ice_init_pf(struct ice_pf *pf)
mutex_init(&pf->sw_mutex);
mutex_init(&pf->tc_mutex);
+ mutex_init(&pf->adev_mutex);
INIT_HLIST_HEAD(&pf->aq_wait_list);
spin_lock_init(&pf->aq_wait_lock);
--
2.35.1
^ permalink raw reply related
* Re: [PATCH net-next v2] net: phy: broadcom: 1588 support on bcm54210pe
From: Lasse Johnsen @ 2022-04-23 10:26 UTC (permalink / raw)
To: Jonathan Lemon
Cc: Richard Cochran, netdev, Gordon Hollingworth, Ahmad Byagowi,
Florian Fainelli, Andrew Lunn, Heiner Kallweit, Russell King,
bcm-kernel-feedback-list, David S. Miller, Jakub Kicinski,
Paolo Abeni
In-Reply-To: <FCDBE44F-57EB-420E-844B-29BBB37EA2C6@gmail.com>
I have reviewed the documentation again, and I am inclined to agree with you. I will modify driver to use in-band RX timestamps. It looks like TX timestamps can also be updated on the fly to allow for one-step operation.
> On 22 Apr 2022, at 19:20, Jonathan Lemon <jonathan.lemon@gmail.com> wrote:
>
> Uhm, I have inbound timestamps working for RX on an RPI CM4.
^ permalink raw reply
* Re: [PATCH net 0/2] net/smc: Two fixes for smc fallback
From: Karsten Graul @ 2022-04-23 10:26 UTC (permalink / raw)
To: Wen Gu, davem, kuba; +Cc: linux-s390, netdev, linux-kernel
In-Reply-To: <1650614179-11529-1-git-send-email-guwen@linux.alibaba.com>
On 22/04/2022 09:56, Wen Gu wrote:
> This patch set includes two fixes for smc fallback:
>
> Patch 1/2 introduces some simple helpers to wrap the replacement
> and restore of clcsock's callback functions. Make sure that only
> the original callbacks will be saved and not overwritten.
>
> Patch 2/2 fixes a syzbot reporting slab-out-of-bound issue where
> smc_fback_error_report() accesses the already freed smc sock (see
> https://lore.kernel.org/r/00000000000013ca8105d7ae3ada@google.com/).
> The patch fixes it by resetting sk_user_data and restoring clcsock
> callback functions timely in fallback situation.
Thank you for the analysis and the fix!
For the series:
Acked-by: Karsten Graul <kgraul@linux.ibm.com>
^ permalink raw reply
page: next (older) | prev (newer) | latest
- recent:[subjects (threaded)|topics (new)|topics (active)]
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox